Merge pull request #1135 from Adyen/automation/release

Release v21.5.0

Author: AdyenAutomationBot

Diff for: Makefile

@@ -33,11 +33,15 @@ balanceplatform: spec=BalancePlatformService-v2
 transfers: spec=TransferService-v3
 legalentitymanagement: spec=LegalEntityService-v3
 # Classic Platforms
-marketpay/account: spec=AccountService-v6
-marketpay/fund: spec=FundService-v6
-marketpay/configuration: spec=NotificationConfigurationService-v6
-marketpay/webhooks: spec=MarketPayNotificationService-v6
-hop: spec=HopService-v6
+marketpayaccount: spec=AccountService-v6
+marketpayaccount: smallServiceName=ClassicPlatformAccountApi
+marketpayfund: spec=FundService-v6
+marketpayfund: smallServiceName=ClassicPlatformFundApi
+marketpayconfiguration: spec=NotificationConfigurationService-v6
+marketpayconfiguration: smallServiceName=ClassicPlatformConfigurationApi
+marketpayhop: spec=HopService-v6
+marketpayhop: smallServiceName=ClassicPlatformHopApi
+#marketpaywebhooks: spec=MarketPayNotificationService-v6
 # Balance Webhooks
 acswebhooks: spec=BalancePlatformAcsNotification-v1
 configurationwebhooks: spec=BalancePlatformConfigurationNotification-v1

Diff for: README.md

@@ -58,7 +58,7 @@ You can use Maven and add this dependency to your project's POM:
 <dependency>
   <groupId>com.adyen</groupId>
   <artifactId>adyen-java-api-library</artifactId>
