Merge pull request #734 from Adyen/develop

Release 17.4.0

.github/CODEOWNERS

@@ -1 +1 @@
-* @AlexandrosMor @wboereboom @Morerice
+* @AlexandrosMor @wboereboom @Morerice @michaelpaul

.github/workflows/codeql-analysis.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
@@ -26,15 +26,15 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       # Override language selection by uncommenting this and choosing your languages
       # with:
       #   languages: go, javascript, csharp, python, cpp, java
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -48,4 +48,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/coveralls.yml

@@ -1,16 +1,16 @@
 name: Coveralls
 
-on: [push]
+on: [pull_request]
 
 jobs:
 
   coveralls:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: '11'
           distribution: 'adopt'

.github/workflows/javaci.yml

@@ -0,0 +1,19 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+
+      - name: Run the tests with Maven
+        run: mvn test

README.md

@@ -39,7 +39,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>17.3.0</version>
+  <version>17.4.0</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.adyen</groupId>
     <artifactId>adyen-java-api-library</artifactId>
     <packaging>jar</packaging>
-    <version>17.3.0</version>
+    <version>17.4.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>
@@ -25,7 +25,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <jackson.version>2.13.1</jackson.version>
     </properties>
     <scm>
         <connection>scm:git:[email protected]:Adyen/adyen-java-api-library.git</connection>
@@ -37,13 +36,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
                 <configuration>
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -65,7 +67,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.7</version>
+                <version>0.8.8</version>
                 <executions>
                     <execution>
                         <id>default-prepare-agent</id>
@@ -91,7 +93,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.3.1</version>
+                <configuration>
+                    <source>8</source>
+                </configuration>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -118,7 +123,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.8</version>
+                <version>1.6.13</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>
@@ -149,7 +154,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>5.1.3</version>
+                <version>5.1.4</version>
                 <executions>
                     <execution>
                         <id>bundle-manifest</id>
@@ -176,22 +181,22 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.9</version>
+            <version>2.9.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
+            <version>2.13.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
+            <version>2.13.2.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.1.2</version>
+            <version>5.1.3</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -202,13 +207,13 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.2.0</version>
+            <version>4.5.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jdk8</artifactId>
-            <version>${jackson.version}</version>
+            <version>2.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -219,12 +224,12 @@
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-models</artifactId>
-            <version>2.1.12</version>
+            <version>2.2.0</version>
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>2.1.12</version>
+            <version>2.2.0</version>
         </dependency>
     </dependencies>
 </project>

src/main/java/com/adyen/Client.java

