From 3722296d25324db1d83ecc7ea352d2b0eea96f71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Oct 2021 08:23:47 +0200 Subject: [PATCH 01/20] Bump httpclient5 from 5.1 to 5.1.1 (#643) Bumps [httpclient5](https://github.com/apache/httpcomponents-client) from 5.1 to 5.1.1. - [Release notes](https://github.com/apache/httpcomponents-client/releases) - [Changelog](https://github.com/apache/httpcomponents-client/blob/rel/v5.1.1/RELEASE_NOTES.txt) - [Commits](https://github.com/apache/httpcomponents-client/compare/rel/v5.1...rel/v5.1.1) --- updated-dependencies: - dependency-name: org.apache.httpcomponents.client5:httpclient5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0c4363795..b3de6b4d1 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ org.apache.httpcomponents.client5 httpclient5 - 5.1 + 5.1.1 junit From a0dc74dd75e4f6f15da48beaf43afba8c246f3c3 Mon Sep 17 00:00:00 2001 From: LukasDrP <77005767+LukasDrP@users.noreply.github.com> Date: Fri, 29 Oct 2021 11:25:06 +0200 Subject: [PATCH 02/20] + Added functionality for funds/debitAccountHolder (aka "Top up Funds") (#618) * Fund.debitAccountHolder() + DebitAccountHolder, DebitAccountHolderRequest, DebitAccountHolderResponse --- .../marketpay/DebitAccountHolderRequest.java | 113 ++++++++++++++++++ .../marketpay/DebitAccountHolderResponse.java | 76 ++++++++++++ src/main/java/com/adyen/service/Fund.java | 14 +++ .../resource/fund/DebitAccountHolder.java | 34 ++++++ 4 files changed, 237 insertions(+) create mode 100644 src/main/java/com/adyen/model/marketpay/DebitAccountHolderRequest.java create mode 100644 src/main/java/com/adyen/model/marketpay/DebitAccountHolderResponse.java create mode 100644 src/main/java/com/adyen/service/resource/fund/DebitAccountHolder.java diff --git a/src/main/java/com/adyen/model/marketpay/DebitAccountHolderRequest.java b/src/main/java/com/adyen/model/marketpay/DebitAccountHolderRequest.java new file mode 100644 index 000000000..50978b201 --- /dev/null +++ b/src/main/java/com/adyen/model/marketpay/DebitAccountHolderRequest.java @@ -0,0 +1,113 @@ +package com.adyen.model.marketpay; + +import static com.adyen.util.Util.toIndentedString; + +import java.util.List; +import java.util.Objects; + +import com.adyen.model.Amount; +import com.adyen.model.Split; +import com.google.gson.annotations.SerializedName; + +public class DebitAccountHolderRequest { + @SerializedName("accountHolderCode") + private String accountHolderCode; + + @SerializedName("bankAccountUUID") + private String bankAccountUUID; + + @SerializedName("amount") + private Amount amount = null; + + @SerializedName("description") + private String description; + + @SerializedName("merchantAccount") + private String merchantAccount; + + @SerializedName("splits") + private List splits = null; + + public DebitAccountHolderRequest(String accountHolderCode, String bankAccountUUID, String merchantAccount, List splits) { + this.accountHolderCode = accountHolderCode; + this.bankAccountUUID = bankAccountUUID; + this.merchantAccount = merchantAccount; + this.splits = splits; + } + public String getAccountHolderCode() { + return accountHolderCode; + } + public void setAccountHolderCode(String accountHolderCode) { + this.accountHolderCode = accountHolderCode; + } + public String getBankAccountUUID() { + return bankAccountUUID; + } + public void setBankAccountUUID(String bankAccountUUID) { + this.bankAccountUUID = bankAccountUUID; + } + /** + * Get amount + * + * @return amount + **/ + public Amount getAmount() { + return amount; + } + public void setAmount(Amount amount) { + this.amount = amount; + } + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + public String getMerchantAccount() { + return merchantAccount; + } + public void setMerchantAccount(String merchantAccount) { + this.merchantAccount = merchantAccount; + } + public List getSplits() { + return splits; + } + public void setSplits(List splits) { + this.splits = splits; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + DebitAccountHolderRequest debitAccountHolderRequest = (DebitAccountHolderRequest) o; + return Objects.equals(this.accountHolderCode, debitAccountHolderRequest.accountHolderCode) + && Objects.equals(this.amount, debitAccountHolderRequest.amount) + && Objects.equals(this.bankAccountUUID, + debitAccountHolderRequest.bankAccountUUID) + && Objects.equals(this.merchantAccount, debitAccountHolderRequest.merchantAccount) + && Objects.equals(this.splits, debitAccountHolderRequest.splits); + } + + @Override + public int hashCode() { + return Objects.hash(accountHolderCode, amount, bankAccountUUID, merchantAccount, splits); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class DebitAccountHolderRequest {\n"); + sb.append(" accountHolderCode: ").append(toIndentedString(accountHolderCode)).append("\n"); + sb.append(" amount: ").append(toIndentedString(amount)).append("\n"); + sb.append(" bankAccountUUID: ").append(toIndentedString(bankAccountUUID)).append("\n"); + sb.append(" merchantAccount: ").append(toIndentedString(merchantAccount)).append("\n"); + sb.append(" description: ").append(toIndentedString(description)).append("\n"); + sb.append("}"); + return sb.toString(); + } +} diff --git a/src/main/java/com/adyen/model/marketpay/DebitAccountHolderResponse.java b/src/main/java/com/adyen/model/marketpay/DebitAccountHolderResponse.java new file mode 100644 index 000000000..00b56d12f --- /dev/null +++ b/src/main/java/com/adyen/model/marketpay/DebitAccountHolderResponse.java @@ -0,0 +1,76 @@ +package com.adyen.model.marketpay; + +import java.util.List; + +import com.google.gson.annotations.SerializedName; + +public class DebitAccountHolderResponse { + @SerializedName("accountHolderCode") + private String accountHolderCode; + + @SerializedName("bankAccountUUID") + private String bankAccountUUID; + + @SerializedName("invalidFields") + private List invalidFields = null; + + @SerializedName("merchantReferences") + private String[] merchantReferences; + + @SerializedName("pspReference") + private String pspReference; + + @SerializedName("resultCode") + private String resultCode; + + public String getAccountHolderCode() { + return accountHolderCode; + } + public void setAccountHolderCode(String accountHolderCode) { + this.accountHolderCode = accountHolderCode; + } + public String getBankAccountUUID() { + return bankAccountUUID; + } + public void setBankAccountUUID(String bankAccountUUID) { + this.bankAccountUUID = bankAccountUUID; + } + + /** + * List of the reference values from the split array in the request. + * + * @return merchantReferences + **/ + public String[] getMerchantReferences() { + return merchantReferences; + } + + public void setMerchantReference(String[] merchantReferences) { + this.merchantReferences = merchantReferences; + } + + /** + * The reference of a request. Can be used to uniquely identify the request. + * + * @return pspReference + **/ + public String getPspReference() { + return pspReference; + } + + public void setPspReference(String pspReference) { + this.pspReference = pspReference; + } + + /** + * The result code. + * + * @return resultCode + **/ + public String getResultCode() { + return resultCode; + } + public void setResultCode(String resultCode) { + this.resultCode = resultCode; + } +} diff --git a/src/main/java/com/adyen/service/Fund.java b/src/main/java/com/adyen/service/Fund.java index 333f5efef..c65d51e02 100644 --- a/src/main/java/com/adyen/service/Fund.java +++ b/src/main/java/com/adyen/service/Fund.java @@ -28,6 +28,8 @@ import com.adyen.model.marketpay.AccountHolderBalanceResponse; import com.adyen.model.marketpay.AccountHolderTransactionListRequest; import com.adyen.model.marketpay.AccountHolderTransactionListResponse; +import com.adyen.model.marketpay.DebitAccountHolderRequest; +import com.adyen.model.marketpay.DebitAccountHolderResponse; import com.adyen.model.marketpay.PayoutAccountHolderRequest; import com.adyen.model.marketpay.PayoutAccountHolderResponse; import com.adyen.model.marketpay.RefundFundsTransferRequest; @@ -41,6 +43,7 @@ import com.adyen.service.exception.ApiException; import com.adyen.service.resource.fund.AccountHolderBalance; import com.adyen.service.resource.fund.AccountHolderTransactionList; +import com.adyen.service.resource.fund.DebitAccountHolder; import com.adyen.service.resource.fund.PayoutAccountHolder; import com.adyen.service.resource.fund.RefundFundsTransfer; import com.adyen.service.resource.fund.RefundNotPaidOutTransfers; @@ -59,6 +62,7 @@ public class Fund extends Service { private RefundNotPaidOutTransfers refundNotPaidOutTransfers; private SetupBeneficiary setupBeneficiary; private RefundFundsTransfer refundFundsTransfer; + private DebitAccountHolder debitAccountHolder; public Fund(Client client) { super(client); @@ -69,6 +73,7 @@ public Fund(Client client) { refundNotPaidOutTransfers = new RefundNotPaidOutTransfers(this); setupBeneficiary = new SetupBeneficiary(this); refundFundsTransfer = new RefundFundsTransfer(this); + debitAccountHolder = new DebitAccountHolder(this); } public AccountHolderBalanceResponse accountHolderBalance(AccountHolderBalanceRequest accountHolderBalanceRequest) throws ApiException, IOException { @@ -133,4 +138,13 @@ public RefundFundsTransferResponse refundFundsTransfer(RefundFundsTransferReques return GSON.fromJson(jsonResult, new TypeToken() { }.getType()); } + + public DebitAccountHolderResponse debitAccountHolder(DebitAccountHolderRequest debitAccountHolderRequest) throws ApiException, IOException { + String jsonRequest = GSON.toJson(debitAccountHolderRequest); + + String jsonResult = debitAccountHolder.request(jsonRequest); + + return GSON.fromJson(jsonResult, new TypeToken() { + }.getType()); + } } \ No newline at end of file diff --git a/src/main/java/com/adyen/service/resource/fund/DebitAccountHolder.java b/src/main/java/com/adyen/service/resource/fund/DebitAccountHolder.java new file mode 100644 index 000000000..819d025fa --- /dev/null +++ b/src/main/java/com/adyen/service/resource/fund/DebitAccountHolder.java @@ -0,0 +1,34 @@ +/* + * ###### + * ###### + * ############ ####( ###### #####. ###### ############ ############ + * ############# #####( ###### #####. ###### ############# ############# + * ###### #####( ###### #####. ###### ##### ###### ##### ###### + * ###### ###### #####( ###### #####. ###### ##### ##### ##### ###### + * ###### ###### #####( ###### #####. ###### ##### ##### ###### + * ############# ############# ############# ############# ##### ###### + * ############ ############ ############# ############ ##### ###### + * ###### + * ############# + * ############ + * + * Adyen Java API Library + * + * Copyright (c) 2021 Adyen B.V. + * This file is open source and available under the MIT license. + * See the LICENSE file for more info. + */ + +package com.adyen.service.resource.fund; + +import com.adyen.Client; +import com.adyen.Service; +import com.adyen.service.Resource; + +public class DebitAccountHolder extends Resource { + + public DebitAccountHolder(Service service) { + super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Fund/" + Client.MARKETPAY_FUND_API_VERSION + "/debitAccountHolder", null); + } + +} \ No newline at end of file From 467384151da4005296fc45b1533e7d9a0ad5ba15 Mon Sep 17 00:00:00 2001 From: Terje Ness Andersen Date: Fri, 29 Oct 2021 16:51:41 +0200 Subject: [PATCH 03/20] add props 'showPages' and 'collectInformation' to GetOnboardingUrlRequest (#626) * add props 'showPages' and 'collectInformation' to GetOnboardingUrlRequest * set showPages and collectInformation in test TestGetOnboardingUrlSuccess * update get hop url 'showPages' options, add some descriptions to the getters * update toString format in OnboardingCollectInformation Co-authored-by: Wouter Boereboom <62436079+wboereboom@users.noreply.github.com> * update toString format in OnboardingCollectInformation Co-authored-by: Wouter Boereboom <62436079+wboereboom@users.noreply.github.com> * update toString formats in collectInformation showPages beans Co-authored-by: Terje Andersen Co-authored-by: Wouter Boereboom <62436079+wboereboom@users.noreply.github.com> --- .../model/hop/GetOnboardingUrlRequest.java | 77 +++++-- .../hop/OnboardingCollectInformation.java | 195 +++++++++++++++++ .../adyen/model/hop/OnboardingShowPages.java | 196 ++++++++++++++++++ src/test/java/com/adyen/MarketPayTest.java | 21 ++ 4 files changed, 476 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/adyen/model/hop/OnboardingCollectInformation.java create mode 100644 src/main/java/com/adyen/model/hop/OnboardingShowPages.java diff --git a/src/main/java/com/adyen/model/hop/GetOnboardingUrlRequest.java b/src/main/java/com/adyen/model/hop/GetOnboardingUrlRequest.java index 4ef03fbb8..ce22ed772 100755 --- a/src/main/java/com/adyen/model/hop/GetOnboardingUrlRequest.java +++ b/src/main/java/com/adyen/model/hop/GetOnboardingUrlRequest.java @@ -14,7 +14,7 @@ * * Adyen Java API Library * - * Copyright (c) 2020 Adyen B.V. + * Copyright (c) 2021 Adyen B.V. * This file is open source and available under the MIT license. * See the LICENSE file for more info. */ @@ -45,10 +45,11 @@ public class GetOnboardingUrlRequest { @SerializedName("shopperLocale") private String shopperLocale = null; - public GetOnboardingUrlRequest accountHolderCode(String accountHolderCode) { - this.accountHolderCode = accountHolderCode; - return this; - } + @SerializedName("showPages") + private OnboardingShowPages showPages = null; + + @SerializedName("collectInformation") + private OnboardingCollectInformation collectInformation = null; /** * The account holder code you provided when you created the account holder. @@ -63,8 +64,8 @@ public void setAccountHolderCode(String accountHolderCode) { this.accountHolderCode = accountHolderCode; } - public GetOnboardingUrlRequest editMode(Boolean editMode) { - this.editMode = editMode; + public GetOnboardingUrlRequest accountHolderCode(String accountHolderCode) { + this.accountHolderCode = accountHolderCode; return this; } @@ -81,8 +82,8 @@ public void setEditMode(Boolean editMode) { this.editMode = editMode; } - public GetOnboardingUrlRequest platformName(String platformName) { - this.platformName = platformName; + public GetOnboardingUrlRequest editMode(Boolean editMode) { + this.editMode = editMode; return this; } @@ -99,8 +100,8 @@ public void setPlatformName(String platformName) { this.platformName = platformName; } - public GetOnboardingUrlRequest returnUrl(String returnUrl) { - this.returnUrl = returnUrl; + public GetOnboardingUrlRequest platformName(String platformName) { + this.platformName = platformName; return this; } @@ -117,6 +118,11 @@ public void setReturnUrl(String returnUrl) { this.returnUrl = returnUrl; } + public GetOnboardingUrlRequest returnUrl(String returnUrl) { + this.returnUrl = returnUrl; + return this; + } + /** * The language to be used in the page, specified by a combination of a language and country code. For example, **pt-BR**. \n\nIf not specified in the request or if the language is not supported, the page uses the browser language. If the browser language is not supported, the page uses **en-US** by default.\n\nFor a list supported languages, refer to [Change the page language](https://docs.adyen.com/platforms/onboarding-and-verification/hosted-onboarding-page#change-page-language). * @@ -130,6 +136,47 @@ public void setShopperLocale(String shopperLocale) { this.shopperLocale = shopperLocale; } + public GetOnboardingUrlRequest shopperLocale(String shopperLocale) { + this.shopperLocale = shopperLocale; + return this; + } + + /** + * What pages should be shown on the hosted onbarding page + * + * @return + */ + public OnboardingShowPages getShowPages() { + return showPages; + } + + public void setShowPages(OnboardingShowPages showPages) { + this.showPages = showPages; + } + + public GetOnboardingUrlRequest showPages(OnboardingShowPages showPages) { + this.showPages = showPages; + return this; + } + + /** + * What information should be collected on the hosted onboarding page + * + * @return + */ + public OnboardingCollectInformation getCollectInformation() { + return collectInformation; + } + + public void setCollectInformation(OnboardingCollectInformation collectInformation) { + this.collectInformation = collectInformation; + } + + public GetOnboardingUrlRequest collectInformation(OnboardingCollectInformation collectInformation) { + this.collectInformation = collectInformation; + return this; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -143,12 +190,14 @@ public boolean equals(Object o) { Objects.equals(this.editMode, getOnboardingUrlRequest.editMode) && Objects.equals(this.platformName, getOnboardingUrlRequest.platformName) && Objects.equals(this.returnUrl, getOnboardingUrlRequest.returnUrl) && - Objects.equals(this.shopperLocale, getOnboardingUrlRequest.shopperLocale); + Objects.equals(this.shopperLocale, getOnboardingUrlRequest.shopperLocale) && + Objects.equals(this.showPages, getOnboardingUrlRequest.showPages) && + Objects.equals(this.collectInformation, getOnboardingUrlRequest.collectInformation); } @Override public int hashCode() { - return Objects.hash(accountHolderCode, editMode, platformName, returnUrl, shopperLocale); + return Objects.hash(accountHolderCode, editMode, platformName, returnUrl, shopperLocale, showPages, collectInformation); } @@ -162,6 +211,8 @@ public String toString() { sb.append(" platformName: ").append(toIndentedString(platformName)).append("\n"); sb.append(" returnUrl: ").append(toIndentedString(returnUrl)).append("\n"); sb.append(" shopperLocale: ").append(toIndentedString(shopperLocale)).append("\n"); + sb.append(" showPages: ").append(toIndentedString(showPages)).append("\n"); + sb.append(" collectInformation: ").append(toIndentedString(collectInformation)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/com/adyen/model/hop/OnboardingCollectInformation.java b/src/main/java/com/adyen/model/hop/OnboardingCollectInformation.java new file mode 100644 index 000000000..95131b4a6 --- /dev/null +++ b/src/main/java/com/adyen/model/hop/OnboardingCollectInformation.java @@ -0,0 +1,195 @@ +/* + * ###### + * ###### + * ############ ####( ###### #####. ###### ############ ############ + * ############# #####( ###### #####. ###### ############# ############# + * ###### #####( ###### #####. ###### ##### ###### ##### ###### + * ###### ###### #####( ###### #####. ###### ##### ##### ##### ###### + * ###### ###### #####( ###### #####. ###### ##### ##### ###### + * ############# ############# ############# ############# ##### ###### + * ############ ############ ############# ############ ##### ###### + * ###### + * ############# + * ############ + * + * Adyen Java API Library + * + * Copyright (c) 2021 Adyen B.V. + * This file is open source and available under the MIT license. + * See the LICENSE file for more info. + */ + +package com.adyen.model.hop; + +import java.util.Objects; + +import com.google.gson.annotations.SerializedName; + +import static com.adyen.util.Util.toIndentedString; + +public class OnboardingCollectInformation { + + @SerializedName("individualDetails") + private Boolean individualDetails = null; + + @SerializedName("businessDetails") + private Boolean businessDetails = null; + + @SerializedName("bankDetails") + private Boolean bankDetails = null; + + @SerializedName("legalArrangementDetails") + private Boolean legalArrangementDetails = null; + + @SerializedName("pciQuestionnaire") + private Boolean pciQuestionnaire = null; + + @SerializedName("shareholderDetails") + private Boolean shareholderDetails = null; + + /** + * Indicates whether individual details must be collected. Default is true. + * + * @return + */ + public Boolean getIndividualDetails() { + return individualDetails; + } + + public void setIndividualDetails(Boolean individualDetails) { + this.individualDetails = individualDetails; + } + + public OnboardingCollectInformation individualDetails(Boolean individualDetails) { + this.individualDetails = individualDetails; + return this; + } + + /** + * Indicates whether business details must be collected. Default is true. + * + * @return + */ + public Boolean getBusinessDetails() { + return businessDetails; + } + + public void setBusinessDetails(Boolean businessDetails) { + this.businessDetails = businessDetails; + } + + public OnboardingCollectInformation businessDetails(Boolean businessDetails) { + this.businessDetails = businessDetails; + return this; + } + + /** + * Indicates whether bank account details must be collected. Default is true. + * + * @return + */ + public Boolean getBankDetails() { + return bankDetails; + } + + public void setBankDetails(Boolean bankDetails) { + this.bankDetails = bankDetails; + } + + public OnboardingCollectInformation bankDetails(Boolean bankDetails) { + this.bankDetails = bankDetails; + return this; + } + + /** + * Indicates whether legal arrangement details must be collected. Default is true. + * + * @return + */ + public Boolean getLegalArrangementDetails() { + return legalArrangementDetails; + } + + public void setLegalArrangementDetails(Boolean legalArrangementDetails) { + this.legalArrangementDetails = legalArrangementDetails; + } + + public OnboardingCollectInformation legalArrangementDetails(Boolean legalArrangementDetails) { + this.legalArrangementDetails = legalArrangementDetails; + return this; + } + + /** + * Indicates whether answers to a PCI questionnaire must be collected. Applies only to partner platforms. Default is true. + * + * @return + */ + public Boolean getPciQuestionnaire() { + return pciQuestionnaire; + } + + public void setPciQuestionnaire(Boolean pciQuestionnaire) { + this.pciQuestionnaire = pciQuestionnaire; + } + + public OnboardingCollectInformation pciQuestionnaire(Boolean pciQuestionnaire) { + this.pciQuestionnaire = pciQuestionnaire; + return this; + } + + /** + * Indicates whether shareholder details must be collected. Defaults to true. + * + * @return + */ + public Boolean getShareholderDetails() { + return shareholderDetails; + } + + public void setShareholderDetails(Boolean shareholderDetails) { + this.shareholderDetails = shareholderDetails; + } + + public OnboardingCollectInformation shareholderDetails(Boolean shareholderDetails) { + this.shareholderDetails = shareholderDetails; + return this; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + OnboardingCollectInformation that = (OnboardingCollectInformation) o; + return Objects.equals(individualDetails, that.individualDetails) && + Objects.equals(businessDetails, that.businessDetails) && + Objects.equals(bankDetails, that.bankDetails) && + Objects.equals(legalArrangementDetails, that.legalArrangementDetails) && + Objects.equals(pciQuestionnaire, that.pciQuestionnaire) && + Objects.equals(shareholderDetails, that.shareholderDetails); + } + + @Override + public int hashCode() { + return Objects.hash(individualDetails, businessDetails, bankDetails, legalArrangementDetails, pciQuestionnaire, shareholderDetails); + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder(); + sb.append("class OnboardingCollectInformation {\n"); + + sb.append(" individualDetails: ").append(toIndentedString(individualDetails)).append("\n"); + sb.append(" businessDetails: ").append(toIndentedString(businessDetails)).append("\n"); + sb.append(" bankDetails: ").append(toIndentedString(bankDetails)).append("\n"); + sb.append(" legalArrangementDetails: ").append(toIndentedString(legalArrangementDetails)).append("\n"); + sb.append(" pciQuestionnaire: ").append(toIndentedString(pciQuestionnaire)).append("\n"); + sb.append(" shareholderDetails: ").append(toIndentedString(shareholderDetails)).append("\n"); + sb.append('}'); + return sb.toString(); + } + +} diff --git a/src/main/java/com/adyen/model/hop/OnboardingShowPages.java b/src/main/java/com/adyen/model/hop/OnboardingShowPages.java new file mode 100644 index 000000000..a807d3b78 --- /dev/null +++ b/src/main/java/com/adyen/model/hop/OnboardingShowPages.java @@ -0,0 +1,196 @@ +/* + * ###### + * ###### + * ############ ####( ###### #####. ###### ############ ############ + * ############# #####( ###### #####. ###### ############# ############# + * ###### #####( ###### #####. ###### ##### ###### ##### ###### + * ###### ###### #####( ###### #####. ###### ##### ##### ##### ###### + * ###### ###### #####( ###### #####. ###### ##### ##### ###### + * ############# ############# ############# ############# ##### ###### + * ############ ############ ############# ############ ##### ###### + * ###### + * ############# + * ############ + * + * Adyen Java API Library + * + * Copyright (c) 2021 Adyen B.V. + * This file is open source and available under the MIT license. + * See the LICENSE file for more info. + */ + +package com.adyen.model.hop; + +import java.util.Objects; + +import com.google.gson.annotations.SerializedName; + +import static com.adyen.util.Util.toIndentedString; + +public class OnboardingShowPages { + + @SerializedName("welcomePage") + private Boolean welcomePage = null; + + @SerializedName("individualDetailsSummaryPage") + private Boolean individualDetailsSummaryPage = null; + + @SerializedName("businessDetailsSummaryPage") + private Boolean businessDetailsSummaryPage = null; + + @SerializedName("bankDetailsSummaryPage") + private Boolean bankDetailsSummaryPage = null; + + @SerializedName("shareholderDetailsSummaryPage") + private Boolean shareholderDetailsSummaryPage = null; + + @SerializedName("legalArrangementsDetailsSummaryPage") + private Boolean legalArrangementsDetailsSummaryPage = null; + + /** + * Indicates whether the welcome page must be shown. Defaults to false. + * + * @return + */ + public Boolean getWelcomePage() { + return welcomePage; + } + + public void setWelcomePage(Boolean welcomePage) { + this.welcomePage = welcomePage; + } + + public OnboardingShowPages welcomePage(Boolean welcomePage) { + this.welcomePage = welcomePage; + return this; + } + + /** + * Indicates whether the page with the individual's details must be shown. Defaults to true. + * + * @return + */ + public Boolean getIndividualDetailsSummaryPage() { + return individualDetailsSummaryPage; + } + + public void setIndividualDetailsSummaryPage(Boolean individualDetailsSummaryPage) { + this.individualDetailsSummaryPage = individualDetailsSummaryPage; + } + + public OnboardingShowPages individualDetailsSummaryPage(Boolean individualDetailsSummaryPage) { + this.individualDetailsSummaryPage = individualDetailsSummaryPage; + return this; + } + + /** + * Indicates whether the page with bank account details must be shown. Defaults to true. + * + * @return + */ + public Boolean getBusinessDetailsSummaryPage() { + return businessDetailsSummaryPage; + } + + public void setBusinessDetailsSummaryPage(Boolean businessDetailsSummaryPage) { + this.businessDetailsSummaryPage = businessDetailsSummaryPage; + } + + public OnboardingShowPages businessDetailsSummaryPage(Boolean businessDetailsSummaryPage) { + this.businessDetailsSummaryPage = businessDetailsSummaryPage; + return this; + } + + /** + * Indicates whether the page with bank account details must be shown. Defaults to true. + * + * @return + */ + public Boolean getBankDetailsSummaryPage() { + return bankDetailsSummaryPage; + } + + public void setBankDetailsSummaryPage(Boolean bankDetailsSummaryPage) { + this.bankDetailsSummaryPage = bankDetailsSummaryPage; + } + + public OnboardingShowPages bankDetailsSummaryPage(Boolean bankDetailsSummaryPage) { + this.bankDetailsSummaryPage = bankDetailsSummaryPage; + return this; + } + + /** + * Indicates whether the page with the shareholders' details must be shown. Defaults to true. + * + * @return + */ + public Boolean getShareholderDetailsSummaryPage() { + return shareholderDetailsSummaryPage; + } + + public void setShareholderDetailsSummaryPage(Boolean shareholderDetailsSummaryPage) { + this.shareholderDetailsSummaryPage = shareholderDetailsSummaryPage; + } + + public OnboardingShowPages shareholderDetailsSummaryPage(Boolean shareholderDetailsSummaryPage) { + this.shareholderDetailsSummaryPage = shareholderDetailsSummaryPage; + return this; + } + + /** + * Indicates whether the page with the legal arrangements' details must be shown. Defaults to true. + * + * @return + */ + + public Boolean getLegalArrangementsDetailsSummaryPage() { + return legalArrangementsDetailsSummaryPage; + } + + public void setLegalArrangementsDetailsSummaryPage(Boolean legalArrangementsDetailsSummaryPage) { + this.legalArrangementsDetailsSummaryPage = legalArrangementsDetailsSummaryPage; + } + + public OnboardingShowPages legalArrangementsDetailsSummaryPage(Boolean legalArrangementsDetailsSummaryPage) { + this.legalArrangementsDetailsSummaryPage = legalArrangementsDetailsSummaryPage; + return this; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + OnboardingShowPages that = (OnboardingShowPages) o; + return Objects.equals(welcomePage, that.welcomePage) && + Objects.equals(individualDetailsSummaryPage, that.individualDetailsSummaryPage) && + Objects.equals(businessDetailsSummaryPage, that.businessDetailsSummaryPage) && + Objects.equals(bankDetailsSummaryPage, that.bankDetailsSummaryPage) && + Objects.equals(shareholderDetailsSummaryPage, that.shareholderDetailsSummaryPage) && + Objects.equals(legalArrangementsDetailsSummaryPage, that.legalArrangementsDetailsSummaryPage); + } + + @Override + public int hashCode() { + return Objects.hash(welcomePage, individualDetailsSummaryPage, businessDetailsSummaryPage, bankDetailsSummaryPage, shareholderDetailsSummaryPage, legalArrangementsDetailsSummaryPage); + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder(); + sb.append("class OnboardingShowPages {\n"); + + sb.append(" welcomePage: ").append(toIndentedString(welcomePage)).append("\n"); + sb.append(" individualDetailsSummaryPage: ").append(toIndentedString(individualDetailsSummaryPage)).append("\n"); + sb.append(" businessDetailsSummaryPage: ").append(toIndentedString(businessDetailsSummaryPage)).append("\n"); + sb.append(" bankDetailsSummaryPage: ").append(toIndentedString(bankDetailsSummaryPage)).append("\n"); + sb.append(" shareholderDetailsSummaryPage: ").append(toIndentedString(shareholderDetailsSummaryPage)).append("\n"); + sb.append(" legalArrangementsDetailsSummaryPage: ").append(toIndentedString(legalArrangementsDetailsSummaryPage)).append("\n"); + sb.append('}'); + return sb.toString(); + } + +} diff --git a/src/test/java/com/adyen/MarketPayTest.java b/src/test/java/com/adyen/MarketPayTest.java index 77089b599..8301fb9ac 100644 --- a/src/test/java/com/adyen/MarketPayTest.java +++ b/src/test/java/com/adyen/MarketPayTest.java @@ -30,6 +30,8 @@ import com.adyen.model.additionalData.SplitPaymentItem; import com.adyen.model.hop.GetOnboardingUrlRequest; import com.adyen.model.hop.GetOnboardingUrlResponse; +import com.adyen.model.hop.OnboardingCollectInformation; +import com.adyen.model.hop.OnboardingShowPages; import com.adyen.model.marketpay.AccountHolderBalanceRequest; import com.adyen.model.marketpay.AccountHolderBalanceResponse; import com.adyen.model.marketpay.AccountHolderDetails; @@ -1013,6 +1015,25 @@ public void TestGetOnboardingUrlSuccess() throws Exception { getOnboardingUrlRequest.setAccountHolderCode("accountHolderCode"); getOnboardingUrlRequest.setReturnUrl("myReturnUrl"); getOnboardingUrlRequest.setShopperLocale("en_GB"); + + OnboardingShowPages onboardingShowPages = new OnboardingShowPages(); + onboardingShowPages.setWelcomePage(true); + onboardingShowPages.setIndividualDetailsSummaryPage(true); + onboardingShowPages.setBusinessDetailsSummaryPage(true); + onboardingShowPages.setBankDetailsSummaryPage(false); + onboardingShowPages.setShareholderDetailsSummaryPage(false); + onboardingShowPages.setLegalArrangementsDetailsSummaryPage(true); + getOnboardingUrlRequest.setShowPages(onboardingShowPages); + + OnboardingCollectInformation onboardingCollectInformation = new OnboardingCollectInformation(); + onboardingCollectInformation.setIndividualDetails(true); + onboardingCollectInformation.setBusinessDetails(true); + onboardingCollectInformation.setBankDetails(false); + onboardingCollectInformation.setLegalArrangementDetails(false); + onboardingCollectInformation.setPciQuestionnaire(false); + onboardingCollectInformation.setShareholderDetails(false); + getOnboardingUrlRequest.setCollectInformation(onboardingCollectInformation); + GetOnboardingUrlResponse getOnboardingUrlResponse = hop.getOnboardingUrl(getOnboardingUrlRequest); assertEquals("8115977378312467", getOnboardingUrlResponse.getPspReference()); From a2a67b97c3156c1b7d5d001f3a99f1338b352d9b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Nov 2021 07:50:18 +0100 Subject: [PATCH 04/20] Bump gson from 2.8.8 to 2.8.9 (#646) Bumps [gson](https://github.com/google/gson) from 2.8.8 to 2.8.9. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.8.8...gson-parent-2.8.9) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b3de6b4d1..f1d3b625a 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ com.google.code.gson gson - 2.8.8 + 2.8.9 com.fasterxml.jackson.core From 21ae8bf5eb16a2375333da405f3b79cdbd431fa1 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 1 Nov 2021 07:50:40 +0100 Subject: [PATCH 05/20] Update dependency com.google.code.gson:gson to v2.8.9 (#645) From 2c2745776eddf8d69d9d2d72ca043dc141dbc817 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Nov 2021 08:06:33 +0100 Subject: [PATCH 06/20] Bump httpclient5 from 5.1.1 to 5.1.2 (#650) Bumps [httpclient5](https://github.com/apache/httpcomponents-client) from 5.1.1 to 5.1.2. - [Release notes](https://github.com/apache/httpcomponents-client/releases) - [Changelog](https://github.com/apache/httpcomponents-client/blob/rel/v5.1.2/RELEASE_NOTES.txt) - [Commits](https://github.com/apache/httpcomponents-client/compare/rel/v5.1.1...rel/v5.1.2) --- updated-dependencies: - dependency-name: org.apache.httpcomponents.client5:httpclient5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f1d3b625a..bdcceab6e 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ org.apache.httpcomponents.client5 httpclient5 - 5.1.1 + 5.1.2 junit From d0866cd0dbc5f6fa15c0f022b7cdc9113fa8d177 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 08:22:36 +0100 Subject: [PATCH 07/20] Bump mockito-core from 4.0.0 to 4.1.0 (#652) Bumps [mockito-core](https://github.com/mockito/mockito) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.0.0...v4.1.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bdcceab6e..8ae28f671 100644 --- a/pom.xml +++ b/pom.xml @@ -195,7 +195,7 @@ org.mockito mockito-core - 4.0.0 + 4.1.0 test From 6fb5cd049b57a22d2ec4465d204c15f1c90dd325 Mon Sep 17 00:00:00 2001 From: Alessio Zampatti Date: Fri, 26 Nov 2021 11:05:08 +0100 Subject: [PATCH 08/20] Update CODEOWNERS --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4f6f4405a..2c5f5a59f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @AlexandrosMor @wboereboom @Morerice @Aleffio +* @AlexandrosMor @wboereboom @Morerice From 6e4356613e0838b92d5f5165d492411505c0d380 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Dec 2021 08:17:37 +0100 Subject: [PATCH 09/20] Bump swagger-annotations from 2.1.11 to 2.1.12 (#668) Bumps swagger-annotations from 2.1.11 to 2.1.12. --- updated-dependencies: - dependency-name: io.swagger.core.v3:swagger-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8ae28f671..eb86d0d95 100644 --- a/pom.xml +++ b/pom.xml @@ -217,7 +217,7 @@ io.swagger.core.v3 swagger-annotations - 2.1.11 + 2.1.12 From e003977b6820ca6635433415c9bfe6325199acab Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 24 Dec 2021 08:18:05 +0100 Subject: [PATCH 10/20] Update dependency io.swagger.core.v3:swagger-models to v2.1.12 (#665) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb86d0d95..0eeaa9550 100644 --- a/pom.xml +++ b/pom.xml @@ -212,7 +212,7 @@ io.swagger.core.v3 swagger-models - 2.1.11 + 2.1.12 io.swagger.core.v3 From 56a6f65ecfa979c003696f19d4f5fb16f3da60b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Dec 2021 08:18:32 +0100 Subject: [PATCH 11/20] Bump jackson.version from 2.13.0 to 2.13.1 (#661) Bumps `jackson.version` from 2.13.0 to 2.13.1. Updates `jackson-annotations` from 2.13.0 to 2.13.1 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-databind` from 2.13.0 to 2.13.1 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-datatype-jdk8` from 2.13.0 to 2.13.1 --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jdk8 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0eeaa9550..4c79d9e89 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ UTF-8 UTF-8 - 2.13.0 + 2.13.1 scm:git:git@github.com:Adyen/adyen-java-api-library.git From ca462d2eeb056cca145fdbb0efb28ae4e50e9278 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Dec 2021 08:19:03 +0100 Subject: [PATCH 12/20] Bump maven-bundle-plugin from 5.1.2 to 5.1.3 (#657) Bumps maven-bundle-plugin from 5.1.2 to 5.1.3. --- updated-dependencies: - dependency-name: org.apache.felix:maven-bundle-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c79d9e89..1218f3334 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ org.apache.felix maven-bundle-plugin - 5.1.2 + 5.1.3 bundle-manifest From c66ec175a43aefc7b30259b87ae17a8ee5a0ca08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Dec 2021 08:19:27 +0100 Subject: [PATCH 13/20] Bump mockito-core from 4.1.0 to 4.2.0 (#659) Bumps [mockito-core](https://github.com/mockito/mockito) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.1.0...v4.2.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1218f3334..85fbc777f 100644 --- a/pom.xml +++ b/pom.xml @@ -195,7 +195,7 @@ org.mockito mockito-core - 4.1.0 + 4.2.0 test From d5b748d5b66856022222ef75b5ff939e8df3ff6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Dec 2021 08:19:50 +0100 Subject: [PATCH 14/20] Bump swagger-models from 2.1.11 to 2.1.12 (#667) Bumps swagger-models from 2.1.11 to 2.1.12. --- updated-dependencies: - dependency-name: io.swagger.core.v3:swagger-models dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> From e32290035941d1594f94b32d342b4877ff5ae236 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 24 Dec 2021 08:20:05 +0100 Subject: [PATCH 15/20] Update dependency org.mockito:mockito-core to v4.2.0 (#658) From dea4bfe5d0b85c6c5571bea2ca5a98ee7e8b12b0 Mon Sep 17 00:00:00 2001 From: Wouter Boereboom <62436079+wboereboom@users.noreply.github.com> Date: Tue, 28 Dec 2021 09:51:32 +0100 Subject: [PATCH 16/20] Pw 5250 remove travis (#655) * new coveralls workflow * removed .travis.yml * updated coveralls yml * run coveralls using github action * fix pom + remove TRAVIS from README.md --- .github/workflows/coveralls.yml | 22 ++++++++++++++++++++++ .travis.yml | 13 ------------- README.md | 1 - pom.xml | 7 +++++++ 4 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/coveralls.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml new file mode 100644 index 000000000..50676aaaa --- /dev/null +++ b/.github/workflows/coveralls.yml @@ -0,0 +1,22 @@ +name: Coveralls + +on: [push] + +jobs: + + coveralls: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + - name: Build & Test + run: mvn clean test + - name: Build with Maven + run: mvn test jacoco:report + - name: Coveralls Coverage Report Submission + run: mvn coveralls:report --define repoToken=${{ secrets.COVERALL_REPO_TOKEN }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5460d8f6c..000000000 --- a/.travis.yml +++ /dev/null @@ -1,13 +0,0 @@ -language: java - -dist: trusty - -jdk: - - oraclejdk8 - -install: mvn install -Dgpg.skip=true - -sudo: false - -after_success: - - mvn clean test jacoco:report coveralls:report diff --git a/README.md b/README.md index 2baf32b09..0e57b6e5f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -[![Build Status](https://travis-ci.org/Adyen/adyen-java-api-library.svg?branch=master)](https://travis-ci.org/Adyen/adyen-java-api-library) [![Coverage Status](https://coveralls.io/repos/github/Adyen/adyen-java-api-library/badge.svg?branch=master)](https://coveralls.io/github/Adyen/adyen-java-api-library?branch=master) diff --git a/pom.xml b/pom.xml index 85fbc777f..75886df47 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,13 @@ org.eluder.coveralls coveralls-maven-plugin 4.3.0 + + + javax.xml.bind + jaxb-api + 2.3.1 + + org.jacoco From 4faaece41de926eeb8897a0c124ea057ab918954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Campos?= Date: Tue, 28 Dec 2021 09:45:30 -0300 Subject: [PATCH 17/20] Renaming master branch to main in README.md (#653) --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 0e57b6e5f..2f54e9bdb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ [![Coverage Status](https://coveralls.io/repos/github/Adyen/adyen-java-api-library/badge.svg?branch=master)](https://coveralls.io/github/Adyen/adyen-java-api-library?branch=master) - # Adyen Java API Library This is the officially supported Java library for using Adyen's APIs. @@ -145,7 +144,7 @@ For other questions, [contact our Support Team](https://www.adyen.help/hc/en-us/ ## Licence -This repository is available under the [MIT license](https://github.com/Adyen/adyen-java-api-library/blob/master/LICENSE). +This repository is available under the [MIT license](https://github.com/Adyen/adyen-java-api-library/blob/main/LICENSE). From 6820031a6bf17d1ed97ca664b0d876287a74f631 Mon Sep 17 00:00:00 2001 From: wouterboe Date: Thu, 30 Dec 2021 08:37:35 +0100 Subject: [PATCH 18/20] change ProtectedCardData type from ContentInformation to String due to terminal implementation --- .../com/adyen/model/nexo/PaymentInstrumentData.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/adyen/model/nexo/PaymentInstrumentData.java b/src/main/java/com/adyen/model/nexo/PaymentInstrumentData.java index b9e00b57f..a91aba088 100644 --- a/src/main/java/com/adyen/model/nexo/PaymentInstrumentData.java +++ b/src/main/java/com/adyen/model/nexo/PaymentInstrumentData.java @@ -71,7 +71,7 @@ public class PaymentInstrumentData { * The Protected card data. */ @XmlElement(name = "ProtectedCardData") - protected ContentInformation protectedCardData; + protected String protectedCardData; /** * Gets the value of the cardData property. @@ -166,18 +166,18 @@ public void setStoredValueAccountID(StoredValueAccountID value) { /** * Gets the value of the protectedCardData property. * - * @return possible object is {@link ContentInformation } + * @return possible object is {@link String } */ - public ContentInformation getProtectedCardData() { + public String getProtectedCardData() { return protectedCardData; } /** * Sets the value of the protectedCardData property. * - * @param value allowed object is {@link ContentInformation } + * @param value allowed object is {@link String } */ - public void setProtectedCardData(ContentInformation value) { + public void setProtectedCardData(String value) { this.protectedCardData = value; } } From 67790c67643d7bf0751411f5f33971dd08a8106e Mon Sep 17 00:00:00 2001 From: wouterboe Date: Fri, 31 Dec 2021 13:31:25 +0100 Subject: [PATCH 19/20] Version Bump 17.3.0 --- README.md | 2 +- pom.xml | 2 +- src/main/java/com/adyen/Client.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2f54e9bdb..c29740e94 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ You can use Maven and add this dependency to your project's POM: com.adyen adyen-java-api-library - 17.2.0 + 17.3.0 ``` diff --git a/pom.xml b/pom.xml index 75886df47..39322493e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.adyen adyen-java-api-library jar - 17.2.0 + 17.3.0 Adyen Java API Library Adyen API Client Library for Java https://github.com/adyen/adyen-java-api-library diff --git a/src/main/java/com/adyen/Client.java b/src/main/java/com/adyen/Client.java index 5a385a3be..8637f56d6 100644 --- a/src/main/java/com/adyen/Client.java +++ b/src/main/java/com/adyen/Client.java @@ -47,7 +47,7 @@ public class Client { public static final String MARKETPAY_NOTIFICATION_API_VERSION = "v6"; public static final String MARKETPAY_HOP_API_VERSION = "v6"; public static final String LIB_NAME = "adyen-java-api-library"; - public static final String LIB_VERSION = "17.2.0"; + public static final String LIB_VERSION = "17.3.0"; public static final String CHECKOUT_ENDPOINT_TEST = "https://checkout-test.adyen.com/checkout"; public static final String CHECKOUT_ENDPOINT_LIVE_SUFFIX = "-checkout-live.adyenpayments.com/checkout"; public static final String CHECKOUT_ENDPOINT_CERT_LIVE = "https://checkoutcert-live-%s.adyen.com/checkout"; From a0f1356edb43a3d4516824788459ce4c36f190aa Mon Sep 17 00:00:00 2001 From: Alexandros Moraitis Date: Fri, 31 Dec 2021 14:59:26 +0100 Subject: [PATCH 20/20] Remove enableRealTimeUpdate (#648) --- .../model/checkout/PaymentMethodsRequest.java | 32 ++----------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/adyen/model/checkout/PaymentMethodsRequest.java b/src/main/java/com/adyen/model/checkout/PaymentMethodsRequest.java index 05c64d250..51435dad4 100755 --- a/src/main/java/com/adyen/model/checkout/PaymentMethodsRequest.java +++ b/src/main/java/com/adyen/model/checkout/PaymentMethodsRequest.java @@ -83,9 +83,6 @@ public class PaymentMethodsRequest { @SerializedName("trustedShopper") private Boolean trustedShopper = null; - @SerializedName("enableRealTimeUpdate") - private Boolean enableRealTimeUpdate = null; - @SerializedName("threeDSAuthenticationOnly") private Boolean threeDSAuthenticationOnly = null; @@ -279,11 +276,6 @@ public void setBlockedPaymentMethods(List blockedPaymentMethods) { this.blockedPaymentMethods = blockedPaymentMethods; } - public PaymentMethodsRequest enableRealTimeUpdate(Boolean enableRealTimeUpdate) { - this.enableRealTimeUpdate = enableRealTimeUpdate; - return this; - } - public String getStore() { return store; } @@ -297,19 +289,6 @@ public PaymentMethodsRequest store(String store) { return this; } - /** - * Choose if a specific transaction should use the Real-time Account Updater, regardless of other settings. - * - * @return enableRealTimeUpdate - **/ - public Boolean isEnableRealTimeUpdate() { - return enableRealTimeUpdate; - } - - public void setEnableRealTimeUpdate(Boolean enableRealTimeUpdate) { - this.enableRealTimeUpdate = enableRealTimeUpdate; - } - public PaymentMethodsRequest threeDSAuthenticationOnly(Boolean threeDSAuthenticationOnly) { this.threeDSAuthenticationOnly = threeDSAuthenticationOnly; return this; @@ -368,7 +347,6 @@ public boolean equals(java.lang.Object o) { Objects.equals(this.blockedPaymentMethods, paymentMethodsRequest.blockedPaymentMethods) && Objects.equals(this.channel, paymentMethodsRequest.channel) && Objects.equals(this.countryCode, paymentMethodsRequest.countryCode) && - Objects.equals(this.enableRealTimeUpdate, paymentMethodsRequest.enableRealTimeUpdate) && Objects.equals(this.merchantAccount, paymentMethodsRequest.merchantAccount) && Objects.equals(this.order, paymentMethodsRequest.order) && Objects.equals(this.shopperLocale, paymentMethodsRequest.shopperLocale) && @@ -379,7 +357,7 @@ public boolean equals(java.lang.Object o) { @Override public int hashCode() { - return Objects.hash(additionalData, allowedPaymentMethods, amount, blockedPaymentMethods, channel, countryCode, enableRealTimeUpdate, merchantAccount, order, shopperLocale, shopperReference, splitCardFundingSources, store); + return Objects.hash(additionalData, allowedPaymentMethods, amount, blockedPaymentMethods, channel, countryCode, merchantAccount, order, shopperLocale, shopperReference, splitCardFundingSources, store); } @Override @@ -393,7 +371,6 @@ public String toString() { sb.append(" blockedPaymentMethods: ").append(toIndentedString(blockedPaymentMethods)).append("\n"); sb.append(" channel: ").append(toIndentedString(channel)).append("\n"); sb.append(" countryCode: ").append(toIndentedString(countryCode)).append("\n"); - sb.append(" enableRealTimeUpdate: ").append(toIndentedString(enableRealTimeUpdate)).append("\n"); sb.append(" merchantAccount: ").append(toIndentedString(merchantAccount)).append("\n"); sb.append(" order: ").append(toIndentedString(order)).append("\n"); sb.append(" shopperLocale: ").append(toIndentedString(shopperLocale)).append("\n"); @@ -425,7 +402,7 @@ public enum ChannelEnum { public static ChannelEnum fromValue(String text) { return Arrays.stream(values()). filter(s -> s.value.equals(text)). - findFirst().orElse(null); + findFirst().orElse(null); } public String getValue() { @@ -451,7 +428,4 @@ public ChannelEnum read(final JsonReader jsonReader) throws IOException { } } -} - - - +} \ No newline at end of file