Merge pull request #670 from Adyen/develop

17.3.0 Release

Author: wboereboom

.github/CODEOWNERS

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

.github/workflows/coveralls.yml

@@ -0,0 +1,22 @@
+name: Coveralls
+
+on: [push]
+
+jobs:
+
+  coveralls:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+      - name: Build & Test
+        run: mvn clean test
+      - name: Build with Maven
+        run: mvn test jacoco:report
+      - name: Coveralls Coverage Report Submission
+        run: mvn coveralls:report --define repoToken=${{ secrets.COVERALL_REPO_TOKEN }}

.travis.yml

@@ -1,7 +1,5 @@
-[![Build Status](https://travis-ci.org/Adyen/adyen-java-api-library.svg?branch=master)](https://travis-ci.org/Adyen/adyen-java-api-library)
 [![Coverage Status](https://coveralls.io/repos/github/Adyen/adyen-java-api-library/badge.svg?branch=master)](https://coveralls.io/github/Adyen/adyen-java-api-library?branch=master)
 
-
 # Adyen Java API Library
 
 This is the officially supported Java library for using Adyen's APIs.
@@ -41,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.2.0</version>
+  <version>17.3.0</version>
 </dependency>
 ```
 
@@ -146,7 +144,7 @@ For other questions, [contact our Support Team](https://www.adyen.help/hc/en-us/
 
 
 ## Licence
-This repository is available under the [MIT license](https://github.com/Adyen/adyen-java-api-library/blob/master/LICENSE).
+This repository is available under the [MIT license](https://github.com/Adyen/adyen-java-api-library/blob/main/LICENSE).
 
 
 

README.md

@@ -4,7 +4,7 @@
     <groupId>com.adyen</groupId>
     <artifactId>adyen-java-api-library</artifactId>
     <packaging>jar</packaging>
-    <version>17.2.0</version>
+    <version>17.3.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,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <jackson.version>2.13.0</jackson.version>
+        <jackson.version>2.13.1</jackson.version>
     </properties>
     <scm>
         <connection>scm:git:[email protected]:Adyen/adyen-java-api-library.git</connection>
@@ -54,6 +54,13 @@
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
                 <version>4.3.0</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                        <version>2.3.1</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
@@ -142,7 +149,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>5.1.2</version>
+                <version>5.1.3</version>
                 <executions>
                     <execution>
                         <id>bundle-manifest</id>
@@ -169,7 +176,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.8</version>
+            <version>2.8.9</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -184,7 +191,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.1</version>
+            <version>5.1.2</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -195,7 +202,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.0.0</version>
+            <version>4.2.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -212,12 +219,12 @@
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-models</artifactId>
-            <version>2.1.11</version>
+            <version>2.1.12</version>
         </dependency>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>2.1.11</version>
+            <version>2.1.12</version>
         </dependency>
     </dependencies>
 </project>

pom.xml

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

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

@@ -83,9 +83,6 @@ public class PaymentMethodsRequest {
     @SerializedName("trustedShopper")
     private Boolean trustedShopper = null;
 
-    @SerializedName("enableRealTimeUpdate")
-    private Boolean enableRealTimeUpdate = null;
-
     @SerializedName("threeDSAuthenticationOnly")
     private Boolean threeDSAuthenticationOnly = null;
 
@@ -279,11 +276,6 @@ public void setBlockedPaymentMethods(List<String> blockedPaymentMethods) {
         this.blockedPaymentMethods = blockedPaymentMethods;
     }
 
-    public PaymentMethodsRequest enableRealTimeUpdate(Boolean enableRealTimeUpdate) {
-        this.enableRealTimeUpdate = enableRealTimeUpdate;
-        return this;
-    }
-
     public String getStore() {
         return store;
     }
@@ -297,19 +289,6 @@ public PaymentMethodsRequest store(String store) {
         return this;
     }
 
-    /**
-     * Choose if a specific transaction should use the Real-time Account Updater, regardless of other settings.
-     *
-     * @return enableRealTimeUpdate
-     **/
-    public Boolean isEnableRealTimeUpdate() {
-        return enableRealTimeUpdate;
-    }
-
-    public void setEnableRealTimeUpdate(Boolean enableRealTimeUpdate) {
-        this.enableRealTimeUpdate = enableRealTimeUpdate;
-    }
-
     public PaymentMethodsRequest threeDSAuthenticationOnly(Boolean threeDSAuthenticationOnly) {
         this.threeDSAuthenticationOnly = threeDSAuthenticationOnly;
         return this;
@@ -368,7 +347,6 @@ public boolean equals(java.lang.Object o) {
                 Objects.equals(this.blockedPaymentMethods, paymentMethodsRequest.blockedPaymentMethods) &&
                 Objects.equals(this.channel, paymentMethodsRequest.channel) &&
                 Objects.equals(this.countryCode, paymentMethodsRequest.countryCode) &&
-                Objects.equals(this.enableRealTimeUpdate, paymentMethodsRequest.enableRealTimeUpdate) &&
                 Objects.equals(this.merchantAccount, paymentMethodsRequest.merchantAccount) &&
                 Objects.equals(this.order, paymentMethodsRequest.order) &&
                 Objects.equals(this.shopperLocale, paymentMethodsRequest.shopperLocale) &&
@@ -379,7 +357,7 @@ public boolean equals(java.lang.Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(additionalData, allowedPaymentMethods, amount, blockedPaymentMethods, channel, countryCode, enableRealTimeUpdate, merchantAccount, order, shopperLocale, shopperReference, splitCardFundingSources, store);
+        return Objects.hash(additionalData, allowedPaymentMethods, amount, blockedPaymentMethods, channel, countryCode, merchantAccount, order, shopperLocale, shopperReference, splitCardFundingSources, store);
     }
 
     @Override
@@ -393,7 +371,6 @@ public String toString() {
         sb.append("    blockedPaymentMethods: ").append(toIndentedString(blockedPaymentMethods)).append("\n");
         sb.append("    channel: ").append(toIndentedString(channel)).append("\n");
         sb.append("    countryCode: ").append(toIndentedString(countryCode)).append("\n");
-        sb.append("    enableRealTimeUpdate: ").append(toIndentedString(enableRealTimeUpdate)).append("\n");
         sb.append("    merchantAccount: ").append(toIndentedString(merchantAccount)).append("\n");
         sb.append("    order: ").append(toIndentedString(order)).append("\n");
         sb.append("    shopperLocale: ").append(toIndentedString(shopperLocale)).append("\n");
@@ -425,7 +402,7 @@ public enum ChannelEnum {
         public static ChannelEnum fromValue(String text) {
             return Arrays.stream(values()).
                     filter(s -> s.value.equals(text)).
-                    findFirst().orElse(null);
+                                 findFirst().orElse(null);
         }
 
         public String getValue() {
@@ -451,7 +428,4 @@ public ChannelEnum read(final JsonReader jsonReader) throws IOException {
         }
     }
 
-}
-
-
-
+}

src/main/java/com/adyen/model/checkout/PaymentMethodsRequest.java

@@ -14,7 +14,7 @@
  *
  * Adyen Java API Library
  *
- * Copyright (c) 2020 Adyen B.V.
+ * Copyright (c) 2021 Adyen B.V.
  * This file is open source and available under the MIT license.
  * See the LICENSE file for more info.
  */
@@ -45,10 +45,11 @@ public class GetOnboardingUrlRequest {
     @SerializedName("shopperLocale")
     private String shopperLocale = null;
 
-    public GetOnboardingUrlRequest accountHolderCode(String accountHolderCode) {
-        this.accountHolderCode = accountHolderCode;
-        return this;
-    }
+    @SerializedName("showPages")
+    private OnboardingShowPages showPages = null;
+
+    @SerializedName("collectInformation")
+    private OnboardingCollectInformation collectInformation = null;
 
     /**
      * The account holder code you provided when you created the account holder.
@@ -63,8 +64,8 @@ public void setAccountHolderCode(String accountHolderCode) {
         this.accountHolderCode = accountHolderCode;
     }
 
-    public GetOnboardingUrlRequest editMode(Boolean editMode) {
-        this.editMode = editMode;
+    public GetOnboardingUrlRequest accountHolderCode(String accountHolderCode) {
+        this.accountHolderCode = accountHolderCode;
         return this;
     }
 
@@ -81,8 +82,8 @@ public void setEditMode(Boolean editMode) {
         this.editMode = editMode;
     }
 
-    public GetOnboardingUrlRequest platformName(String platformName) {
-        this.platformName = platformName;
+    public GetOnboardingUrlRequest editMode(Boolean editMode) {
+        this.editMode = editMode;
         return this;
     }
 
@@ -99,8 +100,8 @@ public void setPlatformName(String platformName) {
         this.platformName = platformName;
     }
 
-    public GetOnboardingUrlRequest returnUrl(String returnUrl) {
-        this.returnUrl = returnUrl;
+    public GetOnboardingUrlRequest platformName(String platformName) {
+        this.platformName = platformName;
         return this;
     }
 
@@ -117,6 +118,11 @@ public void setReturnUrl(String returnUrl) {
         this.returnUrl = returnUrl;
     }
 
+    public GetOnboardingUrlRequest returnUrl(String returnUrl) {
+        this.returnUrl = returnUrl;
+        return this;
+    }
+
     /**
      * The language to be used in the page, specified by a combination of a language and country code. For example, **pt-BR**. \n\nIf not specified in the request or if the language is not supported, the page uses the browser language. If the browser language is not supported, the page uses **en-US** by default.\n\nFor a list supported languages, refer to [Change the page language](https://docs.adyen.com/platforms/onboarding-and-verification/hosted-onboarding-page#change-page-language).
      *
@@ -130,6 +136,47 @@ public void setShopperLocale(String shopperLocale) {
         this.shopperLocale = shopperLocale;
     }
 
+    public GetOnboardingUrlRequest shopperLocale(String shopperLocale) {
+        this.shopperLocale = shopperLocale;
+        return this;
+    }
+
+    /**
+     * What pages should be shown on the hosted onbarding page
+     *
+     * @return
+     */
+    public OnboardingShowPages getShowPages() {
+        return showPages;
+    }
+
+    public void setShowPages(OnboardingShowPages showPages) {
+        this.showPages = showPages;
+    }
+
+    public GetOnboardingUrlRequest showPages(OnboardingShowPages showPages) {
+        this.showPages = showPages;
+        return this;
+    }
+
+    /**
+     * What information should be collected on the hosted onboarding page
+     *
+     * @return
+     */
+    public OnboardingCollectInformation getCollectInformation() {
+        return collectInformation;
+    }
+
+    public void setCollectInformation(OnboardingCollectInformation collectInformation) {
+        this.collectInformation = collectInformation;
+    }
+
+    public GetOnboardingUrlRequest collectInformation(OnboardingCollectInformation collectInformation) {
+        this.collectInformation = collectInformation;
+        return this;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -143,12 +190,14 @@ public boolean equals(Object o) {
                 Objects.equals(this.editMode, getOnboardingUrlRequest.editMode) &&
                 Objects.equals(this.platformName, getOnboardingUrlRequest.platformName) &&
                 Objects.equals(this.returnUrl, getOnboardingUrlRequest.returnUrl) &&
-                Objects.equals(this.shopperLocale, getOnboardingUrlRequest.shopperLocale);
+                Objects.equals(this.shopperLocale, getOnboardingUrlRequest.shopperLocale) &&
+                Objects.equals(this.showPages, getOnboardingUrlRequest.showPages) &&
+                Objects.equals(this.collectInformation, getOnboardingUrlRequest.collectInformation);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(accountHolderCode, editMode, platformName, returnUrl, shopperLocale);
+        return Objects.hash(accountHolderCode, editMode, platformName, returnUrl, shopperLocale, showPages, collectInformation);
     }
 
 
@@ -162,6 +211,8 @@ public String toString() {
         sb.append("    platformName: ").append(toIndentedString(platformName)).append("\n");
         sb.append("    returnUrl: ").append(toIndentedString(returnUrl)).append("\n");
         sb.append("    shopperLocale: ").append(toIndentedString(shopperLocale)).append("\n");
+        sb.append("    showPages: ").append(toIndentedString(showPages)).append("\n");
+        sb.append("    collectInformation: ").append(toIndentedString(collectInformation)).append("\n");
         sb.append("}");
         return sb.toString();
     }