From c503457e9f79798f074c2ad632a1ba207786e212 Mon Sep 17 00:00:00 2001 From: Simon Michel Date: Sat, 4 Apr 2020 22:15:47 +0200 Subject: [PATCH 1/9] Change to Java 8 version --- pom.xml | 4 ++-- .../java/com/adyen/model/AbstractPaymentRequest.java | 4 ++-- src/main/java/com/adyen/model/DeviceRenderOptions.java | 2 +- src/main/java/com/adyen/model/FraudResult.java | 2 +- src/main/java/com/adyen/model/PaymentRequest3ds2.java | 2 +- .../model/binlookup/ThreeDSAvailabilityRequest.java | 2 +- .../model/binlookup/ThreeDSAvailabilityResponse.java | 4 ++-- .../adyen/model/checkout/CreatePaymentLinkRequest.java | 4 ++-- .../java/com/adyen/model/checkout/InputDetail.java | 4 ++-- .../java/com/adyen/model/checkout/PaymentMethod.java | 4 ++-- .../adyen/model/checkout/PaymentMethodsResponse.java | 4 ++-- .../adyen/model/checkout/PaymentSessionRequest.java | 8 ++++---- .../adyen/model/checkout/PaymentSessionResponse.java | 6 +++--- .../com/adyen/model/checkout/PaymentsResponse.java | 2 +- .../java/com/adyen/model/checkout/RecurringDetail.java | 4 ++-- .../java/com/adyen/model/checkout/SubInputDetail.java | 2 +- .../adyen/model/checkoututility/OriginKeysRequest.java | 2 +- .../model/marketpay/AccountHolderBalanceResponse.java | 4 ++-- .../adyen/model/marketpay/AccountHolderDetails.java | 4 ++-- .../com/adyen/model/marketpay/AccountHolderStatus.java | 2 +- .../marketpay/AccountHolderTransactionListRequest.java | 4 ++-- .../AccountHolderTransactionListResponse.java | 4 ++-- .../adyen/model/marketpay/AccountStateRequirement.java | 2 +- .../java/com/adyen/model/marketpay/AccountStatus.java | 4 ++-- .../adyen/model/marketpay/AccountTransactionList.java | 2 +- .../com/adyen/model/marketpay/BusinessDetails.java | 2 +- .../model/marketpay/CloseAccountHolderResponse.java | 2 +- .../adyen/model/marketpay/CloseAccountResponse.java | 2 +- .../model/marketpay/CreateAccountHolderResponse.java | 2 +- .../adyen/model/marketpay/CreateAccountResponse.java | 4 ++-- .../model/marketpay/DeleteBankAccountRequest.java | 2 +- .../model/marketpay/DeletePayoutMethodRequest.java | 2 +- .../model/marketpay/DeleteShareholderRequest.java | 2 +- .../com/adyen/model/marketpay/GenericResponse.java | 2 +- .../model/marketpay/GetAccountHolderResponse.java | 4 ++-- .../marketpay/GetAccountHolderStatusResponse.java | 2 +- .../model/marketpay/GetTierConfigurationResponse.java | 2 +- .../model/marketpay/GetUploadedDocumentsResponse.java | 4 ++-- .../model/marketpay/KYCBankAccountCheckResult.java | 2 +- .../java/com/adyen/model/marketpay/KYCCheckResult.java | 2 +- .../com/adyen/model/marketpay/KYCCheckStatusData.java | 2 +- .../model/marketpay/KYCShareholderCheckResult.java | 2 +- .../adyen/model/marketpay/KYCVerificationResult.java | 4 ++-- .../model/marketpay/PayoutAccountHolderResponse.java | 2 +- .../java/com/adyen/model/marketpay/PersonalData.java | 2 +- .../model/marketpay/RefundFundsTransferResponse.java | 2 +- .../marketpay/RefundNotPaidOutTransfersResponse.java | 2 +- .../model/marketpay/SetupBeneficiaryResponse.java | 2 +- .../model/marketpay/SuspendAccountHolderResponse.java | 2 +- .../com/adyen/model/marketpay/TierConfiguration.java | 2 +- .../adyen/model/marketpay/TransferFundsResponse.java | 2 +- .../marketpay/UnSuspendAccountHolderResponse.java | 2 +- .../model/marketpay/UpdateAccountHolderResponse.java | 2 +- .../adyen/model/marketpay/UpdateAccountResponse.java | 4 ++-- .../DeleteNotificationConfigurationRequest.java | 2 +- .../notification/ExchangeMessageContainer.java | 4 +++- .../GetNotificationConfigurationListResponse.java | 4 ++-- .../notification/NotificationConfigurationDetails.java | 10 +++++----- .../marketpay/notification/PaymentFailureContent.java | 2 +- .../TestNotificationConfigurationRequest.java | 2 +- .../TestNotificationConfigurationResponse.java | 10 +++++----- .../modification/AbstractModificationRequest.java | 2 +- .../java/com/adyen/model/nexo/AuthenticatedData.java | 2 +- src/main/java/com/adyen/model/nexo/BatchRequest.java | 2 +- src/main/java/com/adyen/model/nexo/BatchResponse.java | 2 +- .../java/com/adyen/model/nexo/CapturedSignature.java | 2 +- .../com/adyen/model/nexo/CardAcquisitionResponse.java | 6 +++--- .../adyen/model/nexo/CardAcquisitionTransaction.java | 6 +++--- src/main/java/com/adyen/model/nexo/CardData.java | 8 ++++---- .../com/adyen/model/nexo/CardReaderInitRequest.java | 2 +- .../com/adyen/model/nexo/CardReaderInitResponse.java | 4 ++-- .../java/com/adyen/model/nexo/CashHandlingDevice.java | 2 +- .../java/com/adyen/model/nexo/DiagnosisRequest.java | 2 +- .../java/com/adyen/model/nexo/DiagnosisResponse.java | 4 ++-- src/main/java/com/adyen/model/nexo/DisplayOutput.java | 2 +- src/main/java/com/adyen/model/nexo/DisplayRequest.java | 2 +- .../java/com/adyen/model/nexo/DisplayResponse.java | 2 +- .../com/adyen/model/nexo/EnableServiceRequest.java | 2 +- src/main/java/com/adyen/model/nexo/EnvelopedData.java | 2 +- .../java/com/adyen/model/nexo/GetTotalsRequest.java | 2 +- .../java/com/adyen/model/nexo/GetTotalsResponse.java | 2 +- src/main/java/com/adyen/model/nexo/InputUpdate.java | 2 +- src/main/java/com/adyen/model/nexo/Instalment.java | 2 +- src/main/java/com/adyen/model/nexo/Issuer.java | 2 +- src/main/java/com/adyen/model/nexo/LoginRequest.java | 2 +- .../java/com/adyen/model/nexo/LoyaltyAccountID.java | 2 +- src/main/java/com/adyen/model/nexo/LoyaltyRequest.java | 2 +- .../java/com/adyen/model/nexo/LoyaltyResponse.java | 4 ++-- .../java/com/adyen/model/nexo/LoyaltyTransaction.java | 2 +- src/main/java/com/adyen/model/nexo/MenuEntry.java | 2 +- src/main/java/com/adyen/model/nexo/OutputContent.java | 2 +- src/main/java/com/adyen/model/nexo/POIProfile.java | 2 +- src/main/java/com/adyen/model/nexo/POIStatus.java | 2 +- .../java/com/adyen/model/nexo/POITerminalData.java | 2 +- src/main/java/com/adyen/model/nexo/PaymentRequest.java | 2 +- .../java/com/adyen/model/nexo/PaymentResponse.java | 6 +++--- src/main/java/com/adyen/model/nexo/PaymentResult.java | 4 ++-- .../java/com/adyen/model/nexo/PaymentTransaction.java | 2 +- .../com/adyen/model/nexo/PerformedTransaction.java | 2 +- src/main/java/com/adyen/model/nexo/Rebates.java | 2 +- .../com/adyen/model/nexo/ReconciliationRequest.java | 2 +- .../com/adyen/model/nexo/ReconciliationResponse.java | 2 +- .../java/com/adyen/model/nexo/ReversalResponse.java | 2 +- src/main/java/com/adyen/model/nexo/SaleData.java | 4 ++-- src/main/java/com/adyen/model/nexo/SaleProfile.java | 2 +- .../java/com/adyen/model/nexo/SaleTerminalData.java | 2 +- .../java/com/adyen/model/nexo/SensitiveCardData.java | 2 +- src/main/java/com/adyen/model/nexo/SignedData.java | 6 +++--- .../com/adyen/model/nexo/StoredValueAccountID.java | 2 +- .../java/com/adyen/model/nexo/StoredValueRequest.java | 2 +- .../java/com/adyen/model/nexo/StoredValueResponse.java | 2 +- .../com/adyen/model/nexo/TransactionConditions.java | 8 ++++---- .../com/adyen/model/nexo/TransactionStatusRequest.java | 2 +- .../java/com/adyen/model/nexo/TransactionTotals.java | 4 ++-- .../java/com/adyen/model/payout/PayoutRequest.java | 2 +- .../java/com/adyen/model/recurring/DisableResult.java | 2 +- .../com/adyen/model/recurring/RecurringDetail.java | 2 +- .../adyen/model/recurring/RecurringDetailsResult.java | 2 +- .../notification/GetNotificationConfigurationList.java | 2 +- 119 files changed, 173 insertions(+), 171 deletions(-) diff --git a/pom.xml b/pom.xml index a1356d77f..90c74c172 100644 --- a/pom.xml +++ b/pom.xml @@ -37,8 +37,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.7 - 1.7 + 1.8 + 1.8 diff --git a/src/main/java/com/adyen/model/AbstractPaymentRequest.java b/src/main/java/com/adyen/model/AbstractPaymentRequest.java index 4403b8f9a..cf375f405 100644 --- a/src/main/java/com/adyen/model/AbstractPaymentRequest.java +++ b/src/main/java/com/adyen/model/AbstractPaymentRequest.java @@ -193,7 +193,7 @@ public T setBrowserInfoData(String userAgent, String acceptHeader) { */ public Map getOrCreateAdditionalData() { if (this.getAdditionalData() == null) { - this.setAdditionalData(new HashMap()); + this.setAdditionalData(new HashMap<>()); } return this.getAdditionalData(); @@ -941,7 +941,7 @@ private String stringifyAdditionalData() { return null; } - Map nonSensitiveAdditionalData = new HashMap(additionalData); + Map nonSensitiveAdditionalData = new HashMap<>(additionalData); List keys = Arrays.asList(ApiConstants.AdditionalData.Card.Encrypted.JSON, ApiConstants.AdditionalData.ENCRYPTED_CARD_NUMBER, ApiConstants.AdditionalData.ENCRYPTED_EXPIRY_MONTH, diff --git a/src/main/java/com/adyen/model/DeviceRenderOptions.java b/src/main/java/com/adyen/model/DeviceRenderOptions.java index 785753301..f51b89a72 100644 --- a/src/main/java/com/adyen/model/DeviceRenderOptions.java +++ b/src/main/java/com/adyen/model/DeviceRenderOptions.java @@ -162,7 +162,7 @@ public DeviceRenderOptions sdkUiType(List sdkUiType) { public DeviceRenderOptions addSdkUiTypeItem(SdkUiTypeEnum sdkUiTypeItem) { if (this.sdkUiType == null) { - this.sdkUiType = new ArrayList(); + this.sdkUiType = new ArrayList<>(); } this.sdkUiType.add(sdkUiTypeItem); diff --git a/src/main/java/com/adyen/model/FraudResult.java b/src/main/java/com/adyen/model/FraudResult.java index fbe57103c..f03938e44 100644 --- a/src/main/java/com/adyen/model/FraudResult.java +++ b/src/main/java/com/adyen/model/FraudResult.java @@ -33,7 +33,7 @@ public class FraudResult { private Integer accountScore = null; @SerializedName("results") - private List results = new ArrayList(); + private List results = new ArrayList<>(); public FraudResult accountScore(Integer accountScore) { this.accountScore = accountScore; diff --git a/src/main/java/com/adyen/model/PaymentRequest3ds2.java b/src/main/java/com/adyen/model/PaymentRequest3ds2.java index 1a6f84a58..dacc8fbba 100644 --- a/src/main/java/com/adyen/model/PaymentRequest3ds2.java +++ b/src/main/java/com/adyen/model/PaymentRequest3ds2.java @@ -198,7 +198,7 @@ public void setMerchantRiskIndicator(MerchantRiskIndicator merchantRiskIndicator public PaymentRequest3ds2 addSplitsItem(Split splitsItem) { if (this.splits == null) { - this.splits = new ArrayList(); + this.splits = new ArrayList<>(); } this.splits.add(splitsItem); diff --git a/src/main/java/com/adyen/model/binlookup/ThreeDSAvailabilityRequest.java b/src/main/java/com/adyen/model/binlookup/ThreeDSAvailabilityRequest.java index 155bb90dd..249050876 100755 --- a/src/main/java/com/adyen/model/binlookup/ThreeDSAvailabilityRequest.java +++ b/src/main/java/com/adyen/model/binlookup/ThreeDSAvailabilityRequest.java @@ -35,7 +35,7 @@ public class ThreeDSAvailabilityRequest { private Object additionalData = null; @SerializedName("brands") - private List brands = new ArrayList(); + private List brands = new ArrayList<>(); @SerializedName("cardNumber") private String cardNumber = null; diff --git a/src/main/java/com/adyen/model/binlookup/ThreeDSAvailabilityResponse.java b/src/main/java/com/adyen/model/binlookup/ThreeDSAvailabilityResponse.java index e326ae7c4..e12138fe2 100755 --- a/src/main/java/com/adyen/model/binlookup/ThreeDSAvailabilityResponse.java +++ b/src/main/java/com/adyen/model/binlookup/ThreeDSAvailabilityResponse.java @@ -71,7 +71,7 @@ public ThreeDSAvailabilityResponse dsPublicKeys(List dsPublic public ThreeDSAvailabilityResponse addDsPublicKeysItem(DSPublicKeyDetail dsPublicKeysItem) { if (this.dsPublicKeys == null) { - this.dsPublicKeys = new ArrayList(); + this.dsPublicKeys = new ArrayList<>(); } this.dsPublicKeys.add(dsPublicKeysItem); return this; @@ -115,7 +115,7 @@ public ThreeDSAvailabilityResponse threeDS2CardRangeDetails(List(); + this.threeDS2CardRangeDetails = new ArrayList<>(); } this.threeDS2CardRangeDetails.add(threeDS2CardRangeDetailsItem); return this; diff --git a/src/main/java/com/adyen/model/checkout/CreatePaymentLinkRequest.java b/src/main/java/com/adyen/model/checkout/CreatePaymentLinkRequest.java index 02117741e..1921df31e 100755 --- a/src/main/java/com/adyen/model/checkout/CreatePaymentLinkRequest.java +++ b/src/main/java/com/adyen/model/checkout/CreatePaymentLinkRequest.java @@ -84,7 +84,7 @@ public CreatePaymentLinkRequest allowedPaymentMethods(List allowedPaymen public CreatePaymentLinkRequest addAllowedPaymentMethodsItem(String allowedPaymentMethodsItem) { if (this.allowedPaymentMethods == null) { - this.allowedPaymentMethods = new ArrayList(); + this.allowedPaymentMethods = new ArrayList<>(); } this.allowedPaymentMethods.add(allowedPaymentMethodsItem); return this; @@ -146,7 +146,7 @@ public CreatePaymentLinkRequest blockedPaymentMethods(List blockedPaymen public CreatePaymentLinkRequest addBlockedPaymentMethodsItem(String blockedPaymentMethodsItem) { if (this.blockedPaymentMethods == null) { - this.blockedPaymentMethods = new ArrayList(); + this.blockedPaymentMethods = new ArrayList<>(); } this.blockedPaymentMethods.add(blockedPaymentMethodsItem); return this; diff --git a/src/main/java/com/adyen/model/checkout/InputDetail.java b/src/main/java/com/adyen/model/checkout/InputDetail.java index 0cf57a194..7ec60bb19 100755 --- a/src/main/java/com/adyen/model/checkout/InputDetail.java +++ b/src/main/java/com/adyen/model/checkout/InputDetail.java @@ -94,7 +94,7 @@ public InputDetail details(List details) { public InputDetail addDetailsItem(SubInputDetail detailsItem) { if (this.details == null) { - this.details = new ArrayList(); + this.details = new ArrayList<>(); } this.details.add(detailsItem); @@ -141,7 +141,7 @@ public InputDetail items(List items) { public InputDetail addItemsItem(Item itemsItem) { if (this.items == null) { - this.items = new ArrayList(); + this.items = new ArrayList<>(); } this.items.add(itemsItem); diff --git a/src/main/java/com/adyen/model/checkout/PaymentMethod.java b/src/main/java/com/adyen/model/checkout/PaymentMethod.java index 12d1237e6..b8a95892f 100755 --- a/src/main/java/com/adyen/model/checkout/PaymentMethod.java +++ b/src/main/java/com/adyen/model/checkout/PaymentMethod.java @@ -62,7 +62,7 @@ public PaymentMethod brands(List brands) { public PaymentMethod addBrandsItem(String brandsItem) { if (this.brands == null) { - this.brands = new ArrayList(); + this.brands = new ArrayList<>(); } this.brands.add(brandsItem); return this; @@ -117,7 +117,7 @@ public PaymentMethod details(List details) { public PaymentMethod addDetailsItem(InputDetail detailsItem) { if (this.details == null) { - this.details = new ArrayList(); + this.details = new ArrayList<>(); } this.details.add(detailsItem); diff --git a/src/main/java/com/adyen/model/checkout/PaymentMethodsResponse.java b/src/main/java/com/adyen/model/checkout/PaymentMethodsResponse.java index 5e2030f3c..5903892d5 100755 --- a/src/main/java/com/adyen/model/checkout/PaymentMethodsResponse.java +++ b/src/main/java/com/adyen/model/checkout/PaymentMethodsResponse.java @@ -52,7 +52,7 @@ public PaymentMethodsResponse oneClickPaymentMethods(List oneCl public PaymentMethodsResponse addOneClickPaymentMethodsItem(RecurringDetail oneClickPaymentMethodsItem) { if (this.oneClickPaymentMethods == null) { - this.oneClickPaymentMethods = new ArrayList(); + this.oneClickPaymentMethods = new ArrayList<>(); } this.oneClickPaymentMethods.add(oneClickPaymentMethodsItem); @@ -80,7 +80,7 @@ public PaymentMethodsResponse paymentMethods(List paymentMethods) public PaymentMethodsResponse addPaymentMethodsItem(PaymentMethod paymentMethodsItem) { if (this.paymentMethods == null) { - this.paymentMethods = new ArrayList(); + this.paymentMethods = new ArrayList<>(); } this.paymentMethods.add(paymentMethodsItem); diff --git a/src/main/java/com/adyen/model/checkout/PaymentSessionRequest.java b/src/main/java/com/adyen/model/checkout/PaymentSessionRequest.java index aeef0de58..58184235e 100755 --- a/src/main/java/com/adyen/model/checkout/PaymentSessionRequest.java +++ b/src/main/java/com/adyen/model/checkout/PaymentSessionRequest.java @@ -512,7 +512,7 @@ public PaymentSessionRequest allowedPaymentMethods(List allowedPaymentMe public PaymentSessionRequest addAllowedPaymentMethodsItem(String allowedPaymentMethodsItem) { if (this.allowedPaymentMethods == null) { - this.allowedPaymentMethods = new ArrayList(); + this.allowedPaymentMethods = new ArrayList<>(); } this.allowedPaymentMethods.add(allowedPaymentMethodsItem); @@ -591,7 +591,7 @@ public PaymentSessionRequest blockedPaymentMethods(List blockedPaymentMe public PaymentSessionRequest addBlockedPaymentMethodsItem(String blockedPaymentMethodsItem) { if (this.blockedPaymentMethods == null) { - this.blockedPaymentMethods = new ArrayList(); + this.blockedPaymentMethods = new ArrayList<>(); } this.blockedPaymentMethods.add(blockedPaymentMethodsItem); @@ -901,7 +901,7 @@ public PaymentSessionRequest lineItems(List lineItems) { public PaymentSessionRequest addLineItemsItem(LineItem lineItemsItem) { if (this.lineItems == null) { - this.lineItems = new ArrayList(); + this.lineItems = new ArrayList<>(); } this.lineItems.add(lineItemsItem); @@ -1319,7 +1319,7 @@ public PaymentSessionRequest splits(List splits) { public PaymentSessionRequest addSplitsItem(Split splitsItem) { if (this.splits == null) { - this.splits = new ArrayList(); + this.splits = new ArrayList<>(); } this.splits.add(splitsItem); diff --git a/src/main/java/com/adyen/model/checkout/PaymentSessionResponse.java b/src/main/java/com/adyen/model/checkout/PaymentSessionResponse.java index 9d214c724..69b1c9f31 100755 --- a/src/main/java/com/adyen/model/checkout/PaymentSessionResponse.java +++ b/src/main/java/com/adyen/model/checkout/PaymentSessionResponse.java @@ -186,7 +186,7 @@ public PaymentSessionResponse lineItems(List lineItems) { public PaymentSessionResponse addLineItemsItem(LineItem lineItemsItem) { if (this.lineItems == null) { - this.lineItems = new ArrayList(); + this.lineItems = new ArrayList<>(); } this.lineItems.add(lineItemsItem); @@ -233,7 +233,7 @@ public PaymentSessionResponse oneClickPaymentMethods(List oneCl public PaymentSessionResponse addOneClickPaymentMethodsItem(RecurringDetail oneClickPaymentMethodsItem) { if (this.oneClickPaymentMethods == null) { - this.oneClickPaymentMethods = new ArrayList(); + this.oneClickPaymentMethods = new ArrayList<>(); } this.oneClickPaymentMethods.add(oneClickPaymentMethodsItem); @@ -337,7 +337,7 @@ public PaymentSessionResponse paymentMethods(List paymentMethods) public PaymentSessionResponse addPaymentMethodsItem(PaymentMethod paymentMethodsItem) { if (this.paymentMethods == null) { - this.paymentMethods = new ArrayList(); + this.paymentMethods = new ArrayList<>(); } this.paymentMethods.add(paymentMethodsItem); diff --git a/src/main/java/com/adyen/model/checkout/PaymentsResponse.java b/src/main/java/com/adyen/model/checkout/PaymentsResponse.java index 0dbb837ed..fc8550026 100755 --- a/src/main/java/com/adyen/model/checkout/PaymentsResponse.java +++ b/src/main/java/com/adyen/model/checkout/PaymentsResponse.java @@ -150,7 +150,7 @@ public PaymentsResponse details(List details) { public PaymentsResponse addDetailsItem(InputDetail detailsItem) { if (this.details == null) { - this.details = new ArrayList(); + this.details = new ArrayList<>(); } this.details.add(detailsItem); diff --git a/src/main/java/com/adyen/model/checkout/RecurringDetail.java b/src/main/java/com/adyen/model/checkout/RecurringDetail.java index 2eb9e370a..be199ad3d 100755 --- a/src/main/java/com/adyen/model/checkout/RecurringDetail.java +++ b/src/main/java/com/adyen/model/checkout/RecurringDetail.java @@ -70,7 +70,7 @@ public RecurringDetail brands(List brands) { public RecurringDetail addBrandsItem(String brandsItem) { if (this.brands == null) { - this.brands = new ArrayList(); + this.brands = new ArrayList<>(); } this.brands.add(brandsItem); return this; @@ -124,7 +124,7 @@ public RecurringDetail details(List details) { public RecurringDetail addDetailsItem(InputDetail detailsItem) { if (this.details == null) { - this.details = new ArrayList(); + this.details = new ArrayList<>(); } this.details.add(detailsItem); return this; diff --git a/src/main/java/com/adyen/model/checkout/SubInputDetail.java b/src/main/java/com/adyen/model/checkout/SubInputDetail.java index 46963dfea..6ea421b55 100755 --- a/src/main/java/com/adyen/model/checkout/SubInputDetail.java +++ b/src/main/java/com/adyen/model/checkout/SubInputDetail.java @@ -58,7 +58,7 @@ public SubInputDetail items(List items) { public SubInputDetail addItemsItem(Item itemsItem) { if (this.items == null) { - this.items = new ArrayList(); + this.items = new ArrayList<>(); } this.items.add(itemsItem); diff --git a/src/main/java/com/adyen/model/checkoututility/OriginKeysRequest.java b/src/main/java/com/adyen/model/checkoututility/OriginKeysRequest.java index 81f1c0fd8..9ea04a307 100755 --- a/src/main/java/com/adyen/model/checkoututility/OriginKeysRequest.java +++ b/src/main/java/com/adyen/model/checkoututility/OriginKeysRequest.java @@ -33,7 +33,7 @@ public class OriginKeysRequest { @SerializedName("originDomains") - private List originDomains = new ArrayList(); + private List originDomains = new ArrayList<>(); public OriginKeysRequest originDomains(List originDomains) { this.originDomains = originDomains; diff --git a/src/main/java/com/adyen/model/marketpay/AccountHolderBalanceResponse.java b/src/main/java/com/adyen/model/marketpay/AccountHolderBalanceResponse.java index 3c96a9ed2..5d8b111b4 100755 --- a/src/main/java/com/adyen/model/marketpay/AccountHolderBalanceResponse.java +++ b/src/main/java/com/adyen/model/marketpay/AccountHolderBalanceResponse.java @@ -54,7 +54,7 @@ public AccountHolderBalanceResponse balancePerAccount(List public AccountHolderBalanceResponse addBalancePerAccountItem(AccountDetailBalance balancePerAccountItem) { if (this.balancePerAccount == null) { - this.balancePerAccount = new ArrayList(); + this.balancePerAccount = new ArrayList<>(); } this.balancePerAccount.add(balancePerAccountItem); return this; @@ -80,7 +80,7 @@ public AccountHolderBalanceResponse invalidFields(List invalidFi public AccountHolderBalanceResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/AccountHolderDetails.java b/src/main/java/com/adyen/model/marketpay/AccountHolderDetails.java index 0cf363f81..081dbdf87 100755 --- a/src/main/java/com/adyen/model/marketpay/AccountHolderDetails.java +++ b/src/main/java/com/adyen/model/marketpay/AccountHolderDetails.java @@ -88,7 +88,7 @@ public AccountHolderDetails bankAccountDetails(List bankAccou public AccountHolderDetails addBankAccountDetailsItem(BankAccountDetail bankAccountDetailsItem) { if (this.bankAccountDetails == null) { - this.bankAccountDetails = new ArrayList(); + this.bankAccountDetails = new ArrayList<>(); } this.bankAccountDetails.add(bankAccountDetailsItem); return this; @@ -222,7 +222,7 @@ public AccountHolderDetails payoutMethods(List payoutMethods) { public AccountHolderDetails addPayoutMethodsItem(PayoutMethod payoutMethodsItem) { if (this.payoutMethods == null) { - this.payoutMethods = new ArrayList(); + this.payoutMethods = new ArrayList<>(); } this.payoutMethods.add(payoutMethodsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/AccountHolderStatus.java b/src/main/java/com/adyen/model/marketpay/AccountHolderStatus.java index dd1288840..b2b855dbd 100755 --- a/src/main/java/com/adyen/model/marketpay/AccountHolderStatus.java +++ b/src/main/java/com/adyen/model/marketpay/AccountHolderStatus.java @@ -70,7 +70,7 @@ public String toString() { private StatusEnum status = null; @SerializedName("accountEvents") - private List accountEvents = new ArrayList(); + private List accountEvents = new ArrayList<>(); public AccountHolderStatus processingState(AccountProcessingState processingState) { this.processingState = processingState; diff --git a/src/main/java/com/adyen/model/marketpay/AccountHolderTransactionListRequest.java b/src/main/java/com/adyen/model/marketpay/AccountHolderTransactionListRequest.java index 06cfc5836..0384a163b 100755 --- a/src/main/java/com/adyen/model/marketpay/AccountHolderTransactionListRequest.java +++ b/src/main/java/com/adyen/model/marketpay/AccountHolderTransactionListRequest.java @@ -30,7 +30,7 @@ */ public class AccountHolderTransactionListRequest { @SerializedName("transactionListsPerAccount") - private List transactionListsPerAccount = new ArrayList(); + private List transactionListsPerAccount = new ArrayList<>(); @SerializedName("accountHolderCode") private String accountHolderCode = null; @@ -100,7 +100,7 @@ public String toString() { } @SerializedName("transactionStatuses") - private List transactionStatuses = new ArrayList(); + private List transactionStatuses = new ArrayList<>(); public AccountHolderTransactionListRequest transactionListsPerAccount(List transactionListsPerAccount) { this.transactionListsPerAccount = transactionListsPerAccount; diff --git a/src/main/java/com/adyen/model/marketpay/AccountHolderTransactionListResponse.java b/src/main/java/com/adyen/model/marketpay/AccountHolderTransactionListResponse.java index 5f7b62ab6..8ae2207f6 100755 --- a/src/main/java/com/adyen/model/marketpay/AccountHolderTransactionListResponse.java +++ b/src/main/java/com/adyen/model/marketpay/AccountHolderTransactionListResponse.java @@ -51,7 +51,7 @@ public AccountHolderTransactionListResponse accountTransactionLists(List(); + this.accountTransactionLists = new ArrayList<>(); } this.accountTransactionLists.add(accountTransactionListsItem); return this; @@ -77,7 +77,7 @@ public AccountHolderTransactionListResponse invalidFields(List i public AccountHolderTransactionListResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/AccountStateRequirement.java b/src/main/java/com/adyen/model/marketpay/AccountStateRequirement.java index c01959d21..28a4840b4 100755 --- a/src/main/java/com/adyen/model/marketpay/AccountStateRequirement.java +++ b/src/main/java/com/adyen/model/marketpay/AccountStateRequirement.java @@ -30,7 +30,7 @@ */ public class AccountStateRequirement { @SerializedName("requiredFields") - private List requiredFields = new ArrayList(); + private List requiredFields = new ArrayList<>(); @SerializedName("state") private AccountState state = null; diff --git a/src/main/java/com/adyen/model/marketpay/AccountStatus.java b/src/main/java/com/adyen/model/marketpay/AccountStatus.java index ee5a31130..37d0da40a 100755 --- a/src/main/java/com/adyen/model/marketpay/AccountStatus.java +++ b/src/main/java/com/adyen/model/marketpay/AccountStatus.java @@ -33,10 +33,10 @@ public class AccountStatus { private String status = null; @SerializedName("states") - private List states = new ArrayList(); + private List states = new ArrayList<>(); @SerializedName("accountEvents") - private List accountEvents = new ArrayList(); + private List accountEvents = new ArrayList<>(); public AccountStatus status(String status) { this.status = status; diff --git a/src/main/java/com/adyen/model/marketpay/AccountTransactionList.java b/src/main/java/com/adyen/model/marketpay/AccountTransactionList.java index aaa230033..b9e75a89b 100755 --- a/src/main/java/com/adyen/model/marketpay/AccountTransactionList.java +++ b/src/main/java/com/adyen/model/marketpay/AccountTransactionList.java @@ -84,7 +84,7 @@ public AccountTransactionList transactions(List transactions) { public AccountTransactionList addTransactionsItem(Transaction transactionsItem) { if (this.transactions == null) { - this.transactions = new ArrayList(); + this.transactions = new ArrayList<>(); } this.transactions.add(transactionsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/BusinessDetails.java b/src/main/java/com/adyen/model/marketpay/BusinessDetails.java index 47682133e..b8fe9f2a6 100755 --- a/src/main/java/com/adyen/model/marketpay/BusinessDetails.java +++ b/src/main/java/com/adyen/model/marketpay/BusinessDetails.java @@ -128,7 +128,7 @@ public BusinessDetails shareholders(List shareholders) { public BusinessDetails addShareholdersItem(ShareholderContact shareholdersItem) { if (this.shareholders == null) { - this.shareholders = new ArrayList(); + this.shareholders = new ArrayList<>(); } this.shareholders.add(shareholdersItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/CloseAccountHolderResponse.java b/src/main/java/com/adyen/model/marketpay/CloseAccountHolderResponse.java index 61e44310f..baf80a98f 100755 --- a/src/main/java/com/adyen/model/marketpay/CloseAccountHolderResponse.java +++ b/src/main/java/com/adyen/model/marketpay/CloseAccountHolderResponse.java @@ -69,7 +69,7 @@ public CloseAccountHolderResponse invalidFields(List invalidFiel public CloseAccountHolderResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/CloseAccountResponse.java b/src/main/java/com/adyen/model/marketpay/CloseAccountResponse.java index 231145959..c8140f32c 100755 --- a/src/main/java/com/adyen/model/marketpay/CloseAccountResponse.java +++ b/src/main/java/com/adyen/model/marketpay/CloseAccountResponse.java @@ -104,7 +104,7 @@ public CloseAccountResponse invalidFields(List invalidFields) { public CloseAccountResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/CreateAccountHolderResponse.java b/src/main/java/com/adyen/model/marketpay/CreateAccountHolderResponse.java index 42c8fdefa..f1b16a027 100755 --- a/src/main/java/com/adyen/model/marketpay/CreateAccountHolderResponse.java +++ b/src/main/java/com/adyen/model/marketpay/CreateAccountHolderResponse.java @@ -215,7 +215,7 @@ public CreateAccountHolderResponse invalidFields(List invalidFie public CreateAccountHolderResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/CreateAccountResponse.java b/src/main/java/com/adyen/model/marketpay/CreateAccountResponse.java index 58d2420a6..d03bed827 100755 --- a/src/main/java/com/adyen/model/marketpay/CreateAccountResponse.java +++ b/src/main/java/com/adyen/model/marketpay/CreateAccountResponse.java @@ -174,7 +174,7 @@ public CreateAccountResponse invalidFields(List invalidFields) { public CreateAccountResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; @@ -200,7 +200,7 @@ public CreateAccountResponse metadata(Map metadata) { public CreateAccountResponse putMetadataItem(String key, String metadataItem) { if (this.metadata == null) { - this.metadata = new HashMap(); + this.metadata = new HashMap<>(); } this.metadata.put(key, metadataItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/DeleteBankAccountRequest.java b/src/main/java/com/adyen/model/marketpay/DeleteBankAccountRequest.java index 5706f284b..55498e715 100755 --- a/src/main/java/com/adyen/model/marketpay/DeleteBankAccountRequest.java +++ b/src/main/java/com/adyen/model/marketpay/DeleteBankAccountRequest.java @@ -33,7 +33,7 @@ public class DeleteBankAccountRequest { private String accountHolderCode = null; @SerializedName("bankAccountUUIDs") - private List bankAccountUUIDs = new ArrayList(); + private List bankAccountUUIDs = new ArrayList<>(); public DeleteBankAccountRequest accountHolderCode(String accountHolderCode) { this.accountHolderCode = accountHolderCode; diff --git a/src/main/java/com/adyen/model/marketpay/DeletePayoutMethodRequest.java b/src/main/java/com/adyen/model/marketpay/DeletePayoutMethodRequest.java index 39f6b76f8..b7f2d64b6 100755 --- a/src/main/java/com/adyen/model/marketpay/DeletePayoutMethodRequest.java +++ b/src/main/java/com/adyen/model/marketpay/DeletePayoutMethodRequest.java @@ -35,7 +35,7 @@ public class DeletePayoutMethodRequest { private String accountHolderCode = null; @SerializedName("payoutMethodCodes") - private List payoutMethodCodes = new ArrayList(); + private List payoutMethodCodes = new ArrayList<>(); public DeletePayoutMethodRequest accountHolderCode(String accountHolderCode) { this.accountHolderCode = accountHolderCode; diff --git a/src/main/java/com/adyen/model/marketpay/DeleteShareholderRequest.java b/src/main/java/com/adyen/model/marketpay/DeleteShareholderRequest.java index 13d2f23ec..73afe7b74 100755 --- a/src/main/java/com/adyen/model/marketpay/DeleteShareholderRequest.java +++ b/src/main/java/com/adyen/model/marketpay/DeleteShareholderRequest.java @@ -33,7 +33,7 @@ public class DeleteShareholderRequest { private String accountHolderCode = null; @SerializedName("shareholderCodes") - private List shareholderCodes = new ArrayList(); + private List shareholderCodes = new ArrayList<>(); public DeleteShareholderRequest accountHolderCode(String accountHolderCode) { this.accountHolderCode = accountHolderCode; diff --git a/src/main/java/com/adyen/model/marketpay/GenericResponse.java b/src/main/java/com/adyen/model/marketpay/GenericResponse.java index 13104f841..12aa8f37c 100755 --- a/src/main/java/com/adyen/model/marketpay/GenericResponse.java +++ b/src/main/java/com/adyen/model/marketpay/GenericResponse.java @@ -47,7 +47,7 @@ public GenericResponse invalidFields(List invalidFields) { public GenericResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/GetAccountHolderResponse.java b/src/main/java/com/adyen/model/marketpay/GetAccountHolderResponse.java index cb4376123..b24e6e0f1 100755 --- a/src/main/java/com/adyen/model/marketpay/GetAccountHolderResponse.java +++ b/src/main/java/com/adyen/model/marketpay/GetAccountHolderResponse.java @@ -183,7 +183,7 @@ public GetAccountHolderResponse accounts(List accounts) { public GetAccountHolderResponse addAccountsItem(Account accountsItem) { if (this.accounts == null) { - this.accounts = new ArrayList(); + this.accounts = new ArrayList<>(); } this.accounts.add(accountsItem); return this; @@ -227,7 +227,7 @@ public GetAccountHolderResponse invalidFields(List invalidFields public GetAccountHolderResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/GetAccountHolderStatusResponse.java b/src/main/java/com/adyen/model/marketpay/GetAccountHolderStatusResponse.java index c087717af..582c48351 100755 --- a/src/main/java/com/adyen/model/marketpay/GetAccountHolderStatusResponse.java +++ b/src/main/java/com/adyen/model/marketpay/GetAccountHolderStatusResponse.java @@ -90,7 +90,7 @@ public GetAccountHolderStatusResponse invalidFields(List invalid public GetAccountHolderStatusResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/GetTierConfigurationResponse.java b/src/main/java/com/adyen/model/marketpay/GetTierConfigurationResponse.java index 8873c6e1d..733f6e326 100755 --- a/src/main/java/com/adyen/model/marketpay/GetTierConfigurationResponse.java +++ b/src/main/java/com/adyen/model/marketpay/GetTierConfigurationResponse.java @@ -33,7 +33,7 @@ public class GetTierConfigurationResponse { private Boolean submittedAsync = null; @SerializedName("tierConfiguration") - private List tierConfiguration = new ArrayList(); + private List tierConfiguration = new ArrayList<>(); @SerializedName("pspReference") private String pspReference = null; diff --git a/src/main/java/com/adyen/model/marketpay/GetUploadedDocumentsResponse.java b/src/main/java/com/adyen/model/marketpay/GetUploadedDocumentsResponse.java index 06d731160..6153a1eca 100755 --- a/src/main/java/com/adyen/model/marketpay/GetUploadedDocumentsResponse.java +++ b/src/main/java/com/adyen/model/marketpay/GetUploadedDocumentsResponse.java @@ -50,7 +50,7 @@ public GetUploadedDocumentsResponse documentDetails(List documen public GetUploadedDocumentsResponse addDocumentDetailsItem(DocumentDetail documentDetailsItem) { if (this.documentDetails == null) { - this.documentDetails = new ArrayList(); + this.documentDetails = new ArrayList<>(); } this.documentDetails.add(documentDetailsItem); return this; @@ -76,7 +76,7 @@ public GetUploadedDocumentsResponse invalidFields(List invalidFi public GetUploadedDocumentsResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/KYCBankAccountCheckResult.java b/src/main/java/com/adyen/model/marketpay/KYCBankAccountCheckResult.java index aacfdfe7b..95edda9f9 100755 --- a/src/main/java/com/adyen/model/marketpay/KYCBankAccountCheckResult.java +++ b/src/main/java/com/adyen/model/marketpay/KYCBankAccountCheckResult.java @@ -33,7 +33,7 @@ public class KYCBankAccountCheckResult { private String bankAccountUUID = null; @SerializedName("checks") - private List checks = new ArrayList(); + private List checks = new ArrayList<>(); public KYCBankAccountCheckResult bankAccountUUID(String bankAccountUUID) { this.bankAccountUUID = bankAccountUUID; diff --git a/src/main/java/com/adyen/model/marketpay/KYCCheckResult.java b/src/main/java/com/adyen/model/marketpay/KYCCheckResult.java index b4acc8646..90824424f 100755 --- a/src/main/java/com/adyen/model/marketpay/KYCCheckResult.java +++ b/src/main/java/com/adyen/model/marketpay/KYCCheckResult.java @@ -30,7 +30,7 @@ */ public class KYCCheckResult { @SerializedName("checks") - private List checks = new ArrayList(); + private List checks = new ArrayList<>(); public KYCCheckResult checkStatusData(List checkStatusData) { this.checks = checkStatusData; diff --git a/src/main/java/com/adyen/model/marketpay/KYCCheckStatusData.java b/src/main/java/com/adyen/model/marketpay/KYCCheckStatusData.java index d63199f9f..e05e8add4 100755 --- a/src/main/java/com/adyen/model/marketpay/KYCCheckStatusData.java +++ b/src/main/java/com/adyen/model/marketpay/KYCCheckStatusData.java @@ -110,7 +110,7 @@ public String toString() { private CheckStatusEnum checkStatus = null; @SerializedName("requiredFields") - private List requiredFields = new ArrayList(); + private List requiredFields = new ArrayList<>(); public KYCCheckStatusData checkType(CheckTypeEnum checkType) { this.checkType = checkType; diff --git a/src/main/java/com/adyen/model/marketpay/KYCShareholderCheckResult.java b/src/main/java/com/adyen/model/marketpay/KYCShareholderCheckResult.java index d20c227ca..9cbf713bf 100755 --- a/src/main/java/com/adyen/model/marketpay/KYCShareholderCheckResult.java +++ b/src/main/java/com/adyen/model/marketpay/KYCShareholderCheckResult.java @@ -30,7 +30,7 @@ */ public class KYCShareholderCheckResult { @SerializedName("checks") - private List checks = new ArrayList(); + private List checks = new ArrayList<>(); @SerializedName("shareholderCode") private String shareholderCode = null; diff --git a/src/main/java/com/adyen/model/marketpay/KYCVerificationResult.java b/src/main/java/com/adyen/model/marketpay/KYCVerificationResult.java index d88ed0cce..2dc3dccf1 100755 --- a/src/main/java/com/adyen/model/marketpay/KYCVerificationResult.java +++ b/src/main/java/com/adyen/model/marketpay/KYCVerificationResult.java @@ -29,13 +29,13 @@ */ public class KYCVerificationResult { @SerializedName("shareholders") - private List shareholders = new ArrayList(); + private List shareholders = new ArrayList<>(); @SerializedName("accountHolder") private KYCCheckResult accountHolder; @SerializedName("bankAccounts") - private List bankAccounts = new ArrayList(); + private List bankAccounts = new ArrayList<>(); public List getShareholders() { return shareholders; diff --git a/src/main/java/com/adyen/model/marketpay/PayoutAccountHolderResponse.java b/src/main/java/com/adyen/model/marketpay/PayoutAccountHolderResponse.java index 56e489a63..a1f808fe5 100755 --- a/src/main/java/com/adyen/model/marketpay/PayoutAccountHolderResponse.java +++ b/src/main/java/com/adyen/model/marketpay/PayoutAccountHolderResponse.java @@ -73,7 +73,7 @@ public PayoutAccountHolderResponse invalidFields(List invalidFie public PayoutAccountHolderResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/PersonalData.java b/src/main/java/com/adyen/model/marketpay/PersonalData.java index d1f73ae20..169f03c6b 100755 --- a/src/main/java/com/adyen/model/marketpay/PersonalData.java +++ b/src/main/java/com/adyen/model/marketpay/PersonalData.java @@ -66,7 +66,7 @@ public PersonalData documentData(List documentData) { public PersonalData addDocumentDataItem(PersonalDocumentData documentDataItem) { if (this.documentData == null) { - this.documentData = new ArrayList(); + this.documentData = new ArrayList<>(); } this.documentData.add(documentDataItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/RefundFundsTransferResponse.java b/src/main/java/com/adyen/model/marketpay/RefundFundsTransferResponse.java index e52f87447..a110a25fe 100755 --- a/src/main/java/com/adyen/model/marketpay/RefundFundsTransferResponse.java +++ b/src/main/java/com/adyen/model/marketpay/RefundFundsTransferResponse.java @@ -57,7 +57,7 @@ public RefundFundsTransferResponse invalidFields(List invalidFie public RefundFundsTransferResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/RefundNotPaidOutTransfersResponse.java b/src/main/java/com/adyen/model/marketpay/RefundNotPaidOutTransfersResponse.java index eae31afb2..86d0d113e 100755 --- a/src/main/java/com/adyen/model/marketpay/RefundNotPaidOutTransfersResponse.java +++ b/src/main/java/com/adyen/model/marketpay/RefundNotPaidOutTransfersResponse.java @@ -48,7 +48,7 @@ public RefundNotPaidOutTransfersResponse invalidFields(List inva public RefundNotPaidOutTransfersResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/SetupBeneficiaryResponse.java b/src/main/java/com/adyen/model/marketpay/SetupBeneficiaryResponse.java index 57ece2c9e..733220433 100755 --- a/src/main/java/com/adyen/model/marketpay/SetupBeneficiaryResponse.java +++ b/src/main/java/com/adyen/model/marketpay/SetupBeneficiaryResponse.java @@ -48,7 +48,7 @@ public SetupBeneficiaryResponse invalidFields(List invalidFields public SetupBeneficiaryResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/SuspendAccountHolderResponse.java b/src/main/java/com/adyen/model/marketpay/SuspendAccountHolderResponse.java index 7ca7a59e9..696f1e1b7 100755 --- a/src/main/java/com/adyen/model/marketpay/SuspendAccountHolderResponse.java +++ b/src/main/java/com/adyen/model/marketpay/SuspendAccountHolderResponse.java @@ -70,7 +70,7 @@ public SuspendAccountHolderResponse invalidFields(List invalidFi public SuspendAccountHolderResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/TierConfiguration.java b/src/main/java/com/adyen/model/marketpay/TierConfiguration.java index a627ff359..c4e05b70c 100755 --- a/src/main/java/com/adyen/model/marketpay/TierConfiguration.java +++ b/src/main/java/com/adyen/model/marketpay/TierConfiguration.java @@ -30,7 +30,7 @@ */ public class TierConfiguration { @SerializedName("tiers") - private List tiers = new ArrayList(); + private List tiers = new ArrayList<>(); @SerializedName("countryCode") private String countryCode = null; diff --git a/src/main/java/com/adyen/model/marketpay/TransferFundsResponse.java b/src/main/java/com/adyen/model/marketpay/TransferFundsResponse.java index f707e79e3..ce57aac24 100755 --- a/src/main/java/com/adyen/model/marketpay/TransferFundsResponse.java +++ b/src/main/java/com/adyen/model/marketpay/TransferFundsResponse.java @@ -51,7 +51,7 @@ public TransferFundsResponse invalidFields(List invalidFields) { public TransferFundsResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/UnSuspendAccountHolderResponse.java b/src/main/java/com/adyen/model/marketpay/UnSuspendAccountHolderResponse.java index 6eca66139..accc72bc8 100755 --- a/src/main/java/com/adyen/model/marketpay/UnSuspendAccountHolderResponse.java +++ b/src/main/java/com/adyen/model/marketpay/UnSuspendAccountHolderResponse.java @@ -69,7 +69,7 @@ public UnSuspendAccountHolderResponse invalidFields(List invalid public UnSuspendAccountHolderResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/UpdateAccountHolderResponse.java b/src/main/java/com/adyen/model/marketpay/UpdateAccountHolderResponse.java index 62ed4c45d..1ede13a3f 100755 --- a/src/main/java/com/adyen/model/marketpay/UpdateAccountHolderResponse.java +++ b/src/main/java/com/adyen/model/marketpay/UpdateAccountHolderResponse.java @@ -194,7 +194,7 @@ public UpdateAccountHolderResponse invalidFields(List invalidFie public UpdateAccountHolderResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/UpdateAccountResponse.java b/src/main/java/com/adyen/model/marketpay/UpdateAccountResponse.java index b7bb478b7..616b618ed 100755 --- a/src/main/java/com/adyen/model/marketpay/UpdateAccountResponse.java +++ b/src/main/java/com/adyen/model/marketpay/UpdateAccountResponse.java @@ -98,7 +98,7 @@ public UpdateAccountResponse invalidFields(List invalidFields) { public UpdateAccountResponse addInvalidFieldsItem(ErrorFieldType invalidFieldsItem) { if (this.invalidFields == null) { - this.invalidFields = new ArrayList(); + this.invalidFields = new ArrayList<>(); } this.invalidFields.add(invalidFieldsItem); return this; @@ -124,7 +124,7 @@ public UpdateAccountResponse metadata(Map metadata) { public UpdateAccountResponse putMetadataItem(String key, String metadataItem) { if (this.metadata == null) { - this.metadata = new HashMap(); + this.metadata = new HashMap<>(); } this.metadata.put(key, metadataItem); return this; diff --git a/src/main/java/com/adyen/model/marketpay/notification/DeleteNotificationConfigurationRequest.java b/src/main/java/com/adyen/model/marketpay/notification/DeleteNotificationConfigurationRequest.java index 0879f4079..3492fc467 100755 --- a/src/main/java/com/adyen/model/marketpay/notification/DeleteNotificationConfigurationRequest.java +++ b/src/main/java/com/adyen/model/marketpay/notification/DeleteNotificationConfigurationRequest.java @@ -31,7 +31,7 @@ */ public class DeleteNotificationConfigurationRequest { @SerializedName("notificationIds") - private List notificationIds = new ArrayList(); + private List notificationIds = new ArrayList<>(); public DeleteNotificationConfigurationRequest notificationIds(List notificationIds) { this.notificationIds = notificationIds; diff --git a/src/main/java/com/adyen/model/marketpay/notification/ExchangeMessageContainer.java b/src/main/java/com/adyen/model/marketpay/notification/ExchangeMessageContainer.java index e9594c06f..ce080213f 100644 --- a/src/main/java/com/adyen/model/marketpay/notification/ExchangeMessageContainer.java +++ b/src/main/java/com/adyen/model/marketpay/notification/ExchangeMessageContainer.java @@ -22,6 +22,8 @@ import com.google.gson.annotations.SerializedName; +import java.util.Objects; + public class ExchangeMessageContainer { @SerializedName("ExchangeMessage") @@ -62,7 +64,7 @@ public boolean equals(Object o) { ExchangeMessageContainer that = (ExchangeMessageContainer) o; - return exchangeMessage != null ? exchangeMessage.equals(that.exchangeMessage) : that.exchangeMessage == null; + return Objects.equals(exchangeMessage, that.exchangeMessage); } @Override diff --git a/src/main/java/com/adyen/model/marketpay/notification/GetNotificationConfigurationListResponse.java b/src/main/java/com/adyen/model/marketpay/notification/GetNotificationConfigurationListResponse.java index 3e269d889..5b185f94b 100755 --- a/src/main/java/com/adyen/model/marketpay/notification/GetNotificationConfigurationListResponse.java +++ b/src/main/java/com/adyen/model/marketpay/notification/GetNotificationConfigurationListResponse.java @@ -67,7 +67,7 @@ public void setSubmittedAsync(Boolean submittedAsync) { **/ public List getConfigurations() { if (configurations == null) { - configurations = new ArrayList(); + configurations = new ArrayList<>(); if (configurationsContainers != null && ! configurationsContainers.isEmpty()) { for (NotificationConfigurationDetailsContainer notificationConfigurationDetailsContainer : configurationsContainers) { @@ -83,7 +83,7 @@ public void setConfigurations(List configurati this.configurations = configurations; // set as well the container list this will be send in the API request - this.configurationsContainers = new ArrayList(); + this.configurationsContainers = new ArrayList<>(); for (NotificationConfigurationDetails notificationConfigurationDetails : configurations) { NotificationConfigurationDetailsContainer notificationConfigurationDetailsContainer = createNotificationConfigurationDetailsContainerFromConfiguration(notificationConfigurationDetails); this.configurationsContainers.add(notificationConfigurationDetailsContainer); diff --git a/src/main/java/com/adyen/model/marketpay/notification/NotificationConfigurationDetails.java b/src/main/java/com/adyen/model/marketpay/notification/NotificationConfigurationDetails.java index 905bc2d94..e5bbc1c96 100755 --- a/src/main/java/com/adyen/model/marketpay/notification/NotificationConfigurationDetails.java +++ b/src/main/java/com/adyen/model/marketpay/notification/NotificationConfigurationDetails.java @@ -33,7 +33,7 @@ */ public class NotificationConfigurationDetails { @SerializedName("settings") - private Map settings = new HashMap(); + private Map settings = new HashMap<>(); @SerializedName("apiVersion") private Integer apiVersion = null; @@ -179,12 +179,12 @@ public NotificationConfigurationDetails addEventConfigsItem(NotificationEventCon NotificationEventConfigurationContainer notificationEventConfigurationContainer = createEventConfigsContainerForEventConfig(eventConfigsItem); if (eventConfigsContainer == null) { - eventConfigsContainer = new ArrayList(); + eventConfigsContainer = new ArrayList<>(); } this.eventConfigsContainer.add(notificationEventConfigurationContainer); if (eventConfigs == null) { - eventConfigs = new ArrayList(); + eventConfigs = new ArrayList<>(); } this.eventConfigs.add(eventConfigsItem); @@ -198,7 +198,7 @@ public NotificationConfigurationDetails addEventConfigsItem(NotificationEventCon **/ public List getEventConfigs() { if (eventConfigs == null) { - eventConfigs = new ArrayList(); + eventConfigs = new ArrayList<>(); if (eventConfigsContainer != null && ! eventConfigsContainer.isEmpty()) { for (NotificationEventConfigurationContainer notificationEventConfigurationContainer : eventConfigsContainer) { @@ -213,7 +213,7 @@ public void setEventConfigs(List eventConfigs) { this.eventConfigs = eventConfigs; // set as well the container list this will be send in the API request - this.eventConfigsContainer = new ArrayList(); + this.eventConfigsContainer = new ArrayList<>(); for (NotificationEventConfiguration notificationConfigurationDetails : eventConfigs) { NotificationEventConfigurationContainer notificationEventConfigurationContainer = createEventConfigsContainerForEventConfig(notificationConfigurationDetails); this.eventConfigsContainer.add(notificationEventConfigurationContainer); diff --git a/src/main/java/com/adyen/model/marketpay/notification/PaymentFailureContent.java b/src/main/java/com/adyen/model/marketpay/notification/PaymentFailureContent.java index f56d98c32..c5b6484f5 100644 --- a/src/main/java/com/adyen/model/marketpay/notification/PaymentFailureContent.java +++ b/src/main/java/com/adyen/model/marketpay/notification/PaymentFailureContent.java @@ -36,7 +36,7 @@ public class PaymentFailureContent { public Message errorMessage; public List getErrorFieldList() { - List errorFieldTypeList = new ArrayList(); + List errorFieldTypeList = new ArrayList<>(); if (errorFieldTypeContainers == null) { return errorFieldTypeList; diff --git a/src/main/java/com/adyen/model/marketpay/notification/TestNotificationConfigurationRequest.java b/src/main/java/com/adyen/model/marketpay/notification/TestNotificationConfigurationRequest.java index 05975574d..9ce5e6783 100755 --- a/src/main/java/com/adyen/model/marketpay/notification/TestNotificationConfigurationRequest.java +++ b/src/main/java/com/adyen/model/marketpay/notification/TestNotificationConfigurationRequest.java @@ -92,7 +92,7 @@ public String toString() { } @SerializedName("eventTypes") - private List eventTypes = new ArrayList(); + private List eventTypes = new ArrayList<>(); public TestNotificationConfigurationRequest notificationId(Long notificationId) { this.notificationId = notificationId; diff --git a/src/main/java/com/adyen/model/marketpay/notification/TestNotificationConfigurationResponse.java b/src/main/java/com/adyen/model/marketpay/notification/TestNotificationConfigurationResponse.java index aa30ca024..cd0e1173b 100755 --- a/src/main/java/com/adyen/model/marketpay/notification/TestNotificationConfigurationResponse.java +++ b/src/main/java/com/adyen/model/marketpay/notification/TestNotificationConfigurationResponse.java @@ -117,7 +117,7 @@ public TestNotificationConfigurationResponse errorMessages(List errorMes public TestNotificationConfigurationResponse addErrorMessagesItem(String errorMessagesItem) { if (this.errorMessages == null) { - this.errorMessages = new ArrayList(); + this.errorMessages = new ArrayList<>(); } this.errorMessages.add(errorMessagesItem); return this; @@ -161,7 +161,7 @@ public TestNotificationConfigurationResponse okMessages(List okMessages) public TestNotificationConfigurationResponse addOkMessagesItem(String okMessagesItem) { if (this.okMessages == null) { - this.okMessages = new ArrayList(); + this.okMessages = new ArrayList<>(); } this.okMessages.add(okMessagesItem); return this; @@ -189,7 +189,7 @@ public void setOkMessages(List okMessages) { public List getExchangeMessages() { if (exchangeMessages == null) { - exchangeMessages = new ArrayList(); + exchangeMessages = new ArrayList<>(); if (exchangeMessageContainers != null && ! exchangeMessageContainers.isEmpty()) { for (ExchangeMessageContainer exchangeMessageContainer : exchangeMessageContainers) { @@ -204,7 +204,7 @@ public void setExchangeMessages(List exchangeMessages) { this.exchangeMessages = exchangeMessages; // set as well the container list this will be send in the API request - this.exchangeMessageContainers = new ArrayList(); + this.exchangeMessageContainers = new ArrayList<>(); for (ExchangeMessage exchangeMessage : exchangeMessages) { ExchangeMessageContainer exchangeMessageContainer = createExchangeMessageContainerFromExchangeMessage(exchangeMessage); this.exchangeMessageContainers.add(exchangeMessageContainer); @@ -243,7 +243,7 @@ public TestNotificationConfigurationResponse eventTypes(List eve public TestNotificationConfigurationResponse addEventTypesItem(EventTypesEnum eventTypesItem) { if (this.eventTypes == null) { - this.eventTypes = new ArrayList(); + this.eventTypes = new ArrayList<>(); } this.eventTypes.add(eventTypesItem); return this; diff --git a/src/main/java/com/adyen/model/modification/AbstractModificationRequest.java b/src/main/java/com/adyen/model/modification/AbstractModificationRequest.java index ec6e0a95c..0eca60c62 100644 --- a/src/main/java/com/adyen/model/modification/AbstractModificationRequest.java +++ b/src/main/java/com/adyen/model/modification/AbstractModificationRequest.java @@ -238,7 +238,7 @@ public void setUniqueTerminalId(String uniqueTerminalId) { */ public Map getOrCreateAdditionalData() { if (this.getAdditionalData() == null) { - this.setAdditionalData(new HashMap()); + this.setAdditionalData(new HashMap<>()); } return this.getAdditionalData(); diff --git a/src/main/java/com/adyen/model/nexo/AuthenticatedData.java b/src/main/java/com/adyen/model/nexo/AuthenticatedData.java index 475a5d78f..8bc052a94 100644 --- a/src/main/java/com/adyen/model/nexo/AuthenticatedData.java +++ b/src/main/java/com/adyen/model/nexo/AuthenticatedData.java @@ -98,7 +98,7 @@ public class AuthenticatedData { */ public List getKeyTransportOrKEK() { if (keyTransportOrKEK == null) { - keyTransportOrKEK = new ArrayList(); + keyTransportOrKEK = new ArrayList<>(); } return this.keyTransportOrKEK; } diff --git a/src/main/java/com/adyen/model/nexo/BatchRequest.java b/src/main/java/com/adyen/model/nexo/BatchRequest.java index d0ec4800e..be68c942a 100644 --- a/src/main/java/com/adyen/model/nexo/BatchRequest.java +++ b/src/main/java/com/adyen/model/nexo/BatchRequest.java @@ -70,7 +70,7 @@ public class BatchRequest { */ public List getTransactionToPerform() { if (transactionToPerform == null) { - transactionToPerform = new ArrayList(); + transactionToPerform = new ArrayList<>(); } return this.transactionToPerform; } diff --git a/src/main/java/com/adyen/model/nexo/BatchResponse.java b/src/main/java/com/adyen/model/nexo/BatchResponse.java index e882d8002..2a1acc80e 100644 --- a/src/main/java/com/adyen/model/nexo/BatchResponse.java +++ b/src/main/java/com/adyen/model/nexo/BatchResponse.java @@ -88,7 +88,7 @@ public void setResponse(Response value) { */ public List getPerformedTransaction() { if (performedTransaction == null) { - performedTransaction = new ArrayList(); + performedTransaction = new ArrayList<>(); } return this.performedTransaction; } diff --git a/src/main/java/com/adyen/model/nexo/CapturedSignature.java b/src/main/java/com/adyen/model/nexo/CapturedSignature.java index dcd386483..497071c23 100644 --- a/src/main/java/com/adyen/model/nexo/CapturedSignature.java +++ b/src/main/java/com/adyen/model/nexo/CapturedSignature.java @@ -88,7 +88,7 @@ public void setAreaSize(AreaSize value) { */ public List getSignaturePoint() { if (signaturePoint == null) { - signaturePoint = new ArrayList(); + signaturePoint = new ArrayList<>(); } return this.signaturePoint; } diff --git a/src/main/java/com/adyen/model/nexo/CardAcquisitionResponse.java b/src/main/java/com/adyen/model/nexo/CardAcquisitionResponse.java index 0c1b45f4a..492505dba 100644 --- a/src/main/java/com/adyen/model/nexo/CardAcquisitionResponse.java +++ b/src/main/java/com/adyen/model/nexo/CardAcquisitionResponse.java @@ -159,7 +159,7 @@ public void setPOIData(POIData value) { */ public List getPaymentBrand() { if (paymentBrand == null) { - paymentBrand = new ArrayList(); + paymentBrand = new ArrayList<>(); } return this.paymentBrand; } @@ -206,7 +206,7 @@ public void setPaymentInstrumentData(PaymentInstrumentData value) { */ public List getLoyaltyAccount() { if (loyaltyAccount == null) { - loyaltyAccount = new ArrayList(); + loyaltyAccount = new ArrayList<>(); } return this.loyaltyAccount; } @@ -235,7 +235,7 @@ public List getLoyaltyAccount() { */ public List getCustomerOrder() { if (customerOrder == null) { - customerOrder = new ArrayList(); + customerOrder = new ArrayList<>(); } return this.customerOrder; } diff --git a/src/main/java/com/adyen/model/nexo/CardAcquisitionTransaction.java b/src/main/java/com/adyen/model/nexo/CardAcquisitionTransaction.java index 1a3f276f2..08dc9f303 100644 --- a/src/main/java/com/adyen/model/nexo/CardAcquisitionTransaction.java +++ b/src/main/java/com/adyen/model/nexo/CardAcquisitionTransaction.java @@ -115,7 +115,7 @@ public class CardAcquisitionTransaction { */ public List getAllowedPaymentBrand() { if (allowedPaymentBrand == null) { - allowedPaymentBrand = new ArrayList(); + allowedPaymentBrand = new ArrayList<>(); } return this.allowedPaymentBrand; } @@ -144,7 +144,7 @@ public List getAllowedPaymentBrand() { */ public List getAllowedLoyaltyBrand() { if (allowedLoyaltyBrand == null) { - allowedLoyaltyBrand = new ArrayList(); + allowedLoyaltyBrand = new ArrayList<>(); } return this.allowedLoyaltyBrand; } @@ -173,7 +173,7 @@ public List getAllowedLoyaltyBrand() { */ public List getForceEntryMode() { if (forceEntryMode == null) { - forceEntryMode = new ArrayList(); + forceEntryMode = new ArrayList<>(); } return this.forceEntryMode; } diff --git a/src/main/java/com/adyen/model/nexo/CardData.java b/src/main/java/com/adyen/model/nexo/CardData.java index f46802cba..c90ca8c1b 100644 --- a/src/main/java/com/adyen/model/nexo/CardData.java +++ b/src/main/java/com/adyen/model/nexo/CardData.java @@ -165,7 +165,7 @@ public void setSensitiveCardData(SensitiveCardData value) { */ public List getAllowedProductCode() { if (allowedProductCode == null) { - allowedProductCode = new ArrayList(); + allowedProductCode = new ArrayList<>(); } return this.allowedProductCode; } @@ -194,7 +194,7 @@ public List getAllowedProductCode() { */ public List getAllowedProduct() { if (allowedProduct == null) { - allowedProduct = new ArrayList(); + allowedProduct = new ArrayList<>(); } return this.allowedProduct; } @@ -241,7 +241,7 @@ public void setPaymentToken(PaymentToken value) { */ public List getCustomerOrder() { if (customerOrder == null) { - customerOrder = new ArrayList(); + customerOrder = new ArrayList<>(); } return this.customerOrder; } @@ -324,7 +324,7 @@ public void setPaymentAccountRef(String value) { */ public List getEntryMode() { if (entryMode == null) { - entryMode = new ArrayList(); + entryMode = new ArrayList<>(); } return this.entryMode; } diff --git a/src/main/java/com/adyen/model/nexo/CardReaderInitRequest.java b/src/main/java/com/adyen/model/nexo/CardReaderInitRequest.java index 43e81d127..4fe593645 100644 --- a/src/main/java/com/adyen/model/nexo/CardReaderInitRequest.java +++ b/src/main/java/com/adyen/model/nexo/CardReaderInitRequest.java @@ -90,7 +90,7 @@ public class CardReaderInitRequest { */ public List getForceEntryMode() { if (forceEntryMode == null) { - forceEntryMode = new ArrayList(); + forceEntryMode = new ArrayList<>(); } return this.forceEntryMode; } diff --git a/src/main/java/com/adyen/model/nexo/CardReaderInitResponse.java b/src/main/java/com/adyen/model/nexo/CardReaderInitResponse.java index 6521ac65f..d814c8d56 100644 --- a/src/main/java/com/adyen/model/nexo/CardReaderInitResponse.java +++ b/src/main/java/com/adyen/model/nexo/CardReaderInitResponse.java @@ -109,7 +109,7 @@ public void setResponse(Response value) { */ public List getTrackData() { if (trackData == null) { - trackData = new ArrayList(); + trackData = new ArrayList<>(); } return this.trackData; } @@ -156,7 +156,7 @@ public void setICCResetData(ICCResetData value) { */ public List getEntryMode() { if (entryMode == null) { - entryMode = new ArrayList(); + entryMode = new ArrayList<>(); } return this.entryMode; } diff --git a/src/main/java/com/adyen/model/nexo/CashHandlingDevice.java b/src/main/java/com/adyen/model/nexo/CashHandlingDevice.java index 694a50cea..068102f63 100644 --- a/src/main/java/com/adyen/model/nexo/CashHandlingDevice.java +++ b/src/main/java/com/adyen/model/nexo/CashHandlingDevice.java @@ -76,7 +76,7 @@ public class CashHandlingDevice { */ public List getCoinsOrBills() { if (coinsOrBills == null) { - coinsOrBills = new ArrayList(); + coinsOrBills = new ArrayList<>(); } return this.coinsOrBills; } diff --git a/src/main/java/com/adyen/model/nexo/DiagnosisRequest.java b/src/main/java/com/adyen/model/nexo/DiagnosisRequest.java index f7cc622ae..5a766436a 100644 --- a/src/main/java/com/adyen/model/nexo/DiagnosisRequest.java +++ b/src/main/java/com/adyen/model/nexo/DiagnosisRequest.java @@ -76,7 +76,7 @@ public class DiagnosisRequest { */ public List getAcquirerID() { if (acquirerID == null) { - acquirerID = new ArrayList(); + acquirerID = new ArrayList<>(); } return this.acquirerID; } diff --git a/src/main/java/com/adyen/model/nexo/DiagnosisResponse.java b/src/main/java/com/adyen/model/nexo/DiagnosisResponse.java index 1ab80437c..338d6cce4 100644 --- a/src/main/java/com/adyen/model/nexo/DiagnosisResponse.java +++ b/src/main/java/com/adyen/model/nexo/DiagnosisResponse.java @@ -102,7 +102,7 @@ public void setResponse(Response value) { */ public List getLoggedSaleID() { if (loggedSaleID == null) { - loggedSaleID = new ArrayList(); + loggedSaleID = new ArrayList<>(); } return this.loggedSaleID; } @@ -149,7 +149,7 @@ public void setPOIStatus(POIStatus value) { */ public List getHostStatus() { if (hostStatus == null) { - hostStatus = new ArrayList(); + hostStatus = new ArrayList<>(); } return this.hostStatus; } diff --git a/src/main/java/com/adyen/model/nexo/DisplayOutput.java b/src/main/java/com/adyen/model/nexo/DisplayOutput.java index b23d3a3e7..ba7f572dc 100644 --- a/src/main/java/com/adyen/model/nexo/DisplayOutput.java +++ b/src/main/java/com/adyen/model/nexo/DisplayOutput.java @@ -120,7 +120,7 @@ public void setOutputContent(OutputContent value) { */ public List getMenuEntry() { if (menuEntry == null) { - menuEntry = new ArrayList(); + menuEntry = new ArrayList<>(); } return this.menuEntry; } diff --git a/src/main/java/com/adyen/model/nexo/DisplayRequest.java b/src/main/java/com/adyen/model/nexo/DisplayRequest.java index 7b27f56c1..879a811be 100644 --- a/src/main/java/com/adyen/model/nexo/DisplayRequest.java +++ b/src/main/java/com/adyen/model/nexo/DisplayRequest.java @@ -63,7 +63,7 @@ public class DisplayRequest { */ public List getDisplayOutput() { if (displayOutput == null) { - displayOutput = new ArrayList(); + displayOutput = new ArrayList<>(); } return this.displayOutput; } diff --git a/src/main/java/com/adyen/model/nexo/DisplayResponse.java b/src/main/java/com/adyen/model/nexo/DisplayResponse.java index ba0d2f2be..424d8f1c9 100644 --- a/src/main/java/com/adyen/model/nexo/DisplayResponse.java +++ b/src/main/java/com/adyen/model/nexo/DisplayResponse.java @@ -63,7 +63,7 @@ public class DisplayResponse { */ public List getOutputResult() { if (outputResult == null) { - outputResult = new ArrayList(); + outputResult = new ArrayList<>(); } return this.outputResult; } diff --git a/src/main/java/com/adyen/model/nexo/EnableServiceRequest.java b/src/main/java/com/adyen/model/nexo/EnableServiceRequest.java index 9b8aebe8c..c77415001 100644 --- a/src/main/java/com/adyen/model/nexo/EnableServiceRequest.java +++ b/src/main/java/com/adyen/model/nexo/EnableServiceRequest.java @@ -86,7 +86,7 @@ public class EnableServiceRequest { */ public List getServicesEnabled() { if (servicesEnabled == null) { - servicesEnabled = new ArrayList(); + servicesEnabled = new ArrayList<>(); } return this.servicesEnabled; } diff --git a/src/main/java/com/adyen/model/nexo/EnvelopedData.java b/src/main/java/com/adyen/model/nexo/EnvelopedData.java index af3391b9d..e73623283 100644 --- a/src/main/java/com/adyen/model/nexo/EnvelopedData.java +++ b/src/main/java/com/adyen/model/nexo/EnvelopedData.java @@ -85,7 +85,7 @@ public class EnvelopedData { */ public List getKeyTransportOrKEK() { if (keyTransportOrKEK == null) { - keyTransportOrKEK = new ArrayList(); + keyTransportOrKEK = new ArrayList<>(); } return this.keyTransportOrKEK; } diff --git a/src/main/java/com/adyen/model/nexo/GetTotalsRequest.java b/src/main/java/com/adyen/model/nexo/GetTotalsRequest.java index e59008451..04f635984 100644 --- a/src/main/java/com/adyen/model/nexo/GetTotalsRequest.java +++ b/src/main/java/com/adyen/model/nexo/GetTotalsRequest.java @@ -72,7 +72,7 @@ public class GetTotalsRequest { */ public List getTotalDetails() { if (totalDetails == null) { - totalDetails = new ArrayList(); + totalDetails = new ArrayList<>(); } return this.totalDetails; } diff --git a/src/main/java/com/adyen/model/nexo/GetTotalsResponse.java b/src/main/java/com/adyen/model/nexo/GetTotalsResponse.java index 71cbc01ef..0a61d2934 100644 --- a/src/main/java/com/adyen/model/nexo/GetTotalsResponse.java +++ b/src/main/java/com/adyen/model/nexo/GetTotalsResponse.java @@ -95,7 +95,7 @@ public void setResponse(Response value) { */ public List getTransactionTotals() { if (transactionTotals == null) { - transactionTotals = new ArrayList(); + transactionTotals = new ArrayList<>(); } return this.transactionTotals; } diff --git a/src/main/java/com/adyen/model/nexo/InputUpdate.java b/src/main/java/com/adyen/model/nexo/InputUpdate.java index e8233daae..709574668 100644 --- a/src/main/java/com/adyen/model/nexo/InputUpdate.java +++ b/src/main/java/com/adyen/model/nexo/InputUpdate.java @@ -140,7 +140,7 @@ public void setOutputContent(OutputContent value) { */ public List getMenuEntry() { if (menuEntry == null) { - menuEntry = new ArrayList(); + menuEntry = new ArrayList<>(); } return this.menuEntry; } diff --git a/src/main/java/com/adyen/model/nexo/Instalment.java b/src/main/java/com/adyen/model/nexo/Instalment.java index b364bd52d..7edf37a1b 100644 --- a/src/main/java/com/adyen/model/nexo/Instalment.java +++ b/src/main/java/com/adyen/model/nexo/Instalment.java @@ -122,7 +122,7 @@ public class Instalment { */ public List getInstalmentType() { if (instalmentType == null) { - instalmentType = new ArrayList(); + instalmentType = new ArrayList<>(); } return this.instalmentType; } diff --git a/src/main/java/com/adyen/model/nexo/Issuer.java b/src/main/java/com/adyen/model/nexo/Issuer.java index f0fea600c..e126526ed 100644 --- a/src/main/java/com/adyen/model/nexo/Issuer.java +++ b/src/main/java/com/adyen/model/nexo/Issuer.java @@ -63,7 +63,7 @@ public class Issuer { */ public List getRelativeDistinguishedName() { if (relativeDistinguishedName == null) { - relativeDistinguishedName = new ArrayList(); + relativeDistinguishedName = new ArrayList<>(); } return this.relativeDistinguishedName; } diff --git a/src/main/java/com/adyen/model/nexo/LoginRequest.java b/src/main/java/com/adyen/model/nexo/LoginRequest.java index 7252e765d..a4b3eb164 100644 --- a/src/main/java/com/adyen/model/nexo/LoginRequest.java +++ b/src/main/java/com/adyen/model/nexo/LoginRequest.java @@ -271,7 +271,7 @@ public void setTokenRequestedType(TokenRequestedType value) { */ public List getCustomerOrderReq() { if (customerOrderReq == null) { - customerOrderReq = new ArrayList(); + customerOrderReq = new ArrayList<>(); } return this.customerOrderReq; } diff --git a/src/main/java/com/adyen/model/nexo/LoyaltyAccountID.java b/src/main/java/com/adyen/model/nexo/LoyaltyAccountID.java index f3d450cbd..0788ac970 100644 --- a/src/main/java/com/adyen/model/nexo/LoyaltyAccountID.java +++ b/src/main/java/com/adyen/model/nexo/LoyaltyAccountID.java @@ -97,7 +97,7 @@ public void setValue(String value) { */ public List getEntryMode() { if (entryMode == null) { - entryMode = new ArrayList(); + entryMode = new ArrayList<>(); } return this.entryMode; } diff --git a/src/main/java/com/adyen/model/nexo/LoyaltyRequest.java b/src/main/java/com/adyen/model/nexo/LoyaltyRequest.java index b042dd2fe..eecb97c90 100644 --- a/src/main/java/com/adyen/model/nexo/LoyaltyRequest.java +++ b/src/main/java/com/adyen/model/nexo/LoyaltyRequest.java @@ -113,7 +113,7 @@ public void setLoyaltyTransaction(LoyaltyTransaction value) { */ public List getLoyaltyData() { if (loyaltyData == null) { - loyaltyData = new ArrayList(); + loyaltyData = new ArrayList<>(); } return this.loyaltyData; } diff --git a/src/main/java/com/adyen/model/nexo/LoyaltyResponse.java b/src/main/java/com/adyen/model/nexo/LoyaltyResponse.java index 4b274224e..08451372c 100644 --- a/src/main/java/com/adyen/model/nexo/LoyaltyResponse.java +++ b/src/main/java/com/adyen/model/nexo/LoyaltyResponse.java @@ -145,7 +145,7 @@ public void setPOIData(POIData value) { */ public List getLoyaltyResult() { if (loyaltyResult == null) { - loyaltyResult = new ArrayList(); + loyaltyResult = new ArrayList<>(); } return this.loyaltyResult; } @@ -174,7 +174,7 @@ public List getLoyaltyResult() { */ public List getPaymentReceipt() { if (paymentReceipt == null) { - paymentReceipt = new ArrayList(); + paymentReceipt = new ArrayList<>(); } return this.paymentReceipt; } diff --git a/src/main/java/com/adyen/model/nexo/LoyaltyTransaction.java b/src/main/java/com/adyen/model/nexo/LoyaltyTransaction.java index 99b3e96a6..a46addd2b 100644 --- a/src/main/java/com/adyen/model/nexo/LoyaltyTransaction.java +++ b/src/main/java/com/adyen/model/nexo/LoyaltyTransaction.java @@ -133,7 +133,7 @@ public void setTransactionConditions(TransactionConditions value) { */ public List getSaleItem() { if (saleItem == null) { - saleItem = new ArrayList(); + saleItem = new ArrayList<>(); } return this.saleItem; } diff --git a/src/main/java/com/adyen/model/nexo/MenuEntry.java b/src/main/java/com/adyen/model/nexo/MenuEntry.java index 2b6b16a11..113e637ec 100644 --- a/src/main/java/com/adyen/model/nexo/MenuEntry.java +++ b/src/main/java/com/adyen/model/nexo/MenuEntry.java @@ -114,7 +114,7 @@ public void setPredefinedContent(PredefinedContent value) { */ public List getOutputText() { if (outputText == null) { - outputText = new ArrayList(); + outputText = new ArrayList<>(); } return this.outputText; } diff --git a/src/main/java/com/adyen/model/nexo/OutputContent.java b/src/main/java/com/adyen/model/nexo/OutputContent.java index e37f1f995..9c451d716 100644 --- a/src/main/java/com/adyen/model/nexo/OutputContent.java +++ b/src/main/java/com/adyen/model/nexo/OutputContent.java @@ -109,7 +109,7 @@ public void setPredefinedContent(PredefinedContent value) { */ public List getOutputText() { if (outputText == null) { - outputText = new ArrayList(); + outputText = new ArrayList<>(); } return this.outputText; } diff --git a/src/main/java/com/adyen/model/nexo/POIProfile.java b/src/main/java/com/adyen/model/nexo/POIProfile.java index 0c0ba8e5e..98ab39ace 100644 --- a/src/main/java/com/adyen/model/nexo/POIProfile.java +++ b/src/main/java/com/adyen/model/nexo/POIProfile.java @@ -72,7 +72,7 @@ public class POIProfile { */ public List getServiceProfiles() { if (serviceProfiles == null) { - serviceProfiles = new ArrayList(); + serviceProfiles = new ArrayList<>(); } return this.serviceProfiles; } diff --git a/src/main/java/com/adyen/model/nexo/POIStatus.java b/src/main/java/com/adyen/model/nexo/POIStatus.java index ed7b0298d..c41c8f58a 100644 --- a/src/main/java/com/adyen/model/nexo/POIStatus.java +++ b/src/main/java/com/adyen/model/nexo/POIStatus.java @@ -106,7 +106,7 @@ public class POIStatus { */ public List getCashHandlingDevice() { if (cashHandlingDevice == null) { - cashHandlingDevice = new ArrayList(); + cashHandlingDevice = new ArrayList<>(); } return this.cashHandlingDevice; } diff --git a/src/main/java/com/adyen/model/nexo/POITerminalData.java b/src/main/java/com/adyen/model/nexo/POITerminalData.java index 9626ee2d2..5bfd15cf4 100644 --- a/src/main/java/com/adyen/model/nexo/POITerminalData.java +++ b/src/main/java/com/adyen/model/nexo/POITerminalData.java @@ -92,7 +92,7 @@ public class POITerminalData { */ public List getPOICapabilities() { if (poiCapabilities == null) { - poiCapabilities = new ArrayList(); + poiCapabilities = new ArrayList<>(); } return this.poiCapabilities; } diff --git a/src/main/java/com/adyen/model/nexo/PaymentRequest.java b/src/main/java/com/adyen/model/nexo/PaymentRequest.java index e6f4d9ba4..446b01c69 100644 --- a/src/main/java/com/adyen/model/nexo/PaymentRequest.java +++ b/src/main/java/com/adyen/model/nexo/PaymentRequest.java @@ -138,7 +138,7 @@ public void setPaymentData(PaymentData value) { */ public List getLoyaltyData() { if (loyaltyData == null) { - loyaltyData = new ArrayList(); + loyaltyData = new ArrayList<>(); } return this.loyaltyData; } diff --git a/src/main/java/com/adyen/model/nexo/PaymentResponse.java b/src/main/java/com/adyen/model/nexo/PaymentResponse.java index 7a8f4f394..5693dada3 100644 --- a/src/main/java/com/adyen/model/nexo/PaymentResponse.java +++ b/src/main/java/com/adyen/model/nexo/PaymentResponse.java @@ -177,7 +177,7 @@ public void setPaymentResult(PaymentResult value) { */ public List getLoyaltyResult() { if (loyaltyResult == null) { - loyaltyResult = new ArrayList(); + loyaltyResult = new ArrayList<>(); } return this.loyaltyResult; } @@ -206,7 +206,7 @@ public List getLoyaltyResult() { */ public List getPaymentReceipt() { if (paymentReceipt == null) { - paymentReceipt = new ArrayList(); + paymentReceipt = new ArrayList<>(); } return this.paymentReceipt; } @@ -235,7 +235,7 @@ public List getPaymentReceipt() { */ public List getCustomerOrder() { if (customerOrder == null) { - customerOrder = new ArrayList(); + customerOrder = new ArrayList<>(); } return this.customerOrder; } diff --git a/src/main/java/com/adyen/model/nexo/PaymentResult.java b/src/main/java/com/adyen/model/nexo/PaymentResult.java index c40f7094c..d85797c76 100644 --- a/src/main/java/com/adyen/model/nexo/PaymentResult.java +++ b/src/main/java/com/adyen/model/nexo/PaymentResult.java @@ -196,7 +196,7 @@ public void setInstalment(Instalment value) { */ public List getCurrencyConversion() { if (currencyConversion == null) { - currencyConversion = new ArrayList(); + currencyConversion = new ArrayList<>(); } return this.currencyConversion; } @@ -363,7 +363,7 @@ public void setOnlineFlag(Boolean value) { */ public List getAuthenticationMethod() { if (authenticationMethod == null) { - authenticationMethod = new ArrayList(); + authenticationMethod = new ArrayList<>(); } return this.authenticationMethod; } diff --git a/src/main/java/com/adyen/model/nexo/PaymentTransaction.java b/src/main/java/com/adyen/model/nexo/PaymentTransaction.java index eba4c91dd..013718197 100644 --- a/src/main/java/com/adyen/model/nexo/PaymentTransaction.java +++ b/src/main/java/com/adyen/model/nexo/PaymentTransaction.java @@ -138,7 +138,7 @@ public void setTransactionConditions(TransactionConditions value) { */ public List getSaleItem() { if (saleItem == null) { - saleItem = new ArrayList(); + saleItem = new ArrayList<>(); } return this.saleItem; } diff --git a/src/main/java/com/adyen/model/nexo/PerformedTransaction.java b/src/main/java/com/adyen/model/nexo/PerformedTransaction.java index 17b1d38e0..310a068cf 100644 --- a/src/main/java/com/adyen/model/nexo/PerformedTransaction.java +++ b/src/main/java/com/adyen/model/nexo/PerformedTransaction.java @@ -171,7 +171,7 @@ public void setPaymentResult(PaymentResult value) { */ public List getLoyaltyResult() { if (loyaltyResult == null) { - loyaltyResult = new ArrayList(); + loyaltyResult = new ArrayList<>(); } return this.loyaltyResult; } diff --git a/src/main/java/com/adyen/model/nexo/Rebates.java b/src/main/java/com/adyen/model/nexo/Rebates.java index bf8c14f58..6cd861be2 100644 --- a/src/main/java/com/adyen/model/nexo/Rebates.java +++ b/src/main/java/com/adyen/model/nexo/Rebates.java @@ -114,7 +114,7 @@ public void setRebateLabel(String value) { */ public List getSaleItemRebate() { if (saleItemRebate == null) { - saleItemRebate = new ArrayList(); + saleItemRebate = new ArrayList<>(); } return this.saleItemRebate; } diff --git a/src/main/java/com/adyen/model/nexo/ReconciliationRequest.java b/src/main/java/com/adyen/model/nexo/ReconciliationRequest.java index 9e25ab31f..76f23ba5b 100644 --- a/src/main/java/com/adyen/model/nexo/ReconciliationRequest.java +++ b/src/main/java/com/adyen/model/nexo/ReconciliationRequest.java @@ -76,7 +76,7 @@ public class ReconciliationRequest { */ public List getAcquirerID() { if (acquirerID == null) { - acquirerID = new ArrayList(); + acquirerID = new ArrayList<>(); } return this.acquirerID; } diff --git a/src/main/java/com/adyen/model/nexo/ReconciliationResponse.java b/src/main/java/com/adyen/model/nexo/ReconciliationResponse.java index 94d9cd099..e2e60d46f 100644 --- a/src/main/java/com/adyen/model/nexo/ReconciliationResponse.java +++ b/src/main/java/com/adyen/model/nexo/ReconciliationResponse.java @@ -101,7 +101,7 @@ public void setResponse(Response value) { */ public List getTransactionTotals() { if (transactionTotals == null) { - transactionTotals = new ArrayList(); + transactionTotals = new ArrayList<>(); } return this.transactionTotals; } diff --git a/src/main/java/com/adyen/model/nexo/ReversalResponse.java b/src/main/java/com/adyen/model/nexo/ReversalResponse.java index 120d324a2..fc79f7260 100644 --- a/src/main/java/com/adyen/model/nexo/ReversalResponse.java +++ b/src/main/java/com/adyen/model/nexo/ReversalResponse.java @@ -152,7 +152,7 @@ public void setOriginalPOITransaction(OriginalPOITransaction value) { */ public List getPaymentReceipt() { if (paymentReceipt == null) { - paymentReceipt = new ArrayList(); + paymentReceipt = new ArrayList<>(); } return this.paymentReceipt; } diff --git a/src/main/java/com/adyen/model/nexo/SaleData.java b/src/main/java/com/adyen/model/nexo/SaleData.java index a43fcff5f..c5a328fe4 100644 --- a/src/main/java/com/adyen/model/nexo/SaleData.java +++ b/src/main/java/com/adyen/model/nexo/SaleData.java @@ -188,7 +188,7 @@ public void setSaleTerminalData(SaleTerminalData value) { */ public List getSponsoredMerchant() { if (sponsoredMerchant == null) { - sponsoredMerchant = new ArrayList(); + sponsoredMerchant = new ArrayList<>(); } return this.sponsoredMerchant; } @@ -379,7 +379,7 @@ public void setCustomerOrderID(String value) { */ public List getCustomerOrderReq() { if (customerOrderReq == null) { - customerOrderReq = new ArrayList(); + customerOrderReq = new ArrayList<>(); } return this.customerOrderReq; } diff --git a/src/main/java/com/adyen/model/nexo/SaleProfile.java b/src/main/java/com/adyen/model/nexo/SaleProfile.java index 16172cde3..9e870b992 100644 --- a/src/main/java/com/adyen/model/nexo/SaleProfile.java +++ b/src/main/java/com/adyen/model/nexo/SaleProfile.java @@ -72,7 +72,7 @@ public class SaleProfile { */ public List getServiceProfiles() { if (serviceProfiles == null) { - serviceProfiles = new ArrayList(); + serviceProfiles = new ArrayList<>(); } return this.serviceProfiles; } diff --git a/src/main/java/com/adyen/model/nexo/SaleTerminalData.java b/src/main/java/com/adyen/model/nexo/SaleTerminalData.java index 8d7cab3bc..8fc2e4634 100644 --- a/src/main/java/com/adyen/model/nexo/SaleTerminalData.java +++ b/src/main/java/com/adyen/model/nexo/SaleTerminalData.java @@ -85,7 +85,7 @@ public class SaleTerminalData { */ public List getSaleCapabilities() { if (saleCapabilities == null) { - saleCapabilities = new ArrayList(); + saleCapabilities = new ArrayList<>(); } return this.saleCapabilities; } diff --git a/src/main/java/com/adyen/model/nexo/SensitiveCardData.java b/src/main/java/com/adyen/model/nexo/SensitiveCardData.java index 8acfc76d4..fac295d78 100644 --- a/src/main/java/com/adyen/model/nexo/SensitiveCardData.java +++ b/src/main/java/com/adyen/model/nexo/SensitiveCardData.java @@ -89,7 +89,7 @@ public class SensitiveCardData { */ public List getTrackData() { if (trackData == null) { - trackData = new ArrayList(); + trackData = new ArrayList<>(); } return this.trackData; } diff --git a/src/main/java/com/adyen/model/nexo/SignedData.java b/src/main/java/com/adyen/model/nexo/SignedData.java index 99f46dba9..73b712f6a 100644 --- a/src/main/java/com/adyen/model/nexo/SignedData.java +++ b/src/main/java/com/adyen/model/nexo/SignedData.java @@ -91,7 +91,7 @@ public class SignedData { */ public List getDigestAlgorithm() { if (digestAlgorithm == null) { - digestAlgorithm = new ArrayList(); + digestAlgorithm = new ArrayList<>(); } return this.digestAlgorithm; } @@ -138,7 +138,7 @@ public void setEncapsulatedContent(EncapsulatedContent value) { */ public List getCertificate() { if (certificate == null) { - certificate = new ArrayList(); + certificate = new ArrayList<>(); } return this.certificate; } @@ -167,7 +167,7 @@ public List getCertificate() { */ public List getSigner() { if (signer == null) { - signer = new ArrayList(); + signer = new ArrayList<>(); } return this.signer; } diff --git a/src/main/java/com/adyen/model/nexo/StoredValueAccountID.java b/src/main/java/com/adyen/model/nexo/StoredValueAccountID.java index 48cba5df2..e751307ac 100644 --- a/src/main/java/com/adyen/model/nexo/StoredValueAccountID.java +++ b/src/main/java/com/adyen/model/nexo/StoredValueAccountID.java @@ -187,7 +187,7 @@ public void setExpiryDate(String value) { */ public List getEntryMode() { if (entryMode == null) { - entryMode = new ArrayList(); + entryMode = new ArrayList<>(); } return this.entryMode; } diff --git a/src/main/java/com/adyen/model/nexo/StoredValueRequest.java b/src/main/java/com/adyen/model/nexo/StoredValueRequest.java index 57936853f..1eb12b804 100644 --- a/src/main/java/com/adyen/model/nexo/StoredValueRequest.java +++ b/src/main/java/com/adyen/model/nexo/StoredValueRequest.java @@ -102,7 +102,7 @@ public void setSaleData(SaleData value) { */ public List getStoredValueData() { if (storedValueData == null) { - storedValueData = new ArrayList(); + storedValueData = new ArrayList<>(); } return this.storedValueData; } diff --git a/src/main/java/com/adyen/model/nexo/StoredValueResponse.java b/src/main/java/com/adyen/model/nexo/StoredValueResponse.java index e810e7e96..dd87c3572 100644 --- a/src/main/java/com/adyen/model/nexo/StoredValueResponse.java +++ b/src/main/java/com/adyen/model/nexo/StoredValueResponse.java @@ -138,7 +138,7 @@ public void setPOIData(POIData value) { */ public List getStoredValueResult() { if (storedValueResult == null) { - storedValueResult = new ArrayList(); + storedValueResult = new ArrayList<>(); } return this.storedValueResult; } diff --git a/src/main/java/com/adyen/model/nexo/TransactionConditions.java b/src/main/java/com/adyen/model/nexo/TransactionConditions.java index df2ff85c8..2d49f31b4 100644 --- a/src/main/java/com/adyen/model/nexo/TransactionConditions.java +++ b/src/main/java/com/adyen/model/nexo/TransactionConditions.java @@ -115,7 +115,7 @@ public class TransactionConditions { */ public List getAllowedPaymentBrand() { if (allowedPaymentBrand == null) { - allowedPaymentBrand = new ArrayList(); + allowedPaymentBrand = new ArrayList<>(); } return this.allowedPaymentBrand; } @@ -144,7 +144,7 @@ public List getAllowedPaymentBrand() { */ public List getAcquirerID() { if (acquirerID == null) { - acquirerID = new ArrayList(); + acquirerID = new ArrayList<>(); } return this.acquirerID; } @@ -173,7 +173,7 @@ public List getAcquirerID() { */ public List getAllowedLoyaltyBrand() { if (allowedLoyaltyBrand == null) { - allowedLoyaltyBrand = new ArrayList(); + allowedLoyaltyBrand = new ArrayList<>(); } return this.allowedLoyaltyBrand; } @@ -202,7 +202,7 @@ public List getAllowedLoyaltyBrand() { */ public List getForceEntryMode() { if (forceEntryMode == null) { - forceEntryMode = new ArrayList(); + forceEntryMode = new ArrayList<>(); } return this.forceEntryMode; } diff --git a/src/main/java/com/adyen/model/nexo/TransactionStatusRequest.java b/src/main/java/com/adyen/model/nexo/TransactionStatusRequest.java index 578a68c06..9184ff52f 100644 --- a/src/main/java/com/adyen/model/nexo/TransactionStatusRequest.java +++ b/src/main/java/com/adyen/model/nexo/TransactionStatusRequest.java @@ -97,7 +97,7 @@ public void setMessageReference(MessageReference value) { */ public List getDocumentQualifier() { if (documentQualifier == null) { - documentQualifier = new ArrayList(); + documentQualifier = new ArrayList<>(); } return this.documentQualifier; } diff --git a/src/main/java/com/adyen/model/nexo/TransactionTotals.java b/src/main/java/com/adyen/model/nexo/TransactionTotals.java index 00286147f..125bea819 100644 --- a/src/main/java/com/adyen/model/nexo/TransactionTotals.java +++ b/src/main/java/com/adyen/model/nexo/TransactionTotals.java @@ -149,7 +149,7 @@ public class TransactionTotals { */ public List getPaymentTotals() { if (paymentTotals == null) { - paymentTotals = new ArrayList(); + paymentTotals = new ArrayList<>(); } return this.paymentTotals; } @@ -178,7 +178,7 @@ public List getPaymentTotals() { */ public List getLoyaltyTotals() { if (loyaltyTotals == null) { - loyaltyTotals = new ArrayList(); + loyaltyTotals = new ArrayList<>(); } return this.loyaltyTotals; } diff --git a/src/main/java/com/adyen/model/payout/PayoutRequest.java b/src/main/java/com/adyen/model/payout/PayoutRequest.java index 771a3d2c3..f7bc66308 100644 --- a/src/main/java/com/adyen/model/payout/PayoutRequest.java +++ b/src/main/java/com/adyen/model/payout/PayoutRequest.java @@ -1104,7 +1104,7 @@ public PayoutRequest splits(List splits) { public PayoutRequest addSplitsItem(Split splitsItem) { if (this.splits == null) { - this.splits = new ArrayList(); + this.splits = new ArrayList<>(); } this.splits.add(splitsItem); return this; diff --git a/src/main/java/com/adyen/model/recurring/DisableResult.java b/src/main/java/com/adyen/model/recurring/DisableResult.java index be047002c..73dffd320 100644 --- a/src/main/java/com/adyen/model/recurring/DisableResult.java +++ b/src/main/java/com/adyen/model/recurring/DisableResult.java @@ -33,7 +33,7 @@ public class DisableResult { private String response = null; @SerializedName("details") - private List details = new ArrayList(); + private List details = new ArrayList<>(); public DisableResult response(String response) { this.response = response; diff --git a/src/main/java/com/adyen/model/recurring/RecurringDetail.java b/src/main/java/com/adyen/model/recurring/RecurringDetail.java index 3c256cbe2..c5d92e51c 100644 --- a/src/main/java/com/adyen/model/recurring/RecurringDetail.java +++ b/src/main/java/com/adyen/model/recurring/RecurringDetail.java @@ -85,7 +85,7 @@ public class RecurringDetail { private String firstPspReference = null; @SerializedName("contractTypes") - private List contractTypes = new ArrayList(); + private List contractTypes = new ArrayList<>(); @SerializedName("acquirer") private String acquirer = null; diff --git a/src/main/java/com/adyen/model/recurring/RecurringDetailsResult.java b/src/main/java/com/adyen/model/recurring/RecurringDetailsResult.java index 15de06ea4..980f0130a 100644 --- a/src/main/java/com/adyen/model/recurring/RecurringDetailsResult.java +++ b/src/main/java/com/adyen/model/recurring/RecurringDetailsResult.java @@ -37,7 +37,7 @@ public class RecurringDetailsResult { private String shopperReference = null; @SerializedName("details") - private List details = new ArrayList(); + private List details = new ArrayList<>(); @SerializedName("lastKnownShopperEmail") private String lastKnownShopperEmail = null; diff --git a/src/main/java/com/adyen/service/resource/notification/GetNotificationConfigurationList.java b/src/main/java/com/adyen/service/resource/notification/GetNotificationConfigurationList.java index ccf5aefff..5af029f5b 100644 --- a/src/main/java/com/adyen/service/resource/notification/GetNotificationConfigurationList.java +++ b/src/main/java/com/adyen/service/resource/notification/GetNotificationConfigurationList.java @@ -32,6 +32,6 @@ public class GetNotificationConfigurationList extends Resource { public GetNotificationConfigurationList(Service service) { super(service, service.getClient().getConfig().getMarketPayEndpoint() + "/Notification/" + Client.MARKETPAY_NOTIFICATION_API_VERSION + "/getNotificationConfigurationList", - new ArrayList()); + new ArrayList<>()); } } From d0475046feabdd66fccabc6f4e79c30cf7a17bae Mon Sep 17 00:00:00 2001 From: Simon Michel Date: Sat, 4 Apr 2020 22:16:54 +0200 Subject: [PATCH 2/9] Use lambda --- .../httpclient/HttpURLConnectionClient.java | 24 ++++++++---------- .../serialization/TerminalAPIGsonBuilder.java | 25 ++++++++----------- 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/adyen/httpclient/HttpURLConnectionClient.java b/src/main/java/com/adyen/httpclient/HttpURLConnectionClient.java index 16aa107cb..e8ebe24ca 100644 --- a/src/main/java/com/adyen/httpclient/HttpURLConnectionClient.java +++ b/src/main/java/com/adyen/httpclient/HttpURLConnectionClient.java @@ -299,20 +299,18 @@ private void installCertificateCommonNameValidator(HttpURLConnection connection, if (connection instanceof HttpsURLConnection) { HttpsURLConnection httpsConnection = (HttpsURLConnection) connection; - HostnameVerifier terminalHostsValid = new HostnameVerifier() { - public boolean verify(String host, SSLSession session) { - try { - if (session.getPeerCertificates() != null && session.getPeerCertificates().length > 0) { - // Assume the first certificate is the leaf, since chain will be ordered, according to Java documentation: - // https://docs.oracle.com/javase/7/docs/api/javax/net/ssl/SSLSession.html#getPeerCertificates() - X509Certificate certificate = (X509Certificate) session.getPeerCertificates()[0]; - return TerminalCommonNameValidator.validateCertificate(certificate, environment); - } - return false; - } catch (SSLPeerUnverifiedException e) { - e.printStackTrace(); - return false; + HostnameVerifier terminalHostsValid = (host, session) -> { + try { + if (session.getPeerCertificates() != null && session.getPeerCertificates().length > 0) { + // Assume the first certificate is the leaf, since chain will be ordered, according to Java documentation: + // https://docs.oracle.com/javase/7/docs/api/javax/net/ssl/SSLSession.html#getPeerCertificates() + X509Certificate certificate = (X509Certificate) session.getPeerCertificates()[0]; + return TerminalCommonNameValidator.validateCertificate(certificate, environment); } + return false; + } catch (SSLPeerUnverifiedException e) { + e.printStackTrace(); + return false; } }; // Install the terminal-trusting host verifier diff --git a/src/main/java/com/adyen/terminal/serialization/TerminalAPIGsonBuilder.java b/src/main/java/com/adyen/terminal/serialization/TerminalAPIGsonBuilder.java index 7e5cbacdf..47a9f908d 100644 --- a/src/main/java/com/adyen/terminal/serialization/TerminalAPIGsonBuilder.java +++ b/src/main/java/com/adyen/terminal/serialization/TerminalAPIGsonBuilder.java @@ -38,21 +38,18 @@ private TerminalAPIGsonBuilder() { public static Gson create() { GsonBuilder gsonBuilder = new GsonBuilder(); - FieldNamingStrategy fieldNamingStrategy = new FieldNamingStrategy() { - @Override - public String translateName(Field field) { - if (field.getAnnotation(XmlElement.class) != null) { - XmlElement xmlElement = field.getAnnotation(XmlElement.class); - return xmlElement.name(); - } else if (field.getAnnotation(XmlAttribute.class) != null) { - XmlAttribute xmlAttribute = field.getAnnotation(XmlAttribute.class); - return xmlAttribute.name(); - } else if (field.getAnnotation(XmlRootElement.class) != null) { - XmlRootElement xmlRootElement = field.getAnnotation(XmlRootElement.class); - return xmlRootElement.name(); - } - return field.getName(); + FieldNamingStrategy fieldNamingStrategy = field -> { + if (field.getAnnotation(XmlElement.class) != null) { + XmlElement xmlElement = field.getAnnotation(XmlElement.class); + return xmlElement.name(); + } else if (field.getAnnotation(XmlAttribute.class) != null) { + XmlAttribute xmlAttribute = field.getAnnotation(XmlAttribute.class); + return xmlAttribute.name(); + } else if (field.getAnnotation(XmlRootElement.class) != null) { + XmlRootElement xmlRootElement = field.getAnnotation(XmlRootElement.class); + return xmlRootElement.name(); } + return field.getName(); }; gsonBuilder.setFieldNamingStrategy(fieldNamingStrategy); gsonBuilder.registerTypeHierarchyAdapter(byte[].class, new ByteArrayToBase64TypeAdapter()); From 434c1a230f5ccade685ef137bd35c0556ea1c459 Mon Sep 17 00:00:00 2001 From: Simon Michel Date: Sat, 4 Apr 2020 22:27:48 +0200 Subject: [PATCH 3/9] Minor improvements --- src/main/java/com/adyen/Util/HMACValidator.java | 4 ++-- .../adyen/model/binlookup/DSPublicKeyDetail.java | 5 +++-- .../checkout/DefaultPaymentMethodDetails.java | 16 ---------------- .../adyen/model/checkout/PaymentsRequest.java | 3 ++- .../adyen/model/checkout/ThreeDSecureData.java | 5 +++-- 5 files changed, 10 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/adyen/Util/HMACValidator.java b/src/main/java/com/adyen/Util/HMACValidator.java index 5d436336b..a10b5d64e 100644 --- a/src/main/java/com/adyen/Util/HMACValidator.java +++ b/src/main/java/com/adyen/Util/HMACValidator.java @@ -21,6 +21,7 @@ package com.adyen.Util; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.security.SignatureException; import java.util.ArrayList; import java.util.List; @@ -37,7 +38,6 @@ public class HMACValidator { public static final String HMAC_SHA256_ALGORITHM = "HmacSHA256"; - public static final Charset C_UTF8 = Charset.forName("UTF8"); public static final String DATA_SEPARATOR = ":"; // To calculate the HMAC SHA-256 @@ -54,7 +54,7 @@ public String calculateHMAC(String data, String key) throws java.security.Signat mac.init(signingKey); // Compute the hmac on input data bytes - byte[] rawHmac = mac.doFinal(data.getBytes(C_UTF8)); + byte[] rawHmac = mac.doFinal(data.getBytes(StandardCharsets.UTF_8)); // Base64-encode the hmac return new String(Base64.encodeBase64(rawHmac)); diff --git a/src/main/java/com/adyen/model/binlookup/DSPublicKeyDetail.java b/src/main/java/com/adyen/model/binlookup/DSPublicKeyDetail.java index d365a0100..d8d4cec8f 100755 --- a/src/main/java/com/adyen/model/binlookup/DSPublicKeyDetail.java +++ b/src/main/java/com/adyen/model/binlookup/DSPublicKeyDetail.java @@ -20,6 +20,7 @@ */ package com.adyen.model.binlookup; +import java.util.Arrays; import java.util.Objects; import com.adyen.serializer.ByteArrayToStringAdapter; @@ -108,8 +109,8 @@ public boolean equals(Object o) { return false; } DSPublicKeyDetail dsPublicKeyDetail = (DSPublicKeyDetail) o; - return Objects.equals(this.brand, dsPublicKeyDetail.brand) && Objects.equals(this.directoryServerId, dsPublicKeyDetail.directoryServerId) && Objects.equals(this.publicKey, - dsPublicKeyDetail.publicKey); + return Objects.equals(this.brand, dsPublicKeyDetail.brand) && Objects.equals(this.directoryServerId, dsPublicKeyDetail.directoryServerId) && Arrays.equals(this.publicKey, + dsPublicKeyDetail.publicKey); } @Override diff --git a/src/main/java/com/adyen/model/checkout/DefaultPaymentMethodDetails.java b/src/main/java/com/adyen/model/checkout/DefaultPaymentMethodDetails.java index 6404e83c4..5952dc568 100755 --- a/src/main/java/com/adyen/model/checkout/DefaultPaymentMethodDetails.java +++ b/src/main/java/com/adyen/model/checkout/DefaultPaymentMethodDetails.java @@ -237,22 +237,6 @@ public DefaultPaymentMethodDetails encryptedSecurityCode(String encryptedSecurit return this; } - /** - * @deprecated This field is deprecated. Use {@link DefaultPaymentMethodDetails#storedPaymentMethodId } instead. - */ - @Deprecated - public String getRecurringDetailReference() { - return recurringDetailReference; - } - - /** - * @deprecated This field is deprecated. Use {@link DefaultPaymentMethodDetails#storedPaymentMethodId } instead. - */ - @Deprecated - public void setRecurringDetailReference(String recurringDetailReference) { - this.recurringDetailReference = recurringDetailReference; - } - /** * @deprecated This field is deprecated. Use {@link DefaultPaymentMethodDetails#storedPaymentMethodId } instead. */ diff --git a/src/main/java/com/adyen/model/checkout/PaymentsRequest.java b/src/main/java/com/adyen/model/checkout/PaymentsRequest.java index e5d53b45e..bcfafe935 100755 --- a/src/main/java/com/adyen/model/checkout/PaymentsRequest.java +++ b/src/main/java/com/adyen/model/checkout/PaymentsRequest.java @@ -818,7 +818,8 @@ public PaymentsRequest addCardData(String cardNumber, String expiryMonth, String public PaymentsRequest addOneClickData(String recurringDetailReference, String encryptedSecurityCode) { DefaultPaymentMethodDetails paymentMethodDetails = new DefaultPaymentMethodDetails(); - paymentMethodDetails.type(TYPE_SCHEME).recurringDetailReference(recurringDetailReference).encryptedSecurityCode(encryptedSecurityCode); + paymentMethodDetails.type(TYPE_SCHEME).setStoredPaymentMethodId(recurringDetailReference); + paymentMethodDetails.type(TYPE_SCHEME).encryptedSecurityCode(encryptedSecurityCode); this.paymentMethod = paymentMethodDetails; return this; diff --git a/src/main/java/com/adyen/model/checkout/ThreeDSecureData.java b/src/main/java/com/adyen/model/checkout/ThreeDSecureData.java index f72ea6b98..0f548d8bf 100644 --- a/src/main/java/com/adyen/model/checkout/ThreeDSecureData.java +++ b/src/main/java/com/adyen/model/checkout/ThreeDSecureData.java @@ -29,6 +29,7 @@ import com.google.gson.stream.JsonWriter; import java.io.IOException; +import java.util.Arrays; import java.util.Objects; /** @@ -174,13 +175,13 @@ public boolean equals(java.lang.Object o) { } ThreeDSecureData threeDSecureData = (ThreeDSecureData) o; return Objects.equals(this.authenticationResponse, threeDSecureData.authenticationResponse) - && Objects.equals(this.cavv, threeDSecureData.cavv) + && Arrays.equals(this.cavv, threeDSecureData.cavv) && Objects.equals(this.cavvAlgorithm, threeDSecureData.cavvAlgorithm) && Objects.equals(this.directoryResponse, threeDSecureData.directoryResponse) && Objects.equals(this.eci, threeDSecureData.eci) && Objects.equals(this.threeDSVersion, threeDSecureData.threeDSVersion) - && Objects.equals(this.xid, threeDSecureData.xid) + && Arrays.equals(this.xid, threeDSecureData.xid) && Objects.equals(this.dsTransID, threeDSecureData.dsTransID); } From 955290cf2fc87d295567079832c81a711dc27a50 Mon Sep 17 00:00:00 2001 From: Simon Michel Date: Thu, 16 Apr 2020 20:42:10 +0200 Subject: [PATCH 4/9] Remove unused imports --- src/main/java/com/adyen/Util/HMACValidator.java | 15 +++++++-------- .../adyen/httpclient/HttpURLConnectionClient.java | 1 - .../serialization/TerminalAPIGsonBuilder.java | 1 - 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/adyen/Util/HMACValidator.java b/src/main/java/com/adyen/Util/HMACValidator.java index a10b5d64e..1d105b70f 100644 --- a/src/main/java/com/adyen/Util/HMACValidator.java +++ b/src/main/java/com/adyen/Util/HMACValidator.java @@ -20,19 +20,18 @@ */ package com.adyen.Util; -import java.nio.charset.Charset; +import com.adyen.model.Amount; +import com.adyen.model.notification.NotificationRequestItem; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.codec.binary.Hex; + +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; import java.nio.charset.StandardCharsets; import java.security.SignatureException; import java.util.ArrayList; import java.util.List; import java.util.SortedMap; -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; - -import org.apache.commons.codec.binary.Base64; -import org.apache.commons.codec.binary.Hex; -import com.adyen.model.Amount; -import com.adyen.model.notification.NotificationRequestItem; import static com.adyen.constants.ApiConstants.AdditionalData.HMAC_SIGNATURE; diff --git a/src/main/java/com/adyen/httpclient/HttpURLConnectionClient.java b/src/main/java/com/adyen/httpclient/HttpURLConnectionClient.java index e8ebe24ca..f6ff8872e 100644 --- a/src/main/java/com/adyen/httpclient/HttpURLConnectionClient.java +++ b/src/main/java/com/adyen/httpclient/HttpURLConnectionClient.java @@ -31,7 +31,6 @@ import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLPeerUnverifiedException; -import javax.net.ssl.SSLSession; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; import java.io.FileInputStream; diff --git a/src/main/java/com/adyen/terminal/serialization/TerminalAPIGsonBuilder.java b/src/main/java/com/adyen/terminal/serialization/TerminalAPIGsonBuilder.java index 47a9f908d..cdf276f0e 100644 --- a/src/main/java/com/adyen/terminal/serialization/TerminalAPIGsonBuilder.java +++ b/src/main/java/com/adyen/terminal/serialization/TerminalAPIGsonBuilder.java @@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.datatype.XMLGregorianCalendar; -import java.lang.reflect.Field; public final class TerminalAPIGsonBuilder { From 58c30b4429c1504c96691a1fca479a0d76398021 Mon Sep 17 00:00:00 2001 From: Simon Michel Date: Thu, 16 Apr 2020 21:23:01 +0200 Subject: [PATCH 5/9] Updated the minimum requirement in the readme.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 544f6a181..0fff32dff 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ The Library supports all APIs under the following services: ## Requirements -* Java 7 or higher +* Java 8 or higher ## Installation From 1117b9117fee168b1b808da4725d1e7ca65a22dd Mon Sep 17 00:00:00 2001 From: Simon Michel Date: Wed, 22 Apr 2020 22:01:52 +0200 Subject: [PATCH 6/9] - Remove unused imports - Remove redundant null values --- .../marketpay/ErrorFieldTypeContainer.java | 5 +-- .../payout/StoreDetailAndSubmitRequest.java | 7 +++-- .../model/payout/StoreDetailRequest.java | 7 +++-- .../com/adyen/model/payout/SubmitRequest.java | 7 +++-- .../adyen/terminal/security/NexoCrypto.java | 1 + src/test/java/com/adyen/BaseTest.java | 31 +++++++++---------- .../java/com/adyen/CheckoutUtilityTest.java | 2 +- src/test/java/com/adyen/MarketPayTest.java | 2 +- .../com/adyen/PaymentRequestBuilderTest.java | 3 +- .../java/com/adyen/PaymentRequestTest.java | 2 -- src/test/java/com/adyen/PaymentTest.java | 26 ++++++++-------- src/test/java/com/adyen/PayoutTest.java | 10 +++--- src/test/java/com/adyen/RecurringTest.java | 13 ++++---- .../java/com/adyen/TerminalLocalAPITest.java | 1 - .../SaleToAcquirerDataSerializerTest.java | 4 +-- .../java/com/adyen/service/ResourceTest.java | 19 ++++++------ 16 files changed, 70 insertions(+), 70 deletions(-) diff --git a/src/main/java/com/adyen/model/marketpay/ErrorFieldTypeContainer.java b/src/main/java/com/adyen/model/marketpay/ErrorFieldTypeContainer.java index a1cb3cc13..d0bed8bab 100644 --- a/src/main/java/com/adyen/model/marketpay/ErrorFieldTypeContainer.java +++ b/src/main/java/com/adyen/model/marketpay/ErrorFieldTypeContainer.java @@ -20,12 +20,13 @@ */ package com.adyen.model.marketpay; -import java.util.Objects; import com.google.gson.annotations.SerializedName; +import java.util.Objects; + public class ErrorFieldTypeContainer { @SerializedName("ErrorFieldType") - private ErrorFieldType errorFieldType = null; + private ErrorFieldType errorFieldType; public ErrorFieldTypeContainer(ErrorFieldType errorFieldType) { this.errorFieldType = errorFieldType; diff --git a/src/main/java/com/adyen/model/payout/StoreDetailAndSubmitRequest.java b/src/main/java/com/adyen/model/payout/StoreDetailAndSubmitRequest.java index fc7a297cc..a688109f4 100644 --- a/src/main/java/com/adyen/model/payout/StoreDetailAndSubmitRequest.java +++ b/src/main/java/com/adyen/model/payout/StoreDetailAndSubmitRequest.java @@ -20,8 +20,6 @@ */ package com.adyen.model.payout; -import java.util.Date; -import java.util.Map; import com.adyen.model.Address; import com.adyen.model.Amount; import com.adyen.model.BankAccount; @@ -32,6 +30,9 @@ import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.SerializedName; +import java.util.Date; +import java.util.Map; + /** * StoreDetailsAndSubmitRequest */ @@ -68,7 +69,7 @@ public class StoreDetailAndSubmitRequest { private String nationality = null; @SerializedName("recurring") - private Recurring recurring = null; + private Recurring recurring; @SerializedName("selectedBrand") private String selectedBrand = null; diff --git a/src/main/java/com/adyen/model/payout/StoreDetailRequest.java b/src/main/java/com/adyen/model/payout/StoreDetailRequest.java index dfd00485f..46e5bdeb0 100644 --- a/src/main/java/com/adyen/model/payout/StoreDetailRequest.java +++ b/src/main/java/com/adyen/model/payout/StoreDetailRequest.java @@ -20,8 +20,6 @@ */ package com.adyen.model.payout; -import java.util.Date; -import java.util.Map; import com.adyen.model.Address; import com.adyen.model.BankAccount; import com.adyen.model.Card; @@ -31,6 +29,9 @@ import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.SerializedName; +import java.util.Date; +import java.util.Map; + /** * StoreDetailsAndSubmitRequest */ @@ -64,7 +65,7 @@ public class StoreDetailRequest { private String nationality = null; @SerializedName("recurring") - private Recurring recurring = null; + private Recurring recurring; @SerializedName("selectedBrand") private String selectedBrand = null; diff --git a/src/main/java/com/adyen/model/payout/SubmitRequest.java b/src/main/java/com/adyen/model/payout/SubmitRequest.java index 72d786391..39f3dfc34 100644 --- a/src/main/java/com/adyen/model/payout/SubmitRequest.java +++ b/src/main/java/com/adyen/model/payout/SubmitRequest.java @@ -20,8 +20,6 @@ */ package com.adyen.model.payout; -import java.util.Date; -import java.util.Map; import com.adyen.model.Amount; import com.adyen.model.Name; import com.adyen.model.recurring.Recurring; @@ -29,6 +27,9 @@ import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.SerializedName; +import java.util.Date; +import java.util.Map; + public class SubmitRequest { @SerializedName("additionalData") private Map additionalData = null; @@ -56,7 +57,7 @@ public class SubmitRequest { private String nationality = null; @SerializedName("recurring") - private Recurring recurring = null; + private Recurring recurring; @SerializedName("shopperEmail") private String shopperEmail = null; diff --git a/src/main/java/com/adyen/terminal/security/NexoCrypto.java b/src/main/java/com/adyen/terminal/security/NexoCrypto.java index 2899f4f39..f4ecf6327 100644 --- a/src/main/java/com/adyen/terminal/security/NexoCrypto.java +++ b/src/main/java/com/adyen/terminal/security/NexoCrypto.java @@ -144,6 +144,7 @@ private void validateHmac(byte[] receivedHmac, byte[] decryptedMessage, NexoDeri for (int i = 0; i < hmac.length && valid; i++) { if (receivedHmac[i] != hmac[i]) { valid = false; + break; } } diff --git a/src/test/java/com/adyen/BaseTest.java b/src/test/java/com/adyen/BaseTest.java index ab11bb387..390d43221 100644 --- a/src/test/java/com/adyen/BaseTest.java +++ b/src/test/java/com/adyen/BaseTest.java @@ -20,18 +20,6 @@ */ package com.adyen; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.math.BigDecimal; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import com.adyen.Util.DateUtil; import com.adyen.Util.Util; import com.adyen.enums.Gender; @@ -75,6 +63,17 @@ import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -94,7 +93,7 @@ protected Client createMockClientFromResponse(String response) { try { when(httpURLConnectionClient.post(any(String.class), any(Map.class), any(Config.class))).thenReturn(response); when(httpURLConnectionClient.request(any(String.class), any(String.class), any(Config.class), anyBoolean(), any(RequestOptions.class))).thenReturn(response); - when(httpURLConnectionClient.request(any(String.class), any(String.class), any(Config.class), anyBoolean(), (RequestOptions) isNull())).thenReturn(response); + when(httpURLConnectionClient.request(any(String.class), any(String.class), any(Config.class), anyBoolean(), isNull())).thenReturn(response); } catch (IOException | HTTPClientException e) { e.printStackTrace(); @@ -277,7 +276,7 @@ protected PaymentRequest createOpenInvoicePaymentRequest() { Long itemVatAmount = new Long("1000"); Long itemVatPercentage = new Long("1000"); - List invoiceLines = new ArrayList(); + List invoiceLines = new ArrayList<>(); // invoiceLine1 InvoiceLine invoiceLine = new InvoiceLine(); @@ -346,9 +345,9 @@ protected Client createMockClientForErrors(int status, String fileName) { String response = getFileContents(fileName); HttpURLConnectionClient httpURLConnectionClient = mock(HttpURLConnectionClient.class); - HTTPClientException httpClientException = new HTTPClientException(status, "An error occured", new HashMap>(), response); + HTTPClientException httpClientException = new HTTPClientException(status, "An error occured", new HashMap<>(), response); try { - when(httpURLConnectionClient.request(any(String.class), any(String.class), any(Config.class), anyBoolean(), (RequestOptions) isNull())).thenThrow(httpClientException); + when(httpURLConnectionClient.request(any(String.class), any(String.class), any(Config.class), anyBoolean(), isNull())).thenThrow(httpClientException); } catch (IOException | HTTPClientException e) { fail("Unexpected exception: " + e.getMessage()); } diff --git a/src/test/java/com/adyen/CheckoutUtilityTest.java b/src/test/java/com/adyen/CheckoutUtilityTest.java index 190731fb9..48f7f8d27 100644 --- a/src/test/java/com/adyen/CheckoutUtilityTest.java +++ b/src/test/java/com/adyen/CheckoutUtilityTest.java @@ -44,7 +44,7 @@ public void TestOriginKeysSuccessMocked() throws Exception { Client client = createMockClientFromFile("mocks/checkoututility/originkeys-success.json"); CheckoutUtility checkoutUtility = new CheckoutUtility(client); OriginKeysRequest originKeysRequest = new OriginKeysRequest(); - originKeysRequest.setOriginDomains(new ArrayList(Arrays.asList("www.test.com", "https://www.your-domain2.com"))); + originKeysRequest.setOriginDomains(new ArrayList<>(Arrays.asList("www.test.com", "https://www.your-domain2.com"))); OriginKeysResponse originKeysResponse = checkoutUtility.originKeys(originKeysRequest); assertEquals("pub.v2.7814286629520534.aHR0cHM6Ly93d3cueW91ci1kb21haW4xLmNvbQ.UEwIBmW9-c_uXo5wSEr2w8Hz8hVIpujXPHjpcEse3xI", originKeysResponse.getOriginKeys().get("https://www.your-domain1.com")); } diff --git a/src/test/java/com/adyen/MarketPayTest.java b/src/test/java/com/adyen/MarketPayTest.java index 2bb9cda30..79fcde2c2 100644 --- a/src/test/java/com/adyen/MarketPayTest.java +++ b/src/test/java/com/adyen/MarketPayTest.java @@ -130,7 +130,7 @@ public void TestCreateSplitPayment() throws Exception { splitPayment.setTotalAmount(6200L); splitPayment.setCurrencyCode("EUR"); - List splitPaymentItems = new ArrayList(); + List splitPaymentItems = new ArrayList<>(); // first split payment item SplitPaymentItem splitPaymentItem = new SplitPaymentItem(); diff --git a/src/test/java/com/adyen/PaymentRequestBuilderTest.java b/src/test/java/com/adyen/PaymentRequestBuilderTest.java index b3c5283be..ff4773472 100644 --- a/src/test/java/com/adyen/PaymentRequestBuilderTest.java +++ b/src/test/java/com/adyen/PaymentRequestBuilderTest.java @@ -23,7 +23,6 @@ import com.adyen.constants.ApiConstants; import com.adyen.model.PaymentRequest; import com.adyen.model.PaymentRequest3d; -import com.adyen.model.applicationinfo.ApplicationInfo; import com.adyen.model.applicationinfo.ExternalPlatform; import org.junit.Test; @@ -46,7 +45,7 @@ public void TestCCPaymentRequest() { // Test metadata - paymentRequest.setMetadata(new HashMap()); + paymentRequest.setMetadata(new HashMap<>()); paymentRequest.getMetadata().put("key", "value"); // Test recurring processing model diff --git a/src/test/java/com/adyen/PaymentRequestTest.java b/src/test/java/com/adyen/PaymentRequestTest.java index 3dd76d258..599037e75 100644 --- a/src/test/java/com/adyen/PaymentRequestTest.java +++ b/src/test/java/com/adyen/PaymentRequestTest.java @@ -26,8 +26,6 @@ import com.adyen.model.applicationinfo.ExternalPlatform; import com.adyen.model.checkout.DefaultPaymentMethodDetails; import com.adyen.model.checkout.PaymentsRequest; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import org.junit.Test; import static com.adyen.Client.LIB_NAME; diff --git a/src/test/java/com/adyen/PaymentTest.java b/src/test/java/com/adyen/PaymentTest.java index c58ef1ea6..ffb7bb0cf 100644 --- a/src/test/java/com/adyen/PaymentTest.java +++ b/src/test/java/com/adyen/PaymentTest.java @@ -20,22 +20,13 @@ */ package com.adyen; -import java.io.IOException; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.TimeZone; - -import com.adyen.model.AuthenticationResultRequest; -import com.adyen.model.AuthenticationResultResponse; -import org.junit.Test; import com.adyen.constants.ApiConstants.AdditionalData; import com.adyen.constants.ApiConstants.RefusalReason; import com.adyen.httpclient.HTTPClientException; import com.adyen.httpclient.HttpURLConnectionClient; import com.adyen.model.Address; +import com.adyen.model.AuthenticationResultRequest; +import com.adyen.model.AuthenticationResultResponse; import com.adyen.model.FraudCheckResult; import com.adyen.model.Name; import com.adyen.model.PaymentRequest; @@ -47,6 +38,15 @@ import com.adyen.model.ThreeDS2ResultResponse; import com.adyen.service.Payment; import com.adyen.service.exception.ApiException; +import org.junit.Test; + +import java.io.IOException; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Locale; +import java.util.TimeZone; + import static com.adyen.constants.ApiConstants.SelectedBrand.BOLETO_SANTANDER; import static com.adyen.model.PaymentResult.ResultCodeEnum.RECEIVED; import static org.junit.Assert.assertEquals; @@ -245,10 +245,10 @@ public void TestAuthoriseCSEErrorExpiredMocked() throws Exception { @Test public void TestError401Mocked() throws Exception { HttpURLConnectionClient httpURLConnectionClient = mock(HttpURLConnectionClient.class); - HTTPClientException httpClientException = new HTTPClientException(401, "An error occured", new HashMap>(), null); + HTTPClientException httpClientException = new HTTPClientException(401, "An error occured", new HashMap<>(), null); when(httpURLConnectionClient.request(any(String.class), any(String.class), any(Config.class), anyBoolean(), any(RequestOptions.class))).thenThrow(httpClientException); - when(httpURLConnectionClient.request(any(String.class), any(String.class), any(Config.class), anyBoolean(), (RequestOptions) isNull())).thenThrow(httpClientException); + when(httpURLConnectionClient.request(any(String.class), any(String.class), any(Config.class), anyBoolean(), isNull())).thenThrow(httpClientException); Client client = new Client(); client.setHttpClient(httpURLConnectionClient); diff --git a/src/test/java/com/adyen/PayoutTest.java b/src/test/java/com/adyen/PayoutTest.java index b749fd4e7..132ec6281 100644 --- a/src/test/java/com/adyen/PayoutTest.java +++ b/src/test/java/com/adyen/PayoutTest.java @@ -20,14 +20,12 @@ */ package com.adyen; -import com.adyen.model.payout.PayoutRequest; -import com.adyen.model.payout.PayoutResponse; -import com.adyen.service.exception.ApiException; -import org.junit.Test; import com.adyen.model.payout.ConfirmThirdPartyRequest; import com.adyen.model.payout.ConfirmThirdPartyResponse; import com.adyen.model.payout.DeclineThirdPartyRequest; import com.adyen.model.payout.DeclineThirdPartyResponse; +import com.adyen.model.payout.PayoutRequest; +import com.adyen.model.payout.PayoutResponse; import com.adyen.model.payout.StoreDetailAndSubmitRequest; import com.adyen.model.payout.StoreDetailAndSubmitResponse; import com.adyen.model.payout.StoreDetailRequest; @@ -35,11 +33,13 @@ import com.adyen.model.payout.SubmitRequest; import com.adyen.model.payout.SubmitResponse; import com.adyen.service.Payout; +import com.adyen.service.exception.ApiException; +import org.junit.Test; + import static com.adyen.constants.ApiConstants.AdditionalData.FRAUD_MANUAL_REVIEW; import static com.adyen.constants.ApiConstants.AdditionalData.FRAUD_RESULT_TYPE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; public class PayoutTest extends BaseTest { diff --git a/src/test/java/com/adyen/RecurringTest.java b/src/test/java/com/adyen/RecurringTest.java index 88cbdc000..b8cf59852 100644 --- a/src/test/java/com/adyen/RecurringTest.java +++ b/src/test/java/com/adyen/RecurringTest.java @@ -20,8 +20,6 @@ */ package com.adyen; -import java.io.IOException; -import org.junit.Test; import com.adyen.model.recurring.DisableRequest; import com.adyen.model.recurring.DisableResult; import com.adyen.model.recurring.RecurringDetail; @@ -31,6 +29,10 @@ import com.adyen.model.recurring.StoreTokenResult; import com.adyen.service.Recurring; import com.adyen.service.exception.ApiException; +import org.junit.Test; + +import java.io.IOException; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; @@ -106,9 +108,8 @@ public void testDisable803() throws IOException { DisableRequest request = createDisableRequest(); - DisableResult result = null; try { - result = recurring.disable(request); + recurring.disable(request); fail("Exception expected!"); } catch (ApiException e) { assertNotEquals(200, e.getStatusCode()); @@ -138,10 +139,8 @@ public void testStoreToken101() throws IOException { StoreTokenRequest request = createStoreTokenRequest(); - @SuppressWarnings("unused") - StoreTokenResult result = null; try { - result = recurring.storeToken(request); + recurring.storeToken(request); fail("Exception expected!"); } catch (ApiException e) { assertNotEquals(200, e.getStatusCode()); diff --git a/src/test/java/com/adyen/TerminalLocalAPITest.java b/src/test/java/com/adyen/TerminalLocalAPITest.java index c18f0f479..f8d496456 100644 --- a/src/test/java/com/adyen/TerminalLocalAPITest.java +++ b/src/test/java/com/adyen/TerminalLocalAPITest.java @@ -37,7 +37,6 @@ import com.adyen.model.terminal.TerminalAPIRequest; import com.adyen.model.terminal.TerminalAPIResponse; import com.adyen.model.terminal.security.SecurityKey; -import com.adyen.service.TerminalCloudAPI; import com.adyen.service.TerminalLocalAPI; import org.junit.Test; diff --git a/src/test/java/com/adyen/serializer/SaleToAcquirerDataSerializerTest.java b/src/test/java/com/adyen/serializer/SaleToAcquirerDataSerializerTest.java index d15ff4113..9c3c180bc 100644 --- a/src/test/java/com/adyen/serializer/SaleToAcquirerDataSerializerTest.java +++ b/src/test/java/com/adyen/serializer/SaleToAcquirerDataSerializerTest.java @@ -25,7 +25,7 @@ public void testSerialize() { SaleToAcquirerDataSerializer saleToAcquirerDataModelAdapter = new SaleToAcquirerDataSerializer(); SaleToAcquirerData saleToAcquirerData = new SaleToAcquirerData(); - Map metadata = new HashMap(); + Map metadata = new HashMap<>(); metadata.put("key", "value"); saleToAcquirerData.setMetadata(metadata); saleToAcquirerData.setShopperEmail("myemail@mail.com"); @@ -55,7 +55,7 @@ public void testSerialize() { saleToAcquirerData.setApplicationInfo(applicationInfo); saleToAcquirerData.setTenderOption("ReceiptHandler,AllowPartialAuthorisation,AskGratuity"); - Map additionalData = new HashMap(); + Map additionalData = new HashMap<>(); additionalData.put("key.key", "value"); additionalData.put("key.keyTwo", "value2"); saleToAcquirerData.setAdditionalData(additionalData); diff --git a/src/test/java/com/adyen/service/ResourceTest.java b/src/test/java/com/adyen/service/ResourceTest.java index 0ac719aa3..899943242 100644 --- a/src/test/java/com/adyen/service/ResourceTest.java +++ b/src/test/java/com/adyen/service/ResourceTest.java @@ -20,20 +20,21 @@ */ package com.adyen.service; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; import com.adyen.BaseTest; import com.adyen.Client; import com.adyen.Service; import com.adyen.httpclient.ClientInterface; import com.adyen.httpclient.HTTPClientException; import com.adyen.service.exception.ApiException; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + +import java.io.IOException; +import java.util.HashMap; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -71,7 +72,7 @@ public void testRequest() throws Exception { public void testRequestExceptionEmpty() throws IOException, HTTPClientException { try { when(clientInterfaceMock.request("", "request", null, false, null)) - .thenThrow(new HTTPClientException("message", 403, new HashMap>(), null)); + .thenThrow(new HTTPClientException("message", 403, new HashMap<>(), null)); Resource resource = new Resource(serviceMock, "", null); String response = resource.request("request"); From b7c4b3944babad542e0bad46e7b9285cfee54efc Mon Sep 17 00:00:00 2001 From: Simon Michel Date: Fri, 1 May 2020 20:02:40 +0200 Subject: [PATCH 7/9] Revert deprecated methods based on andrei-dediu comment --- .../checkout/DefaultPaymentMethodDetails.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/java/com/adyen/model/checkout/DefaultPaymentMethodDetails.java b/src/main/java/com/adyen/model/checkout/DefaultPaymentMethodDetails.java index 5952dc568..6404e83c4 100755 --- a/src/main/java/com/adyen/model/checkout/DefaultPaymentMethodDetails.java +++ b/src/main/java/com/adyen/model/checkout/DefaultPaymentMethodDetails.java @@ -237,6 +237,22 @@ public DefaultPaymentMethodDetails encryptedSecurityCode(String encryptedSecurit return this; } + /** + * @deprecated This field is deprecated. Use {@link DefaultPaymentMethodDetails#storedPaymentMethodId } instead. + */ + @Deprecated + public String getRecurringDetailReference() { + return recurringDetailReference; + } + + /** + * @deprecated This field is deprecated. Use {@link DefaultPaymentMethodDetails#storedPaymentMethodId } instead. + */ + @Deprecated + public void setRecurringDetailReference(String recurringDetailReference) { + this.recurringDetailReference = recurringDetailReference; + } + /** * @deprecated This field is deprecated. Use {@link DefaultPaymentMethodDetails#storedPaymentMethodId } instead. */ From 6e4e8d78f8b4abed43142c13bb78089eaab4b846 Mon Sep 17 00:00:00 2001 From: Simon Michel Date: Fri, 8 May 2020 15:23:10 +0200 Subject: [PATCH 8/9] Change travis configuration. Remove openjdk7. Add openjdk11. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e33274927..5f5278c0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ dist: trusty jdk: - oraclejdk8 - - openjdk7 + - openjdk11 install: mvn install -Dgpg.skip=true From de222ad7c74bc31295b80d4877b9c6f69c1f3b41 Mon Sep 17 00:00:00 2001 From: Simon Michel Date: Fri, 8 May 2020 15:26:09 +0200 Subject: [PATCH 9/9] Removed openjdk11 in travis configuration --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5f5278c0f..5460d8f6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ dist: trusty jdk: - oraclejdk8 - - openjdk11 install: mvn install -Dgpg.skip=true