-  <version>21.4.0</version>
+  <version>21.5.0</version>
 </dependency>
 ```
 

Diff for: pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.adyen</groupId>
     <artifactId>adyen-java-api-library</artifactId>
     <packaging>jar</packaging>
-    <version>21.4.0</version>
+    <version>21.5.0</version>
     <name>Adyen Java API Library</name>
     <description>Adyen API Client Library for Java</description>
     <url>https://github.com/adyen/adyen-java-api-library</url>
@@ -248,7 +248,7 @@
         <dependency>
             <groupId>com.squareup.okio</groupId>
             <artifactId>okio</artifactId>
-            <version>3.5.0</version>
+            <version>3.6.0</version>
             <scope>test</scope>
         </dependency>
         <!-- Generated model annotations -->

Diff for: src/main/java/com/adyen/Client.java

@@ -11,7 +11,7 @@ public class Client {
     private ClientInterface httpClient;
     private Config config;
     public static final String LIB_NAME = "adyen-java-api-library";
-    public static final String LIB_VERSION = "21.4.0";
+    public static final String LIB_VERSION = "21.5.0";
     public static final String TERMINAL_API_ENDPOINT_TEST = "https://terminal-api-test.adyen.com";
     public static final String TERMINAL_API_ENDPOINT_LIVE = "https://terminal-api-live.adyen.com";
 

Diff for: src/main/java/com/adyen/model/balancecontrol/JSON.java

@@ -1,6 +1,7 @@
 package com.adyen.model.balancecontrol;
 
 import com.adyen.serializer.ByteArraySerializer;
+import com.adyen.serializer.ByteArrayDeserializer;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.json.JsonMapper;
@@ -33,6 +34,7 @@ public JSON() {
     // Custom ByteSerializer
     SimpleModule simpleModule = new SimpleModule();
     simpleModule.addSerializer(byte[].class, new ByteArraySerializer());
+    simpleModule.addDeserializer(byte[].class, new ByteArrayDeserializer());
     mapper.registerModule(simpleModule);
   }
 

Diff for: src/main/java/com/adyen/model/balanceplatform/JSON.java

@@ -1,6 +1,7 @@
 package com.adyen.model.balanceplatform;
 
 import com.adyen.serializer.ByteArraySerializer;
+import com.adyen.serializer.ByteArrayDeserializer;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.json.JsonMapper;
@@ -33,6 +34,7 @@ public JSON() {
     // Custom ByteSerializer
     SimpleModule simpleModule = new SimpleModule();
     simpleModule.addSerializer(byte[].class, new ByteArraySerializer());
+    simpleModule.addDeserializer(byte[].class, new ByteArrayDeserializer());
     mapper.registerModule(simpleModule);
   }
 

Diff for: src/main/java/com/adyen/model/binlookup/JSON.java

@@ -1,6 +1,7 @@
 package com.adyen.model.binlookup;
 
 import com.adyen.serializer.ByteArraySerializer;
+import com.adyen.serializer.ByteArrayDeserializer;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.json.JsonMapper;
@@ -33,6 +34,7 @@ public JSON() {
     // Custom ByteSerializer
     SimpleModule simpleModule = new SimpleModule();
     simpleModule.addSerializer(byte[].class, new ByteArraySerializer());
+    simpleModule.addDeserializer(byte[].class, new ByteArrayDeserializer());
     mapper.registerModule(simpleModule);
   }
 

Diff for: src/main/java/com/adyen/model/checkout/AfterpayDetails.java

@@ -67,7 +67,9 @@ public enum TypeEnum {
 
     AFTERPAYTOUCH("afterpaytouch"),
 
-    AFTERPAY_B2B("afterpay_b2b");
+    AFTERPAY_B2B("afterpay_b2b"),
+    
+    CLEARPAY("clearpay");
 
     private String value;
 

Diff for: src/main/java/com/adyen/model/checkout/BalanceCheckRequest.java

@@ -704,10 +704,10 @@ public BalanceCheckRequest putLocalizedShopperStatementItem(String key, String l
   }
 
    /**
-   * This field allows merchants to use dynamic shopper statement in local character sets. The local shopper statement field can be supplied in markets where localized merchant descriptors are used. Currently, Adyen only supports this in the Japanese market .The available character sets at the moment are: * Processing in Japan: **ja-Kana** The character set **ja-Kana** supports UTF-8 based Katakana and alphanumeric and special characters. Merchants can use half-width or full-width characters. An example request would be: > {   \"shopperStatement\" : \"ADYEN - SELLER-A\",   \"localizedShopperStatement\" : {     \"ja-Kana\" : \"ADYEN - セラーA\"   } } We recommend merchants to always supply the field localizedShopperStatement in addition to the field shopperStatement.It is issuer dependent whether the localized shopper statement field is supported. In the case of non-domestic transactions (e.g. US-issued cards processed in JP) the field `shopperStatement` is used to modify the statement of the shopper. Adyen handles the complexity of ensuring the correct descriptors are assigned. Please note, this field can be used for only Visa and Mastercard transactions.
+   * The `localizedShopperStatement` field lets you use dynamic values for your shopper statement in a local character set. If not supplied, left empty, or for cross-border transactions, **shopperStatement** is used.  Adyen currently supports the ja-Kana character set for Visa and Mastercard payments in Japan using Japanese cards. This character set supports:  * UTF-8 based Katakana, capital letters, numbers and special characters.  * Half-width or full-width characters.
    * @return localizedShopperStatement
   **/
-  @ApiModelProperty(value = "This field allows merchants to use dynamic shopper statement in local character sets. The local shopper statement field can be supplied in markets where localized merchant descriptors are used. Currently, Adyen only supports this in the Japanese market .The available character sets at the moment are: * Processing in Japan: **ja-Kana** The character set **ja-Kana** supports UTF-8 based Katakana and alphanumeric and special characters. Merchants can use half-width or full-width characters. An example request would be: > {   \"shopperStatement\" : \"ADYEN - SELLER-A\",   \"localizedShopperStatement\" : {     \"ja-Kana\" : \"ADYEN - セラーA\"   } } We recommend merchants to always supply the field localizedShopperStatement in addition to the field shopperStatement.It is issuer dependent whether the localized shopper statement field is supported. In the case of non-domestic transactions (e.g. US-issued cards processed in JP) the field `shopperStatement` is used to modify the statement of the shopper. Adyen handles the complexity of ensuring the correct descriptors are assigned. Please note, this field can be used for only Visa and Mastercard transactions.")
+  @ApiModelProperty(value = "The `localizedShopperStatement` field lets you use dynamic values for your shopper statement in a local character set. If not supplied, left empty, or for cross-border transactions, **shopperStatement** is used.  Adyen currently supports the ja-Kana character set for Visa and Mastercard payments in Japan using Japanese cards. This character set supports:  * UTF-8 based Katakana, capital letters, numbers and special characters.  * Half-width or full-width characters.")
   @JsonProperty(JSON_PROPERTY_LOCALIZED_SHOPPER_STATEMENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 

Diff for: src/main/java/com/adyen/model/checkout/DonationPaymentRequest.java

@@ -1390,10 +1390,10 @@ public DonationPaymentRequest putLocalizedShopperStatementItem(String key, Strin
   }
 
    /**
-   * This field allows merchants to use dynamic shopper statement in local character sets. The local shopper statement field can be supplied in markets where localized merchant descriptors are used. Currently, Adyen only supports this in the Japanese market .The available character sets at the moment are: * Processing in Japan: **ja-Kana** The character set **ja-Kana** supports UTF-8 based Katakana and alphanumeric and special characters. Merchants should send the Katakana shopperStatement in full-width characters.  An example request would be: > {   \"shopperStatement\" : \"ADYEN - SELLER-A\",   \"localizedShopperStatement\" : {     \"ja-Kana\" : \"ADYEN - セラーA\"   } } We recommend merchants to always supply the field localizedShopperStatement in addition to the field shopperStatement.It is issuer dependent whether the localized shopper statement field is supported. In the case of non-domestic transactions (e.g. US-issued cards processed in JP) the field `shopperStatement` is used to modify the statement of the shopper. Adyen handles the complexity of ensuring the correct descriptors are assigned.
+   * The `localizedShopperStatement` field lets you use dynamic values for your shopper statement in a local character set. If not supplied, left empty, or for cross-border transactions, **shopperStatement** is used.  Adyen currently supports the ja-Kana character set for Visa and Mastercard payments in Japan using Japanese cards. This character set supports:  * UTF-8 based Katakana, capital letters, numbers and special characters.  * Half-width or full-width characters.
    * @return localizedShopperStatement
   **/
-  @ApiModelProperty(value = "This field allows merchants to use dynamic shopper statement in local character sets. The local shopper statement field can be supplied in markets where localized merchant descriptors are used. Currently, Adyen only supports this in the Japanese market .The available character sets at the moment are: * Processing in Japan: **ja-Kana** The character set **ja-Kana** supports UTF-8 based Katakana and alphanumeric and special characters. Merchants should send the Katakana shopperStatement in full-width characters.  An example request would be: > {   \"shopperStatement\" : \"ADYEN - SELLER-A\",   \"localizedShopperStatement\" : {     \"ja-Kana\" : \"ADYEN - セラーA\"   } } We recommend merchants to always supply the field localizedShopperStatement in addition to the field shopperStatement.It is issuer dependent whether the localized shopper statement field is supported. In the case of non-domestic transactions (e.g. US-issued cards processed in JP) the field `shopperStatement` is used to modify the statement of the shopper. Adyen handles the complexity of ensuring the correct descriptors are assigned.")
+  @ApiModelProperty(value = "The `localizedShopperStatement` field lets you use dynamic values for your shopper statement in a local character set. If not supplied, left empty, or for cross-border transactions, **shopperStatement** is used.  Adyen currently supports the ja-Kana character set for Visa and Mastercard payments in Japan using Japanese cards. This character set supports:  * UTF-8 based Katakana, capital letters, numbers and special characters.  * Half-width or full-width characters.")
   @JsonProperty(JSON_PROPERTY_LOCALIZED_SHOPPER_STATEMENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 

Diff for: src/main/java/com/adyen/model/checkout/JSON.java

@@ -1,6 +1,7 @@
 package com.adyen.model.checkout;
 
 import com.adyen.serializer.ByteArraySerializer;
+import com.adyen.serializer.ByteArrayDeserializer;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.json.JsonMapper;
@@ -33,6 +34,7 @@ public JSON() {
     // Custom ByteSerializer
     SimpleModule simpleModule = new SimpleModule();
     simpleModule.addSerializer(byte[].class, new ByteArraySerializer());
+    simpleModule.addDeserializer(byte[].class, new ByteArrayDeserializer());
     mapper.registerModule(simpleModule);
   }
 

Diff for: src/main/java/com/adyen/model/checkout/PaymentDetails.java

@@ -155,8 +155,6 @@ public enum TypeEnum {
 
     GOPAY_WALLET("gopay_wallet"),
 
-    POLI("poli"),
-    
     KCP_NAVERPAY("kcp_naverpay"),
 
     ONLINEBANKING_IN("onlinebanking_IN"),

Diff for: src/main/java/com/adyen/model/checkout/PaymentRequest.java

@@ -1303,10 +1303,10 @@ public PaymentRequest putLocalizedShopperStatementItem(String key, String locali
   }
 
    /**
-   * This field allows merchants to use dynamic shopper statement in local character sets. The local shopper statement field can be supplied in markets where localized merchant descriptors are used. Currently, Adyen only supports this in the Japanese market .The available character sets at the moment are: * Processing in Japan: **ja-Kana** The character set **ja-Kana** supports UTF-8 based Katakana and alphanumeric and special characters. Merchants should send the Katakana shopperStatement in full-width characters.  An example request would be: > {   \"shopperStatement\" : \"ADYEN - SELLER-A\",   \"localizedShopperStatement\" : {     \"ja-Kana\" : \"ADYEN - セラーA\"   } } We recommend merchants to always supply the field localizedShopperStatement in addition to the field shopperStatement.It is issuer dependent whether the localized shopper statement field is supported. In the case of non-domestic transactions (e.g. US-issued cards processed in JP) the field `shopperStatement` is used to modify the statement of the shopper. Adyen handles the complexity of ensuring the correct descriptors are assigned.
+   * The `localizedShopperStatement` field lets you use dynamic values for your shopper statement in a local character set. If not supplied, left empty, or for cross-border transactions, **shopperStatement** is used.  Adyen currently supports the ja-Kana character set for Visa and Mastercard payments in Japan using Japanese cards. This character set supports:  * UTF-8 based Katakana, capital letters, numbers and special characters.  * Half-width or full-width characters.
    * @return localizedShopperStatement
   **/
-  @ApiModelProperty(value = "This field allows merchants to use dynamic shopper statement in local character sets. The local shopper statement field can be supplied in markets where localized merchant descriptors are used. Currently, Adyen only supports this in the Japanese market .The available character sets at the moment are: * Processing in Japan: **ja-Kana** The character set **ja-Kana** supports UTF-8 based Katakana and alphanumeric and special characters. Merchants should send the Katakana shopperStatement in full-width characters.  An example request would be: > {   \"shopperStatement\" : \"ADYEN - SELLER-A\",   \"localizedShopperStatement\" : {     \"ja-Kana\" : \"ADYEN - セラーA\"   } } We recommend merchants to always supply the field localizedShopperStatement in addition to the field shopperStatement.It is issuer dependent whether the localized shopper statement field is supported. In the case of non-domestic transactions (e.g. US-issued cards processed in JP) the field `shopperStatement` is used to modify the statement of the shopper. Adyen handles the complexity of ensuring the correct descriptors are assigned.")
+  @ApiModelProperty(value = "The `localizedShopperStatement` field lets you use dynamic values for your shopper statement in a local character set. If not supplied, left empty, or for cross-border transactions, **shopperStatement** is used.  Adyen currently supports the ja-Kana character set for Visa and Mastercard payments in Japan using Japanese cards. This character set supports:  * UTF-8 based Katakana, capital letters, numbers and special characters.  * Half-width or full-width characters.")
   @JsonProperty(JSON_PROPERTY_LOCALIZED_SHOPPER_STATEMENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 

Diff for: src/main/java/com/adyen/model/checkout/PaymentSetupRequest.java

@@ -1065,10 +1065,10 @@ public PaymentSetupRequest putLocalizedShopperStatementItem(String key, String l
   }
 
    /**
-   * This field allows merchants to use dynamic shopper statement in local character sets. The local shopper statement field can be supplied in markets where localized merchant descriptors are used. Currently, Adyen only supports this in the Japanese market .The available character sets at the moment are: * Processing in Japan: **ja-Kana** The character set **ja-Kana** supports UTF-8 based Katakana and alphanumeric and special characters. Merchants can use half-width or full-width characters. An example request would be: > {   \"shopperStatement\" : \"ADYEN - SELLER-A\",   \"localizedShopperStatement\" : {     \"ja-Kana\" : \"ADYEN - セラーA\"   } } We recommend merchants to always supply the field localizedShopperStatement in addition to the field shopperStatement.It is issuer dependent whether the localized shopper statement field is supported. In the case of non-domestic transactions (e.g. US-issued cards processed in JP) the field `shopperStatement` is used to modify the statement of the shopper. Adyen handles the complexity of ensuring the correct descriptors are assigned. Please note, this field can be used for only Visa and Mastercard transactions.
+   * The `localizedShopperStatement` field lets you use dynamic values for your shopper statement in a local character set. If not supplied, left empty, or for cross-border transactions, **shopperStatement** is used.  Adyen currently supports the ja-Kana character set for Visa and Mastercard payments in Japan using Japanese cards. This character set supports:  * UTF-8 based Katakana, capital letters, numbers and special characters.  * Half-width or full-width characters.
    * @return localizedShopperStatement
   **/
-  @ApiModelProperty(value = "This field allows merchants to use dynamic shopper statement in local character sets. The local shopper statement field can be supplied in markets where localized merchant descriptors are used. Currently, Adyen only supports this in the Japanese market .The available character sets at the moment are: * Processing in Japan: **ja-Kana** The character set **ja-Kana** supports UTF-8 based Katakana and alphanumeric and special characters. Merchants can use half-width or full-width characters. An example request would be: > {   \"shopperStatement\" : \"ADYEN - SELLER-A\",   \"localizedShopperStatement\" : {     \"ja-Kana\" : \"ADYEN - セラーA\"   } } We recommend merchants to always supply the field localizedShopperStatement in addition to the field shopperStatement.It is issuer dependent whether the localized shopper statement field is supported. In the case of non-domestic transactions (e.g. US-issued cards processed in JP) the field `shopperStatement` is used to modify the statement of the shopper. Adyen handles the complexity of ensuring the correct descriptors are assigned. Please note, this field can be used for only Visa and Mastercard transactions.")
+  @ApiModelProperty(value = "The `localizedShopperStatement` field lets you use dynamic values for your shopper statement in a local character set. If not supplied, left empty, or for cross-border transactions, **shopperStatement** is used.  Adyen currently supports the ja-Kana character set for Visa and Mastercard payments in Japan using Japanese cards. This character set supports:  * UTF-8 based Katakana, capital letters, numbers and special characters.  * Half-width or full-width characters.")
   @JsonProperty(JSON_PROPERTY_LOCALIZED_SHOPPER_STATEMENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 

Diff for: src/main/java/com/adyen/model/checkout/ThreeDSRequestData.java

@@ -160,9 +160,9 @@ public static NativeThreeDSEnum fromValue(String value) {
    * The version of 3D Secure to use.  Possible values:  * **2.1.0** * **2.2.0**
    */
   public enum ThreeDSVersionEnum {
-    _1_0("V_2_1_0"),
+    _1_0("2.1.0"),
 
-    _2_0("V_2_2_0");
+    _2_0("2.2.0");
 
     private String value;