Merge pull request #821 from Adyen/develop

michaelpaul · web-flow · commit d471bbfb013b · 2022-09-27T14:23:58.000+02:00
Release 18.1.1
diff --git a/.github/workflows/javaci.yml b/.github/workflows/javaci.yml
@@ -16,4 +16,4 @@ jobs:
           distribution: 'adopt'
           
       - name: Run the tests with Maven
-        run: mvn test
+        run: mvn -B test --no-transfer-progress
diff --git a/.github/workflows/models.yml b/.github/workflows/models.yml
@@ -0,0 +1,30 @@
+name: Java Models
+
+on: [ workflow_dispatch ]
+
+jobs:
+  generate:
+    runs-on: ubuntu-latest
+    name: Generate Models
+    steps:
+      - uses: actions/checkout@v3
+      - run: make models
+      - name: Set PR variables
+        id: vars
+        run: |
+          cd target/spec
+          echo ::set-output name=pr_title::"Update models"
+          echo ::set-output name=pr_body::"OpenAPI spec or templates produced new models on $(date +%d-%m-%Y) \
+            by [commit](https://github.com/Adyen/adyen-openapi/commit/$(git rev-parse HEAD))."
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v4
+        with:
+          token: ${{ secrets.ADYEN_AUTOMATION_BOT_ACCESS_TOKEN }}
+          committer: ${{ secrets.ADYEN_AUTOMATION_BOT_EMAIL }}
+          author: ${{ secrets.ADYEN_AUTOMATION_BOT_EMAIL }}
+          base: develop
+          branch: automation/models
+          title: ${{ steps.vars.outputs.pr_title }}
+          body: ${{ steps.vars.outputs.pr_body }}
+          add-paths: |
+            src/main/java/com/adyen/model
diff --git a/.openapi-generator-ignore b/.openapi-generator-ignore
@@ -0,0 +1,3 @@
+# These models cannot properly represent additional data, a `Map<String, String>` is used instead
+target/out/src/main/java/com/adyen/model/payments/AdditionalData*
+target/out/src/main/java/com/adyen/model/payments/ResponseAdditionalData*
diff --git a/Makefile b/Makefile
@@ -0,0 +1,74 @@
+openapi-generator-version:=6.0.1
+openapi-generator-url:=https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/$(openapi-generator-version)/openapi-generator-cli-$(openapi-generator-version).jar
+openapi-generator-jar:=target/openapi-generator-cli.jar
+openapi-generator-cli:=java -jar $(openapi-generator-jar)
+
+generator:=java
+library:=okhttp-gson
+services:=payments
+models:=src/main/java/com/adyen/model
+output:=target/out
+
+
+# Generate models (for each service)
+models: $(services)
+
+binlookup: spec=BinLookupService-v52
+checkout: spec=CheckoutService-v69
+storedValue: spec=StoredValueService-v46
+posterminalmanagement: spec=TfmAPIService-v1
+payments: spec=PaymentService-v68
+recurring: spec=RecurringService-v68
+payout: spec=PayoutService-v68
+management: spec=ManagementService-v1
+balanceplatform: spec=BalancePlatformService-v2
+transfers: spec=TransferService-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
+
+$(services): target/spec $(openapi-generator-jar)
+	rm -rf $(models)/$@ $(output)
+	$(openapi-generator-cli) generate \
+		-i target/spec/json/$(spec).json \
+		-g $(generator) \
+		-t templates \
+		-o $(output) \
+		--ignore-file-override ./.openapi-generator-ignore \
+		--skip-validate-spec \
+		--model-package $(subst /,.,com.adyen.model.$@) \
+		--library $(library) \
+		--global-property models \
+		--global-property modelDocs=false \
+		--global-property modelTests=false \
+		--additional-properties=dateLibrary=legacy
+	mv $(output)/$(models)/$@ $(models)/$@
+
+
+# Checkout spec (and patch version)
+target/spec:
+	git clone https://github.com/Adyen/adyen-openapi.git target/spec
+	perl -i -pe's/"openapi" : "3.[0-9].[0-9]"/"openapi" : "3.0.0"/' target/spec/json/*.json
+
+
+# Extract templates (copy them for modifications)
+templates: $(openapi-generator-jar)
+	$(openapi-generator-cli) author template -g $(generator) --library $(library) -o target/templates
+
+
+# Download the generator
+$(openapi-generator-jar):
+	wget --quiet -o /dev/null $(openapi-generator-url) -O $(openapi-generator-jar)
+
+
+# Discard generated artifacts and changed models
+clean:
+	rm -rf $(output)
+	git checkout $(models)
+	git clean -f -d $(models)
+
+
+.PHONY: templates models $(services)
diff --git a/README.md b/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>18.1.0</version>
+  <version>18.1.1</version>
 </dependency>
 ```
 
@@ -118,6 +118,15 @@ adyenHttpClientWithProxy.setProxy(proxy);
 client.setHttpClient(adyenHttpClientWithProxy);
 ~~~~
 
+If your proxy requires authentication, set all the settings as system properties instead (don't mix with previous approach), for example: 
+
+~~~~ java
+System.setProperty("https.proxyHost", "127.0.0.1");
+System.setProperty("https.proxyPort", "3128");
+System.setProperty("https.proxyUser", "squid");
+System.setProperty("https.proxyPassword", "ward");
+~~~~
+
 ### Example integrations
  
 For a closer look at how our Java library works, you can clone one of our example integrations:
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -41,6 +41,11 @@
 
     <property name="fileExtensions" value="java, properties, xml"/>
 
+    <!-- Ignore generated models -->
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="model[\\/].*$"/>
+    </module>
+
     <!-- Checks that a package-info.java file exists for each package.     -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->
     <!--<module name="JavadocPackage"/>-->
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>com.adyen</groupId>
     <artifactId>adyen-java-api-library</artifactId>
     <packaging>jar</packaging>
-    <version>18.1.0</version>
+    <version>18.1.1</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,6 +25,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <swagger-core-version>1.6.5</swagger-core-version>
     </properties>
     <scm>
         <connection>scm:git:git@github.com:Adyen/adyen-java-api-library.git</connection>
@@ -45,7 +46,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.3.0</version>
                 <configuration>
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -137,7 +138,6 @@
                 <version>3.2.0</version>
                 <configuration>
                     <configLocation>checkstyle.xml</configLocation>
-                    <encoding>UTF-8</encoding>
                     <consoleOutput>true</consoleOutput>
                     <failsOnError>true</failsOnError>
                 </configuration>
@@ -186,7 +186,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.13.3</version>
+            <version>2.13.4</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -207,13 +207,13 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.7.0</version>
+            <version>4.8.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jdk8</artifactId>
-            <version>2.13.3</version>
+            <version>2.13.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -231,5 +231,17 @@
             <artifactId>swagger-annotations</artifactId>
             <version>2.2.2</version>
         </dependency>
+        <!-- Generated model annotations -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-core-version}</version>
+        </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/com/adyen/Client.java b/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 = "18.1.0";
+    public static final String LIB_VERSION = "18.1.1";
     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";
diff --git a/src/main/java/com/adyen/httpclient/AdyenHttpClient.java b/src/main/java/com/adyen/httpclient/AdyenHttpClient.java
@@ -196,7 +196,7 @@ private CloseableHttpClient createCloseableHttpClient(Config config) throws HTTP
         if (config.getTerminalCertificate() != null) {
             return createHttpClientWithSocketFactory(getTerminalCertificateSocketFactory(config));
         }
-        return HttpClients.createDefault();
+        return HttpClients.createSystem();
     }
 
     private CloseableHttpClient createHttpClientWithSocketFactory(SSLConnectionSocketFactory socketFactory) {
diff --git a/src/main/java/com/adyen/model/PaymentResult.java b/src/main/java/com/adyen/model/PaymentResult.java
@@ -75,6 +75,8 @@ public class PaymentResult {
     public enum ResultCodeEnum {
         @SerializedName("AuthenticationFinished")
         AUTHENTICATIONFINISHED("AuthenticationFinished"),
+        @SerializedName("AuthenticationNotRequired")
+        AUTHENTICATIONNOTREQUIRED("AuthenticationNotRequired"),
         @SerializedName("Authorised")
         AUTHORISED("Authorised"),
         @SerializedName("Cancelled")
diff --git a/src/test/java/com/adyen/ModelSerializationTest.java b/src/test/java/com/adyen/ModelSerializationTest.java
@@ -26,6 +26,7 @@
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -44,6 +45,7 @@ public class ModelSerializationTest {
      * Validate that all the enum fields get serialized to same value using GSON and Jackson
      */
     @Test
