Skip to content

Commit

Permalink
Merge branch 'release/0.12.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
OGKevin committed Nov 15, 2017
2 parents aa0c54f + 3361723 commit d058b03
Show file tree
Hide file tree
Showing 78 changed files with 3,900 additions and 608 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group 'com.bunq.sdk'
version '0.12.2'
version '0.12.3'

apply plugin: 'java'
apply plugin: 'maven'
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/bunq/sdk/http/ApiClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public class ApiClient {
/**
* Prefix for bunq's own headers.
*/
private static final String USER_AGENT_BUNQ = "bunq-sdk-java/0.12.2";
private static final String USER_AGENT_BUNQ = "bunq-sdk-java/0.12.3";
private static final String LANGUAGE_EN_US = "en_US";
private static final String REGION_NL_NL = "nl_NL";
private static final String GEOLOCATION_ZERO = "0 0 0 0 000";
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/bunq/sdk/model/generated/endpoint/Avatar.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
*/
public class Avatar extends BunqModel {

/**
* Field constants.
*/
public static final String FIELD_ATTACHMENT_PUBLIC_UUID = "attachment_public_uuid";

/**
* Endpoint constants.
*/
private static final String ENDPOINT_URL_CREATE = "avatar";
private static final String ENDPOINT_URL_READ = "avatar/%s";

/**
* Field constants.
*/
public static final String FIELD_ATTACHMENT_PUBLIC_UUID = "attachment_public_uuid";

/**
* Object type.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
*/
public class BillingContractSubscription extends BunqModel {

/**
* Field constants.
*/
public static final String FIELD_SUBSCRIPTION_TYPE = "subscription_type";

/**
* Endpoint constants.
*/
private static final String ENDPOINT_URL_CREATE = "user/%s/billing-contract-subscription";
private static final String ENDPOINT_URL_LISTING = "user/%s/billing-contract-subscription";

/**
* Field constants.
*/
public static final String FIELD_SUBSCRIPTION_TYPE = "subscription_type";

/**
* Object type.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@
*/
public class BunqMeTab extends BunqModel {

/**
* Field constants.
*/
public static final String FIELD_BUNQME_TAB_ENTRY = "bunqme_tab_entry";
public static final String FIELD_STATUS = "status";

/**
* Endpoint constants.
*/
Expand All @@ -36,6 +30,12 @@ public class BunqMeTab extends BunqModel {
private static final String ENDPOINT_URL_LISTING = "user/%s/monetary-account/%s/bunqme-tab";
private static final String ENDPOINT_URL_READ = "user/%s/monetary-account/%s/bunqme-tab/%s";

/**
* Field constants.
*/
public static final String FIELD_BUNQME_TAB_ENTRY = "bunqme_tab_entry";
public static final String FIELD_STATUS = "status";

/**
* Object type.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package com.bunq.sdk.model.generated.endpoint;

import com.bunq.sdk.model.core.BunqModel;
import com.bunq.sdk.model.core.MonetaryAccountReference;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
* Used to view bunq.me TabResultResponse objects belonging to a tab. A TabResultResponse is an
* object that holds details on a tab which has been paid from the provided monetary account.
*/
public class BunqMeTabResultResponse extends BunqModel {

/**
* Object type.
*/
private static final String OBJECT_TYPE = "BunqMeTabResultResponse";

/**
* The payment made for the bunq.me tab.
*/
@Expose
@SerializedName("payment")
private Payment payment;

/**
* The payment made for the bunq.me tab.
*/
public Payment getPayment() {
return this.payment;
}

public void setPayment(Payment payment) {
this.payment = payment;
}

}
50 changes: 43 additions & 7 deletions src/main/java/com/bunq/sdk/model/generated/endpoint/Card.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@
*/
public class Card extends BunqModel {

/**
* Endpoint constants.
*/
private static final String ENDPOINT_URL_UPDATE = "user/%s/card/%s";
private static final String ENDPOINT_URL_READ = "user/%s/card/%s";
private static final String ENDPOINT_URL_LISTING = "user/%s/card";

/**
* Field constants.
*/
Expand All @@ -39,13 +46,6 @@ public class Card extends BunqModel {
public static final String FIELD_PIN_CODE_ASSIGNMENT = "pin_code_assignment";
public static final String FIELD_MONETARY_ACCOUNT_ID_FALLBACK = "monetary_account_id_fallback";

/**
* Endpoint constants.
*/
private static final String ENDPOINT_URL_UPDATE = "user/%s/card/%s";
private static final String ENDPOINT_URL_READ = "user/%s/card/%s";
private static final String ENDPOINT_URL_LISTING = "user/%s/card";

/**
* Object type.
*/
Expand Down Expand Up @@ -86,6 +86,13 @@ public class Card extends BunqModel {
@SerializedName("type")
private String type;

/**
* The sub-type of the card.
*/
@Expose
@SerializedName("sub_type")
private String subType;

/**
* The second line of text on the card
*/
Expand Down Expand Up @@ -188,6 +195,13 @@ public class Card extends BunqModel {
@SerializedName("monetary_account_id_fallback")
private Integer monetaryAccountIdFallback;

/**
* The country that is domestic to the card. Defaults to country of residence of user.
*/
@Expose
@SerializedName("country")
private String country;

public static BunqResponse<Card> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer cardId) {
return update(apiContext, requestMap, userId, cardId, new HashMap<>());
}
Expand Down Expand Up @@ -293,6 +307,17 @@ public void setType(String type) {
this.type = type;
}

/**
* The sub-type of the card.
*/
public String getSubType() {
return this.subType;
}

public void setSubType(String subType) {
this.subType = subType;
}

/**
* The second line of text on the card
*/
Expand Down Expand Up @@ -451,4 +476,15 @@ public void setMonetaryAccountIdFallback(Integer monetaryAccountIdFallback) {
this.monetaryAccountIdFallback = monetaryAccountIdFallback;
}

/**
* The country that is domestic to the card. Defaults to country of residence of user.
*/
public String getCountry() {
return this.country;
}

public void setCountry(String country) {
this.country = country;
}

}
47 changes: 42 additions & 5 deletions src/main/java/com/bunq/sdk/model/generated/endpoint/CardDebit.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
*/
public class CardDebit extends BunqModel {

/**
* Endpoint constants.
*/
private static final String ENDPOINT_URL_CREATE = "user/%s/card-debit";

/**
* Field constants.
*/
Expand All @@ -37,11 +42,7 @@ public class CardDebit extends BunqModel {
public static final String FIELD_TYPE = "type";
public static final String FIELD_PIN_CODE_ASSIGNMENT = "pin_code_assignment";
public static final String FIELD_MONETARY_ACCOUNT_ID_FALLBACK = "monetary_account_id_fallback";

/**
* Endpoint constants.
*/
private static final String ENDPOINT_URL_CREATE = "user/%s/card-debit";
public static final String FIELD_COUNTRY = "country";

/**
* Object type.
Expand Down Expand Up @@ -83,6 +84,13 @@ public class CardDebit extends BunqModel {
@SerializedName("type")
private String type;

/**
* The sub_type of card.
*/
@Expose
@SerializedName("sub_type")
private String subType;

/**
* The second line of text on the card
*/
Expand Down Expand Up @@ -175,6 +183,13 @@ public class CardDebit extends BunqModel {
@SerializedName("monetary_account_id_fallback")
private Integer monetaryAccountIdFallback;

/**
* The country that is domestic to the card. Defaults to country of residence of user.
*/
@Expose
@SerializedName("country")
private String country;

public static BunqResponse<CardDebit> create(ApiContext apiContext, Map<String, Object> requestMap, Integer userId) {
return create(apiContext, requestMap, userId, new HashMap<>());
}
Expand Down Expand Up @@ -246,6 +261,17 @@ public void setType(String type) {
this.type = type;
}

/**
* The sub_type of card.
*/
public String getSubType() {
return this.subType;
}

public void setSubType(String subType) {
this.subType = subType;
}

/**
* The second line of text on the card
*/
Expand Down Expand Up @@ -390,4 +416,15 @@ public void setMonetaryAccountIdFallback(Integer monetaryAccountIdFallback) {
this.monetaryAccountIdFallback = monetaryAccountIdFallback;
}

/**
* The country that is domestic to the card. Defaults to country of residence of user.
*/
public String getCountry() {
return this.country;
}

public void setCountry(String country) {
this.country = country;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
public class CardReplace extends BunqModel {

/**
* Field constants.
* Endpoint constants.
*/
public static final String FIELD_PIN_CODE = "pin_code";
public static final String FIELD_SECOND_LINE = "second_line";
private static final String ENDPOINT_URL_CREATE = "user/%s/card/%s/replace";

/**
* Endpoint constants.
* Field constants.
*/
private static final String ENDPOINT_URL_CREATE = "user/%s/card/%s/replace";
public static final String FIELD_PIN_CODE = "pin_code";
public static final String FIELD_SECOND_LINE = "second_line";

/**
* Object type.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@
*/
public class CashRegister extends BunqModel {

/**
* Endpoint constants.
*/
private static final String ENDPOINT_URL_CREATE = "user/%s/monetary-account/%s/cash-register";
private static final String ENDPOINT_URL_READ = "user/%s/monetary-account/%s/cash-register/%s";
private static final String ENDPOINT_URL_UPDATE = "user/%s/monetary-account/%s/cash-register/%s";
private static final String ENDPOINT_URL_LISTING = "user/%s/monetary-account/%s/cash-register";

/**
* Field constants.
*/
Expand All @@ -39,14 +47,6 @@ public class CashRegister extends BunqModel {
public static final String FIELD_NOTIFICATION_FILTERS = "notification_filters";
public static final String FIELD_TAB_TEXT_WAITING_SCREEN = "tab_text_waiting_screen";

/**
* Endpoint constants.
*/
private static final String ENDPOINT_URL_CREATE = "user/%s/monetary-account/%s/cash-register";
private static final String ENDPOINT_URL_READ = "user/%s/monetary-account/%s/cash-register/%s";
private static final String ENDPOINT_URL_UPDATE = "user/%s/monetary-account/%s/cash-register/%s";
private static final String ENDPOINT_URL_LISTING = "user/%s/monetary-account/%s/cash-register";

/**
* Object type.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@
*/
public class CashRegisterQrCode extends BunqModel {

/**
* Field constants.
*/
public static final String FIELD_STATUS = "status";

/**
* Endpoint constants.
*/
Expand All @@ -35,6 +30,11 @@ public class CashRegisterQrCode extends BunqModel {
private static final String ENDPOINT_URL_READ = "user/%s/monetary-account/%s/cash-register/%s/qr-code/%s";
private static final String ENDPOINT_URL_LISTING = "user/%s/monetary-account/%s/cash-register/%s/qr-code";

/**
* Field constants.
*/
public static final String FIELD_STATUS = "status";

/**
* Object type.
*/
Expand Down
Loading

0 comments on commit d058b03

Please sign in to comment.