@@ -47,7 +47,7 @@ public class Client {
     public static final String MARKETPAY_NOTIFICATION_API_VERSION = "v6";
     public static final String MARKETPAY_HOP_API_VERSION = "v6";
     public static final String LIB_NAME = "adyen-java-api-library";
-    public static final String LIB_VERSION = "17.3.0";
+    public static final String LIB_VERSION = "17.4.0";
     public static final String CHECKOUT_ENDPOINT_TEST = "https://checkout-test.adyen.com/checkout";
     public static final String CHECKOUT_ENDPOINT_LIVE_SUFFIX = "-checkout-live.adyenpayments.com/checkout";
     public static final String CHECKOUT_ENDPOINT_CERT_LIVE = "https://checkoutcert-live-%s.adyen.com/checkout";

src/main/java/com/adyen/deserializer/PaymentMethodDetailsDeserializerJackson.java

@@ -20,6 +20,7 @@
  */
 package com.adyen.deserializer;
 
+import java.io.IOException;
 import com.adyen.model.checkout.DefaultPaymentMethodDetails;
 import com.adyen.model.checkout.PaymentMethodDetails;
 import com.adyen.model.checkout.details.AchDetails;
@@ -47,10 +48,13 @@
 import com.adyen.model.checkout.details.MolPayDetails;
 import com.adyen.model.checkout.details.PayPalDetails;
 import com.adyen.model.checkout.details.PayUUpiDetails;
+import com.adyen.model.checkout.details.PayWithGoogleDetails;
 import com.adyen.model.checkout.details.QiwiWalletDetails;
 import com.adyen.model.checkout.details.SamsungPayDetails;
 import com.adyen.model.checkout.details.SepaDirectDebitDetails;
+import com.adyen.model.checkout.details.UpiCollectDetails;
 import com.adyen.model.checkout.details.UpiDetails;
+import com.adyen.model.checkout.details.UpiIntentDetails;
 import com.adyen.model.checkout.details.VippsDetails;
 import com.adyen.model.checkout.details.VisaCheckoutDetails;
 import com.adyen.model.checkout.details.WeChatPayDetails;
@@ -61,8 +65,6 @@
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
 
-import java.io.IOException;
-
 public class PaymentMethodDetailsDeserializerJackson extends JsonDeserializer<PaymentMethodDetails> {
 
     @Override
@@ -118,6 +120,8 @@ public PaymentMethodDetails deserialize(JsonParser jsonParser, DeserializationCo
                 return codec.treeToValue(node, GiropayDetails.class);
             case GooglePayDetails.GOOGLEPAY:
                 return codec.treeToValue(node, GooglePayDetails.class);
+            case PayWithGoogleDetails.PAYWITHGOOGLE:
+                return codec.treeToValue(node, PayWithGoogleDetails.class);
             case IdealDetails.IDEAL:
                 return codec.treeToValue(node, IdealDetails.class);
             case KlarnaDetails.KLARNA:
@@ -157,6 +161,10 @@ public PaymentMethodDetails deserialize(JsonParser jsonParser, DeserializationCo
                 return codec.treeToValue(node, SepaDirectDebitDetails.class);
             case UpiDetails.UPI:
                 return codec.treeToValue(node, UpiDetails.class);
+            case UpiCollectDetails.UPI_COLLECT:
+                return codec.treeToValue(node, UpiCollectDetails.class);
+            case UpiIntentDetails.UPI_INTENT:
+                return codec.treeToValue(node, UpiIntentDetails.class);
             case VippsDetails.VIPPS:
                 return codec.treeToValue(node, VippsDetails.class);
             case VisaCheckoutDetails.VISA_CHECKOUT:

src/main/java/com/adyen/deserializer/PaymentMethodDetailsTypeAdapter.java

@@ -47,10 +47,13 @@
 import com.adyen.model.checkout.details.MolPayDetails;
 import com.adyen.model.checkout.details.PayPalDetails;
 import com.adyen.model.checkout.details.PayUUpiDetails;
+import com.adyen.model.checkout.details.PayWithGoogleDetails;
 import com.adyen.model.checkout.details.QiwiWalletDetails;
 import com.adyen.model.checkout.details.SamsungPayDetails;
 import com.adyen.model.checkout.details.SepaDirectDebitDetails;
+import com.adyen.model.checkout.details.UpiCollectDetails;
 import com.adyen.model.checkout.details.UpiDetails;
+import com.adyen.model.checkout.details.UpiIntentDetails;
 import com.adyen.model.checkout.details.VippsDetails;
 import com.adyen.model.checkout.details.VisaCheckoutDetails;
 import com.adyen.model.checkout.details.WeChatPayDetails;
@@ -135,6 +138,8 @@ public PaymentMethodDetails read(JsonReader in) {
                         return gson.getAdapter(GiropayDetails.class).fromJsonTree(jsonElement);
                     case GooglePayDetails.GOOGLEPAY:
                         return gson.getAdapter(GooglePayDetails.class).fromJsonTree(jsonElement);
+                    case PayWithGoogleDetails.PAYWITHGOOGLE:
+                        return gson.getAdapter(PayWithGoogleDetails.class).fromJsonTree(jsonElement);
                     case IdealDetails.IDEAL:
                         return gson.getAdapter(IdealDetails.class).fromJsonTree(jsonElement);
                     case KlarnaDetails.KLARNA:
@@ -172,6 +177,10 @@ public PaymentMethodDetails read(JsonReader in) {
                         return gson.getAdapter(SamsungPayDetails.class).fromJsonTree(jsonElement);
                     case SepaDirectDebitDetails.SEPA_DIRECT_DEBIT:
                         return gson.getAdapter(SepaDirectDebitDetails.class).fromJsonTree(jsonElement);
+                    case UpiIntentDetails.UPI_INTENT:
+                        return gson.getAdapter(UpiIntentDetails.class).fromJsonTree(jsonElement);
+                    case UpiCollectDetails.UPI_COLLECT:
+                        return gson.getAdapter(UpiCollectDetails.class).fromJsonTree(jsonElement);
                     case UpiDetails.UPI:
                         return gson.getAdapter(UpiDetails.class).fromJsonTree(jsonElement);
                     case VippsDetails.VIPPS:

src/main/java/com/adyen/model/ThreeDS2RequestData.java

@@ -124,6 +124,9 @@ public ChallengeIndicatorEnum read(final JsonReader jsonReader) throws IOExcepti
     @SerializedName("sdkTransID")
     private String sdkTransID = null;
 
+    @SerializedName("sdkVersion")
+    private String sdkVersion = null;
+
     @SerializedName("threeDSCompInd")
     private String threeDSCompInd = null;
 
@@ -361,12 +364,24 @@ public void setSdkTransID(String sdkTransID) {
         this.sdkTransID = sdkTransID;
     }
 
+    public ThreeDS2RequestData sdkVersion(String sdkVersion) {
+        this.sdkVersion = sdkVersion;
+        return this;
+    }
+
+    public String getSdkVersion() {
+        return sdkVersion;
+    }
+
+    public void setSdkVersion(String sdkVersion) {
+        this.sdkVersion = sdkVersion;
+    }
+
     public ThreeDS2RequestData threeDSCompInd(String threeDSCompInd) {
         this.threeDSCompInd = threeDSCompInd;
         return this;
     }
 
-
     public String getThreeDSCompInd() {
         return threeDSCompInd;
     }
@@ -612,6 +627,7 @@ public boolean equals(java.lang.Object o) {
                 Objects.equals(this.sdkMaxTimeout, threeDS2RequestData.sdkMaxTimeout) &&
                 Objects.equals(this.sdkReferenceNumber, threeDS2RequestData.sdkReferenceNumber) &&
                 Objects.equals(this.sdkTransID, threeDS2RequestData.sdkTransID) &&
+                Objects.equals(this.sdkVersion, threeDS2RequestData.sdkVersion) &&
                 Objects.equals(this.threeDSCompInd, threeDS2RequestData.threeDSCompInd) &&
                 Objects.equals(this.threeDSRequestorID, threeDS2RequestData.threeDSRequestorID) &&
                 Objects.equals(this.threeDSRequestorName, threeDS2RequestData.threeDSRequestorName) &&
@@ -622,7 +638,7 @@ public boolean equals(java.lang.Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(acquirerBIN, acquirerMerchantID, authenticationOnly, challengeIndicator, deviceChannel, deviceRenderOptions, mcc, merchantName, messageVersion, notificationURL, sdkAppID, sdkEncData, sdkEphemPubKey, sdkMaxTimeout, sdkReferenceNumber, sdkTransID, threeDSCompInd, threeDSRequestorID, threeDSRequestorName, threeDSRequestorURL, transactionType, whiteListStatus);
+        return Objects.hash(acquirerBIN, acquirerMerchantID, authenticationOnly, challengeIndicator, deviceChannel, deviceRenderOptions, mcc, merchantName, messageVersion, notificationURL, sdkAppID, sdkEncData, sdkEphemPubKey, sdkMaxTimeout, sdkReferenceNumber, sdkTransID, sdkVersion, threeDSCompInd, threeDSRequestorID, threeDSRequestorName, threeDSRequestorURL, transactionType, whiteListStatus);
     }
 
 
@@ -647,6 +663,7 @@ public String toString() {
         sb.append("    sdkMaxTimeout: ").append(toIndentedString(sdkMaxTimeout)).append("\n");
         sb.append("    sdkReferenceNumber: ").append(toIndentedString(sdkReferenceNumber)).append("\n");
         sb.append("    sdkTransID: ").append(toIndentedString(sdkTransID)).append("\n");
+        sb.append("    sdkVersion: ").append(toIndentedString(sdkVersion)).append("\n");
         sb.append("    threeDSCompInd: ").append(toIndentedString(threeDSCompInd)).append("\n");
         sb.append("    threeDSRequestorID: ").append(toIndentedString(threeDSRequestorID)).append("\n");
         sb.append("    threeDSRequestorName: ").append(toIndentedString(threeDSRequestorName)).append("\n");

src/main/java/com/adyen/model/checkout/details/GooglePayDetails.java

@@ -44,7 +44,7 @@ public class GooglePayDetails implements PaymentMethodDetails {
     /**
      * Possible types
      */
-    public static final String GOOGLEPAY = "paywithgoogle";
+    public static final String GOOGLEPAY = "googlepay";
 
     /**
      * Gets or Sets fundingSource