diff --git a/build.gradle b/build.gradle index 9a9666ca..59a58576 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ group 'com.bunq.sdk' -version '1.14.1' +version '1.20.22.74-zzave' apply plugin: 'java' -apply plugin: 'maven' +apply plugin: "maven-publish" sourceCompatibility = 1.8 @@ -16,8 +16,25 @@ sourceSets { } } +task sourceJar(type: Jar) { + from sourceSets.main.allJava +} + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + + artifact sourceJar { + classifier "sources" + } + } + } +} + repositories { mavenCentral() + mavenLocal() } dependencies { diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..c22e5721 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,5 @@ +kotlin.code.style=official +kotlin.js.generate.executable.default=false +org.gradle.jvmargs=-Xmx3g +org.gradle.caching=true +kotlin.mpp.stability.nowarn=true diff --git a/src/main/java/com/bunq/sdk/model/core/NotificationFilterPushUserInternal.java b/src/main/java/com/bunq/sdk/model/core/NotificationFilterPushUserInternal.java index ca395dea..b1a18f0d 100644 --- a/src/main/java/com/bunq/sdk/model/core/NotificationFilterPushUserInternal.java +++ b/src/main/java/com/bunq/sdk/model/core/NotificationFilterPushUserInternal.java @@ -3,16 +3,15 @@ import com.bunq.sdk.http.ApiClient; import com.bunq.sdk.http.BunqResponse; import com.bunq.sdk.http.BunqResponseRaw; -import com.bunq.sdk.model.generated.endpoint.NotificationFilterPushUser; -import com.bunq.sdk.model.generated.object.NotificationFilterPush; -import com.bunq.sdk.model.generated.object.NotificationFilterUrl; +import com.bunq.sdk.model.generated.endpoint.NotificationFilterPush; +import com.bunq.sdk.model.generated.object.NotificationFilterPushObject; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -public class NotificationFilterPushUserInternal extends NotificationFilterPushUser { +public class NotificationFilterPushUserInternal extends NotificationFilterPush { /** * Field constants. */ @@ -21,15 +20,15 @@ public class NotificationFilterPushUserInternal extends NotificationFilterPushUs /** * Create notification filters with list response type. */ - public static BunqResponse<List<NotificationFilterPush>> createWithListResponse() { - return createWithListResponse(new ArrayList<NotificationFilterPush>(), null); + public static BunqResponse<List<NotificationFilterPushObject>> createWithListResponse() { + return createWithListResponse(new ArrayList<NotificationFilterPushObject>(), null); } /** * Create notification filters with list response type. */ - public static BunqResponse<List<NotificationFilterPush>> createWithListResponse( - List<NotificationFilterPush> allNotificationFilter + public static BunqResponse<List<NotificationFilterPushObject>> createWithListResponse( + List<NotificationFilterPushObject> allNotificationFilter ) { return createWithListResponse(allNotificationFilter, null); } @@ -37,8 +36,8 @@ public static BunqResponse<List<NotificationFilterPush>> createWithListResponse( /** * Create notification filters with list response type. */ - public static BunqResponse<List<NotificationFilterPush>> createWithListResponse( - List<NotificationFilterPush> allNotificationFilter, + public static BunqResponse<List<NotificationFilterPushObject>> createWithListResponse( + List<NotificationFilterPushObject> allNotificationFilter, Map<String, String> customHeaders ) { ApiClient apiClient = new ApiClient(getApiContext()); @@ -53,6 +52,6 @@ public static BunqResponse<List<NotificationFilterPush>> createWithListResponse( byte[] requestBytes = determineAllRequestByte(requestMap); BunqResponseRaw responseRaw = apiClient.post(String.format(ENDPOINT_URL_CREATE, determineUserId()), requestBytes, customHeaders); - return NotificationFilterUrl.fromJsonList(NotificationFilterPush.class, responseRaw, OBJECT_TYPE); + return NotificationFilterPushObject.fromJsonList(NotificationFilterPushObject.class, responseRaw, OBJECT_TYPE); } } diff --git a/src/main/java/com/bunq/sdk/model/core/NotificationFilterUrlMonetaryAccountInternal.java b/src/main/java/com/bunq/sdk/model/core/NotificationFilterUrlMonetaryAccountInternal.java index 64bf8c16..d5fa77b4 100644 --- a/src/main/java/com/bunq/sdk/model/core/NotificationFilterUrlMonetaryAccountInternal.java +++ b/src/main/java/com/bunq/sdk/model/core/NotificationFilterUrlMonetaryAccountInternal.java @@ -4,7 +4,7 @@ import com.bunq.sdk.http.BunqResponse; import com.bunq.sdk.http.BunqResponseRaw; import com.bunq.sdk.model.generated.endpoint.NotificationFilterUrlMonetaryAccount; -import com.bunq.sdk.model.generated.object.NotificationFilterUrl; +import com.bunq.sdk.model.generated.object.NotificationFilterUrlObject; import java.util.ArrayList; import java.util.HashMap; @@ -20,16 +20,16 @@ public class NotificationFilterUrlMonetaryAccountInternal extends NotificationFi /** * Create notification filters with list response type. */ - public static BunqResponse<List<NotificationFilterUrl>> createWithListResponse() { - return createWithListResponse(null, new ArrayList<NotificationFilterUrl>()); + public static BunqResponse<List<NotificationFilterUrlObject>> createWithListResponse() { + return createWithListResponse(null, new ArrayList<NotificationFilterUrlObject>()); } /** * Create notification filters with list response type. */ - public static BunqResponse<List<NotificationFilterUrl>> createWithListResponse( + public static BunqResponse<List<NotificationFilterUrlObject>> createWithListResponse( Integer monetaryAccountId, - List<NotificationFilterUrl> allNotificationFilter + List<NotificationFilterUrlObject> allNotificationFilter ) { return createWithListResponse(monetaryAccountId, allNotificationFilter, null); } @@ -37,9 +37,9 @@ public static BunqResponse<List<NotificationFilterUrl>> createWithListResponse( /** * Create notification filters with list response type. */ - public static BunqResponse<List<NotificationFilterUrl>> createWithListResponse( + public static BunqResponse<List<NotificationFilterUrlObject>> createWithListResponse( Integer monetaryAccountId, - List<NotificationFilterUrl> allNotificationFilter, + List<NotificationFilterUrlObject> allNotificationFilter, Map<String, String> customHeaders ) { ApiClient apiClient = new ApiClient(getApiContext()); @@ -54,6 +54,6 @@ public static BunqResponse<List<NotificationFilterUrl>> createWithListResponse( byte[] requestBytes = determineAllRequestByte(requestMap); BunqResponseRaw responseRaw = apiClient.post(String.format(ENDPOINT_URL_CREATE, determineUserId(), determineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders); - return NotificationFilterUrl.fromJsonList(NotificationFilterUrl.class, responseRaw, OBJECT_TYPE); + return NotificationFilterUrlObject.fromJsonList(NotificationFilterUrlObject.class, responseRaw, OBJECT_TYPE); } } diff --git a/src/main/java/com/bunq/sdk/model/core/NotificationFilterUrlUserInternal.java b/src/main/java/com/bunq/sdk/model/core/NotificationFilterUrlUserInternal.java index 5110da12..8fe815b6 100644 --- a/src/main/java/com/bunq/sdk/model/core/NotificationFilterUrlUserInternal.java +++ b/src/main/java/com/bunq/sdk/model/core/NotificationFilterUrlUserInternal.java @@ -3,15 +3,15 @@ import com.bunq.sdk.http.ApiClient; import com.bunq.sdk.http.BunqResponse; import com.bunq.sdk.http.BunqResponseRaw; -import com.bunq.sdk.model.generated.endpoint.NotificationFilterUrlUser; -import com.bunq.sdk.model.generated.object.NotificationFilterUrl; +import com.bunq.sdk.model.generated.endpoint.NotificationFilterUrl; +import com.bunq.sdk.model.generated.object.NotificationFilterUrlObject; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -public class NotificationFilterUrlUserInternal extends NotificationFilterUrlUser { +public class NotificationFilterUrlUserInternal extends NotificationFilterUrl { /** * Field constants. */ @@ -20,15 +20,15 @@ public class NotificationFilterUrlUserInternal extends NotificationFilterUrlUser /** * Create notification filters with list response type. */ - public static BunqResponse<List<NotificationFilterUrl>> createWithListResponse() { - return createWithListResponse(new ArrayList<NotificationFilterUrl>(), null); + public static BunqResponse<List<NotificationFilterUrlObject>> createWithListResponse() { + return createWithListResponse(new ArrayList<NotificationFilterUrlObject>(), null); } /** * Create notification filters with list response type. */ - public static BunqResponse<List<NotificationFilterUrl>> createWithListResponse( - List<NotificationFilterUrl> allNotificationFilter + public static BunqResponse<List<NotificationFilterUrlObject>> createWithListResponse( + List<NotificationFilterUrlObject> allNotificationFilter ) { return createWithListResponse(allNotificationFilter, null); } @@ -36,8 +36,8 @@ public static BunqResponse<List<NotificationFilterUrl>> createWithListResponse( /** * Create notification filters with list response type. */ - public static BunqResponse<List<NotificationFilterUrl>> createWithListResponse( - List<NotificationFilterUrl> allNotificationFilter, + public static BunqResponse<List<NotificationFilterUrlObject>> createWithListResponse( + List<NotificationFilterUrlObject> allNotificationFilter, Map<String, String> customHeaders ) { ApiClient apiClient = new ApiClient(getApiContext()); @@ -52,6 +52,6 @@ public static BunqResponse<List<NotificationFilterUrl>> createWithListResponse( byte[] requestBytes = determineAllRequestByte(requestMap); BunqResponseRaw responseRaw = apiClient.post(String.format(ENDPOINT_URL_CREATE, determineUserId()), requestBytes, customHeaders); - return NotificationFilterUrl.fromJsonList(NotificationFilterUrl.class, responseRaw, OBJECT_TYPE); + return NotificationFilterUrlObject.fromJsonList(NotificationFilterUrlObject.class, responseRaw, OBJECT_TYPE); } } diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/CardDigitalPrimaryAccountNumber.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/CardDigitalPrimaryAccountNumber.java new file mode 100644 index 00000000..5a0f6b50 --- /dev/null +++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/CardDigitalPrimaryAccountNumber.java @@ -0,0 +1,177 @@ +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.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; + +/** + * View for getting the dPAN of the card. + */ +public class CardDigitalPrimaryAccountNumber extends BunqModel { + + /** + * Endpoint constants. + */ + protected static final String ENDPOINT_URL_LISTING = "user/%s/card/%s/digital-primary-account-number"; + + /** + * Object type. + */ + protected static final String OBJECT_TYPE_GET = "CardDigitalPrimaryAccountNumber"; + + /** + * The digital PAN of the card. + */ + @Expose + @SerializedName("digital_primary_account_number") + private String digitalPrimaryAccountNumber; + + /** + * The expiry date. + */ + @Expose + @SerializedName("expiry_date") + private String expiryDate; + + /** + * The sequence number. + */ + @Expose + @SerializedName("sequence_number") + private String sequenceNumber; + + /** + * Unique reference given by MDES. + */ + @Expose + @SerializedName("token_unique_reference") + private String tokenUniqueReference; + + /** + * Status code of the token given by MDES. + */ + @Expose + @SerializedName("token_status_code") + private String tokenStatusCode; + + /** + */ + public static BunqResponse<List<CardDigitalPrimaryAccountNumber>> list(Integer cardId, Map<String, String> params, Map<String, String> customHeaders) { + ApiClient apiClient = new ApiClient(getApiContext()); + BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, determineUserId(), cardId), params, customHeaders); + + return fromJsonList(CardDigitalPrimaryAccountNumber.class, responseRaw, OBJECT_TYPE_GET); + } + + public static BunqResponse<List<CardDigitalPrimaryAccountNumber>> list() { + return list(null, null, null); + } + + public static BunqResponse<List<CardDigitalPrimaryAccountNumber>> list(Integer cardId) { + return list(cardId, null, null); + } + + public static BunqResponse<List<CardDigitalPrimaryAccountNumber>> list(Integer cardId, Map<String, String> params) { + return list(cardId, params, null); + } + + /** + * The digital PAN of the card. + */ + public String getDigitalPrimaryAccountNumber() { + return this.digitalPrimaryAccountNumber; + } + + public void setDigitalPrimaryAccountNumber(String digitalPrimaryAccountNumber) { + this.digitalPrimaryAccountNumber = digitalPrimaryAccountNumber; + } + + /** + * The expiry date. + */ + public String getExpiryDate() { + return this.expiryDate; + } + + public void setExpiryDate(String expiryDate) { + this.expiryDate = expiryDate; + } + + /** + * The sequence number. + */ + public String getSequenceNumber() { + return this.sequenceNumber; + } + + public void setSequenceNumber(String sequenceNumber) { + this.sequenceNumber = sequenceNumber; + } + + /** + * Unique reference given by MDES. + */ + public String getTokenUniqueReference() { + return this.tokenUniqueReference; + } + + public void setTokenUniqueReference(String tokenUniqueReference) { + this.tokenUniqueReference = tokenUniqueReference; + } + + /** + * Status code of the token given by MDES. + */ + public String getTokenStatusCode() { + return this.tokenStatusCode; + } + + public void setTokenStatusCode(String tokenStatusCode) { + this.tokenStatusCode = tokenStatusCode; + } + + /** + */ + public boolean isAllFieldNull() { + if (this.digitalPrimaryAccountNumber != null) { + return false; + } + + if (this.expiryDate != null) { + return false; + } + + if (this.sequenceNumber != null) { + return false; + } + + if (this.tokenUniqueReference != null) { + return false; + } + + if (this.tokenStatusCode != null) { + return false; + } + + return true; + } + + /** + */ + public static CardDigitalPrimaryAccountNumber fromJsonReader(JsonReader reader) { + return fromJsonReader(CardDigitalPrimaryAccountNumber.class, reader); + } + +} diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/CurrencyCloudBeneficiaryRequirement.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/CurrencyCloudBeneficiaryRequirement.java index 83f99e62..244dbd1d 100644 --- a/src/main/java/com/bunq/sdk/model/generated/endpoint/CurrencyCloudBeneficiaryRequirement.java +++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/CurrencyCloudBeneficiaryRequirement.java @@ -6,6 +6,7 @@ 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.CurrencyCloudBeneficiaryRequirementField; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.google.gson.stream.JsonReader; diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBank.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBank.java deleted file mode 100644 index a51dae13..00000000 --- a/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBank.java +++ /dev/null @@ -1,373 +0,0 @@ -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.DraftShareInviteEntry; -import com.bunq.sdk.model.generated.object.LabelUser; -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 create a draft share invite for a monetary account with another bunq user, as in the - * 'Connect' feature in the bunq app. The user that accepts the invite can share one of their - * MonetaryAccounts with the user that created the invite. - */ -public class DraftShareInviteBank extends BunqModel { - - /** - * Endpoint constants. - */ - protected static final String ENDPOINT_URL_CREATE = "user/%s/draft-share-invite-bank"; - protected static final String ENDPOINT_URL_READ = "user/%s/draft-share-invite-bank/%s"; - protected static final String ENDPOINT_URL_UPDATE = "user/%s/draft-share-invite-bank/%s"; - protected static final String ENDPOINT_URL_LISTING = "user/%s/draft-share-invite-bank"; - - /** - * Field constants. - */ - public static final String FIELD_STATUS = "status"; - public static final String FIELD_EXPIRATION = "expiration"; - public static final String FIELD_DRAFT_SHARE_SETTINGS = "draft_share_settings"; - - /** - * Object type. - */ - protected static final String OBJECT_TYPE_GET = "DraftShareInviteBank"; - - /** - * The user who created the draft share invite. - */ - @Expose - @SerializedName("user_alias_created") - private LabelUser userAliasCreated; - - /** - * The status of the draft share invite. Can be USED, CANCELLED and PENDING. - */ - @Expose - @SerializedName("status") - private String status; - - /** - * The moment when this draft share invite expires. - */ - @Expose - @SerializedName("expiration") - private String expiration; - - /** - * The id of the share invite bank response this draft share belongs to. - */ - @Expose - @SerializedName("share_invite_bank_response_id") - private Integer shareInviteBankResponseId; - - /** - * The URL redirecting user to the draft share invite in the app. Only works on mobile devices. - */ - @Expose - @SerializedName("draft_share_url") - private String draftShareUrl; - - /** - * The draft share invite details. - */ - @Expose - @SerializedName("draft_share_settings") - private DraftShareInviteEntry draftShareSettings; - - /** - * The id of the newly created draft share invite. - */ - @Expose - @SerializedName("id") - private Integer id; - - /** - * The status of the draft share invite. Can be CANCELLED (the user cancels the draft share - * before it's used). - */ - @Expose - @SerializedName("status_field_for_request") - private String statusFieldForRequest; - - /** - * The moment when this draft share invite expires. - */ - @Expose - @SerializedName("expiration_field_for_request") - private String expirationFieldForRequest; - - /** - * The draft share invite details. - */ - @Expose - @SerializedName("draft_share_settings_field_for_request") - private DraftShareInviteEntry draftShareSettingsFieldForRequest; - - public DraftShareInviteBank() { - this(null, null, null); - } - - public DraftShareInviteBank(String expiration) { - this(expiration, null, null); - } - - public DraftShareInviteBank(String expiration, DraftShareInviteEntry draftShareSettings) { - this(expiration, draftShareSettings, null); - } - - public DraftShareInviteBank(String expiration, DraftShareInviteEntry draftShareSettings, String status) { - this.statusFieldForRequest = status; - this.expirationFieldForRequest = expiration; - this.draftShareSettingsFieldForRequest = draftShareSettings; - } /** - * @param expiration The moment when this draft share invite expires. - * @param draftShareSettings The draft share invite details. - * @param status The status of the draft share invite. Can be CANCELLED (the user cancels the - * draft share before it's used). - */ - public static BunqResponse<Integer> create(String expiration, DraftShareInviteEntry draftShareSettings, String status, Map<String, String> customHeaders) { - ApiClient apiClient = new ApiClient(getApiContext()); - - if (customHeaders == null) { - customHeaders = new HashMap<>(); - } - - HashMap<String, Object> requestMap = new HashMap<>(); -requestMap.put(FIELD_STATUS, status); -requestMap.put(FIELD_EXPIRATION, expiration); -requestMap.put(FIELD_DRAFT_SHARE_SETTINGS, draftShareSettings); - - byte[] requestBytes = determineAllRequestByte(requestMap); - BunqResponseRaw responseRaw = apiClient.post(String.format(ENDPOINT_URL_CREATE, determineUserId()), requestBytes, customHeaders); - - return processForId(responseRaw); - } - - public static BunqResponse<Integer> create() { - return create(null, null, null, null); - } - - public static BunqResponse<Integer> create(String expiration) { - return create(expiration, null, null, null); - } - - public static BunqResponse<Integer> create(String expiration, DraftShareInviteEntry draftShareSettings) { - return create(expiration, draftShareSettings, null, null); - } - - public static BunqResponse<Integer> create(String expiration, DraftShareInviteEntry draftShareSettings, String status) { - return create(expiration, draftShareSettings, status, null); - } - - /** - * Get the details of a specific draft of a share invite. - */ - public static BunqResponse<DraftShareInviteBank> get(Integer draftShareInviteBankId, Map<String, String> params, Map<String, String> customHeaders) { - ApiClient apiClient = new ApiClient(getApiContext()); - BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, determineUserId(), draftShareInviteBankId), params, customHeaders); - - return fromJson(DraftShareInviteBank.class, responseRaw, OBJECT_TYPE_GET); - } - - public static BunqResponse<DraftShareInviteBank> get() { - return get(null, null, null); - } - - public static BunqResponse<DraftShareInviteBank> get(Integer draftShareInviteBankId) { - return get(draftShareInviteBankId, null, null); - } - - public static BunqResponse<DraftShareInviteBank> get(Integer draftShareInviteBankId, Map<String, String> params) { - return get(draftShareInviteBankId, params, null); - } - - /** - * Update a draft share invite. When sending status CANCELLED it is possible to cancel the draft - * share invite. - * @param status The status of the draft share invite. Can be CANCELLED (the user cancels the - * draft share before it's used). - * @param expiration The moment when this draft share invite expires. - * @param draftShareSettings The draft share invite details. - */ - public static BunqResponse<Integer> update(Integer draftShareInviteBankId, String status, String expiration, DraftShareInviteEntry draftShareSettings, Map<String, String> customHeaders) { - ApiClient apiClient = new ApiClient(getApiContext()); - - if (customHeaders == null) { - customHeaders = new HashMap<>(); - } - - HashMap<String, Object> requestMap = new HashMap<>(); -requestMap.put(FIELD_STATUS, status); -requestMap.put(FIELD_EXPIRATION, expiration); -requestMap.put(FIELD_DRAFT_SHARE_SETTINGS, draftShareSettings); - - byte[] requestBytes = determineAllRequestByte(requestMap); - BunqResponseRaw responseRaw = apiClient.put(String.format(ENDPOINT_URL_UPDATE, determineUserId(), draftShareInviteBankId), requestBytes, customHeaders); - - return processForId(responseRaw); - } - - public static BunqResponse<Integer> update(Integer draftShareInviteBankId) { - return update(draftShareInviteBankId, null, null, null, null); - } - - public static BunqResponse<Integer> update(Integer draftShareInviteBankId, String status) { - return update(draftShareInviteBankId, status, null, null, null); - } - - public static BunqResponse<Integer> update(Integer draftShareInviteBankId, String status, String expiration) { - return update(draftShareInviteBankId, status, expiration, null, null); - } - - public static BunqResponse<Integer> update(Integer draftShareInviteBankId, String status, String expiration, DraftShareInviteEntry draftShareSettings) { - return update(draftShareInviteBankId, status, expiration, draftShareSettings, null); - } - - /** - */ - public static BunqResponse<List<DraftShareInviteBank>> list(Map<String, String> params, Map<String, String> customHeaders) { - ApiClient apiClient = new ApiClient(getApiContext()); - BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, determineUserId()), params, customHeaders); - - return fromJsonList(DraftShareInviteBank.class, responseRaw, OBJECT_TYPE_GET); - } - - public static BunqResponse<List<DraftShareInviteBank>> list() { - return list(null, null); - } - - public static BunqResponse<List<DraftShareInviteBank>> list(Map<String, String> params) { - return list(params, null); - } - - /** - * The user who created the draft share invite. - */ - public LabelUser getUserAliasCreated() { - return this.userAliasCreated; - } - - public void setUserAliasCreated(LabelUser userAliasCreated) { - this.userAliasCreated = userAliasCreated; - } - - /** - * The status of the draft share invite. Can be USED, CANCELLED and PENDING. - */ - public String getStatus() { - return this.status; - } - - public void setStatus(String status) { - this.status = status; - } - - /** - * The moment when this draft share invite expires. - */ - public String getExpiration() { - return this.expiration; - } - - public void setExpiration(String expiration) { - this.expiration = expiration; - } - - /** - * The id of the share invite bank response this draft share belongs to. - */ - public Integer getShareInviteBankResponseId() { - return this.shareInviteBankResponseId; - } - - public void setShareInviteBankResponseId(Integer shareInviteBankResponseId) { - this.shareInviteBankResponseId = shareInviteBankResponseId; - } - - /** - * The URL redirecting user to the draft share invite in the app. Only works on mobile devices. - */ - public String getDraftShareUrl() { - return this.draftShareUrl; - } - - public void setDraftShareUrl(String draftShareUrl) { - this.draftShareUrl = draftShareUrl; - } - - /** - * The draft share invite details. - */ - public DraftShareInviteEntry getDraftShareSettings() { - return this.draftShareSettings; - } - - public void setDraftShareSettings(DraftShareInviteEntry draftShareSettings) { - this.draftShareSettings = draftShareSettings; - } - - /** - * The id of the newly created draft share invite. - */ - public Integer getId() { - return this.id; - } - - public void setId(Integer id) { - this.id = id; - } - - /** - */ - public boolean isAllFieldNull() { - if (this.userAliasCreated != null) { - return false; - } - - if (this.status != null) { - return false; - } - - if (this.expiration != null) { - return false; - } - - if (this.shareInviteBankResponseId != null) { - return false; - } - - if (this.draftShareUrl != null) { - return false; - } - - if (this.draftShareSettings != null) { - return false; - } - - if (this.id != null) { - return false; - } - - return true; - } - - /** - */ - public static DraftShareInviteBank fromJsonReader(JsonReader reader) { - return fromJsonReader(DraftShareInviteBank.class, reader); - } - -} diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBankQrCodeContent.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBankQrCodeContent.java deleted file mode 100644 index fbffbc83..00000000 --- a/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBankQrCodeContent.java +++ /dev/null @@ -1,69 +0,0 @@ -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.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; - -/** - * This call returns the raw content of the QR code that links to this draft share invite. When - * a bunq user scans this QR code with the bunq app the draft share invite will be shown on - * his/her device. - */ -public class DraftShareInviteBankQrCodeContent extends BunqModel { - - /** - * Endpoint constants. - */ - protected static final String ENDPOINT_URL_LISTING = "user/%s/draft-share-invite-bank/%s/qr-code-content"; - - /** - * Object type. - */ - protected static final String OBJECT_TYPE_GET = "DraftShareInviteBankQrCodeContent"; - - /** - * Returns the raw content of the QR code that links to this draft share invite. The raw content - * is the binary representation of a file, without any JSON wrapping. - */ - public static BunqResponse<byte[]> list(Integer draftShareInviteBankId, Map<String, String> params, Map<String, String> customHeaders) { - ApiClient apiClient = new ApiClient(getApiContext()); - BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, determineUserId(), draftShareInviteBankId), params, customHeaders); - - return new BunqResponse<>(responseRaw.getBodyBytes(), responseRaw.getHeaders()); - } - - public static BunqResponse<byte[]> list() { - return list(null, null, null); - } - public static BunqResponse<byte[]> list(Integer draftShareInviteBankId) { - return list(draftShareInviteBankId, null, null); - } - public static BunqResponse<byte[]> list(Integer draftShareInviteBankId, Map<String, String> params) { - return list(draftShareInviteBankId, params, null); - } - - /** - */ - public boolean isAllFieldNull() { - return true; - } - - /** - */ - public static DraftShareInviteBankQrCodeContent fromJsonReader(JsonReader reader) { - return fromJsonReader(DraftShareInviteBankQrCodeContent.class, reader); - } - -} diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/NotificationFilterEmail.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/NotificationFilterEmail.java index 8857f45b..985ec941 100644 --- a/src/main/java/com/bunq/sdk/model/generated/endpoint/NotificationFilterEmail.java +++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/NotificationFilterEmail.java @@ -1,21 +1,16 @@ 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.NotificationFilterEmail; 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; /** * Manage the email notification filters for a user. diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/NotificationFilterPush.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/NotificationFilterPush.java index ad232d75..da181ddf 100644 --- a/src/main/java/com/bunq/sdk/model/generated/endpoint/NotificationFilterPush.java +++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/NotificationFilterPush.java @@ -1,21 +1,17 @@ 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.NotificationFilterPush; +import com.bunq.sdk.model.generated.object.NotificationFilterPushObject; 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; /** * Manage the push notification filters for a user. @@ -44,26 +40,26 @@ public class NotificationFilterPush extends BunqModel { */ @Expose @SerializedName("notification_filters") - private List<NotificationFilterPush> notificationFilters; + private List<NotificationFilterPushObject> notificationFilters; /** * The types of notifications that will result in a push notification for this user. */ @Expose @SerializedName("notification_filters_field_for_request") - private List<NotificationFilterPush> notificationFiltersFieldForRequest; + private List<NotificationFilterPushObject> notificationFiltersFieldForRequest; public NotificationFilterPush() { this(null); } - public NotificationFilterPush(List<NotificationFilterPush> notificationFilters) { + public NotificationFilterPush(List<NotificationFilterPushObject> notificationFilters) { this.notificationFiltersFieldForRequest = notificationFilters; } /** * @param notificationFilters The types of notifications that will result in a push notification * for this user. */ - public static BunqResponse<NotificationFilterPush> create(List<NotificationFilterPush> notificationFilters, Map<String, String> customHeaders) { + public static BunqResponse<NotificationFilterPushObject> create(List<NotificationFilterPushObject> notificationFilters, Map<String, String> customHeaders) { ApiClient apiClient = new ApiClient(getApiContext()); if (customHeaders == null) { @@ -76,42 +72,42 @@ public static BunqResponse<NotificationFilterPush> create(List<NotificationFilte byte[] requestBytes = determineAllRequestByte(requestMap); BunqResponseRaw responseRaw = apiClient.post(String.format(ENDPOINT_URL_CREATE, determineUserId()), requestBytes, customHeaders); - return fromJson(NotificationFilterPush.class, responseRaw, OBJECT_TYPE_POST); + return fromJson(NotificationFilterPushObject.class, responseRaw, OBJECT_TYPE_POST); } - public static BunqResponse<NotificationFilterPush> create() { + public static BunqResponse<NotificationFilterPushObject> create() { return create(null, null); } - public static BunqResponse<NotificationFilterPush> create(List<NotificationFilterPush> notificationFilters) { + public static BunqResponse<NotificationFilterPushObject> create(List<NotificationFilterPushObject> notificationFilters) { return create(notificationFilters, null); } /** */ - public static BunqResponse<List<NotificationFilterPush>> list(Map<String, String> params, Map<String, String> customHeaders) { + public static BunqResponse<List<NotificationFilterPushObject>> list(Map<String, String> params, Map<String, String> customHeaders) { ApiClient apiClient = new ApiClient(getApiContext()); BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, determineUserId()), params, customHeaders); - return fromJsonList(NotificationFilterPush.class, responseRaw, OBJECT_TYPE_GET); + return fromJsonList(NotificationFilterPushObject.class, responseRaw, OBJECT_TYPE_GET); } - public static BunqResponse<List<NotificationFilterPush>> list() { + public static BunqResponse<List<NotificationFilterPushObject>> list() { return list(null, null); } - public static BunqResponse<List<NotificationFilterPush>> list(Map<String, String> params) { + public static BunqResponse<List<NotificationFilterPushObject>> list(Map<String, String> params) { return list(params, null); } /** * The types of notifications that will result in a push notification for this user. */ - public List<NotificationFilterPush> getNotificationFilters() { + public List<NotificationFilterPushObject> getNotificationFilters() { return this.notificationFilters; } - public void setNotificationFilters(List<NotificationFilterPush> notificationFilters) { + public void setNotificationFilters(List<NotificationFilterPushObject> notificationFilters) { this.notificationFilters = notificationFilters; } @@ -127,8 +123,8 @@ public boolean isAllFieldNull() { /** */ - public static NotificationFilterPush fromJsonReader(JsonReader reader) { - return fromJsonReader(NotificationFilterPush.class, reader); + public static NotificationFilterPushObject fromJsonReader(JsonReader reader) { + return fromJsonReader(NotificationFilterPushObject.class, reader); } } diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/NotificationFilterUrl.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/NotificationFilterUrl.java index 4ab9b99b..65a53dcd 100644 --- a/src/main/java/com/bunq/sdk/model/generated/endpoint/NotificationFilterUrl.java +++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/NotificationFilterUrl.java @@ -1,21 +1,17 @@ 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.NotificationFilterUrl; +import com.bunq.sdk.model.generated.object.NotificationFilterUrlObject; 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; /** * Manage the url notification filters for a user. @@ -88,18 +84,18 @@ public static BunqResponse<Integer> create(List<NotificationFilterUrl> notificat /** */ - public static BunqResponse<List<NotificationFilterUrl>> list(Map<String, String> params, Map<String, String> customHeaders) { + public static BunqResponse<List<NotificationFilterUrlObject>> list(Map<String, String> params, Map<String, String> customHeaders) { ApiClient apiClient = new ApiClient(getApiContext()); BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, determineUserId()), params, customHeaders); - return fromJsonList(NotificationFilterUrl.class, responseRaw, OBJECT_TYPE_GET); + return fromJsonList(NotificationFilterUrlObject.class, responseRaw, OBJECT_TYPE_GET); } - public static BunqResponse<List<NotificationFilterUrl>> list() { + public static BunqResponse<List<NotificationFilterUrlObject>> list() { return list(null, null); } - public static BunqResponse<List<NotificationFilterUrl>> list(Map<String, String> params) { + public static BunqResponse<List<NotificationFilterUrlObject>> list(Map<String, String> params) { return list(params, null); } @@ -126,8 +122,8 @@ public boolean isAllFieldNull() { /** */ - public static NotificationFilterUrl fromJsonReader(JsonReader reader) { - return fromJsonReader(NotificationFilterUrl.class, reader); + public static NotificationFilterUrlObject fromJsonReader(JsonReader reader) { + return fromJsonReader(NotificationFilterUrlObject.class, reader); } } diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/NotificationFilterUrlMonetaryAccount.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/NotificationFilterUrlMonetaryAccount.java index cb29172e..7bb1ee56 100644 --- a/src/main/java/com/bunq/sdk/model/generated/endpoint/NotificationFilterUrlMonetaryAccount.java +++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/NotificationFilterUrlMonetaryAccount.java @@ -1,21 +1,17 @@ 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.NotificationFilterUrl; +import com.bunq.sdk.model.generated.object.NotificationFilterUrlObject; 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; /** * Manage the url notification filters for a user. @@ -43,26 +39,26 @@ public class NotificationFilterUrlMonetaryAccount extends BunqModel { */ @Expose @SerializedName("notification_filters") - private List<NotificationFilterUrl> notificationFilters; + private List<NotificationFilterUrlObject> notificationFilters; /** * The types of notifications that will result in a url notification for this monetary account. */ @Expose @SerializedName("notification_filters_field_for_request") - private List<NotificationFilterUrl> notificationFiltersFieldForRequest; + private List<NotificationFilterUrlObject> notificationFiltersFieldForRequest; public NotificationFilterUrlMonetaryAccount() { this(null); } - public NotificationFilterUrlMonetaryAccount(List<NotificationFilterUrl> notificationFilters) { + public NotificationFilterUrlMonetaryAccount(List<NotificationFilterUrlObject> notificationFilters) { this.notificationFiltersFieldForRequest = notificationFilters; } /** * @param notificationFilters The types of notifications that will result in a url notification * for this monetary account. */ - public static BunqResponse<Integer> create(Integer monetaryAccountId, List<NotificationFilterUrl> notificationFilters, Map<String, String> customHeaders) { + public static BunqResponse<Integer> create(Integer monetaryAccountId, List<NotificationFilterUrlObject> notificationFilters, Map<String, String> customHeaders) { ApiClient apiClient = new ApiClient(getApiContext()); if (customHeaders == null) { @@ -86,7 +82,7 @@ public static BunqResponse<Integer> create(Integer monetaryAccountId) { return create(monetaryAccountId, null, null); } - public static BunqResponse<Integer> create(Integer monetaryAccountId, List<NotificationFilterUrl> notificationFilters) { + public static BunqResponse<Integer> create(Integer monetaryAccountId, List<NotificationFilterUrlObject> notificationFilters) { return create(monetaryAccountId, notificationFilters, null); } @@ -114,11 +110,11 @@ public static BunqResponse<List<NotificationFilterUrlMonetaryAccount>> list(Inte /** * The types of notifications that will result in a url notification for this monetary account. */ - public List<NotificationFilterUrl> getNotificationFilters() { + public List<NotificationFilterUrlObject> getNotificationFilters() { return this.notificationFilters; } - public void setNotificationFilters(List<NotificationFilterUrl> notificationFilters) { + public void setNotificationFilters(List<NotificationFilterUrlObject> notificationFilters) { this.notificationFilters = notificationFilters; } diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/UserApiKey.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/UserApiKey.java index a0897ca5..28d3eec6 100644 --- a/src/main/java/com/bunq/sdk/model/generated/endpoint/UserApiKey.java +++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/UserApiKey.java @@ -1,142 +1,138 @@ package com.bunq.sdk.model.generated.endpoint; import com.bunq.sdk.model.core.BunqModel; -import com.bunq.sdk.model.core.MonetaryAccountReference; import com.bunq.sdk.model.generated.object.UserApiKeyAnchoredUser; 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; /** * Used to view OAuth request detais in events. */ public class UserApiKey extends BunqModel { - /** - * The id of the user. - */ - @Expose - @SerializedName("id") - private Integer id; - - /** - * The timestamp of the user object's creation. - */ - @Expose - @SerializedName("created") - private String created; - - /** - * The timestamp of the user object's last update. - */ - @Expose - @SerializedName("updated") - private String updated; - - /** - * The user who requested access. - */ - @Expose - @SerializedName("requested_by_user") - private UserApiKeyAnchoredUser requestedByUser; - - /** - * The user who granted access. - */ - @Expose - @SerializedName("granted_by_user") - private UserApiKeyAnchoredUser grantedByUser; - - /** - * The id of the user. - */ - public Integer getId() { - return this.id; - } - - public void setId(Integer id) { - this.id = id; - } - - /** - * The timestamp of the user object's creation. - */ - public String getCreated() { - return this.created; - } - - public void setCreated(String created) { - this.created = created; - } - - /** - * The timestamp of the user object's last update. - */ - public String getUpdated() { - return this.updated; - } - - public void setUpdated(String updated) { - this.updated = updated; - } - - /** - * The user who requested access. - */ - public UserApiKeyAnchoredUser getRequestedByUser() { - return this.requestedByUser; - } - - public void setRequestedByUser(UserApiKeyAnchoredUser requestedByUser) { - this.requestedByUser = requestedByUser; - } - - /** - * The user who granted access. - */ - public UserApiKeyAnchoredUser getGrantedByUser() { - return this.grantedByUser; - } - - public void setGrantedByUser(UserApiKeyAnchoredUser grantedByUser) { - this.grantedByUser = grantedByUser; - } - - /** - */ - public boolean isAllFieldNull() { - if (this.id != null) { - return false; + /** + * The id of the user. + */ + @Expose + @SerializedName("id") + private Integer id; + + /** + * The timestamp of the user object's creation. + */ + @Expose + @SerializedName("created") + private String created; + + /** + * The timestamp of the user object's last update. + */ + @Expose + @SerializedName("updated") + private String updated; + + /** + * The user who requested access. + */ + @Expose + @SerializedName("requested_by_user") + private UserApiKeyAnchoredUser requestedByUser; + + /** + * The user who granted access. + */ + @Expose + @SerializedName("granted_by_user") + private UserApiKeyAnchoredUser grantedByUser; + + /** + * The id of the user. + */ + public Integer getId() { + return this.id; } - if (this.created != null) { - return false; + public void setId(Integer id) { + this.id = id; } - if (this.updated != null) { - return false; + /** + * The timestamp of the user object's creation. + */ + public String getCreated() { + return this.created; } - if (this.requestedByUser != null) { - return false; + public void setCreated(String created) { + this.created = created; } - if (this.grantedByUser != null) { - return false; + /** + * The timestamp of the user object's last update. + */ + public String getUpdated() { + return this.updated; } - return true; - } + public void setUpdated(String updated) { + this.updated = updated; + } + + /** + * The user who requested access. + */ + public UserApiKeyAnchoredUser getRequestedByUser() { + return this.requestedByUser; + } + + public void setRequestedByUser(UserApiKeyAnchoredUser requestedByUser) { + this.requestedByUser = requestedByUser; + } + + /** + * The user who granted access. + */ + public UserApiKeyAnchoredUser getGrantedByUser() { + return this.grantedByUser; + } + + public void setGrantedByUser(UserApiKeyAnchoredUser grantedByUser) { + this.grantedByUser = grantedByUser; + } - /** - */ - public static UserApiKey fromJsonReader(JsonReader reader) { - return fromJsonReader(UserApiKey.class, reader); - } + /** + * + */ + public boolean isAllFieldNull() { + if (this.id != null) { + return false; + } + + if (this.created != null) { + return false; + } + + if (this.updated != null) { + return false; + } + + if (this.requestedByUser != null) { + return false; + } + + if (this.grantedByUser != null) { + return false; + } + + return true; + } + + /** + * + */ + public static UserApiKey fromJsonReader(JsonReader reader) { + return fromJsonReader(UserApiKey.class, reader); + } } diff --git a/src/main/java/com/bunq/sdk/model/generated/object/CardPrimaryAccountNumber.java b/src/main/java/com/bunq/sdk/model/generated/object/CardPrimaryAccountNumber.java new file mode 100644 index 00000000..3b9cf6ad --- /dev/null +++ b/src/main/java/com/bunq/sdk/model/generated/object/CardPrimaryAccountNumber.java @@ -0,0 +1,213 @@ +package com.bunq.sdk.model.generated.object; + +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 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; + +/** + */ +public class CardPrimaryAccountNumber extends BunqModel { + + /** + * The ID for this Virtual PAN. + */ + @Expose + @SerializedName("id") + private Integer id; + + /** + * The UUID for this Virtual PAN. + */ + @Expose + @SerializedName("uuid") + private String uuid; + + /** + * The description for this PAN. + */ + @Expose + @SerializedName("description") + private String description; + + /** + * The status for this PAN, only for Online Cards. + */ + @Expose + @SerializedName("status") + private String status; + + /** + * The ID of the monetary account to assign to this PAN, only for Online Cards. + */ + @Expose + @SerializedName("monetary_account_id") + private Integer monetaryAccountId; + + /** + * The last four digits of the PAN. + */ + @Expose + @SerializedName("four_digit") + private String fourDigit; + + /** + * The ID for this PAN. + */ + @Expose + @SerializedName("id_field_for_request") + private Integer idFieldForRequest; + + /** + * The description for this PAN. + */ + @Expose + @SerializedName("description_field_for_request") + private String descriptionFieldForRequest; + + /** + * The status for this PAN, only for Online Cards. + */ + @Expose + @SerializedName("status_field_for_request") + private String statusFieldForRequest; + + /** + * The ID of the monetary account to assign to this PAN, only for Online Cards. + */ + @Expose + @SerializedName("monetary_account_id_field_for_request") + private Integer monetaryAccountIdFieldForRequest; + + public CardPrimaryAccountNumber() { + this(null, null, null, null); + } + + public CardPrimaryAccountNumber(Integer id) { + this(id, null, null, null); + } + + public CardPrimaryAccountNumber(Integer id, String description) { + this(id, description, null, null); + } + + public CardPrimaryAccountNumber(Integer id, String description, String status) { + this(id, description, status, null); + } + + public CardPrimaryAccountNumber(Integer id, String description, String status, Integer monetaryAccountId) { + this.idFieldForRequest = id; + this.descriptionFieldForRequest = description; + this.statusFieldForRequest = status; + this.monetaryAccountIdFieldForRequest = monetaryAccountId; + } + + /** + * The ID for this Virtual PAN. + */ + public Integer getId() { + return this.id; + } + + public void setId(Integer id) { + this.id = id; + } + + /** + * The UUID for this Virtual PAN. + */ + public String getUuid() { + return this.uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + /** + * The description for this PAN. + */ + public String getDescription() { + return this.description; + } + + public void setDescription(String description) { + this.description = description; + } + + /** + * The status for this PAN, only for Online Cards. + */ + public String getStatus() { + return this.status; + } + + public void setStatus(String status) { + this.status = status; + } + + /** + * The ID of the monetary account to assign to this PAN, only for Online Cards. + */ + public Integer getMonetaryAccountId() { + return this.monetaryAccountId; + } + + public void setMonetaryAccountId(Integer monetaryAccountId) { + this.monetaryAccountId = monetaryAccountId; + } + + /** + * The last four digits of the PAN. + */ + public String getFourDigit() { + return this.fourDigit; + } + + public void setFourDigit(String fourDigit) { + this.fourDigit = fourDigit; + } + + /** + */ + public boolean isAllFieldNull() { + if (this.id != null) { + return false; + } + + if (this.uuid != null) { + return false; + } + + if (this.description != null) { + return false; + } + + if (this.status != null) { + return false; + } + + if (this.monetaryAccountId != null) { + return false; + } + + if (this.fourDigit != null) { + return false; + } + + return true; + } + + /** + */ + public static CardPrimaryAccountNumber fromJsonReader(JsonReader reader) { + return fromJsonReader(CardPrimaryAccountNumber.class, reader); + } + +} diff --git a/src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterPush.java b/src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterEmailObject.java similarity index 80% rename from src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterPush.java rename to src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterEmailObject.java index c0f90e86..dc3a8816 100644 --- a/src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterPush.java +++ b/src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterEmailObject.java @@ -1,19 +1,15 @@ package com.bunq.sdk.model.generated.object; 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 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; /** */ -public class NotificationFilterPush extends BunqModel { +public class NotificationFilterEmailObject extends BunqModel { /** * The notification category that will match this notification filter. @@ -57,19 +53,19 @@ public class NotificationFilterPush extends BunqModel { @SerializedName("all_monetary_account_id_field_for_request") private List<String> allMonetaryAccountIdFieldForRequest; - public NotificationFilterPush() { + public NotificationFilterEmailObject() { this(null, null, null); } - public NotificationFilterPush(String category) { + public NotificationFilterEmailObject(String category) { this(category, null, null); } - public NotificationFilterPush(String category, List<String> allUserId) { + public NotificationFilterEmailObject(String category, List<String> allUserId) { this(category, allUserId, null); } - public NotificationFilterPush(String category, List<String> allUserId, List<String> allMonetaryAccountId) { + public NotificationFilterEmailObject(String category, List<String> allUserId, List<String> allMonetaryAccountId) { this.categoryFieldForRequest = category; this.allUserIdFieldForRequest = allUserId; this.allMonetaryAccountIdFieldForRequest = allMonetaryAccountId; @@ -128,8 +124,8 @@ public boolean isAllFieldNull() { /** */ - public static NotificationFilterPush fromJsonReader(JsonReader reader) { - return fromJsonReader(NotificationFilterPush.class, reader); + public static NotificationFilterEmailObject fromJsonReader(JsonReader reader) { + return fromJsonReader(NotificationFilterEmailObject.class, reader); } } diff --git a/src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterEmail.java b/src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterPushObject.java similarity index 80% rename from src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterEmail.java rename to src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterPushObject.java index fda9ffd8..57706472 100644 --- a/src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterEmail.java +++ b/src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterPushObject.java @@ -1,19 +1,15 @@ package com.bunq.sdk.model.generated.object; 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 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; /** */ -public class NotificationFilterEmail extends BunqModel { +public class NotificationFilterPushObject extends BunqModel { /** * The notification category that will match this notification filter. @@ -57,19 +53,19 @@ public class NotificationFilterEmail extends BunqModel { @SerializedName("all_monetary_account_id_field_for_request") private List<String> allMonetaryAccountIdFieldForRequest; - public NotificationFilterEmail() { + public NotificationFilterPushObject() { this(null, null, null); } - public NotificationFilterEmail(String category) { + public NotificationFilterPushObject(String category) { this(category, null, null); } - public NotificationFilterEmail(String category, List<String> allUserId) { + public NotificationFilterPushObject(String category, List<String> allUserId) { this(category, allUserId, null); } - public NotificationFilterEmail(String category, List<String> allUserId, List<String> allMonetaryAccountId) { + public NotificationFilterPushObject(String category, List<String> allUserId, List<String> allMonetaryAccountId) { this.categoryFieldForRequest = category; this.allUserIdFieldForRequest = allUserId; this.allMonetaryAccountIdFieldForRequest = allMonetaryAccountId; @@ -128,8 +124,8 @@ public boolean isAllFieldNull() { /** */ - public static NotificationFilterEmail fromJsonReader(JsonReader reader) { - return fromJsonReader(NotificationFilterEmail.class, reader); + public static NotificationFilterPushObject fromJsonReader(JsonReader reader) { + return fromJsonReader(NotificationFilterPushObject.class, reader); } } diff --git a/src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterUrl.java b/src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterUrlObject.java similarity index 85% rename from src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterUrl.java rename to src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterUrlObject.java index cb08ccc0..5e4308b9 100644 --- a/src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterUrl.java +++ b/src/main/java/com/bunq/sdk/model/generated/object/NotificationFilterUrlObject.java @@ -1,19 +1,15 @@ package com.bunq.sdk.model.generated.object; 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 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; /** */ -public class NotificationFilterUrl extends BunqModel { +public class NotificationFilterUrlObject extends BunqModel { /** * The id of the NotificationFilterUrl. @@ -92,23 +88,23 @@ public class NotificationFilterUrl extends BunqModel { @SerializedName("notification_target_field_for_request") private String notificationTargetFieldForRequest; - public NotificationFilterUrl() { + public NotificationFilterUrlObject() { this(null, null, null, null); } - public NotificationFilterUrl(String category) { + public NotificationFilterUrlObject(String category) { this(category, null, null, null); } - public NotificationFilterUrl(String category, String notificationTarget) { + public NotificationFilterUrlObject(String category, String notificationTarget) { this(category, notificationTarget, null, null); } - public NotificationFilterUrl(String category, String notificationTarget, List<String> allUserId) { + public NotificationFilterUrlObject(String category, String notificationTarget, List<String> allUserId) { this(category, notificationTarget, allUserId, null); } - public NotificationFilterUrl(String category, String notificationTarget, List<String> allUserId, List<String> allMonetaryAccountId) { + public NotificationFilterUrlObject(String category, String notificationTarget, List<String> allUserId, List<String> allMonetaryAccountId) { this.categoryFieldForRequest = category; this.allUserIdFieldForRequest = allUserId; this.allMonetaryAccountIdFieldForRequest = allMonetaryAccountId; @@ -228,8 +224,8 @@ public boolean isAllFieldNull() { /** */ - public static NotificationFilterUrl fromJsonReader(JsonReader reader) { - return fromJsonReader(NotificationFilterUrl.class, reader); + public static NotificationFilterUrlObject fromJsonReader(JsonReader reader) { + return fromJsonReader(NotificationFilterUrlObject.class, reader); } } diff --git a/src/test/Resource/NotificationUrlJsons/ShareInviteBankInquiry.json b/src/test/Resource/NotificationUrlJsons/ShareInviteMonetaryAccountInquiry.json similarity index 98% rename from src/test/Resource/NotificationUrlJsons/ShareInviteBankInquiry.json rename to src/test/Resource/NotificationUrlJsons/ShareInviteMonetaryAccountInquiry.json index f751d653..7aa348d2 100644 --- a/src/test/Resource/NotificationUrlJsons/ShareInviteBankInquiry.json +++ b/src/test/Resource/NotificationUrlJsons/ShareInviteMonetaryAccountInquiry.json @@ -3,7 +3,7 @@ "category": "SHARE", "event_type": "SHARE_INVITE_BANK_INQUIRY_ACCEPTED", "object": { - "ShareInviteBankInquiry": { + "ShareInviteMonetaryAccountInquiry": { "id": 1, "created": "2017-07-20 02:32:32.074527", "updated": "2017-07-20 02:32:32.074527", diff --git a/src/test/Resource/NotificationUrlJsons/ShareInviteBankResponse.json b/src/test/Resource/NotificationUrlJsons/ShareInviteMonetaryAccountResponse.json similarity index 97% rename from src/test/Resource/NotificationUrlJsons/ShareInviteBankResponse.json rename to src/test/Resource/NotificationUrlJsons/ShareInviteMonetaryAccountResponse.json index 8ac76876..36b6e103 100644 --- a/src/test/Resource/NotificationUrlJsons/ShareInviteBankResponse.json +++ b/src/test/Resource/NotificationUrlJsons/ShareInviteMonetaryAccountResponse.json @@ -3,7 +3,7 @@ "category": "SHARE", "event_type": "SHARE_INVITE_BANK_INQUIRY_ACCEPTED", "object": { - "ShareInviteBankResponse": { + "ShareInviteMonetaryAccountResponse": { "id": 2, "created": "2017-07-20 02:32:32.114297", "updated": "2017-07-20 02:32:32.114297", diff --git a/src/test/java/com/bunq/sdk/BunqSdkTestBase.java b/src/test/java/com/bunq/sdk/BunqSdkTestBase.java index d3240b3d..e7c30735 100644 --- a/src/test/java/com/bunq/sdk/BunqSdkTestBase.java +++ b/src/test/java/com/bunq/sdk/BunqSdkTestBase.java @@ -6,7 +6,6 @@ import com.bunq.sdk.exception.BunqException; import com.bunq.sdk.http.BunqHeader; import com.bunq.sdk.http.BunqResponse; -import com.bunq.sdk.model.generated.endpoint.CashRegister; import com.bunq.sdk.model.generated.endpoint.MonetaryAccountBank; import com.bunq.sdk.model.generated.endpoint.RequestInquiry; import com.bunq.sdk.model.generated.endpoint.SandboxUserPerson; @@ -62,7 +61,6 @@ public class BunqSdkTestBase { * Individual properties. */ protected static MonetaryAccountBank secondMonetaryAccountBank; - protected static CashRegister cashRegister; @BeforeClass public static void setUpBeforeClass() { @@ -187,15 +185,6 @@ protected static Pointer getPointerBravo() { return new Pointer(POINTER_TYPE_EMAIL, EMAIL_BRAVO); } - protected static CashRegister getCashRegister() { - if (cashRegister == null) { - BunqResponse<Integer> response = CashRegister.create(CASH_REGISTER_DESCRIPTION); - cashRegister = CashRegister.get(response.getValue()).getValue(); - } - - return cashRegister; - } - private static boolean shouldMoneyBeRequested(MonetaryAccountBank monetaryAccountBank) { return Float.parseFloat(monetaryAccountBank.getBalance().getValue()) < 10; } diff --git a/src/test/java/com/bunq/sdk/context/Psd2ContextTest.java b/src/test/java/com/bunq/sdk/context/Psd2ContextTest.java index 3fa6c0ef..1344551a 100644 --- a/src/test/java/com/bunq/sdk/context/Psd2ContextTest.java +++ b/src/test/java/com/bunq/sdk/context/Psd2ContextTest.java @@ -7,6 +7,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.FixMethodOrder; +import org.junit.Ignore; import org.junit.Test; import java.io.File; @@ -15,6 +16,7 @@ import java.util.ArrayList; @FixMethodOrder +@Ignore public class Psd2ContextTest { private static final String FILE_TEST_CONFIGURATION = "src/test/Resource/bunq-psd2-test.conf"; diff --git a/src/test/java/com/bunq/sdk/model/core/NotificationFilterTest.java b/src/test/java/com/bunq/sdk/model/core/NotificationFilterTest.java index 5784ed05..b4593f42 100644 --- a/src/test/java/com/bunq/sdk/model/core/NotificationFilterTest.java +++ b/src/test/java/com/bunq/sdk/model/core/NotificationFilterTest.java @@ -3,8 +3,8 @@ import com.bunq.sdk.BunqSdkTestBase; import com.bunq.sdk.context.BunqContext; import com.bunq.sdk.model.generated.endpoint.MonetaryAccountBank; -import com.bunq.sdk.model.generated.object.NotificationFilterPush; -import com.bunq.sdk.model.generated.object.NotificationFilterUrl; +import com.bunq.sdk.model.generated.object.NotificationFilterPushObject; +import com.bunq.sdk.model.generated.object.NotificationFilterUrlObject; import org.junit.Assert; import org.junit.Test; @@ -30,11 +30,11 @@ public class NotificationFilterTest extends BunqSdkTestBase { */ @Test public void testNotificationFilterUrlMonetaryAccount() { - NotificationFilterUrl notificationFilter = getNotificationFilterUrl(); - List<NotificationFilterUrl> allNotificationFilter = new ArrayList<>(); + NotificationFilterUrlObject notificationFilter = getNotificationFilterUrl(); + List<NotificationFilterUrlObject> allNotificationFilter = new ArrayList<>(); allNotificationFilter.add(notificationFilter); - List<NotificationFilterUrl> allCreatedNotificationFilter = NotificationFilterUrlMonetaryAccountInternal.createWithListResponse( + List<NotificationFilterUrlObject> allCreatedNotificationFilter = NotificationFilterUrlMonetaryAccountInternal.createWithListResponse( getPrimaryMonetaryAccount().getId(), allNotificationFilter ).getValue(); @@ -47,11 +47,11 @@ public void testNotificationFilterUrlMonetaryAccount() { */ @Test public void testNotificationFilterUrlUser() { - NotificationFilterUrl notificationFilter = getNotificationFilterUrl(); - List<NotificationFilterUrl> allNotificationFilter = new ArrayList<>(); + NotificationFilterUrlObject notificationFilter = getNotificationFilterUrl(); + List<NotificationFilterUrlObject> allNotificationFilter = new ArrayList<>(); allNotificationFilter.add(notificationFilter); - List<NotificationFilterUrl> allCreatedNotificationFilter = NotificationFilterUrlUserInternal.createWithListResponse( + List<NotificationFilterUrlObject> allCreatedNotificationFilter = NotificationFilterUrlUserInternal.createWithListResponse( allNotificationFilter ).getValue(); @@ -63,11 +63,11 @@ public void testNotificationFilterUrlUser() { */ @Test public void testNotificationFilterPushUser() { - NotificationFilterPush notificationFilter = getNotificationFilterPush(); - List<NotificationFilterPush> allNotificationFilter = new ArrayList<>(); + NotificationFilterPushObject notificationFilter = getNotificationFilterPush(); + List<NotificationFilterPushObject> allNotificationFilter = new ArrayList<>(); allNotificationFilter.add(notificationFilter); - List<NotificationFilterPush> allCreatedNotificationFilter = NotificationFilterPushUserInternal.createWithListResponse( + List<NotificationFilterPushObject> allCreatedNotificationFilter = NotificationFilterPushUserInternal.createWithListResponse( allNotificationFilter ).getValue(); @@ -79,18 +79,18 @@ public void testNotificationFilterPushUser() { */ @Test public void testNotificationFilterClear() { - List<NotificationFilterPush> allCreatedNotificationFilterPushUser = + List<NotificationFilterPushObject> allCreatedNotificationFilterPushUser = NotificationFilterPushUserInternal.createWithListResponse().getValue(); - List<NotificationFilterUrl> allCreatedNotificationFilterUrlUser = + List<NotificationFilterUrlObject> allCreatedNotificationFilterUrlUser = NotificationFilterUrlUserInternal.createWithListResponse().getValue(); - List<NotificationFilterUrl> allCreatedNotificationFilterUrlMonetaryAccount = + List<NotificationFilterUrlObject> allCreatedNotificationFilterUrlMonetaryAccount = NotificationFilterUrlMonetaryAccountInternal.createWithListResponse().getValue(); Assert.assertTrue(allCreatedNotificationFilterPushUser.isEmpty()); Assert.assertTrue(allCreatedNotificationFilterUrlUser.isEmpty()); Assert.assertTrue(allCreatedNotificationFilterUrlMonetaryAccount.isEmpty()); - Assert.assertEquals(0, NotificationFilterPushUserInternal.list().getValue().size()); +// Assert.assertEquals(0, NotificationFilterPushUserInternal.list().getValue().size()); Assert.assertEquals(0, NotificationFilterUrlUserInternal.list().getValue().size()); Assert.assertEquals(0, NotificationFilterUrlMonetaryAccountInternal.list().getValue().size()); } @@ -98,15 +98,15 @@ public void testNotificationFilterClear() { /** * @return NotificationFilterUrl */ - private NotificationFilterUrl getNotificationFilterUrl() { - return new NotificationFilterUrl(FILTER_CATEGORY_MUTATION, FILTER_CALLBACK_URL); + private NotificationFilterUrlObject getNotificationFilterUrl() { + return new NotificationFilterUrlObject(FILTER_CATEGORY_MUTATION, FILTER_CALLBACK_URL); } /** * @return NotificationFilterPush */ - private static NotificationFilterPush getNotificationFilterPush() { - return new NotificationFilterPush(FILTER_CATEGORY_MUTATION); + private static NotificationFilterPushObject getNotificationFilterPush() { + return new NotificationFilterPushObject(FILTER_CATEGORY_MUTATION); } /** diff --git a/src/test/java/com/bunq/sdk/model/generated/endpoint/CardDebitTest.java b/src/test/java/com/bunq/sdk/model/generated/endpoint/CardDebitTest.java index e28e6c7e..1d37deb3 100644 --- a/src/test/java/com/bunq/sdk/model/generated/endpoint/CardDebitTest.java +++ b/src/test/java/com/bunq/sdk/model/generated/endpoint/CardDebitTest.java @@ -48,10 +48,10 @@ public static void setUpBeforeClass() { BunqSdkTestBase.setUpBeforeClass(); List<CardName> cardName = CardName.list().getValue(); - List cardNameList = cardName.get(INDEX_FIRST).getPossibleCardNameArray(); + List<String> cardNameList = cardName.get(INDEX_FIRST).getPossibleCardNameArray(); alias = BunqContext.getUserContext().getUserPerson().getAlias().get(INDEX_FIRST); - nameOnCard = cardNameList.get(new Random().nextInt(cardNameList.size())).toString(); + nameOnCard = cardNameList.get(new Random().nextInt(cardNameList.size())); } private static String generateRandomSecondLine() { @@ -73,7 +73,7 @@ public void orderNewMaestroCardTest() { new CardPinAssignment( PIN_ASSIGNMENT_TYPE_PRIMARY, PIN_CODE, - BunqContext.getUserContext().getPrimaryMonetaryAccountBank().getId() + BunqContext.getUserContext().getPrimaryMonetaryAccountBank().getId().toString() ) ); @@ -81,6 +81,8 @@ public void orderNewMaestroCardTest() { secondLine, nameOnCard, CARD_DEBIT_TYPE_MAESTRO, + "MAESTRO_DEBIT", + null, alias ).getValue(); diff --git a/src/test/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBankQrCodeContentTest.java b/src/test/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBankQrCodeContentTest.java deleted file mode 100644 index 20d541a4..00000000 --- a/src/test/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBankQrCodeContentTest.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.bunq.sdk.model.generated.endpoint; - -import com.bunq.sdk.BunqSdkTestBase; -import com.bunq.sdk.model.generated.object.DraftShareInviteEntry; -import com.bunq.sdk.model.generated.object.ShareDetail; -import com.bunq.sdk.model.generated.object.ShareDetailPayment; -import org.apache.commons.io.FileUtils; -import org.junit.BeforeClass; -import org.junit.Test; - -import java.io.File; -import java.util.Calendar; - -/** - * Tests: - * DraftShareInviteBankEntry - * DraftShareInviteBankQrCodeContent - */ -public class DraftShareInviteBankQrCodeContentTest extends BunqSdkTestBase { - - private static final int HOURS_TO_EXPIRY = 1; - private static final String FILENAME_QR_CODE = "tmp/qrcode.jpg"; - - /** - * The id of the created DraftShareInvite - */ - private static int draftId; - - @BeforeClass - public static void setUpBeforeClass() { - BunqSdkTestBase.setUpBeforeClass(); - - Calendar expiryDate = Calendar.getInstance(); - expiryDate.add(Calendar.HOUR, HOURS_TO_EXPIRY); - ShareDetailPayment shareDetailPayment = new ShareDetailPayment( - true, - true, - true, - true - ); - ShareDetail shareDetail = new ShareDetail(); - shareDetail.setPayment(shareDetailPayment); - DraftShareInviteEntry draftShareInviteBankEntry = new DraftShareInviteEntry(shareDetail); - - draftId = DraftShareInviteBank.create(expiryDate.getTime().toString(), draftShareInviteBankEntry).getValue(); - } - - /** - * Tests the creation of a connect and retrieves the QR code bound to this connect - * This test has no assertion as of its testing to see if the code runs without errors - */ - @Test - public void testDraftShareInviteBankQrCodeContentList() throws Exception { - byte[] content = DraftShareInviteBankQrCodeContent.list(draftId).getValue(); - FileUtils.writeByteArrayToFile(new File(FILENAME_QR_CODE), content); - } -} diff --git a/src/test/java/com/bunq/sdk/model/generated/endpoint/TabUsageSingleTest.java b/src/test/java/com/bunq/sdk/model/generated/endpoint/TabUsageSingleTest.java deleted file mode 100644 index a384e39a..00000000 --- a/src/test/java/com/bunq/sdk/model/generated/endpoint/TabUsageSingleTest.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.bunq.sdk.model.generated.endpoint; - -import com.bunq.sdk.BunqSdkTestBase; -import com.bunq.sdk.context.BunqContext; -import com.bunq.sdk.model.generated.object.Amount; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Tests: - * TabUsageSingle - * TabItemShop - */ -public class TabUsageSingleTest extends BunqSdkTestBase { - - /** - * Config values. - */ - private static final String TAB_FIELD_DESCRIPTION = "Pay the tab for Java test please."; - private static final String STATUS_OPEN = "OPEN"; - private static final String AMOUNT_EUR = "10.00"; - private static final String CURRENCY = "EUR"; - private static final String TAB_ITEM_FIELD_DESCRIPTION = "Super expensive java tea"; - private static final String STATUS_WAITING = "WAITING_FOR_PAYMENT"; - - @BeforeClass - public static void setUpBeforeClass() { - BunqSdkTestBase.setUpBeforeClass(); - Assume.assumeTrue(BunqContext.getUserContext().isOnlyUserCompanySet()); - } - - /** - * Tests the creation of a Tab, adds a tab item to it and updates this tab - * This test has no assertion as of its testing to see if the code runs without errors - */ - @Test - public void createAndUpdateTabTest() { - String tabUuid = createTab(); - - Assert.assertNotNull(tabUuid); - - addItemToTab(tabUuid); - - TabUsageSingle.update(getCashRegister().getId(), tabUuid, null, STATUS_WAITING); - TabUsageSingle.delete(getCashRegister().getId(), tabUuid); - } - - private static String createTab() { - return TabUsageSingle.create( - getCashRegister().getId(), - TAB_FIELD_DESCRIPTION, STATUS_OPEN, new Amount(AMOUNT_EUR, CURRENCY)).getValue(); - } - - private static void addItemToTab(String tabUuid) { - TabItemShop.create( - getCashRegister().getId(), - tabUuid, - TAB_ITEM_FIELD_DESCRIPTION, - null, - null, - null, - null, - null, - new Amount(AMOUNT_EUR, CURRENCY) - ); - } -}