From c23309bf3ac64fd092eb8c7a60dd18dbf32fc1a1 Mon Sep 17 00:00:00 2001 From: AdyenAutomationBot <38424300+AdyenAutomationBot@users.noreply.github.com> Date: Mon, 23 Dec 2024 17:13:20 +0100 Subject: [PATCH] false[adyen-sdk-automation] automated change (#1405) Co-authored-by: Djoyke Reijans <115019123+DjoykeAbyah@users.noreply.github.com> --- .../adyen/model/balanceplatform/Amount.java | 16 +- .../adyen/model/balanceplatform/Balance.java | 32 +- .../CounterpartyBankRestriction.java | 8 +- .../CounterpartyTypesRestriction.java | 223 ++++++++++++++ .../PlatformPaymentConfiguration.java | 8 +- .../SourceAccountTypesRestriction.java | 219 +++++++++++++ .../TransactionRuleRestrictions.java | 82 ++++- .../AccountHolderNotificationRequest.java | 42 ++- .../model/configurationwebhooks/Amount.java | 16 +- .../model/configurationwebhooks/Balance.java | 32 +- .../BalanceAccountNotificationRequest.java | 42 ++- .../CardOrderNotificationRequest.java | 42 ++- .../PaymentNotificationRequest.java | 42 ++- .../PlatformPaymentConfiguration.java | 8 +- ...SweepConfigurationNotificationRequest.java | 42 ++- .../com/adyen/model/management/Amount.java | 16 +- .../TerminalConnectivityCellular.java | 59 +++- .../management/UpdatePaymentMethodInfo.java | 54 +++- ...TerminalAssignmentNotificationRequest.java | 291 ++++++++++++++++++ ...erminalAssignmentNotificationResponse.java | 135 ++++++++ .../ReportNotificationRequest.java | 42 ++- 21 files changed, 1365 insertions(+), 86 deletions(-) create mode 100644 src/main/java/com/adyen/model/balanceplatform/CounterpartyTypesRestriction.java create mode 100644 src/main/java/com/adyen/model/balanceplatform/SourceAccountTypesRestriction.java create mode 100644 src/main/java/com/adyen/model/managementwebhooks/TerminalAssignmentNotificationRequest.java create mode 100644 src/main/java/com/adyen/model/managementwebhooks/TerminalAssignmentNotificationResponse.java diff --git a/src/main/java/com/adyen/model/balanceplatform/Amount.java b/src/main/java/com/adyen/model/balanceplatform/Amount.java index b236fe2a2..cd1cd3a9d 100644 --- a/src/main/java/com/adyen/model/balanceplatform/Amount.java +++ b/src/main/java/com/adyen/model/balanceplatform/Amount.java @@ -46,7 +46,7 @@ public Amount() { } /** - * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes). + * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes). * * @param currency * @return the current {@code Amount} instance, allowing for method chaining @@ -57,10 +57,10 @@ public Amount currency(String currency) { } /** - * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes). + * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes). * @return currency */ - @ApiModelProperty(required = true, value = "The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes).") + @ApiModelProperty(required = true, value = "The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes).") @JsonProperty(JSON_PROPERTY_CURRENCY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getCurrency() { @@ -68,7 +68,7 @@ public String getCurrency() { } /** - * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes). + * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes). * * @param currency */ @@ -79,7 +79,7 @@ public void setCurrency(String currency) { } /** - * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes). + * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units). * * @param value * @return the current {@code Amount} instance, allowing for method chaining @@ -90,10 +90,10 @@ public Amount value(Long value) { } /** - * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes). + * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units). * @return value */ - @ApiModelProperty(required = true, value = "The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes).") + @ApiModelProperty(required = true, value = "The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units).") @JsonProperty(JSON_PROPERTY_VALUE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Long getValue() { @@ -101,7 +101,7 @@ public Long getValue() { } /** - * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes). + * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units). * * @param value */ diff --git a/src/main/java/com/adyen/model/balanceplatform/Balance.java b/src/main/java/com/adyen/model/balanceplatform/Balance.java index a864bab5b..958d645ec 100644 --- a/src/main/java/com/adyen/model/balanceplatform/Balance.java +++ b/src/main/java/com/adyen/model/balanceplatform/Balance.java @@ -58,7 +58,7 @@ public Balance() { } /** - * The current balance minus any reserved balance. + * The balance available for use. * * @param available * @return the current {@code Balance} instance, allowing for method chaining @@ -69,10 +69,10 @@ public Balance available(Long available) { } /** - * The current balance minus any reserved balance. + * The balance available for use. * @return available */ - @ApiModelProperty(required = true, value = "The current balance minus any reserved balance.") + @ApiModelProperty(required = true, value = "The balance available for use.") @JsonProperty(JSON_PROPERTY_AVAILABLE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Long getAvailable() { @@ -80,7 +80,7 @@ public Long getAvailable() { } /** - * The current balance minus any reserved balance. + * The balance available for use. * * @param available */ @@ -91,7 +91,7 @@ public void setAvailable(Long available) { } /** - * The current balance of funds in the balance account. These are the funds from all transactions with a value date in the past that have not yet been paid out. + * The sum of transactions that have already been settled. * * @param balance * @return the current {@code Balance} instance, allowing for method chaining @@ -102,10 +102,10 @@ public Balance balance(Long balance) { } /** - * The current balance of funds in the balance account. These are the funds from all transactions with a value date in the past that have not yet been paid out. + * The sum of transactions that have already been settled. * @return balance */ - @ApiModelProperty(required = true, value = "The current balance of funds in the balance account. These are the funds from all transactions with a value date in the past that have not yet been paid out.") + @ApiModelProperty(required = true, value = "The sum of transactions that have already been settled.") @JsonProperty(JSON_PROPERTY_BALANCE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Long getBalance() { @@ -113,7 +113,7 @@ public Long getBalance() { } /** - * The current balance of funds in the balance account. These are the funds from all transactions with a value date in the past that have not yet been paid out. + * The sum of transactions that have already been settled. * * @param balance */ @@ -157,7 +157,7 @@ public void setCurrency(String currency) { } /** - * The amount of funds that Adyen has processed for this account, but will be settled in a future date. For more information, see how to settle funds for users in your [platform](https://docs.adyen.com/platforms/settle-funds) and [marketplace](https://docs.adyen.com/marketplaces/settle-funds). + * The sum of the transactions that will be settled in the future. * * @param pending * @return the current {@code Balance} instance, allowing for method chaining @@ -168,10 +168,10 @@ public Balance pending(Long pending) { } /** - * The amount of funds that Adyen has processed for this account, but will be settled in a future date. For more information, see how to settle funds for users in your [platform](https://docs.adyen.com/platforms/settle-funds) and [marketplace](https://docs.adyen.com/marketplaces/settle-funds). + * The sum of the transactions that will be settled in the future. * @return pending */ - @ApiModelProperty(value = "The amount of funds that Adyen has processed for this account, but will be settled in a future date. For more information, see how to settle funds for users in your [platform](https://docs.adyen.com/platforms/settle-funds) and [marketplace](https://docs.adyen.com/marketplaces/settle-funds).") + @ApiModelProperty(value = "The sum of the transactions that will be settled in the future.") @JsonProperty(JSON_PROPERTY_PENDING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Long getPending() { @@ -179,7 +179,7 @@ public Long getPending() { } /** - * The amount of funds that Adyen has processed for this account, but will be settled in a future date. For more information, see how to settle funds for users in your [platform](https://docs.adyen.com/platforms/settle-funds) and [marketplace](https://docs.adyen.com/marketplaces/settle-funds). + * The sum of the transactions that will be settled in the future. * * @param pending */ @@ -190,7 +190,7 @@ public void setPending(Long pending) { } /** - * The amount reserved for payments that have been [authorised](https://docs.adyen.com/issuing/payment-stages/#authorised), but not yet [captured](https://docs.adyen.com/issuing/payment-stages/#captured) by the merchant. Applies only to [Adyen-issued cards](https://docs.adyen.com/issuing). + * The balance currently held in reserve. * * @param reserved * @return the current {@code Balance} instance, allowing for method chaining @@ -201,10 +201,10 @@ public Balance reserved(Long reserved) { } /** - * The amount reserved for payments that have been [authorised](https://docs.adyen.com/issuing/payment-stages/#authorised), but not yet [captured](https://docs.adyen.com/issuing/payment-stages/#captured) by the merchant. Applies only to [Adyen-issued cards](https://docs.adyen.com/issuing). + * The balance currently held in reserve. * @return reserved */ - @ApiModelProperty(required = true, value = "The amount reserved for payments that have been [authorised](https://docs.adyen.com/issuing/payment-stages/#authorised), but not yet [captured](https://docs.adyen.com/issuing/payment-stages/#captured) by the merchant. Applies only to [Adyen-issued cards](https://docs.adyen.com/issuing).") + @ApiModelProperty(required = true, value = "The balance currently held in reserve.") @JsonProperty(JSON_PROPERTY_RESERVED) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Long getReserved() { @@ -212,7 +212,7 @@ public Long getReserved() { } /** - * The amount reserved for payments that have been [authorised](https://docs.adyen.com/issuing/payment-stages/#authorised), but not yet [captured](https://docs.adyen.com/issuing/payment-stages/#captured) by the merchant. Applies only to [Adyen-issued cards](https://docs.adyen.com/issuing). + * The balance currently held in reserve. * * @param reserved */ diff --git a/src/main/java/com/adyen/model/balanceplatform/CounterpartyBankRestriction.java b/src/main/java/com/adyen/model/balanceplatform/CounterpartyBankRestriction.java index 385191ab1..fd011b6f6 100644 --- a/src/main/java/com/adyen/model/balanceplatform/CounterpartyBankRestriction.java +++ b/src/main/java/com/adyen/model/balanceplatform/CounterpartyBankRestriction.java @@ -82,7 +82,7 @@ public void setOperation(String operation) { } /** - * List of counterparty Bank Institutions and the operation. + * The list of counterparty bank institutions to be evaluated. * * @param value * @return the current {@code CounterpartyBankRestriction} instance, allowing for method chaining @@ -101,10 +101,10 @@ public CounterpartyBankRestriction addValueItem(BankIdentification valueItem) { } /** - * List of counterparty Bank Institutions and the operation. + * The list of counterparty bank institutions to be evaluated. * @return value */ - @ApiModelProperty(value = "List of counterparty Bank Institutions and the operation.") + @ApiModelProperty(value = "The list of counterparty bank institutions to be evaluated.") @JsonProperty(JSON_PROPERTY_VALUE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public List getValue() { @@ -112,7 +112,7 @@ public List getValue() { } /** - * List of counterparty Bank Institutions and the operation. + * The list of counterparty bank institutions to be evaluated. * * @param value */ diff --git a/src/main/java/com/adyen/model/balanceplatform/CounterpartyTypesRestriction.java b/src/main/java/com/adyen/model/balanceplatform/CounterpartyTypesRestriction.java new file mode 100644 index 000000000..930d476d9 --- /dev/null +++ b/src/main/java/com/adyen/model/balanceplatform/CounterpartyTypesRestriction.java @@ -0,0 +1,223 @@ +/* + * Configuration API + * + * The version of the OpenAPI document: 2 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package com.adyen.model.balanceplatform; + +import java.util.Objects; +import java.util.Arrays; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.core.JsonProcessingException; + + +/** + * CounterpartyTypesRestriction + */ +@JsonPropertyOrder({ + CounterpartyTypesRestriction.JSON_PROPERTY_OPERATION, + CounterpartyTypesRestriction.JSON_PROPERTY_VALUE +}) + +public class CounterpartyTypesRestriction { + public static final String JSON_PROPERTY_OPERATION = "operation"; + private String operation; + + /** + * Gets or Sets value + */ + public enum ValueEnum { + BALANCEACCOUNT("balanceAccount"), + + BANKACCOUNT("bankAccount"), + + CARD("card"), + + TRANSFERINSTRUMENT("transferInstrument"); + + private String value; + + ValueEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static ValueEnum fromValue(String value) { + for (ValueEnum b : ValueEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_VALUE = "value"; + private List value = null; + + public CounterpartyTypesRestriction() { + } + + /** + * Defines how the condition must be evaluated. + * + * @param operation + * @return the current {@code CounterpartyTypesRestriction} instance, allowing for method chaining + */ + public CounterpartyTypesRestriction operation(String operation) { + this.operation = operation; + return this; + } + + /** + * Defines how the condition must be evaluated. + * @return operation + */ + @ApiModelProperty(required = true, value = "Defines how the condition must be evaluated.") + @JsonProperty(JSON_PROPERTY_OPERATION) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getOperation() { + return operation; + } + + /** + * Defines how the condition must be evaluated. + * + * @param operation + */ + @JsonProperty(JSON_PROPERTY_OPERATION) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOperation(String operation) { + this.operation = operation; + } + + /** + * The list of counterparty types to be evaluated. + * + * @param value + * @return the current {@code CounterpartyTypesRestriction} instance, allowing for method chaining + */ + public CounterpartyTypesRestriction value(List value) { + this.value = value; + return this; + } + + public CounterpartyTypesRestriction addValueItem(ValueEnum valueItem) { + if (this.value == null) { + this.value = new ArrayList<>(); + } + this.value.add(valueItem); + return this; + } + + /** + * The list of counterparty types to be evaluated. + * @return value + */ + @ApiModelProperty(value = "The list of counterparty types to be evaluated.") + @JsonProperty(JSON_PROPERTY_VALUE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getValue() { + return value; + } + + /** + * The list of counterparty types to be evaluated. + * + * @param value + */ + @JsonProperty(JSON_PROPERTY_VALUE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setValue(List value) { + this.value = value; + } + + /** + * Return true if this CounterpartyTypesRestriction object is equal to o. + */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + CounterpartyTypesRestriction counterpartyTypesRestriction = (CounterpartyTypesRestriction) o; + return Objects.equals(this.operation, counterpartyTypesRestriction.operation) && + Objects.equals(this.value, counterpartyTypesRestriction.value); + } + + @Override + public int hashCode() { + return Objects.hash(operation, value); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class CounterpartyTypesRestriction {\n"); + sb.append(" operation: ").append(toIndentedString(operation)).append("\n"); + sb.append(" value: ").append(toIndentedString(value)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +/** + * Create an instance of CounterpartyTypesRestriction given an JSON string + * + * @param jsonString JSON string + * @return An instance of CounterpartyTypesRestriction + * @throws JsonProcessingException if the JSON string is invalid with respect to CounterpartyTypesRestriction + */ + public static CounterpartyTypesRestriction fromJson(String jsonString) throws JsonProcessingException { + return JSON.getMapper().readValue(jsonString, CounterpartyTypesRestriction.class); + } +/** + * Convert an instance of CounterpartyTypesRestriction to an JSON string + * + * @return JSON string + */ + public String toJson() throws JsonProcessingException { + return JSON.getMapper().writeValueAsString(this); + } +} diff --git a/src/main/java/com/adyen/model/balanceplatform/PlatformPaymentConfiguration.java b/src/main/java/com/adyen/model/balanceplatform/PlatformPaymentConfiguration.java index dbb976aa1..9626dde13 100644 --- a/src/main/java/com/adyen/model/balanceplatform/PlatformPaymentConfiguration.java +++ b/src/main/java/com/adyen/model/balanceplatform/PlatformPaymentConfiguration.java @@ -79,7 +79,7 @@ public void setSalesDayClosingTime(String salesDayClosingTime) { } /** - * Specifies after how many business days the funds in a [settlement batch](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement#settlement-batch) are made available in this balance account. Possible values: **1** to **10**, or **null**. * Setting this value to an integer enables Sales day settlement in this balance account. See how Sales day settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/sales-day-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement). * Setting this value to **null** enables Pass-through settlement in this balance account. See how Pass-through settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/pass-through-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/pass-through-settlement). Default value: **null**. + * Specifies after how many business days the funds in a [settlement batch](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement#settlement-batch) are made available in this balance account. Possible values: **1** to **20**, or **null**. * Setting this value to an integer enables Sales day settlement in this balance account. See how Sales day settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/sales-day-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement). * Setting this value to **null** enables Pass-through settlement in this balance account. See how Pass-through settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/pass-through-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/pass-through-settlement). Default value: **null**. * * @param settlementDelayDays * @return the current {@code PlatformPaymentConfiguration} instance, allowing for method chaining @@ -90,10 +90,10 @@ public PlatformPaymentConfiguration settlementDelayDays(Integer settlementDelayD } /** - * Specifies after how many business days the funds in a [settlement batch](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement#settlement-batch) are made available in this balance account. Possible values: **1** to **10**, or **null**. * Setting this value to an integer enables Sales day settlement in this balance account. See how Sales day settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/sales-day-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement). * Setting this value to **null** enables Pass-through settlement in this balance account. See how Pass-through settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/pass-through-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/pass-through-settlement). Default value: **null**. + * Specifies after how many business days the funds in a [settlement batch](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement#settlement-batch) are made available in this balance account. Possible values: **1** to **20**, or **null**. * Setting this value to an integer enables Sales day settlement in this balance account. See how Sales day settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/sales-day-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement). * Setting this value to **null** enables Pass-through settlement in this balance account. See how Pass-through settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/pass-through-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/pass-through-settlement). Default value: **null**. * @return settlementDelayDays */ - @ApiModelProperty(value = "Specifies after how many business days the funds in a [settlement batch](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement#settlement-batch) are made available in this balance account. Possible values: **1** to **10**, or **null**. * Setting this value to an integer enables Sales day settlement in this balance account. See how Sales day settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/sales-day-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement). * Setting this value to **null** enables Pass-through settlement in this balance account. See how Pass-through settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/pass-through-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/pass-through-settlement). Default value: **null**.") + @ApiModelProperty(value = "Specifies after how many business days the funds in a [settlement batch](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement#settlement-batch) are made available in this balance account. Possible values: **1** to **20**, or **null**. * Setting this value to an integer enables Sales day settlement in this balance account. See how Sales day settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/sales-day-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement). * Setting this value to **null** enables Pass-through settlement in this balance account. See how Pass-through settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/pass-through-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/pass-through-settlement). Default value: **null**.") @JsonProperty(JSON_PROPERTY_SETTLEMENT_DELAY_DAYS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getSettlementDelayDays() { @@ -101,7 +101,7 @@ public Integer getSettlementDelayDays() { } /** - * Specifies after how many business days the funds in a [settlement batch](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement#settlement-batch) are made available in this balance account. Possible values: **1** to **10**, or **null**. * Setting this value to an integer enables Sales day settlement in this balance account. See how Sales day settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/sales-day-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement). * Setting this value to **null** enables Pass-through settlement in this balance account. See how Pass-through settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/pass-through-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/pass-through-settlement). Default value: **null**. + * Specifies after how many business days the funds in a [settlement batch](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement#settlement-batch) are made available in this balance account. Possible values: **1** to **20**, or **null**. * Setting this value to an integer enables Sales day settlement in this balance account. See how Sales day settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/sales-day-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement). * Setting this value to **null** enables Pass-through settlement in this balance account. See how Pass-through settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/pass-through-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/pass-through-settlement). Default value: **null**. * * @param settlementDelayDays */ diff --git a/src/main/java/com/adyen/model/balanceplatform/SourceAccountTypesRestriction.java b/src/main/java/com/adyen/model/balanceplatform/SourceAccountTypesRestriction.java new file mode 100644 index 000000000..d7d56329f --- /dev/null +++ b/src/main/java/com/adyen/model/balanceplatform/SourceAccountTypesRestriction.java @@ -0,0 +1,219 @@ +/* + * Configuration API + * + * The version of the OpenAPI document: 2 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package com.adyen.model.balanceplatform; + +import java.util.Objects; +import java.util.Arrays; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.core.JsonProcessingException; + + +/** + * SourceAccountTypesRestriction + */ +@JsonPropertyOrder({ + SourceAccountTypesRestriction.JSON_PROPERTY_OPERATION, + SourceAccountTypesRestriction.JSON_PROPERTY_VALUE +}) + +public class SourceAccountTypesRestriction { + public static final String JSON_PROPERTY_OPERATION = "operation"; + private String operation; + + /** + * Gets or Sets value + */ + public enum ValueEnum { + BALANCEACCOUNT("balanceAccount"), + + BUSINESSACCOUNT("businessAccount"); + + private String value; + + ValueEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static ValueEnum fromValue(String value) { + for (ValueEnum b : ValueEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_VALUE = "value"; + private List value = null; + + public SourceAccountTypesRestriction() { + } + + /** + * Defines how the condition must be evaluated. + * + * @param operation + * @return the current {@code SourceAccountTypesRestriction} instance, allowing for method chaining + */ + public SourceAccountTypesRestriction operation(String operation) { + this.operation = operation; + return this; + } + + /** + * Defines how the condition must be evaluated. + * @return operation + */ + @ApiModelProperty(required = true, value = "Defines how the condition must be evaluated.") + @JsonProperty(JSON_PROPERTY_OPERATION) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getOperation() { + return operation; + } + + /** + * Defines how the condition must be evaluated. + * + * @param operation + */ + @JsonProperty(JSON_PROPERTY_OPERATION) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOperation(String operation) { + this.operation = operation; + } + + /** + * The list of source account types to be evaluated. + * + * @param value + * @return the current {@code SourceAccountTypesRestriction} instance, allowing for method chaining + */ + public SourceAccountTypesRestriction value(List value) { + this.value = value; + return this; + } + + public SourceAccountTypesRestriction addValueItem(ValueEnum valueItem) { + if (this.value == null) { + this.value = new ArrayList<>(); + } + this.value.add(valueItem); + return this; + } + + /** + * The list of source account types to be evaluated. + * @return value + */ + @ApiModelProperty(value = "The list of source account types to be evaluated.") + @JsonProperty(JSON_PROPERTY_VALUE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public List getValue() { + return value; + } + + /** + * The list of source account types to be evaluated. + * + * @param value + */ + @JsonProperty(JSON_PROPERTY_VALUE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setValue(List value) { + this.value = value; + } + + /** + * Return true if this SourceAccountTypesRestriction object is equal to o. + */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + SourceAccountTypesRestriction sourceAccountTypesRestriction = (SourceAccountTypesRestriction) o; + return Objects.equals(this.operation, sourceAccountTypesRestriction.operation) && + Objects.equals(this.value, sourceAccountTypesRestriction.value); + } + + @Override + public int hashCode() { + return Objects.hash(operation, value); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class SourceAccountTypesRestriction {\n"); + sb.append(" operation: ").append(toIndentedString(operation)).append("\n"); + sb.append(" value: ").append(toIndentedString(value)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +/** + * Create an instance of SourceAccountTypesRestriction given an JSON string + * + * @param jsonString JSON string + * @return An instance of SourceAccountTypesRestriction + * @throws JsonProcessingException if the JSON string is invalid with respect to SourceAccountTypesRestriction + */ + public static SourceAccountTypesRestriction fromJson(String jsonString) throws JsonProcessingException { + return JSON.getMapper().readValue(jsonString, SourceAccountTypesRestriction.class); + } +/** + * Convert an instance of SourceAccountTypesRestriction to an JSON string + * + * @return JSON string + */ + public String toJson() throws JsonProcessingException { + return JSON.getMapper().writeValueAsString(this); + } +} diff --git a/src/main/java/com/adyen/model/balanceplatform/TransactionRuleRestrictions.java b/src/main/java/com/adyen/model/balanceplatform/TransactionRuleRestrictions.java index e187a7f36..a3925b26b 100644 --- a/src/main/java/com/adyen/model/balanceplatform/TransactionRuleRestrictions.java +++ b/src/main/java/com/adyen/model/balanceplatform/TransactionRuleRestrictions.java @@ -19,6 +19,7 @@ import com.adyen.model.balanceplatform.ActiveNetworkTokensRestriction; import com.adyen.model.balanceplatform.BrandVariantsRestriction; import com.adyen.model.balanceplatform.CounterpartyBankRestriction; +import com.adyen.model.balanceplatform.CounterpartyTypesRestriction; import com.adyen.model.balanceplatform.CountriesRestriction; import com.adyen.model.balanceplatform.DayOfWeekRestriction; import com.adyen.model.balanceplatform.DifferentCurrenciesRestriction; @@ -33,6 +34,7 @@ import com.adyen.model.balanceplatform.RiskScoresRestriction; import com.adyen.model.balanceplatform.SameAmountRestriction; import com.adyen.model.balanceplatform.SameCounterpartyRestriction; +import com.adyen.model.balanceplatform.SourceAccountTypesRestriction; import com.adyen.model.balanceplatform.TimeOfDayRestriction; import com.adyen.model.balanceplatform.TotalAmountRestriction; import com.fasterxml.jackson.annotation.JsonInclude; @@ -53,6 +55,7 @@ TransactionRuleRestrictions.JSON_PROPERTY_ACTIVE_NETWORK_TOKENS, TransactionRuleRestrictions.JSON_PROPERTY_BRAND_VARIANTS, TransactionRuleRestrictions.JSON_PROPERTY_COUNTERPARTY_BANK, + TransactionRuleRestrictions.JSON_PROPERTY_COUNTERPARTY_TYPES, TransactionRuleRestrictions.JSON_PROPERTY_COUNTRIES, TransactionRuleRestrictions.JSON_PROPERTY_DAY_OF_WEEK, TransactionRuleRestrictions.JSON_PROPERTY_DIFFERENT_CURRENCIES, @@ -67,6 +70,7 @@ TransactionRuleRestrictions.JSON_PROPERTY_RISK_SCORES, TransactionRuleRestrictions.JSON_PROPERTY_SAME_AMOUNT_RESTRICTION, TransactionRuleRestrictions.JSON_PROPERTY_SAME_COUNTERPARTY_RESTRICTION, + TransactionRuleRestrictions.JSON_PROPERTY_SOURCE_ACCOUNT_TYPES, TransactionRuleRestrictions.JSON_PROPERTY_TIME_OF_DAY, TransactionRuleRestrictions.JSON_PROPERTY_TOTAL_AMOUNT }) @@ -81,6 +85,9 @@ public class TransactionRuleRestrictions { public static final String JSON_PROPERTY_COUNTERPARTY_BANK = "counterpartyBank"; private CounterpartyBankRestriction counterpartyBank; + public static final String JSON_PROPERTY_COUNTERPARTY_TYPES = "counterpartyTypes"; + private CounterpartyTypesRestriction counterpartyTypes; + public static final String JSON_PROPERTY_COUNTRIES = "countries"; private CountriesRestriction countries; @@ -123,6 +130,9 @@ public class TransactionRuleRestrictions { public static final String JSON_PROPERTY_SAME_COUNTERPARTY_RESTRICTION = "sameCounterpartyRestriction"; private SameCounterpartyRestriction sameCounterpartyRestriction; + public static final String JSON_PROPERTY_SOURCE_ACCOUNT_TYPES = "sourceAccountTypes"; + private SourceAccountTypesRestriction sourceAccountTypes; + public static final String JSON_PROPERTY_TIME_OF_DAY = "timeOfDay"; private TimeOfDayRestriction timeOfDay; @@ -231,6 +241,39 @@ public void setCounterpartyBank(CounterpartyBankRestriction counterpartyBank) { this.counterpartyBank = counterpartyBank; } + /** + * counterpartyTypes + * + * @param counterpartyTypes + * @return the current {@code TransactionRuleRestrictions} instance, allowing for method chaining + */ + public TransactionRuleRestrictions counterpartyTypes(CounterpartyTypesRestriction counterpartyTypes) { + this.counterpartyTypes = counterpartyTypes; + return this; + } + + /** + * counterpartyTypes + * @return counterpartyTypes + */ + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_COUNTERPARTY_TYPES) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public CounterpartyTypesRestriction getCounterpartyTypes() { + return counterpartyTypes; + } + + /** + * counterpartyTypes + * + * @param counterpartyTypes + */ + @JsonProperty(JSON_PROPERTY_COUNTERPARTY_TYPES) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setCounterpartyTypes(CounterpartyTypesRestriction counterpartyTypes) { + this.counterpartyTypes = counterpartyTypes; + } + /** * countries * @@ -693,6 +736,39 @@ public void setSameCounterpartyRestriction(SameCounterpartyRestriction sameCount this.sameCounterpartyRestriction = sameCounterpartyRestriction; } + /** + * sourceAccountTypes + * + * @param sourceAccountTypes + * @return the current {@code TransactionRuleRestrictions} instance, allowing for method chaining + */ + public TransactionRuleRestrictions sourceAccountTypes(SourceAccountTypesRestriction sourceAccountTypes) { + this.sourceAccountTypes = sourceAccountTypes; + return this; + } + + /** + * sourceAccountTypes + * @return sourceAccountTypes + */ + @ApiModelProperty(value = "") + @JsonProperty(JSON_PROPERTY_SOURCE_ACCOUNT_TYPES) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public SourceAccountTypesRestriction getSourceAccountTypes() { + return sourceAccountTypes; + } + + /** + * sourceAccountTypes + * + * @param sourceAccountTypes + */ + @JsonProperty(JSON_PROPERTY_SOURCE_ACCOUNT_TYPES) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setSourceAccountTypes(SourceAccountTypesRestriction sourceAccountTypes) { + this.sourceAccountTypes = sourceAccountTypes; + } + /** * timeOfDay * @@ -774,6 +850,7 @@ public boolean equals(Object o) { return Objects.equals(this.activeNetworkTokens, transactionRuleRestrictions.activeNetworkTokens) && Objects.equals(this.brandVariants, transactionRuleRestrictions.brandVariants) && Objects.equals(this.counterpartyBank, transactionRuleRestrictions.counterpartyBank) && + Objects.equals(this.counterpartyTypes, transactionRuleRestrictions.counterpartyTypes) && Objects.equals(this.countries, transactionRuleRestrictions.countries) && Objects.equals(this.dayOfWeek, transactionRuleRestrictions.dayOfWeek) && Objects.equals(this.differentCurrencies, transactionRuleRestrictions.differentCurrencies) && @@ -788,13 +865,14 @@ public boolean equals(Object o) { Objects.equals(this.riskScores, transactionRuleRestrictions.riskScores) && Objects.equals(this.sameAmountRestriction, transactionRuleRestrictions.sameAmountRestriction) && Objects.equals(this.sameCounterpartyRestriction, transactionRuleRestrictions.sameCounterpartyRestriction) && + Objects.equals(this.sourceAccountTypes, transactionRuleRestrictions.sourceAccountTypes) && Objects.equals(this.timeOfDay, transactionRuleRestrictions.timeOfDay) && Objects.equals(this.totalAmount, transactionRuleRestrictions.totalAmount); } @Override public int hashCode() { - return Objects.hash(activeNetworkTokens, brandVariants, counterpartyBank, countries, dayOfWeek, differentCurrencies, entryModes, internationalTransaction, matchingTransactions, matchingValues, mccs, merchantNames, merchants, processingTypes, riskScores, sameAmountRestriction, sameCounterpartyRestriction, timeOfDay, totalAmount); + return Objects.hash(activeNetworkTokens, brandVariants, counterpartyBank, counterpartyTypes, countries, dayOfWeek, differentCurrencies, entryModes, internationalTransaction, matchingTransactions, matchingValues, mccs, merchantNames, merchants, processingTypes, riskScores, sameAmountRestriction, sameCounterpartyRestriction, sourceAccountTypes, timeOfDay, totalAmount); } @Override @@ -804,6 +882,7 @@ public String toString() { sb.append(" activeNetworkTokens: ").append(toIndentedString(activeNetworkTokens)).append("\n"); sb.append(" brandVariants: ").append(toIndentedString(brandVariants)).append("\n"); sb.append(" counterpartyBank: ").append(toIndentedString(counterpartyBank)).append("\n"); + sb.append(" counterpartyTypes: ").append(toIndentedString(counterpartyTypes)).append("\n"); sb.append(" countries: ").append(toIndentedString(countries)).append("\n"); sb.append(" dayOfWeek: ").append(toIndentedString(dayOfWeek)).append("\n"); sb.append(" differentCurrencies: ").append(toIndentedString(differentCurrencies)).append("\n"); @@ -818,6 +897,7 @@ public String toString() { sb.append(" riskScores: ").append(toIndentedString(riskScores)).append("\n"); sb.append(" sameAmountRestriction: ").append(toIndentedString(sameAmountRestriction)).append("\n"); sb.append(" sameCounterpartyRestriction: ").append(toIndentedString(sameCounterpartyRestriction)).append("\n"); + sb.append(" sourceAccountTypes: ").append(toIndentedString(sourceAccountTypes)).append("\n"); sb.append(" timeOfDay: ").append(toIndentedString(timeOfDay)).append("\n"); sb.append(" totalAmount: ").append(toIndentedString(totalAmount)).append("\n"); sb.append("}"); diff --git a/src/main/java/com/adyen/model/configurationwebhooks/AccountHolderNotificationRequest.java b/src/main/java/com/adyen/model/configurationwebhooks/AccountHolderNotificationRequest.java index 15251e177..b2154e38d 100644 --- a/src/main/java/com/adyen/model/configurationwebhooks/AccountHolderNotificationRequest.java +++ b/src/main/java/com/adyen/model/configurationwebhooks/AccountHolderNotificationRequest.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.time.OffsetDateTime; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.core.JsonProcessingException; @@ -34,6 +35,7 @@ @JsonPropertyOrder({ AccountHolderNotificationRequest.JSON_PROPERTY_DATA, AccountHolderNotificationRequest.JSON_PROPERTY_ENVIRONMENT, + AccountHolderNotificationRequest.JSON_PROPERTY_TIMESTAMP, AccountHolderNotificationRequest.JSON_PROPERTY_TYPE }) @@ -44,6 +46,9 @@ public class AccountHolderNotificationRequest { public static final String JSON_PROPERTY_ENVIRONMENT = "environment"; private String environment; + public static final String JSON_PROPERTY_TIMESTAMP = "timestamp"; + private OffsetDateTime timestamp; + /** * Type of webhook. */ @@ -151,6 +156,39 @@ public void setEnvironment(String environment) { this.environment = environment; } + /** + * When the event was queued. + * + * @param timestamp + * @return the current {@code AccountHolderNotificationRequest} instance, allowing for method chaining + */ + public AccountHolderNotificationRequest timestamp(OffsetDateTime timestamp) { + this.timestamp = timestamp; + return this; + } + + /** + * When the event was queued. + * @return timestamp + */ + @ApiModelProperty(value = "When the event was queued.") + @JsonProperty(JSON_PROPERTY_TIMESTAMP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public OffsetDateTime getTimestamp() { + return timestamp; + } + + /** + * When the event was queued. + * + * @param timestamp + */ + @JsonProperty(JSON_PROPERTY_TIMESTAMP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setTimestamp(OffsetDateTime timestamp) { + this.timestamp = timestamp; + } + /** * Type of webhook. * @@ -198,12 +236,13 @@ public boolean equals(Object o) { AccountHolderNotificationRequest accountHolderNotificationRequest = (AccountHolderNotificationRequest) o; return Objects.equals(this.data, accountHolderNotificationRequest.data) && Objects.equals(this.environment, accountHolderNotificationRequest.environment) && + Objects.equals(this.timestamp, accountHolderNotificationRequest.timestamp) && Objects.equals(this.type, accountHolderNotificationRequest.type); } @Override public int hashCode() { - return Objects.hash(data, environment, type); + return Objects.hash(data, environment, timestamp, type); } @Override @@ -212,6 +251,7 @@ public String toString() { sb.append("class AccountHolderNotificationRequest {\n"); sb.append(" data: ").append(toIndentedString(data)).append("\n"); sb.append(" environment: ").append(toIndentedString(environment)).append("\n"); + sb.append(" timestamp: ").append(toIndentedString(timestamp)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/src/main/java/com/adyen/model/configurationwebhooks/Amount.java b/src/main/java/com/adyen/model/configurationwebhooks/Amount.java index c57902e2c..2a60ffcc1 100644 --- a/src/main/java/com/adyen/model/configurationwebhooks/Amount.java +++ b/src/main/java/com/adyen/model/configurationwebhooks/Amount.java @@ -46,7 +46,7 @@ public Amount() { } /** - * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes). + * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes). * * @param currency * @return the current {@code Amount} instance, allowing for method chaining @@ -57,10 +57,10 @@ public Amount currency(String currency) { } /** - * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes). + * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes). * @return currency */ - @ApiModelProperty(required = true, value = "The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes).") + @ApiModelProperty(required = true, value = "The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes).") @JsonProperty(JSON_PROPERTY_CURRENCY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getCurrency() { @@ -68,7 +68,7 @@ public String getCurrency() { } /** - * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes). + * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes). * * @param currency */ @@ -79,7 +79,7 @@ public void setCurrency(String currency) { } /** - * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes). + * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units). * * @param value * @return the current {@code Amount} instance, allowing for method chaining @@ -90,10 +90,10 @@ public Amount value(Long value) { } /** - * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes). + * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units). * @return value */ - @ApiModelProperty(required = true, value = "The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes).") + @ApiModelProperty(required = true, value = "The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units).") @JsonProperty(JSON_PROPERTY_VALUE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Long getValue() { @@ -101,7 +101,7 @@ public Long getValue() { } /** - * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes). + * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units). * * @param value */ diff --git a/src/main/java/com/adyen/model/configurationwebhooks/Balance.java b/src/main/java/com/adyen/model/configurationwebhooks/Balance.java index 5e2eb4c7e..091256560 100644 --- a/src/main/java/com/adyen/model/configurationwebhooks/Balance.java +++ b/src/main/java/com/adyen/model/configurationwebhooks/Balance.java @@ -58,7 +58,7 @@ public Balance() { } /** - * The current balance minus any reserved balance. + * The balance available for use. * * @param available * @return the current {@code Balance} instance, allowing for method chaining @@ -69,10 +69,10 @@ public Balance available(Long available) { } /** - * The current balance minus any reserved balance. + * The balance available for use. * @return available */ - @ApiModelProperty(required = true, value = "The current balance minus any reserved balance.") + @ApiModelProperty(required = true, value = "The balance available for use.") @JsonProperty(JSON_PROPERTY_AVAILABLE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Long getAvailable() { @@ -80,7 +80,7 @@ public Long getAvailable() { } /** - * The current balance minus any reserved balance. + * The balance available for use. * * @param available */ @@ -91,7 +91,7 @@ public void setAvailable(Long available) { } /** - * The current balance of funds in the balance account. These are the funds from all transactions with a value date in the past that have not yet been paid out. + * The sum of transactions that have already been settled. * * @param balance * @return the current {@code Balance} instance, allowing for method chaining @@ -102,10 +102,10 @@ public Balance balance(Long balance) { } /** - * The current balance of funds in the balance account. These are the funds from all transactions with a value date in the past that have not yet been paid out. + * The sum of transactions that have already been settled. * @return balance */ - @ApiModelProperty(required = true, value = "The current balance of funds in the balance account. These are the funds from all transactions with a value date in the past that have not yet been paid out.") + @ApiModelProperty(required = true, value = "The sum of transactions that have already been settled.") @JsonProperty(JSON_PROPERTY_BALANCE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Long getBalance() { @@ -113,7 +113,7 @@ public Long getBalance() { } /** - * The current balance of funds in the balance account. These are the funds from all transactions with a value date in the past that have not yet been paid out. + * The sum of transactions that have already been settled. * * @param balance */ @@ -157,7 +157,7 @@ public void setCurrency(String currency) { } /** - * The amount of funds that Adyen has processed for this account, but will be settled in a future date. For more information, see how to settle funds for users in your [platform](https://docs.adyen.com/platforms/settle-funds) and [marketplace](https://docs.adyen.com/marketplaces/settle-funds). + * The sum of the transactions that will be settled in the future. * * @param pending * @return the current {@code Balance} instance, allowing for method chaining @@ -168,10 +168,10 @@ public Balance pending(Long pending) { } /** - * The amount of funds that Adyen has processed for this account, but will be settled in a future date. For more information, see how to settle funds for users in your [platform](https://docs.adyen.com/platforms/settle-funds) and [marketplace](https://docs.adyen.com/marketplaces/settle-funds). + * The sum of the transactions that will be settled in the future. * @return pending */ - @ApiModelProperty(value = "The amount of funds that Adyen has processed for this account, but will be settled in a future date. For more information, see how to settle funds for users in your [platform](https://docs.adyen.com/platforms/settle-funds) and [marketplace](https://docs.adyen.com/marketplaces/settle-funds).") + @ApiModelProperty(value = "The sum of the transactions that will be settled in the future.") @JsonProperty(JSON_PROPERTY_PENDING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Long getPending() { @@ -179,7 +179,7 @@ public Long getPending() { } /** - * The amount of funds that Adyen has processed for this account, but will be settled in a future date. For more information, see how to settle funds for users in your [platform](https://docs.adyen.com/platforms/settle-funds) and [marketplace](https://docs.adyen.com/marketplaces/settle-funds). + * The sum of the transactions that will be settled in the future. * * @param pending */ @@ -190,7 +190,7 @@ public void setPending(Long pending) { } /** - * The amount reserved for payments that have been [authorised](https://docs.adyen.com/issuing/payment-stages/#authorised), but not yet [captured](https://docs.adyen.com/issuing/payment-stages/#captured) by the merchant. Applies only to [Adyen-issued cards](https://docs.adyen.com/issuing). + * The balance currently held in reserve. * * @param reserved * @return the current {@code Balance} instance, allowing for method chaining @@ -201,10 +201,10 @@ public Balance reserved(Long reserved) { } /** - * The amount reserved for payments that have been [authorised](https://docs.adyen.com/issuing/payment-stages/#authorised), but not yet [captured](https://docs.adyen.com/issuing/payment-stages/#captured) by the merchant. Applies only to [Adyen-issued cards](https://docs.adyen.com/issuing). + * The balance currently held in reserve. * @return reserved */ - @ApiModelProperty(required = true, value = "The amount reserved for payments that have been [authorised](https://docs.adyen.com/issuing/payment-stages/#authorised), but not yet [captured](https://docs.adyen.com/issuing/payment-stages/#captured) by the merchant. Applies only to [Adyen-issued cards](https://docs.adyen.com/issuing).") + @ApiModelProperty(required = true, value = "The balance currently held in reserve.") @JsonProperty(JSON_PROPERTY_RESERVED) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Long getReserved() { @@ -212,7 +212,7 @@ public Long getReserved() { } /** - * The amount reserved for payments that have been [authorised](https://docs.adyen.com/issuing/payment-stages/#authorised), but not yet [captured](https://docs.adyen.com/issuing/payment-stages/#captured) by the merchant. Applies only to [Adyen-issued cards](https://docs.adyen.com/issuing). + * The balance currently held in reserve. * * @param reserved */ diff --git a/src/main/java/com/adyen/model/configurationwebhooks/BalanceAccountNotificationRequest.java b/src/main/java/com/adyen/model/configurationwebhooks/BalanceAccountNotificationRequest.java index 1a44346fc..4000c3e4e 100644 --- a/src/main/java/com/adyen/model/configurationwebhooks/BalanceAccountNotificationRequest.java +++ b/src/main/java/com/adyen/model/configurationwebhooks/BalanceAccountNotificationRequest.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.time.OffsetDateTime; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.core.JsonProcessingException; @@ -34,6 +35,7 @@ @JsonPropertyOrder({ BalanceAccountNotificationRequest.JSON_PROPERTY_DATA, BalanceAccountNotificationRequest.JSON_PROPERTY_ENVIRONMENT, + BalanceAccountNotificationRequest.JSON_PROPERTY_TIMESTAMP, BalanceAccountNotificationRequest.JSON_PROPERTY_TYPE }) @@ -44,6 +46,9 @@ public class BalanceAccountNotificationRequest { public static final String JSON_PROPERTY_ENVIRONMENT = "environment"; private String environment; + public static final String JSON_PROPERTY_TIMESTAMP = "timestamp"; + private OffsetDateTime timestamp; + /** * Type of webhook. */ @@ -151,6 +156,39 @@ public void setEnvironment(String environment) { this.environment = environment; } + /** + * When the event was queued. + * + * @param timestamp + * @return the current {@code BalanceAccountNotificationRequest} instance, allowing for method chaining + */ + public BalanceAccountNotificationRequest timestamp(OffsetDateTime timestamp) { + this.timestamp = timestamp; + return this; + } + + /** + * When the event was queued. + * @return timestamp + */ + @ApiModelProperty(value = "When the event was queued.") + @JsonProperty(JSON_PROPERTY_TIMESTAMP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public OffsetDateTime getTimestamp() { + return timestamp; + } + + /** + * When the event was queued. + * + * @param timestamp + */ + @JsonProperty(JSON_PROPERTY_TIMESTAMP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setTimestamp(OffsetDateTime timestamp) { + this.timestamp = timestamp; + } + /** * Type of webhook. * @@ -198,12 +236,13 @@ public boolean equals(Object o) { BalanceAccountNotificationRequest balanceAccountNotificationRequest = (BalanceAccountNotificationRequest) o; return Objects.equals(this.data, balanceAccountNotificationRequest.data) && Objects.equals(this.environment, balanceAccountNotificationRequest.environment) && + Objects.equals(this.timestamp, balanceAccountNotificationRequest.timestamp) && Objects.equals(this.type, balanceAccountNotificationRequest.type); } @Override public int hashCode() { - return Objects.hash(data, environment, type); + return Objects.hash(data, environment, timestamp, type); } @Override @@ -212,6 +251,7 @@ public String toString() { sb.append("class BalanceAccountNotificationRequest {\n"); sb.append(" data: ").append(toIndentedString(data)).append("\n"); sb.append(" environment: ").append(toIndentedString(environment)).append("\n"); + sb.append(" timestamp: ").append(toIndentedString(timestamp)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/src/main/java/com/adyen/model/configurationwebhooks/CardOrderNotificationRequest.java b/src/main/java/com/adyen/model/configurationwebhooks/CardOrderNotificationRequest.java index 59b3b2eaa..34f64fdc9 100644 --- a/src/main/java/com/adyen/model/configurationwebhooks/CardOrderNotificationRequest.java +++ b/src/main/java/com/adyen/model/configurationwebhooks/CardOrderNotificationRequest.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.time.OffsetDateTime; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.core.JsonProcessingException; @@ -34,6 +35,7 @@ @JsonPropertyOrder({ CardOrderNotificationRequest.JSON_PROPERTY_DATA, CardOrderNotificationRequest.JSON_PROPERTY_ENVIRONMENT, + CardOrderNotificationRequest.JSON_PROPERTY_TIMESTAMP, CardOrderNotificationRequest.JSON_PROPERTY_TYPE }) @@ -44,6 +46,9 @@ public class CardOrderNotificationRequest { public static final String JSON_PROPERTY_ENVIRONMENT = "environment"; private String environment; + public static final String JSON_PROPERTY_TIMESTAMP = "timestamp"; + private OffsetDateTime timestamp; + /** * Type of webhook. */ @@ -151,6 +156,39 @@ public void setEnvironment(String environment) { this.environment = environment; } + /** + * When the event was queued. + * + * @param timestamp + * @return the current {@code CardOrderNotificationRequest} instance, allowing for method chaining + */ + public CardOrderNotificationRequest timestamp(OffsetDateTime timestamp) { + this.timestamp = timestamp; + return this; + } + + /** + * When the event was queued. + * @return timestamp + */ + @ApiModelProperty(value = "When the event was queued.") + @JsonProperty(JSON_PROPERTY_TIMESTAMP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public OffsetDateTime getTimestamp() { + return timestamp; + } + + /** + * When the event was queued. + * + * @param timestamp + */ + @JsonProperty(JSON_PROPERTY_TIMESTAMP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setTimestamp(OffsetDateTime timestamp) { + this.timestamp = timestamp; + } + /** * Type of webhook. * @@ -198,12 +236,13 @@ public boolean equals(Object o) { CardOrderNotificationRequest cardOrderNotificationRequest = (CardOrderNotificationRequest) o; return Objects.equals(this.data, cardOrderNotificationRequest.data) && Objects.equals(this.environment, cardOrderNotificationRequest.environment) && + Objects.equals(this.timestamp, cardOrderNotificationRequest.timestamp) && Objects.equals(this.type, cardOrderNotificationRequest.type); } @Override public int hashCode() { - return Objects.hash(data, environment, type); + return Objects.hash(data, environment, timestamp, type); } @Override @@ -212,6 +251,7 @@ public String toString() { sb.append("class CardOrderNotificationRequest {\n"); sb.append(" data: ").append(toIndentedString(data)).append("\n"); sb.append(" environment: ").append(toIndentedString(environment)).append("\n"); + sb.append(" timestamp: ").append(toIndentedString(timestamp)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/src/main/java/com/adyen/model/configurationwebhooks/PaymentNotificationRequest.java b/src/main/java/com/adyen/model/configurationwebhooks/PaymentNotificationRequest.java index 32a90e644..770b8758c 100644 --- a/src/main/java/com/adyen/model/configurationwebhooks/PaymentNotificationRequest.java +++ b/src/main/java/com/adyen/model/configurationwebhooks/PaymentNotificationRequest.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.time.OffsetDateTime; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.core.JsonProcessingException; @@ -34,6 +35,7 @@ @JsonPropertyOrder({ PaymentNotificationRequest.JSON_PROPERTY_DATA, PaymentNotificationRequest.JSON_PROPERTY_ENVIRONMENT, + PaymentNotificationRequest.JSON_PROPERTY_TIMESTAMP, PaymentNotificationRequest.JSON_PROPERTY_TYPE }) @@ -44,6 +46,9 @@ public class PaymentNotificationRequest { public static final String JSON_PROPERTY_ENVIRONMENT = "environment"; private String environment; + public static final String JSON_PROPERTY_TIMESTAMP = "timestamp"; + private OffsetDateTime timestamp; + /** * Type of webhook. */ @@ -151,6 +156,39 @@ public void setEnvironment(String environment) { this.environment = environment; } + /** + * When the event was queued. + * + * @param timestamp + * @return the current {@code PaymentNotificationRequest} instance, allowing for method chaining + */ + public PaymentNotificationRequest timestamp(OffsetDateTime timestamp) { + this.timestamp = timestamp; + return this; + } + + /** + * When the event was queued. + * @return timestamp + */ + @ApiModelProperty(value = "When the event was queued.") + @JsonProperty(JSON_PROPERTY_TIMESTAMP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public OffsetDateTime getTimestamp() { + return timestamp; + } + + /** + * When the event was queued. + * + * @param timestamp + */ + @JsonProperty(JSON_PROPERTY_TIMESTAMP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setTimestamp(OffsetDateTime timestamp) { + this.timestamp = timestamp; + } + /** * Type of webhook. * @@ -198,12 +236,13 @@ public boolean equals(Object o) { PaymentNotificationRequest paymentNotificationRequest = (PaymentNotificationRequest) o; return Objects.equals(this.data, paymentNotificationRequest.data) && Objects.equals(this.environment, paymentNotificationRequest.environment) && + Objects.equals(this.timestamp, paymentNotificationRequest.timestamp) && Objects.equals(this.type, paymentNotificationRequest.type); } @Override public int hashCode() { - return Objects.hash(data, environment, type); + return Objects.hash(data, environment, timestamp, type); } @Override @@ -212,6 +251,7 @@ public String toString() { sb.append("class PaymentNotificationRequest {\n"); sb.append(" data: ").append(toIndentedString(data)).append("\n"); sb.append(" environment: ").append(toIndentedString(environment)).append("\n"); + sb.append(" timestamp: ").append(toIndentedString(timestamp)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/src/main/java/com/adyen/model/configurationwebhooks/PlatformPaymentConfiguration.java b/src/main/java/com/adyen/model/configurationwebhooks/PlatformPaymentConfiguration.java index 71130ce1a..28b3885df 100644 --- a/src/main/java/com/adyen/model/configurationwebhooks/PlatformPaymentConfiguration.java +++ b/src/main/java/com/adyen/model/configurationwebhooks/PlatformPaymentConfiguration.java @@ -79,7 +79,7 @@ public void setSalesDayClosingTime(String salesDayClosingTime) { } /** - * Specifies after how many business days the funds in a [settlement batch](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement#settlement-batch) are made available in this balance account. Possible values: **1** to **10**, or **null**. * Setting this value to an integer enables Sales day settlement in this balance account. See how Sales day settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/sales-day-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement). * Setting this value to **null** enables Pass-through settlement in this balance account. See how Pass-through settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/pass-through-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/pass-through-settlement). Default value: **null**. + * Specifies after how many business days the funds in a [settlement batch](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement#settlement-batch) are made available in this balance account. Possible values: **1** to **20**, or **null**. * Setting this value to an integer enables Sales day settlement in this balance account. See how Sales day settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/sales-day-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement). * Setting this value to **null** enables Pass-through settlement in this balance account. See how Pass-through settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/pass-through-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/pass-through-settlement). Default value: **null**. * * @param settlementDelayDays * @return the current {@code PlatformPaymentConfiguration} instance, allowing for method chaining @@ -90,10 +90,10 @@ public PlatformPaymentConfiguration settlementDelayDays(Integer settlementDelayD } /** - * Specifies after how many business days the funds in a [settlement batch](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement#settlement-batch) are made available in this balance account. Possible values: **1** to **10**, or **null**. * Setting this value to an integer enables Sales day settlement in this balance account. See how Sales day settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/sales-day-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement). * Setting this value to **null** enables Pass-through settlement in this balance account. See how Pass-through settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/pass-through-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/pass-through-settlement). Default value: **null**. + * Specifies after how many business days the funds in a [settlement batch](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement#settlement-batch) are made available in this balance account. Possible values: **1** to **20**, or **null**. * Setting this value to an integer enables Sales day settlement in this balance account. See how Sales day settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/sales-day-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement). * Setting this value to **null** enables Pass-through settlement in this balance account. See how Pass-through settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/pass-through-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/pass-through-settlement). Default value: **null**. * @return settlementDelayDays */ - @ApiModelProperty(value = "Specifies after how many business days the funds in a [settlement batch](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement#settlement-batch) are made available in this balance account. Possible values: **1** to **10**, or **null**. * Setting this value to an integer enables Sales day settlement in this balance account. See how Sales day settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/sales-day-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement). * Setting this value to **null** enables Pass-through settlement in this balance account. See how Pass-through settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/pass-through-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/pass-through-settlement). Default value: **null**.") + @ApiModelProperty(value = "Specifies after how many business days the funds in a [settlement batch](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement#settlement-batch) are made available in this balance account. Possible values: **1** to **20**, or **null**. * Setting this value to an integer enables Sales day settlement in this balance account. See how Sales day settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/sales-day-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement). * Setting this value to **null** enables Pass-through settlement in this balance account. See how Pass-through settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/pass-through-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/pass-through-settlement). Default value: **null**.") @JsonProperty(JSON_PROPERTY_SETTLEMENT_DELAY_DAYS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Integer getSettlementDelayDays() { @@ -101,7 +101,7 @@ public Integer getSettlementDelayDays() { } /** - * Specifies after how many business days the funds in a [settlement batch](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement#settlement-batch) are made available in this balance account. Possible values: **1** to **10**, or **null**. * Setting this value to an integer enables Sales day settlement in this balance account. See how Sales day settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/sales-day-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement). * Setting this value to **null** enables Pass-through settlement in this balance account. See how Pass-through settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/pass-through-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/pass-through-settlement). Default value: **null**. + * Specifies after how many business days the funds in a [settlement batch](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement#settlement-batch) are made available in this balance account. Possible values: **1** to **20**, or **null**. * Setting this value to an integer enables Sales day settlement in this balance account. See how Sales day settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/sales-day-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/sales-day-settlement). * Setting this value to **null** enables Pass-through settlement in this balance account. See how Pass-through settlement works in your [marketplace](https://docs.adyen.com/marketplaces/settle-funds/pass-through-settlement) or [platform](https://docs.adyen.com/platforms/settle-funds/pass-through-settlement). Default value: **null**. * * @param settlementDelayDays */ diff --git a/src/main/java/com/adyen/model/configurationwebhooks/SweepConfigurationNotificationRequest.java b/src/main/java/com/adyen/model/configurationwebhooks/SweepConfigurationNotificationRequest.java index 5ecbb90c6..2b0d17df4 100644 --- a/src/main/java/com/adyen/model/configurationwebhooks/SweepConfigurationNotificationRequest.java +++ b/src/main/java/com/adyen/model/configurationwebhooks/SweepConfigurationNotificationRequest.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.time.OffsetDateTime; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.core.JsonProcessingException; @@ -34,6 +35,7 @@ @JsonPropertyOrder({ SweepConfigurationNotificationRequest.JSON_PROPERTY_DATA, SweepConfigurationNotificationRequest.JSON_PROPERTY_ENVIRONMENT, + SweepConfigurationNotificationRequest.JSON_PROPERTY_TIMESTAMP, SweepConfigurationNotificationRequest.JSON_PROPERTY_TYPE }) @@ -44,6 +46,9 @@ public class SweepConfigurationNotificationRequest { public static final String JSON_PROPERTY_ENVIRONMENT = "environment"; private String environment; + public static final String JSON_PROPERTY_TIMESTAMP = "timestamp"; + private OffsetDateTime timestamp; + /** * Type of webhook. */ @@ -153,6 +158,39 @@ public void setEnvironment(String environment) { this.environment = environment; } + /** + * When the event was queued. + * + * @param timestamp + * @return the current {@code SweepConfigurationNotificationRequest} instance, allowing for method chaining + */ + public SweepConfigurationNotificationRequest timestamp(OffsetDateTime timestamp) { + this.timestamp = timestamp; + return this; + } + + /** + * When the event was queued. + * @return timestamp + */ + @ApiModelProperty(value = "When the event was queued.") + @JsonProperty(JSON_PROPERTY_TIMESTAMP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public OffsetDateTime getTimestamp() { + return timestamp; + } + + /** + * When the event was queued. + * + * @param timestamp + */ + @JsonProperty(JSON_PROPERTY_TIMESTAMP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setTimestamp(OffsetDateTime timestamp) { + this.timestamp = timestamp; + } + /** * Type of webhook. * @@ -200,12 +238,13 @@ public boolean equals(Object o) { SweepConfigurationNotificationRequest sweepConfigurationNotificationRequest = (SweepConfigurationNotificationRequest) o; return Objects.equals(this.data, sweepConfigurationNotificationRequest.data) && Objects.equals(this.environment, sweepConfigurationNotificationRequest.environment) && + Objects.equals(this.timestamp, sweepConfigurationNotificationRequest.timestamp) && Objects.equals(this.type, sweepConfigurationNotificationRequest.type); } @Override public int hashCode() { - return Objects.hash(data, environment, type); + return Objects.hash(data, environment, timestamp, type); } @Override @@ -214,6 +253,7 @@ public String toString() { sb.append("class SweepConfigurationNotificationRequest {\n"); sb.append(" data: ").append(toIndentedString(data)).append("\n"); sb.append(" environment: ").append(toIndentedString(environment)).append("\n"); + sb.append(" timestamp: ").append(toIndentedString(timestamp)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/src/main/java/com/adyen/model/management/Amount.java b/src/main/java/com/adyen/model/management/Amount.java index 1ef1f8a05..9ec30e88a 100644 --- a/src/main/java/com/adyen/model/management/Amount.java +++ b/src/main/java/com/adyen/model/management/Amount.java @@ -46,7 +46,7 @@ public Amount() { } /** - * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes). + * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes). * * @param currency * @return the current {@code Amount} instance, allowing for method chaining @@ -57,10 +57,10 @@ public Amount currency(String currency) { } /** - * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes). + * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes). * @return currency */ - @ApiModelProperty(required = true, value = "The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes).") + @ApiModelProperty(required = true, value = "The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes).") @JsonProperty(JSON_PROPERTY_CURRENCY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getCurrency() { @@ -68,7 +68,7 @@ public String getCurrency() { } /** - * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes). + * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes). * * @param currency */ @@ -79,7 +79,7 @@ public void setCurrency(String currency) { } /** - * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes). + * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units). * * @param value * @return the current {@code Amount} instance, allowing for method chaining @@ -90,10 +90,10 @@ public Amount value(Long value) { } /** - * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes). + * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units). * @return value */ - @ApiModelProperty(required = true, value = "The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes).") + @ApiModelProperty(required = true, value = "The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units).") @JsonProperty(JSON_PROPERTY_VALUE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Long getValue() { @@ -101,7 +101,7 @@ public Long getValue() { } /** - * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes). + * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units). * * @param value */ diff --git a/src/main/java/com/adyen/model/management/TerminalConnectivityCellular.java b/src/main/java/com/adyen/model/management/TerminalConnectivityCellular.java index 2b0062266..5960a7ffa 100644 --- a/src/main/java/com/adyen/model/management/TerminalConnectivityCellular.java +++ b/src/main/java/com/adyen/model/management/TerminalConnectivityCellular.java @@ -32,6 +32,7 @@ */ @JsonPropertyOrder({ TerminalConnectivityCellular.JSON_PROPERTY_ICCID, + TerminalConnectivityCellular.JSON_PROPERTY_ICCID2, TerminalConnectivityCellular.JSON_PROPERTY_STATUS }) @@ -39,8 +40,11 @@ public class TerminalConnectivityCellular { public static final String JSON_PROPERTY_ICCID = "iccid"; private String iccid; + public static final String JSON_PROPERTY_ICCID2 = "iccid2"; + private String iccid2; + /** - * On a terminal that supports 3G or 4G connectivity, indicates the status of the SIM card in the terminal. + * On a terminal that supports 3G or 4G connectivity, indicates the status of the primary SIM card in the terminal. */ public enum StatusEnum { ACTIVATED("activated"), @@ -87,7 +91,7 @@ public TerminalConnectivityCellular() { } /** - * The integrated circuit card identifier (ICCID) of the SIM card in the terminal. + * The integrated circuit card identifier (ICCID) of the primary SIM card in the terminal. * * @param iccid * @return the current {@code TerminalConnectivityCellular} instance, allowing for method chaining @@ -98,10 +102,10 @@ public TerminalConnectivityCellular iccid(String iccid) { } /** - * The integrated circuit card identifier (ICCID) of the SIM card in the terminal. + * The integrated circuit card identifier (ICCID) of the primary SIM card in the terminal. * @return iccid */ - @ApiModelProperty(value = "The integrated circuit card identifier (ICCID) of the SIM card in the terminal.") + @ApiModelProperty(value = "The integrated circuit card identifier (ICCID) of the primary SIM card in the terminal.") @JsonProperty(JSON_PROPERTY_ICCID) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public String getIccid() { @@ -109,7 +113,7 @@ public String getIccid() { } /** - * The integrated circuit card identifier (ICCID) of the SIM card in the terminal. + * The integrated circuit card identifier (ICCID) of the primary SIM card in the terminal. * * @param iccid */ @@ -120,7 +124,40 @@ public void setIccid(String iccid) { } /** - * On a terminal that supports 3G or 4G connectivity, indicates the status of the SIM card in the terminal. + * The integrated circuit card identifier (ICCID) of the secondary SIM card in the terminal, typically used for a [third-party SIM card](https://docs.adyen.com/point-of-sale/design-your-integration/network-and-connectivity/cellular-failover/#using-a-third-party-sim-card). + * + * @param iccid2 + * @return the current {@code TerminalConnectivityCellular} instance, allowing for method chaining + */ + public TerminalConnectivityCellular iccid2(String iccid2) { + this.iccid2 = iccid2; + return this; + } + + /** + * The integrated circuit card identifier (ICCID) of the secondary SIM card in the terminal, typically used for a [third-party SIM card](https://docs.adyen.com/point-of-sale/design-your-integration/network-and-connectivity/cellular-failover/#using-a-third-party-sim-card). + * @return iccid2 + */ + @ApiModelProperty(value = "The integrated circuit card identifier (ICCID) of the secondary SIM card in the terminal, typically used for a [third-party SIM card](https://docs.adyen.com/point-of-sale/design-your-integration/network-and-connectivity/cellular-failover/#using-a-third-party-sim-card).") + @JsonProperty(JSON_PROPERTY_ICCID2) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getIccid2() { + return iccid2; + } + + /** + * The integrated circuit card identifier (ICCID) of the secondary SIM card in the terminal, typically used for a [third-party SIM card](https://docs.adyen.com/point-of-sale/design-your-integration/network-and-connectivity/cellular-failover/#using-a-third-party-sim-card). + * + * @param iccid2 + */ + @JsonProperty(JSON_PROPERTY_ICCID2) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setIccid2(String iccid2) { + this.iccid2 = iccid2; + } + + /** + * On a terminal that supports 3G or 4G connectivity, indicates the status of the primary SIM card in the terminal. * * @param status * @return the current {@code TerminalConnectivityCellular} instance, allowing for method chaining @@ -131,10 +168,10 @@ public TerminalConnectivityCellular status(StatusEnum status) { } /** - * On a terminal that supports 3G or 4G connectivity, indicates the status of the SIM card in the terminal. + * On a terminal that supports 3G or 4G connectivity, indicates the status of the primary SIM card in the terminal. * @return status */ - @ApiModelProperty(value = "On a terminal that supports 3G or 4G connectivity, indicates the status of the SIM card in the terminal.") + @ApiModelProperty(value = "On a terminal that supports 3G or 4G connectivity, indicates the status of the primary SIM card in the terminal.") @JsonProperty(JSON_PROPERTY_STATUS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public StatusEnum getStatus() { @@ -142,7 +179,7 @@ public StatusEnum getStatus() { } /** - * On a terminal that supports 3G or 4G connectivity, indicates the status of the SIM card in the terminal. + * On a terminal that supports 3G or 4G connectivity, indicates the status of the primary SIM card in the terminal. * * @param status */ @@ -165,12 +202,13 @@ public boolean equals(Object o) { } TerminalConnectivityCellular terminalConnectivityCellular = (TerminalConnectivityCellular) o; return Objects.equals(this.iccid, terminalConnectivityCellular.iccid) && + Objects.equals(this.iccid2, terminalConnectivityCellular.iccid2) && Objects.equals(this.status, terminalConnectivityCellular.status); } @Override public int hashCode() { - return Objects.hash(iccid, status); + return Objects.hash(iccid, iccid2, status); } @Override @@ -178,6 +216,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class TerminalConnectivityCellular {\n"); sb.append(" iccid: ").append(toIndentedString(iccid)).append("\n"); + sb.append(" iccid2: ").append(toIndentedString(iccid2)).append("\n"); sb.append(" status: ").append(toIndentedString(status)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/src/main/java/com/adyen/model/management/UpdatePaymentMethodInfo.java b/src/main/java/com/adyen/model/management/UpdatePaymentMethodInfo.java index af93ff90e..85fcc9b59 100644 --- a/src/main/java/com/adyen/model/management/UpdatePaymentMethodInfo.java +++ b/src/main/java/com/adyen/model/management/UpdatePaymentMethodInfo.java @@ -60,6 +60,7 @@ UpdatePaymentMethodInfo.JSON_PROPERTY_NYCE, UpdatePaymentMethodInfo.JSON_PROPERTY_PULSE, UpdatePaymentMethodInfo.JSON_PROPERTY_STAR, + UpdatePaymentMethodInfo.JSON_PROPERTY_STORE_ID, UpdatePaymentMethodInfo.JSON_PROPERTY_STORE_IDS, UpdatePaymentMethodInfo.JSON_PROPERTY_VISA }) @@ -125,7 +126,11 @@ public class UpdatePaymentMethodInfo { public static final String JSON_PROPERTY_STAR = "star"; private StarInfo star; + public static final String JSON_PROPERTY_STORE_ID = "storeId"; + private String storeId; + public static final String JSON_PROPERTY_STORE_IDS = "storeIds"; + @Deprecated // deprecated since Management API v3: Use `storeId` instead. Only one store per payment method is allowed. private List storeIds = null; public static final String JSON_PROPERTY_VISA = "visa"; @@ -818,12 +823,49 @@ public void setStar(StarInfo star) { this.star = star; } + /** + * The store for this payment method + * + * @param storeId + * @return the current {@code UpdatePaymentMethodInfo} instance, allowing for method chaining + */ + public UpdatePaymentMethodInfo storeId(String storeId) { + this.storeId = storeId; + return this; + } + + /** + * The store for this payment method + * @return storeId + */ + @ApiModelProperty(value = "The store for this payment method") + @JsonProperty(JSON_PROPERTY_STORE_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getStoreId() { + return storeId; + } + + /** + * The store for this payment method + * + * @param storeId + */ + @JsonProperty(JSON_PROPERTY_STORE_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setStoreId(String storeId) { + this.storeId = storeId; + } + /** * The list of stores for this payment method * * @param storeIds * @return the current {@code UpdatePaymentMethodInfo} instance, allowing for method chaining + * + * @deprecated since Management API v3 + * Use `storeId` instead. Only one store per payment method is allowed. */ + @Deprecated public UpdatePaymentMethodInfo storeIds(List storeIds) { this.storeIds = storeIds; return this; @@ -840,7 +882,11 @@ public UpdatePaymentMethodInfo addStoreIdsItem(String storeIdsItem) { /** * The list of stores for this payment method * @return storeIds + * + * @deprecated since Management API v3 + * Use `storeId` instead. Only one store per payment method is allowed. */ + @Deprecated @ApiModelProperty(value = "The list of stores for this payment method") @JsonProperty(JSON_PROPERTY_STORE_IDS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) @@ -852,7 +898,11 @@ public List getStoreIds() { * The list of stores for this payment method * * @param storeIds + * + * @deprecated since Management API v3 + * Use `storeId` instead. Only one store per payment method is allowed. */ + @Deprecated @JsonProperty(JSON_PROPERTY_STORE_IDS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public void setStoreIds(List storeIds) { @@ -924,13 +974,14 @@ public boolean equals(Object o) { Objects.equals(this.nyce, updatePaymentMethodInfo.nyce) && Objects.equals(this.pulse, updatePaymentMethodInfo.pulse) && Objects.equals(this.star, updatePaymentMethodInfo.star) && + Objects.equals(this.storeId, updatePaymentMethodInfo.storeId) && Objects.equals(this.storeIds, updatePaymentMethodInfo.storeIds) && Objects.equals(this.visa, updatePaymentMethodInfo.visa); } @Override public int hashCode() { - return Objects.hash(accel, bcmc, cartesBancaires, countries, cup, currencies, customRoutingFlags, diners, discover, eftposAustralia, enabled, girocard, ideal, interacCard, jcb, maestro, mc, nyce, pulse, star, storeIds, visa); + return Objects.hash(accel, bcmc, cartesBancaires, countries, cup, currencies, customRoutingFlags, diners, discover, eftposAustralia, enabled, girocard, ideal, interacCard, jcb, maestro, mc, nyce, pulse, star, storeId, storeIds, visa); } @Override @@ -957,6 +1008,7 @@ public String toString() { sb.append(" nyce: ").append(toIndentedString(nyce)).append("\n"); sb.append(" pulse: ").append(toIndentedString(pulse)).append("\n"); sb.append(" star: ").append(toIndentedString(star)).append("\n"); + sb.append(" storeId: ").append(toIndentedString(storeId)).append("\n"); sb.append(" storeIds: ").append(toIndentedString(storeIds)).append("\n"); sb.append(" visa: ").append(toIndentedString(visa)).append("\n"); sb.append("}"); diff --git a/src/main/java/com/adyen/model/managementwebhooks/TerminalAssignmentNotificationRequest.java b/src/main/java/com/adyen/model/managementwebhooks/TerminalAssignmentNotificationRequest.java new file mode 100644 index 000000000..b66c89bb0 --- /dev/null +++ b/src/main/java/com/adyen/model/managementwebhooks/TerminalAssignmentNotificationRequest.java @@ -0,0 +1,291 @@ +/* + * Management Webhooks + * + * The version of the OpenAPI document: 3 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package com.adyen.model.managementwebhooks; + +import java.util.Objects; +import java.util.Arrays; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.core.JsonProcessingException; + + +/** + * TerminalAssignmentNotificationRequest + */ +@JsonPropertyOrder({ + TerminalAssignmentNotificationRequest.JSON_PROPERTY_ASSIGNED_TO_ACCOUNT, + TerminalAssignmentNotificationRequest.JSON_PROPERTY_ASSIGNED_TO_STORE, + TerminalAssignmentNotificationRequest.JSON_PROPERTY_EVENT_DATE, + TerminalAssignmentNotificationRequest.JSON_PROPERTY_PSP_REFERENCE, + TerminalAssignmentNotificationRequest.JSON_PROPERTY_UNIQUE_TERMINAL_ID +}) + +public class TerminalAssignmentNotificationRequest { + public static final String JSON_PROPERTY_ASSIGNED_TO_ACCOUNT = "assignedToAccount"; + private String assignedToAccount; + + public static final String JSON_PROPERTY_ASSIGNED_TO_STORE = "assignedToStore"; + private String assignedToStore; + + public static final String JSON_PROPERTY_EVENT_DATE = "eventDate"; + private String eventDate; + + public static final String JSON_PROPERTY_PSP_REFERENCE = "pspReference"; + private String pspReference; + + public static final String JSON_PROPERTY_UNIQUE_TERMINAL_ID = "uniqueTerminalId"; + private String uniqueTerminalId; + + public TerminalAssignmentNotificationRequest() { + } + + /** + * The unique identifier of the merchant/company account to which the terminal is assigned. + * + * @param assignedToAccount + * @return the current {@code TerminalAssignmentNotificationRequest} instance, allowing for method chaining + */ + public TerminalAssignmentNotificationRequest assignedToAccount(String assignedToAccount) { + this.assignedToAccount = assignedToAccount; + return this; + } + + /** + * The unique identifier of the merchant/company account to which the terminal is assigned. + * @return assignedToAccount + */ + @ApiModelProperty(required = true, value = "The unique identifier of the merchant/company account to which the terminal is assigned.") + @JsonProperty(JSON_PROPERTY_ASSIGNED_TO_ACCOUNT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getAssignedToAccount() { + return assignedToAccount; + } + + /** + * The unique identifier of the merchant/company account to which the terminal is assigned. + * + * @param assignedToAccount + */ + @JsonProperty(JSON_PROPERTY_ASSIGNED_TO_ACCOUNT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAssignedToAccount(String assignedToAccount) { + this.assignedToAccount = assignedToAccount; + } + + /** + * The unique identifier of the store to which the terminal is assigned. + * + * @param assignedToStore + * @return the current {@code TerminalAssignmentNotificationRequest} instance, allowing for method chaining + */ + public TerminalAssignmentNotificationRequest assignedToStore(String assignedToStore) { + this.assignedToStore = assignedToStore; + return this; + } + + /** + * The unique identifier of the store to which the terminal is assigned. + * @return assignedToStore + */ + @ApiModelProperty(value = "The unique identifier of the store to which the terminal is assigned.") + @JsonProperty(JSON_PROPERTY_ASSIGNED_TO_STORE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getAssignedToStore() { + return assignedToStore; + } + + /** + * The unique identifier of the store to which the terminal is assigned. + * + * @param assignedToStore + */ + @JsonProperty(JSON_PROPERTY_ASSIGNED_TO_STORE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAssignedToStore(String assignedToStore) { + this.assignedToStore = assignedToStore; + } + + /** + * The date and time when an event has been completed. + * + * @param eventDate + * @return the current {@code TerminalAssignmentNotificationRequest} instance, allowing for method chaining + */ + public TerminalAssignmentNotificationRequest eventDate(String eventDate) { + this.eventDate = eventDate; + return this; + } + + /** + * The date and time when an event has been completed. + * @return eventDate + */ + @ApiModelProperty(required = true, value = "The date and time when an event has been completed.") + @JsonProperty(JSON_PROPERTY_EVENT_DATE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getEventDate() { + return eventDate; + } + + /** + * The date and time when an event has been completed. + * + * @param eventDate + */ + @JsonProperty(JSON_PROPERTY_EVENT_DATE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setEventDate(String eventDate) { + this.eventDate = eventDate; + } + + /** + * The PSP reference of the request from which the notification originates. + * + * @param pspReference + * @return the current {@code TerminalAssignmentNotificationRequest} instance, allowing for method chaining + */ + public TerminalAssignmentNotificationRequest pspReference(String pspReference) { + this.pspReference = pspReference; + return this; + } + + /** + * The PSP reference of the request from which the notification originates. + * @return pspReference + */ + @ApiModelProperty(required = true, value = "The PSP reference of the request from which the notification originates.") + @JsonProperty(JSON_PROPERTY_PSP_REFERENCE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getPspReference() { + return pspReference; + } + + /** + * The PSP reference of the request from which the notification originates. + * + * @param pspReference + */ + @JsonProperty(JSON_PROPERTY_PSP_REFERENCE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPspReference(String pspReference) { + this.pspReference = pspReference; + } + + /** + * The unique identifier of the terminal. + * + * @param uniqueTerminalId + * @return the current {@code TerminalAssignmentNotificationRequest} instance, allowing for method chaining + */ + public TerminalAssignmentNotificationRequest uniqueTerminalId(String uniqueTerminalId) { + this.uniqueTerminalId = uniqueTerminalId; + return this; + } + + /** + * The unique identifier of the terminal. + * @return uniqueTerminalId + */ + @ApiModelProperty(required = true, value = "The unique identifier of the terminal.") + @JsonProperty(JSON_PROPERTY_UNIQUE_TERMINAL_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getUniqueTerminalId() { + return uniqueTerminalId; + } + + /** + * The unique identifier of the terminal. + * + * @param uniqueTerminalId + */ + @JsonProperty(JSON_PROPERTY_UNIQUE_TERMINAL_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setUniqueTerminalId(String uniqueTerminalId) { + this.uniqueTerminalId = uniqueTerminalId; + } + + /** + * Return true if this TerminalAssignmentNotificationRequest object is equal to o. + */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + TerminalAssignmentNotificationRequest terminalAssignmentNotificationRequest = (TerminalAssignmentNotificationRequest) o; + return Objects.equals(this.assignedToAccount, terminalAssignmentNotificationRequest.assignedToAccount) && + Objects.equals(this.assignedToStore, terminalAssignmentNotificationRequest.assignedToStore) && + Objects.equals(this.eventDate, terminalAssignmentNotificationRequest.eventDate) && + Objects.equals(this.pspReference, terminalAssignmentNotificationRequest.pspReference) && + Objects.equals(this.uniqueTerminalId, terminalAssignmentNotificationRequest.uniqueTerminalId); + } + + @Override + public int hashCode() { + return Objects.hash(assignedToAccount, assignedToStore, eventDate, pspReference, uniqueTerminalId); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class TerminalAssignmentNotificationRequest {\n"); + sb.append(" assignedToAccount: ").append(toIndentedString(assignedToAccount)).append("\n"); + sb.append(" assignedToStore: ").append(toIndentedString(assignedToStore)).append("\n"); + sb.append(" eventDate: ").append(toIndentedString(eventDate)).append("\n"); + sb.append(" pspReference: ").append(toIndentedString(pspReference)).append("\n"); + sb.append(" uniqueTerminalId: ").append(toIndentedString(uniqueTerminalId)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +/** + * Create an instance of TerminalAssignmentNotificationRequest given an JSON string + * + * @param jsonString JSON string + * @return An instance of TerminalAssignmentNotificationRequest + * @throws JsonProcessingException if the JSON string is invalid with respect to TerminalAssignmentNotificationRequest + */ + public static TerminalAssignmentNotificationRequest fromJson(String jsonString) throws JsonProcessingException { + return JSON.getMapper().readValue(jsonString, TerminalAssignmentNotificationRequest.class); + } +/** + * Convert an instance of TerminalAssignmentNotificationRequest to an JSON string + * + * @return JSON string + */ + public String toJson() throws JsonProcessingException { + return JSON.getMapper().writeValueAsString(this); + } +} diff --git a/src/main/java/com/adyen/model/managementwebhooks/TerminalAssignmentNotificationResponse.java b/src/main/java/com/adyen/model/managementwebhooks/TerminalAssignmentNotificationResponse.java new file mode 100644 index 000000000..e68da527e --- /dev/null +++ b/src/main/java/com/adyen/model/managementwebhooks/TerminalAssignmentNotificationResponse.java @@ -0,0 +1,135 @@ +/* + * Management Webhooks + * + * The version of the OpenAPI document: 3 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package com.adyen.model.managementwebhooks; + +import java.util.Objects; +import java.util.Arrays; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.core.JsonProcessingException; + + +/** + * TerminalAssignmentNotificationResponse + */ +@JsonPropertyOrder({ + TerminalAssignmentNotificationResponse.JSON_PROPERTY_NOTIFICATION_RESPONSE +}) + +public class TerminalAssignmentNotificationResponse { + public static final String JSON_PROPERTY_NOTIFICATION_RESPONSE = "notificationResponse"; + private String notificationResponse; + + public TerminalAssignmentNotificationResponse() { + } + + /** + * Respond with any **2xx** HTTP status code to [accept the webhook](https://docs.adyen.com/development-resources/webhooks#accept-notifications). + * + * @param notificationResponse + * @return the current {@code TerminalAssignmentNotificationResponse} instance, allowing for method chaining + */ + public TerminalAssignmentNotificationResponse notificationResponse(String notificationResponse) { + this.notificationResponse = notificationResponse; + return this; + } + + /** + * Respond with any **2xx** HTTP status code to [accept the webhook](https://docs.adyen.com/development-resources/webhooks#accept-notifications). + * @return notificationResponse + */ + @ApiModelProperty(value = "Respond with any **2xx** HTTP status code to [accept the webhook](https://docs.adyen.com/development-resources/webhooks#accept-notifications).") + @JsonProperty(JSON_PROPERTY_NOTIFICATION_RESPONSE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getNotificationResponse() { + return notificationResponse; + } + + /** + * Respond with any **2xx** HTTP status code to [accept the webhook](https://docs.adyen.com/development-resources/webhooks#accept-notifications). + * + * @param notificationResponse + */ + @JsonProperty(JSON_PROPERTY_NOTIFICATION_RESPONSE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNotificationResponse(String notificationResponse) { + this.notificationResponse = notificationResponse; + } + + /** + * Return true if this TerminalAssignmentNotificationResponse object is equal to o. + */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + TerminalAssignmentNotificationResponse terminalAssignmentNotificationResponse = (TerminalAssignmentNotificationResponse) o; + return Objects.equals(this.notificationResponse, terminalAssignmentNotificationResponse.notificationResponse); + } + + @Override + public int hashCode() { + return Objects.hash(notificationResponse); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class TerminalAssignmentNotificationResponse {\n"); + sb.append(" notificationResponse: ").append(toIndentedString(notificationResponse)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +/** + * Create an instance of TerminalAssignmentNotificationResponse given an JSON string + * + * @param jsonString JSON string + * @return An instance of TerminalAssignmentNotificationResponse + * @throws JsonProcessingException if the JSON string is invalid with respect to TerminalAssignmentNotificationResponse + */ + public static TerminalAssignmentNotificationResponse fromJson(String jsonString) throws JsonProcessingException { + return JSON.getMapper().readValue(jsonString, TerminalAssignmentNotificationResponse.class); + } +/** + * Convert an instance of TerminalAssignmentNotificationResponse to an JSON string + * + * @return JSON string + */ + public String toJson() throws JsonProcessingException { + return JSON.getMapper().writeValueAsString(this); + } +} diff --git a/src/main/java/com/adyen/model/reportwebhooks/ReportNotificationRequest.java b/src/main/java/com/adyen/model/reportwebhooks/ReportNotificationRequest.java index 47b17fa14..4c5638db1 100644 --- a/src/main/java/com/adyen/model/reportwebhooks/ReportNotificationRequest.java +++ b/src/main/java/com/adyen/model/reportwebhooks/ReportNotificationRequest.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.time.OffsetDateTime; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.core.JsonProcessingException; @@ -34,6 +35,7 @@ @JsonPropertyOrder({ ReportNotificationRequest.JSON_PROPERTY_DATA, ReportNotificationRequest.JSON_PROPERTY_ENVIRONMENT, + ReportNotificationRequest.JSON_PROPERTY_TIMESTAMP, ReportNotificationRequest.JSON_PROPERTY_TYPE }) @@ -44,6 +46,9 @@ public class ReportNotificationRequest { public static final String JSON_PROPERTY_ENVIRONMENT = "environment"; private String environment; + public static final String JSON_PROPERTY_TIMESTAMP = "timestamp"; + private OffsetDateTime timestamp; + /** * Type of webhook. */ @@ -149,6 +154,39 @@ public void setEnvironment(String environment) { this.environment = environment; } + /** + * When the event was queued. + * + * @param timestamp + * @return the current {@code ReportNotificationRequest} instance, allowing for method chaining + */ + public ReportNotificationRequest timestamp(OffsetDateTime timestamp) { + this.timestamp = timestamp; + return this; + } + + /** + * When the event was queued. + * @return timestamp + */ + @ApiModelProperty(value = "When the event was queued.") + @JsonProperty(JSON_PROPERTY_TIMESTAMP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public OffsetDateTime getTimestamp() { + return timestamp; + } + + /** + * When the event was queued. + * + * @param timestamp + */ + @JsonProperty(JSON_PROPERTY_TIMESTAMP) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setTimestamp(OffsetDateTime timestamp) { + this.timestamp = timestamp; + } + /** * Type of webhook. * @@ -196,12 +234,13 @@ public boolean equals(Object o) { ReportNotificationRequest reportNotificationRequest = (ReportNotificationRequest) o; return Objects.equals(this.data, reportNotificationRequest.data) && Objects.equals(this.environment, reportNotificationRequest.environment) && + Objects.equals(this.timestamp, reportNotificationRequest.timestamp) && Objects.equals(this.type, reportNotificationRequest.type); } @Override public int hashCode() { - return Objects.hash(data, environment, type); + return Objects.hash(data, environment, timestamp, type); } @Override @@ -210,6 +249,7 @@ public String toString() { sb.append("class ReportNotificationRequest {\n"); sb.append(" data: ").append(toIndentedString(data)).append("\n"); sb.append(" environment: ").append(toIndentedString(environment)).append("\n"); + sb.append(" timestamp: ").append(toIndentedString(timestamp)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append("}"); return sb.toString();