Merge branch 'release/1.0.1'

Author: Kevin Hellemun

build.gradle

@@ -5,6 +5,17 @@ apply plugin: 'java'
 apply plugin: 'maven'
 sourceCompatibility = 1.7
 
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src/main/java'
+            exclude '**/examples/**'
+            exclude '**/test/**'
+        }
+    }
+}
+
 repositories {
     mavenCentral()
 }

src/main/java/com/bunq/sdk/model/generated/endpoint/CardBatch.java

@@ -0,0 +1,115 @@
+package com.bunq.sdk.model.generated.endpoint;
+
+import com.bunq.sdk.context.ApiContext;
+import com.bunq.sdk.http.ApiClient;
+import com.bunq.sdk.http.BunqResponse;
+import com.bunq.sdk.http.BunqResponseRaw;
+import com.bunq.sdk.model.core.BunqModel;
+import com.bunq.sdk.model.core.MonetaryAccountReference;
+import com.bunq.sdk.model.generated.object.BunqId;
+import com.bunq.sdk.model.generated.object.CardBatchEntry;
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.lang.model.type.NullType;
+
+/**
+ * Used to update multiple cards in a batch.
+ */
+public class CardBatch extends BunqModel {
+
+  /**
+   * Endpoint constants.
+   */
+  protected static final String ENDPOINT_URL_CREATE = "user/%s/card-batch";
+
+  /**
+   * Field constants.
+   */
+  public static final String FIELD_CARDS = "cards";
+
+  /**
+   * Object type.
+   */
+  protected static final String OBJECT_TYPE_POST = "CardBatch";
+
+  /**
+   * The ids of the cards that have been updated.
+   */
+  @Expose
+  @SerializedName("updated_card_ids")
+  private List<BunqId> updatedCardIds;
+
+  /**
+   * The cards that need to be updated.
+   */
+  @Expose
+  @SerializedName("cards_field_for_request")
+  private List<CardBatchEntry> cardsFieldForRequest;
+
+  public CardBatch() {
+  this(null);
+  }
+
+  public CardBatch(List<CardBatchEntry> cards) {
+    this.cardsFieldForRequest = cards;
+  }  /**
+   * @param cards The cards that need to be updated.
+   */
+  public static BunqResponse<CardBatch> create(List<CardBatchEntry> cards, Map<String, String> customHeaders) {
+    ApiClient apiClient = new ApiClient(getApiContext());
+
+    if (customHeaders == null) {
+      customHeaders = new HashMap<>();
+    }
+
+  HashMap<String, Object> requestMap = new HashMap<>();
+requestMap.put(FIELD_CARDS, cards);
+
+    byte[] requestBytes = determineAllRequestByte(requestMap);
+    BunqResponseRaw responseRaw = apiClient.post(String.format(ENDPOINT_URL_CREATE, determineUserId()), requestBytes, customHeaders);
+
+    return fromJson(CardBatch.class, responseRaw, OBJECT_TYPE_POST);
+  }
+
+  public static BunqResponse<CardBatch> create() {
+    return create(null, null);
+  }
+
+  public static BunqResponse<CardBatch> create(List<CardBatchEntry> cards) {
+    return create(cards, null);
+  }
+
+  /**
+   * The ids of the cards that have been updated.
+   */
+  public List<BunqId> getUpdatedCardIds() {
+    return this.updatedCardIds;
+  }
+
+  public void setUpdatedCardIds(List<BunqId> updatedCardIds) {
+    this.updatedCardIds = updatedCardIds;
+  }
+
+  /**
+   */
+  public boolean isAllFieldNull() {
+    if (this.updatedCardIds != null) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   */
+  public static CardBatch fromJsonReader(JsonReader reader) {
+    return fromJsonReader(CardBatch.class, reader);
+  }
+
+}

src/main/java/com/bunq/sdk/model/generated/endpoint/CardGeneratedCvc2.java

@@ -23,12 +23,13 @@ public class CardGeneratedCvc2 extends BunqModel {
    */
   protected static final String ENDPOINT_URL_CREATE = "user/%s/card/%s/generated-cvc2";
   protected static final String ENDPOINT_URL_READ = "user/%s/card/%s/generated-cvc2/%s";
+  protected static final String ENDPOINT_URL_UPDATE = "user/%s/card/%s/generated-cvc2/%s";
+  protected static final String ENDPOINT_URL_LISTING = "user/%s/card/%s/generated-cvc2";
+
   /**
    * Field constants.
    */
   public static final String FIELD_TYPE = "type";
-  protected static final String ENDPOINT_URL_LISTING = "user/%s/card/%s/generated-cvc2";
-  protected static final String ENDPOINT_URL_UPDATE = "user/%s/card/%s/generated-cvc2/%s";
 
   /**
    * Object type.
@@ -55,6 +56,7 @@ public class CardGeneratedCvc2 extends BunqModel {
   @Expose
   @SerializedName("updated")
   private String updated;
+
   /**
    * The type of generated cvc2. Can be STATIC or GENERATED.
    */

src/main/java/com/bunq/sdk/model/generated/endpoint/Customer.java

@@ -63,6 +63,13 @@ public class Customer extends BunqModel {
   @SerializedName("billing_account_id")
   private String billingAccountId;
 
+  /**
+   * The preferred notification type for invoices.
+   */
+  @Expose
+  @SerializedName("invoice_notification_preference")
+  private String invoiceNotificationPreference;
+
   /**
    * The primary billing account account's id.
    */
@@ -205,6 +212,17 @@ public void setBillingAccountId(String billingAccountId) {
     this.billingAccountId = billingAccountId;
   }
 
+  /**
+   * The preferred notification type for invoices.
+   */
+  public String getInvoiceNotificationPreference() {
+    return this.invoiceNotificationPreference;
+  }
+
+  public void setInvoiceNotificationPreference(String invoiceNotificationPreference) {
+    this.invoiceNotificationPreference = invoiceNotificationPreference;
+  }
+
   /**
    */
   public boolean isAllFieldNull() {
@@ -224,6 +242,10 @@ public boolean isAllFieldNull() {
       return false;
     }
 
+    if (this.invoiceNotificationPreference != null) {
+      return false;
+    }
+
     return true;
   }
 

src/main/java/com/bunq/sdk/model/generated/endpoint/MasterCardAction.java

@@ -87,6 +87,13 @@ public class MasterCardAction extends BunqModel {
   @SerializedName("amount_fee")
   private Amount amountFee;
 
+  /**
+   * The response code by which authorised transaction can be identified as authorised by bunq.
+   */
+  @Expose
+  @SerializedName("card_authorisation_id_response")
+  private String cardAuthorisationIdResponse;
+
   /**
    * Why the transaction was denied, if it was denied, or just ALLOWED.
    */
@@ -357,6 +364,17 @@ public void setAmountFee(Amount amountFee) {
     this.amountFee = amountFee;
   }
 
+  /**
+   * The response code by which authorised transaction can be identified as authorised by bunq.
+   */
+  public String getCardAuthorisationIdResponse() {
+    return this.cardAuthorisationIdResponse;
+  }
+
+  public void setCardAuthorisationIdResponse(String cardAuthorisationIdResponse) {
+    this.cardAuthorisationIdResponse = cardAuthorisationIdResponse;
+  }
+
   /**
    * Why the transaction was denied, if it was denied, or just ALLOWED.
    */
@@ -604,6 +622,10 @@ public boolean isAllFieldNull() {
       return false;
     }
 
+    if (this.cardAuthorisationIdResponse != null) {
+      return false;
+    }
+
     if (this.decision != null) {
       return false;
     }