[java-retrofit2-play24] Fix integration-tests

Running mvn integration-test failed in samples/client/petstore/java/retrofit2-play24 This merges pull requests OpenAPITools#1735 and OpenAPITools#5527 into retrofit2-play24. Also removes the jackson-databind-version field, since it should always be the same as jackson-version, and updates build.gradle/build.sbt on-behalf-of: @nqminds <[email protected]>
aloisklink · May 11, 2020 · d9987c3 · d9987c3
1 parent 30c6d2e
commit d9987c3
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 61 deletions.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
@@ -122,18 +122,16 @@ ext {
     oltu_version = "1.0.1"
     retrofit_version = "2.3.0"
     {{#usePlayWS}}
+    jackson_version = "2.10.3"
+    jackson_databind_version = "2.10.3"
+    jackson_databind_nullable_version = "0.2.1"
     {{#play24}}
-    jackson_version = "2.6.6"
     play_version = "2.4.11"
     {{/play24}}
     {{#play25}}
-    jackson_version = "2.10.1"
     play_version = "2.5.14"
     {{/play25}}
     {{#play26}}
-    jackson_version = "2.10.3"
-    jackson_databind_version = "2.10.3"
-    jackson_databind_nullable_version = "0.2.1"
     play_version = "2.6.7"
     {{/play26}}
     {{/usePlayWS}}

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
@@ -17,23 +17,17 @@ lazy val root = (project in file(".")).
       {{#usePlayWS}}
       {{#play24}}
       "com.typesafe.play" % "play-java-ws_2.11" % "2.4.11" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.6.6" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.6" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.6" % "compile",
       {{/play24}}
       {{#play25}}
       "com.typesafe.play" % "play-java-ws_2.11" % "2.5.15" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3" % "compile",
       {{/play25}}
       {{#play26}}
       "com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile",
       "javax.validation" % "validation-api" % "1.1.0.Final" % "compile",
+      {{/play26}}
       "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile",
       "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10.3" % "compile",
-      {{/play26}}
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3" % "compile",
       "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
       {{/usePlayWS}}
       {{#useRxJava}}

diff --git a/...i-generator/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache b/...i-generator/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache
@@ -1,8 +1,10 @@
 package {{invokerPackage}};
 
 import okhttp3.*;
+import okio.AsyncTimeout;
 import okio.Buffer;
 import okio.BufferedSource;
+import okio.Timeout;
 import play.libs.F;
 import play.libs.ws.WSClient;
 import play.libs.ws.WSRequest;
@@ -95,17 +97,24 @@ public class Play24CallFactory implements okhttp3.Call.Factory {
         private WSRequest wsRequest;
 
         private final Request request;
+        private final AsyncTimeout timeout;
 
         public PlayWSCall(WSClient wsClient, Request request) {
             this.wsClient = wsClient;
             this.request = request;
+            this.timeout = new AsyncTimeout();
         }
 
         @Override
         public Request request() {
             return request;
         }
 
+        @Override
+        public Timeout timeout() {
+            return timeout;
+        }
+
         @Override
         public void enqueue(final okhttp3.Callback responseCallback) {
             final Call call = this;

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
@@ -328,7 +328,12 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>${jackson-databind-version}</version>
+                <version>${jackson-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.openapitools</groupId>
+                <artifactId>jackson-databind-nullable</artifactId>
+                <version>${jackson-databind-nullable-version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -349,23 +354,13 @@
                 <artifactId>play-java-ws_2.11</artifactId>
                 <version>${play-version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
             {{/play24}}
             {{#play25}}
             <dependency>
                 <groupId>com.typesafe.play</groupId>
                 <artifactId>play-java-ws_2.11</artifactId>
                 <version>${play-version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
             {{/play25}}
             {{#play26}}
             <dependency>
@@ -378,11 +373,6 @@
                 <artifactId>validation-api</artifactId>
                 <version>1.1.0.Final</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
             {{/play26}}
         {{/usePlayWS}}
         {{#parcelableModel}}
@@ -410,17 +400,14 @@
         <gson-fire-version>1.8.3</gson-fire-version>
         <swagger-annotations-version>1.5.22</swagger-annotations-version>
         {{#usePlayWS}}
-        <jackson-databind-version>2.10.3</jackson-databind-version>
+        <jackson-version>2.10.3</jackson-version>
         {{#play24}}
-        <jackson-version>2.6.6</jackson-version>
         <play-version>2.4.11</play-version>
         {{/play24}}
         {{#play25}}
-        <jackson-version>2.10.3</jackson-version>
         <play-version>2.5.15</play-version>
         {{/play25}}
         {{#play26}}
-        <jackson-version>2.10.3</jackson-version>
         <play-version>2.6.7</play-version>
         {{/play26}}
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>

diff --git a/samples/client/petstore/java/retrofit2-play24/build.gradle b/samples/client/petstore/java/retrofit2-play24/build.gradle
@@ -97,7 +97,9 @@ if(hasProperty('target') && target == 'android') {
 ext {
     oltu_version = "1.0.1"
     retrofit_version = "2.3.0"
-    jackson_version = "2.6.6"
+    jackson_version = "2.10.3"
+    jackson_databind_version = "2.10.3"
+    jackson_databind_nullable_version = "0.2.1"
     play_version = "2.4.11"
     swagger_annotations_version = "1.5.22"
     junit_version = "4.13"

diff --git a/samples/client/petstore/java/retrofit2-play24/build.sbt b/samples/client/petstore/java/retrofit2-play24/build.sbt
@@ -12,9 +12,9 @@ lazy val root = (project in file(".")).
       "com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
       "com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile",
       "com.typesafe.play" % "play-java-ws_2.11" % "2.4.11" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.6.6" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.6.6" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.6" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3" % "compile",
       "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
       "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",

diff --git a/samples/client/petstore/java/retrofit2-play24/pom.xml b/samples/client/petstore/java/retrofit2-play24/pom.xml
@@ -260,7 +260,12 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>${jackson-databind-version}</version>
+                <version>${jackson-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.openapitools</groupId>
+                <artifactId>jackson-databind-nullable</artifactId>
+                <version>${jackson-databind-nullable-version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -272,11 +277,6 @@
                 <artifactId>play-java-ws_2.11</artifactId>
                 <version>${play-version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -292,8 +292,7 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.3</gson-fire-version>
         <swagger-annotations-version>1.5.22</swagger-annotations-version>
-        <jackson-databind-version>2.10.3</jackson-databind-version>
-        <jackson-version>2.6.6</jackson-version>
+        <jackson-version>2.10.3</jackson-version>
         <play-version>2.4.11</play-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
         <retrofit-version>2.5.0</retrofit-version>

diff --git a/...tstore/java/retrofit2-play24/src/main/java/org/openapitools/client/Play24CallFactory.java b/...tstore/java/retrofit2-play24/src/main/java/org/openapitools/client/Play24CallFactory.java
@@ -1,8 +1,10 @@
 package org.openapitools.client;
 
 import okhttp3.*;
+import okio.AsyncTimeout;
 import okio.Buffer;
 import okio.BufferedSource;
+import okio.Timeout;
 import play.libs.F;
 import play.libs.ws.WSClient;
 import play.libs.ws.WSRequest;
@@ -95,17 +97,24 @@ static class PlayWSCall implements Call {
         private WSRequest wsRequest;
 
         private final Request request;
+        private final AsyncTimeout timeout;
 
         public PlayWSCall(WSClient wsClient, Request request) {
             this.wsClient = wsClient;
             this.request = request;
+            this.timeout = new AsyncTimeout();
         }
 
         @Override
         public Request request() {
             return request;
         }
 
+        @Override
+        public Timeout timeout() {
+            return timeout;
+        }
+
         @Override
         public void enqueue(final okhttp3.Callback responseCallback) {
             final Call call = this;

diff --git a/samples/client/petstore/java/retrofit2-play25/build.gradle b/samples/client/petstore/java/retrofit2-play25/build.gradle
@@ -97,7 +97,9 @@ if(hasProperty('target') && target == 'android') {
 ext {
     oltu_version = "1.0.1"
     retrofit_version = "2.3.0"
-    jackson_version = "2.10.1"
+    jackson_version = "2.10.3"
+    jackson_databind_version = "2.10.3"
+    jackson_databind_nullable_version = "0.2.1"
     play_version = "2.5.14"
     swagger_annotations_version = "1.5.22"
     junit_version = "4.13"

diff --git a/samples/client/petstore/java/retrofit2-play25/pom.xml b/samples/client/petstore/java/retrofit2-play25/pom.xml
@@ -265,7 +265,12 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>${jackson-databind-version}</version>
+                <version>${jackson-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.openapitools</groupId>
+                <artifactId>jackson-databind-nullable</artifactId>
+                <version>${jackson-databind-nullable-version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -277,11 +282,6 @@
                 <artifactId>play-java-ws_2.11</artifactId>
                 <version>${play-version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -297,7 +297,6 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.3</gson-fire-version>
         <swagger-annotations-version>1.5.22</swagger-annotations-version>
-        <jackson-databind-version>2.10.3</jackson-databind-version>
         <jackson-version>2.10.3</jackson-version>
         <play-version>2.5.15</play-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>

diff --git a/samples/client/petstore/java/retrofit2-play26/build.sbt b/samples/client/petstore/java/retrofit2-play26/build.sbt
@@ -15,7 +15,7 @@ lazy val root = (project in file(".")).
       "javax.validation" % "validation-api" % "1.1.0.Final" % "compile",
       "com.fasterxml.jackson.core" % "jackson-core" % "2.10.3" % "compile",
       "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.3" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10.3" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.3" % "compile",
       "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
       "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",

diff --git a/samples/client/petstore/java/retrofit2-play26/pom.xml b/samples/client/petstore/java/retrofit2-play26/pom.xml
@@ -265,7 +265,12 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>${jackson-databind-version}</version>
+                <version>${jackson-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.openapitools</groupId>
+                <artifactId>jackson-databind-nullable</artifactId>
+                <version>${jackson-databind-nullable-version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -282,11 +287,6 @@
                 <artifactId>validation-api</artifactId>
                 <version>1.1.0.Final</version>
             </dependency>
-            <dependency>
-                <groupId>org.openapitools</groupId>
-                <artifactId>jackson-databind-nullable</artifactId>
-                <version>${jackson-databind-nullable-version}</version>
-            </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -302,7 +302,6 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <gson-fire-version>1.8.3</gson-fire-version>
         <swagger-annotations-version>1.5.22</swagger-annotations-version>
-        <jackson-databind-version>2.10.3</jackson-databind-version>
         <jackson-version>2.10.3</jackson-version>
         <play-version>2.6.7</play-version>
         <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>