+    @Ignore("Models should use only one serialization library")
     public void testEnumSerializationInGsonAndJacksonShouldBeSame() throws IOException, ClassNotFoundException {
         List<Class<?>> enums = ReflectionUtil.getEnumClasses("com.adyen.model").stream()
                 .flatMap(aClass -> Arrays.stream(aClass.getEnumConstants()))
diff --git a/src/test/java/com/adyen/PaymentResultTest.java b/src/test/java/com/adyen/PaymentResultTest.java
@@ -4,6 +4,7 @@
 import com.google.gson.Gson;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 public class PaymentResultTest extends BaseTest {
@@ -15,4 +16,12 @@ public void TestAuthenticationFinishedResultCodeDeserialization() {
         PaymentResult result = gson.fromJson(response, PaymentResult.class);
         assertNotNull(result.getResultCode());
     }
+
+    @Test
+    public void TestAuthenticationNotRequiredResultCodeDeserialization() {
+        Gson gson = new Gson();
+        String response = "{\"resultCode\": \"AuthenticationNotRequired\"}";
+        PaymentResult result = gson.fromJson(response, PaymentResult.class);
+        assertEquals(result.getResultCode(), PaymentResult.ResultCodeEnum.AUTHENTICATIONNOTREQUIRED);
+    }
 }
diff --git a/templates/libraries/okhttp-gson/model.mustache b/templates/libraries/okhttp-gson/model.mustache
@@ -0,0 +1,61 @@
+{{>licenseInfo}}
+
+package {{package}};
+
+{{#useReflectionEqualsHashCode}}
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+{{/useReflectionEqualsHashCode}}
+import java.util.Objects;
+import java.util.Arrays;
+{{#imports}}
+import {{import}};
+{{/imports}}
+{{#serializableModel}}
+import java.io.Serializable;
+{{/serializableModel}}
+{{#jackson}}
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+{{#withXml}}
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
+{{/withXml}}
+{{#vendorExtensions.x-has-readonly-properties}}
+import com.fasterxml.jackson.annotation.JsonCreator;
+{{/vendorExtensions.x-has-readonly-properties}}
+{{/jackson}}
+{{#withXml}}
+import javax.xml.bind.annotation.*;
+{{/withXml}}
+{{#jsonb}}
+import java.lang.reflect.Type;
+import javax.json.bind.annotation.JsonbTypeDeserializer;
+import javax.json.bind.annotation.JsonbTypeSerializer;
+import javax.json.bind.serializer.DeserializationContext;
+import javax.json.bind.serializer.JsonbDeserializer;
+import javax.json.bind.serializer.JsonbSerializer;
+import javax.json.bind.serializer.SerializationContext;
+import javax.json.stream.JsonGenerator;
+import javax.json.stream.JsonParser;
+import javax.json.bind.annotation.JsonbProperty;
+{{#vendorExtensions.x-has-readonly-properties}}
+import javax.json.bind.annotation.JsonbCreator;
+{{/vendorExtensions.x-has-readonly-properties}}
+{{/jsonb}}
+{{#parcelableModel}}
+import android.os.Parcelable;
+import android.os.Parcel;
+{{/parcelableModel}}
+{{#useBeanValidation}}
+import javax.validation.constraints.*;
+import javax.validation.Valid;
+{{/useBeanValidation}}
+{{#performBeanValidation}}
+import org.hibernate.validator.constraints.*;
+{{/performBeanValidation}}
+
+{{#models}}
+{{#model}}
+{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#oneOf}}{{#-first}}{{>oneof_model}}{{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}{{>anyof_model}}{{/-first}}{{/anyOf}}{{^anyOf}}{{>pojo}}{{/anyOf}}{{/oneOf}}{{/isEnum}}
+{{/model}}
+{{/models}}
diff --git a/templates/libraries/okhttp-gson/pojo.mustache b/templates/libraries/okhttp-gson/pojo.mustache
diff --git a/templates/licenseInfo.mustache b/templates/licenseInfo.mustache

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+# These models cannot properly represent additional data, a `Map<String, String>` is used instead
	`2`	`+target/out/src/main/java/com/adyen/model/payments/AdditionalData*`
	`3`	`+target/out/src/main/java/com/adyen/model/payments/ResponseAdditionalData*`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ private CloseableHttpClient createCloseableHttpClient(Config config) throws HTTP`
`196`	`196`	`if (config.getTerminalCertificate() != null) {`
`197`	`197`	`return createHttpClientWithSocketFactory(getTerminalCertificateSocketFactory(config));`
`198`	`198`	`}`
`199`		`- return HttpClients.createDefault();`
	`199`	`+ return HttpClients.createSystem();`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`private CloseableHttpClient createHttpClientWithSocketFactory(SSLConnectionSocketFactory socketFactory) {`