From 597c47a3b02661d3a730259b05d3818afb817c6c Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sat, 22 Dec 2018 16:44:49 +0900 Subject: [PATCH 1/6] Update retrofit2 refs: https://nvd.nist.gov/vuln/detail/CVE-2018-1000850 https://nvd.nist.gov/vuln/detail/CVE-2018-1000844 --- .../src/main/resources/Java/libraries/retrofit2/pom.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 4ddee4d014f6..b8f9aa0bd6b3 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache @@ -367,7 +367,7 @@ 2.6.7 {{/play26}} {{/usePlayWS}} - 2.3.0 + 2.5.0 {{#useRxJava}} 1.3.0 {{/useRxJava}} From 00cae341963d11582adcafa4802e28b6caf256c0 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sat, 22 Dec 2018 16:46:03 +0900 Subject: [PATCH 2/6] Update samples ./bin/java-petstore-all.sh --- samples/client/petstore/java/retrofit2-play24/pom.xml | 2 +- samples/client/petstore/java/retrofit2-play25/pom.xml | 2 +- samples/client/petstore/java/retrofit2-play26/pom.xml | 2 +- samples/client/petstore/java/retrofit2/pom.xml | 2 +- samples/client/petstore/java/retrofit2rx/pom.xml | 2 +- samples/client/petstore/java/retrofit2rx2/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/samples/client/petstore/java/retrofit2-play24/pom.xml b/samples/client/petstore/java/retrofit2-play24/pom.xml index e73282392c4c..ce23e80807cb 100644 --- a/samples/client/petstore/java/retrofit2-play24/pom.xml +++ b/samples/client/petstore/java/retrofit2-play24/pom.xml @@ -270,7 +270,7 @@ 1.5.21 2.6.6 2.4.11 - 2.3.0 + 2.5.0 1.0.1 4.12 diff --git a/samples/client/petstore/java/retrofit2-play25/pom.xml b/samples/client/petstore/java/retrofit2-play25/pom.xml index 4051b0036d17..e7dc6681a6c1 100644 --- a/samples/client/petstore/java/retrofit2-play25/pom.xml +++ b/samples/client/petstore/java/retrofit2-play25/pom.xml @@ -275,7 +275,7 @@ 1.5.21 2.7.8 2.5.15 - 2.3.0 + 2.5.0 1.3.5 1.0.1 4.12 diff --git a/samples/client/petstore/java/retrofit2-play26/pom.xml b/samples/client/petstore/java/retrofit2-play26/pom.xml index 6eaabdbc3ebe..e3078639dabd 100644 --- a/samples/client/petstore/java/retrofit2-play26/pom.xml +++ b/samples/client/petstore/java/retrofit2-play26/pom.xml @@ -280,7 +280,7 @@ 1.5.21 2.8.11 2.6.7 - 2.3.0 + 2.5.0 1.3.5 1.0.1 4.12 diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml index 6cba3499f5a4..22586fcb8390 100644 --- a/samples/client/petstore/java/retrofit2/pom.xml +++ b/samples/client/petstore/java/retrofit2/pom.xml @@ -242,7 +242,7 @@ ${java.version} 1.8.0 1.5.21 - 2.3.0 + 2.5.0 1.3.5 1.0.1 4.12 diff --git a/samples/client/petstore/java/retrofit2rx/pom.xml b/samples/client/petstore/java/retrofit2rx/pom.xml index d764b2112d34..08aac7270758 100644 --- a/samples/client/petstore/java/retrofit2rx/pom.xml +++ b/samples/client/petstore/java/retrofit2rx/pom.xml @@ -252,7 +252,7 @@ ${java.version} 1.8.0 1.5.21 - 2.3.0 + 2.5.0 1.3.0 1.3.5 1.0.1 diff --git a/samples/client/petstore/java/retrofit2rx2/pom.xml b/samples/client/petstore/java/retrofit2rx2/pom.xml index 316cedb4f2e8..9bc393d96cbb 100644 --- a/samples/client/petstore/java/retrofit2rx2/pom.xml +++ b/samples/client/petstore/java/retrofit2rx2/pom.xml @@ -252,7 +252,7 @@ ${java.version} 1.8.0 1.5.21 - 2.3.0 + 2.5.0 2.1.1 1.3.5 1.0.1 From 23cda7a6850f5582af5c8e338babbfd105b8abd9 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sat, 22 Dec 2018 19:23:51 +0900 Subject: [PATCH 3/6] Implement okhttp3.Call#timeout refs https://github.com/square/okhttp/pull/4363 --- .../retrofit2/play25/Play25CallFactory.mustache | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache index 93df7a2718d9..cc9362a6a744 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache @@ -1,8 +1,10 @@ package {{invokerPackage}}; import okhttp3.*; +import okio.AsyncTimeout; import okio.Buffer; import okio.BufferedSource; +import okio.Timeout; import play.libs.ws.WSClient; import play.libs.ws.WSRequest; import play.libs.ws.WSResponse; @@ -96,11 +98,13 @@ public class Play25CallFactory implements okhttp3.Call.Factory { private List filters; private final Request request; + private final AsyncTimeout timeout; public PlayWSCall(WSClient wsClient, List filters, Request request) { this.wsClient = wsClient; this.request = request; this.filters = filters; + this.timeout = new AsyncTimeout(); } @Override @@ -108,6 +112,11 @@ public class Play25CallFactory implements okhttp3.Call.Factory { return request; } + @Override + public Timeout timeout() { + return timeout; + } + @Override public void enqueue(final okhttp3.Callback responseCallback) { final Call call = this; From 41733ae0064c1264997e7a03cc1f0bef04328c4f Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sat, 22 Dec 2018 19:25:44 +0900 Subject: [PATCH 4/6] Update samples ./bin/java-petstore-all.sh --- .../java/org/openapitools/client/Play25CallFactory.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Play25CallFactory.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Play25CallFactory.java index 8c43eb675277..7465819461fd 100644 --- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Play25CallFactory.java +++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Play25CallFactory.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.ws.WSClient; import play.libs.ws.WSRequest; import play.libs.ws.WSResponse; @@ -96,11 +98,13 @@ static class PlayWSCall implements Call { private List filters; private final Request request; + private final AsyncTimeout timeout; public PlayWSCall(WSClient wsClient, List filters, Request request) { this.wsClient = wsClient; this.request = request; this.filters = filters; + this.timeout = new AsyncTimeout(); } @Override @@ -108,6 +112,11 @@ public Request request() { return request; } + @Override + public Timeout timeout() { + return timeout; + } + @Override public void enqueue(final okhttp3.Callback responseCallback) { final Call call = this; From 9917af6ad9b3d13b6581fae4cba23ae6774513a8 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sat, 22 Dec 2018 21:13:15 +0900 Subject: [PATCH 5/6] Update Play26CallFactory --- .../retrofit2/play26/Play26CallFactory.mustache | 9 +++++++++ .../java/org/openapitools/client/Play26CallFactory.java | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play26/Play26CallFactory.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play26/Play26CallFactory.mustache index 6e4180341bfd..0542fe65de9f 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play26/Play26CallFactory.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play26/Play26CallFactory.mustache @@ -1,8 +1,10 @@ package {{invokerPackage}}; import okhttp3.*; +import okio.AsyncTimeout; import okio.Buffer; import okio.BufferedSource; +import okio.Timeout; import play.libs.ws.WSClient; import play.libs.ws.WSRequest; import play.libs.ws.WSResponse; @@ -105,11 +107,13 @@ public class Play26CallFactory implements okhttp3.Call.Factory { private Executor executor = java.util.concurrent.ForkJoinPool.commonPool(); private final Request request; + private final AsyncTimeout timeout; public PlayWSCall(WSClient wsClient, Executor executor, List filters, Request request) { this.wsClient = wsClient; this.request = request; this.filters = filters; + this.timeout = new AsyncTimeout(); if (executor != null) { this.executor = executor; @@ -121,6 +125,11 @@ public class Play26CallFactory implements okhttp3.Call.Factory { 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-play26/src/main/java/org/openapitools/client/Play26CallFactory.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Play26CallFactory.java index d320157bcf27..45ed1287871b 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Play26CallFactory.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Play26CallFactory.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.ws.WSClient; import play.libs.ws.WSRequest; import play.libs.ws.WSResponse; @@ -105,11 +107,13 @@ static class PlayWSCall implements Call { private Executor executor = java.util.concurrent.ForkJoinPool.commonPool(); private final Request request; + private final AsyncTimeout timeout; public PlayWSCall(WSClient wsClient, Executor executor, List filters, Request request) { this.wsClient = wsClient; this.request = request; this.filters = filters; + this.timeout = new AsyncTimeout(); if (executor != null) { this.executor = executor; @@ -121,6 +125,11 @@ public Request request() { return request; } + @Override + public Timeout timeout() { + return timeout; + } + @Override public void enqueue(final okhttp3.Callback responseCallback) { final Call call = this; From 3d564916638e530ecf116c9770f8f4d553e480c3 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Sun, 23 Dec 2018 10:30:11 +0900 Subject: [PATCH 6/6] Fix indent --- .../Java/libraries/retrofit2/play25/Play25CallFactory.mustache | 2 +- .../Java/libraries/retrofit2/play26/Play26CallFactory.mustache | 2 +- .../main/java/org/openapitools/client/Play25CallFactory.java | 2 +- .../main/java/org/openapitools/client/Play26CallFactory.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache index cc9362a6a744..fd0057a0e0bc 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache @@ -113,7 +113,7 @@ public class Play25CallFactory implements okhttp3.Call.Factory { } @Override - public Timeout timeout() { + public Timeout timeout() { return timeout; } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play26/Play26CallFactory.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play26/Play26CallFactory.mustache index 0542fe65de9f..b46b3af0eda3 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play26/Play26CallFactory.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play26/Play26CallFactory.mustache @@ -126,7 +126,7 @@ public class Play26CallFactory implements okhttp3.Call.Factory { } @Override - public Timeout timeout() { + public Timeout timeout() { return timeout; } diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Play25CallFactory.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Play25CallFactory.java index 7465819461fd..d016b0eb0902 100644 --- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Play25CallFactory.java +++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Play25CallFactory.java @@ -113,7 +113,7 @@ public Request request() { } @Override - public Timeout timeout() { + public Timeout timeout() { return timeout; } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Play26CallFactory.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Play26CallFactory.java index 45ed1287871b..5b4a012a6575 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Play26CallFactory.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Play26CallFactory.java @@ -126,7 +126,7 @@ public Request request() { } @Override - public Timeout timeout() { + public Timeout timeout() { return timeout; }