From f1831533d4cdd823a4560be1ba2d205122c487b3 Mon Sep 17 00:00:00 2001 From: Akihito Nakano Date: Sun, 23 Dec 2018 20:03:50 +0900 Subject: [PATCH] [Java] Update dependencies (#1735) * Update retrofit2 refs: https://nvd.nist.gov/vuln/detail/CVE-2018-1000850 https://nvd.nist.gov/vuln/detail/CVE-2018-1000844 * Update samples ./bin/java-petstore-all.sh * Implement okhttp3.Call#timeout refs https://github.com/square/okhttp/pull/4363 * Update samples ./bin/java-petstore-all.sh * Update Play26CallFactory * Fix indent --- .../retrofit2/play25/Play25CallFactory.mustache | 9 +++++++++ .../retrofit2/play26/Play26CallFactory.mustache | 9 +++++++++ .../main/resources/Java/libraries/retrofit2/pom.mustache | 2 +- samples/client/petstore/java/retrofit2-play24/pom.xml | 2 +- samples/client/petstore/java/retrofit2-play25/pom.xml | 2 +- .../java/org/openapitools/client/Play25CallFactory.java | 9 +++++++++ samples/client/petstore/java/retrofit2-play26/pom.xml | 2 +- .../java/org/openapitools/client/Play26CallFactory.java | 9 +++++++++ samples/client/petstore/java/retrofit2/pom.xml | 2 +- samples/client/petstore/java/retrofit2rx/pom.xml | 2 +- samples/client/petstore/java/retrofit2rx2/pom.xml | 2 +- 11 files changed, 43 insertions(+), 7 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 93df7a2718d..fd0057a0e0b 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; 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 6e4180341bf..b46b3af0eda 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/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache index 4ddee4d014f..b8f9aa0bd6b 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}} diff --git a/samples/client/petstore/java/retrofit2-play24/pom.xml b/samples/client/petstore/java/retrofit2-play24/pom.xml index e73282392c4..ce23e80807c 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 4051b0036d1..e7dc6681a6c 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-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 8c43eb67527..d016b0eb090 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 @@ 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; diff --git a/samples/client/petstore/java/retrofit2-play26/pom.xml b/samples/client/petstore/java/retrofit2-play26/pom.xml index 6eaabdbc3eb..e3078639dab 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-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 d320157bcf2..5b4a012a657 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 @@ 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/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml index 6cba3499f5a..22586fcb839 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 d764b2112d3..08aac727075 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 316cedb4f2e..9bc393d96cb 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