loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Java] Update dependencies (#1735)

Browse Source 
* 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
This commit is contained in:
Akihito Nakano 2018-12-23 20:03:50 +09:00 committed by William Cheng
parent 05107032d1
commit f1831533d4
11 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache
View File

@ -1,8 +1,10 @@
package {{invokerPackage}}; package {{invokerPackage}};
import okhttp3.*; import okhttp3.*;
import okio.AsyncTimeout;
import okio.Buffer; import okio.Buffer;
import okio.BufferedSource; import okio.BufferedSource;
import okio.Timeout;
import play.libs.ws.WSClient; import play.libs.ws.WSClient;
import play.libs.ws.WSRequest; import play.libs.ws.WSRequest;
import play.libs.ws.WSResponse; import play.libs.ws.WSResponse;
@ -96,11 +98,13 @@ public class Play25CallFactory implements okhttp3.Call.Factory {
private List<WSRequestFilter> filters; private List<WSRequestFilter> filters;
private final Request request; private final Request request;
private final AsyncTimeout timeout;
public PlayWSCall(WSClient wsClient, List<WSRequestFilter> filters, Request request) { public PlayWSCall(WSClient wsClient, List<WSRequestFilter> filters, Request request) {
this.wsClient = wsClient; this.wsClient = wsClient;
this.request = request; this.request = request;
this.filters = filters; this.filters = filters;
this.timeout = new AsyncTimeout();
} }
@Override @Override
@ -108,6 +112,11 @@ public class Play25CallFactory implements okhttp3.Call.Factory {
return request; return request;
} }
@Override
public Timeout timeout() {
return timeout;
}
@Override @Override
public void enqueue(final okhttp3.Callback responseCallback) { public void enqueue(final okhttp3.Callback responseCallback) {
final Call call = this; final Call call = this;

9
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play26/Play26CallFactory.mustache
View File

@ -1,8 +1,10 @@
package {{invokerPackage}}; package {{invokerPackage}};
import okhttp3.*; import okhttp3.*;
import okio.AsyncTimeout;
import okio.Buffer; import okio.Buffer;
import okio.BufferedSource; import okio.BufferedSource;
import okio.Timeout;
import play.libs.ws.WSClient; import play.libs.ws.WSClient;
import play.libs.ws.WSRequest; import play.libs.ws.WSRequest;
import play.libs.ws.WSResponse; 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 Executor executor = java.util.concurrent.ForkJoinPool.commonPool();
private final Request request; private final Request request;
private final AsyncTimeout timeout;
public PlayWSCall(WSClient wsClient, Executor executor, List<WSRequestFilter> filters, Request request) { public PlayWSCall(WSClient wsClient, Executor executor, List<WSRequestFilter> filters, Request request) {
this.wsClient = wsClient; this.wsClient = wsClient;
this.request = request; this.request = request;
this.filters = filters; this.filters = filters;
this.timeout = new AsyncTimeout();
if (executor != null) { if (executor != null) {
this.executor = executor; this.executor = executor;
@ -121,6 +125,11 @@ public class Play26CallFactory implements okhttp3.Call.Factory {
return request; return request;
} }
@Override
public Timeout timeout() {
return timeout;
}
@Override @Override
public void enqueue(final okhttp3.Callback responseCallback) { public void enqueue(final okhttp3.Callback responseCallback) {
final Call call = this; final Call call = this;

2
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
View File

@ -367,7 +367,7 @@
<play-version>2.6.7</play-version> <play-version>2.6.7</play-version>
{{/play26}} {{/play26}}
{{/usePlayWS}} {{/usePlayWS}}
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.5.0</retrofit-version>
{{#useRxJava}} {{#useRxJava}}
<rxjava-version>1.3.0</rxjava-version> <rxjava-version>1.3.0</rxjava-version>
{{/useRxJava}} {{/useRxJava}}

2
samples/client/petstore/java/retrofit2-play24/pom.xml
View File

@ -270,7 +270,7 @@
<swagger-annotations-version>1.5.21</swagger-annotations-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-version>2.6.6</jackson-version> <jackson-version>2.6.6</jackson-version>
<play-version>2.4.11</play-version> <play-version>2.4.11</play-version>
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.5.0</retrofit-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>
</properties> </properties>

2
samples/client/petstore/java/retrofit2-play25/pom.xml
View File

@ -275,7 +275,7 @@
<swagger-annotations-version>1.5.21</swagger-annotations-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-version>2.7.8</jackson-version> <jackson-version>2.7.8</jackson-version>
<play-version>2.5.15</play-version> <play-version>2.5.15</play-version>
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.5.0</retrofit-version>
<threetenbp-version>1.3.5</threetenbp-version> <threetenbp-version>1.3.5</threetenbp-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>

9
samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Play25CallFactory.java
View File

@ -1,8 +1,10 @@
package org.openapitools.client; package org.openapitools.client;
import okhttp3.*; import okhttp3.*;
import okio.AsyncTimeout;
import okio.Buffer; import okio.Buffer;
import okio.BufferedSource; import okio.BufferedSource;
import okio.Timeout;
import play.libs.ws.WSClient; import play.libs.ws.WSClient;
import play.libs.ws.WSRequest; import play.libs.ws.WSRequest;
import play.libs.ws.WSResponse; import play.libs.ws.WSResponse;
@ -96,11 +98,13 @@ public class Play25CallFactory implements okhttp3.Call.Factory {
private List<WSRequestFilter> filters; private List<WSRequestFilter> filters;
private final Request request; private final Request request;
private final AsyncTimeout timeout;
public PlayWSCall(WSClient wsClient, List<WSRequestFilter> filters, Request request) { public PlayWSCall(WSClient wsClient, List<WSRequestFilter> filters, Request request) {
this.wsClient = wsClient; this.wsClient = wsClient;
this.request = request; this.request = request;
this.filters = filters; this.filters = filters;
this.timeout = new AsyncTimeout();
} }
@Override @Override
@ -108,6 +112,11 @@ public class Play25CallFactory implements okhttp3.Call.Factory {
return request; return request;
} }
@Override
public Timeout timeout() {
return timeout;
}
@Override @Override
public void enqueue(final okhttp3.Callback responseCallback) { public void enqueue(final okhttp3.Callback responseCallback) {
final Call call = this; final Call call = this;

2
samples/client/petstore/java/retrofit2-play26/pom.xml
View File

@ -280,7 +280,7 @@
<swagger-annotations-version>1.5.21</swagger-annotations-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-version>2.8.11</jackson-version> <jackson-version>2.8.11</jackson-version>
<play-version>2.6.7</play-version> <play-version>2.6.7</play-version>
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.5.0</retrofit-version>
<threetenbp-version>1.3.5</threetenbp-version> <threetenbp-version>1.3.5</threetenbp-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>

9
samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Play26CallFactory.java
View File

@ -1,8 +1,10 @@
package org.openapitools.client; package org.openapitools.client;
import okhttp3.*; import okhttp3.*;
import okio.AsyncTimeout;
import okio.Buffer; import okio.Buffer;
import okio.BufferedSource; import okio.BufferedSource;
import okio.Timeout;
import play.libs.ws.WSClient; import play.libs.ws.WSClient;
import play.libs.ws.WSRequest; import play.libs.ws.WSRequest;
import play.libs.ws.WSResponse; 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 Executor executor = java.util.concurrent.ForkJoinPool.commonPool();
private final Request request; private final Request request;
private final AsyncTimeout timeout;
public PlayWSCall(WSClient wsClient, Executor executor, List<WSRequestFilter> filters, Request request) { public PlayWSCall(WSClient wsClient, Executor executor, List<WSRequestFilter> filters, Request request) {
this.wsClient = wsClient; this.wsClient = wsClient;
this.request = request; this.request = request;
this.filters = filters; this.filters = filters;
this.timeout = new AsyncTimeout();
if (executor != null) { if (executor != null) {
this.executor = executor; this.executor = executor;
@ -121,6 +125,11 @@ public class Play26CallFactory implements okhttp3.Call.Factory {
return request; return request;
} }
@Override
public Timeout timeout() {
return timeout;
}
@Override @Override
public void enqueue(final okhttp3.Callback responseCallback) { public void enqueue(final okhttp3.Callback responseCallback) {
final Call call = this; final Call call = this;

2
samples/client/petstore/java/retrofit2/pom.xml
View File

@ -242,7 +242,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version> <gson-fire-version>1.8.0</gson-fire-version>
<swagger-annotations-version>1.5.21</swagger-annotations-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.5.0</retrofit-version>
<threetenbp-version>1.3.5</threetenbp-version> <threetenbp-version>1.3.5</threetenbp-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version> <junit-version>4.12</junit-version>

2
samples/client/petstore/java/retrofit2rx/pom.xml
View File

@ -252,7 +252,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version> <gson-fire-version>1.8.0</gson-fire-version>
<swagger-annotations-version>1.5.21</swagger-annotations-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.5.0</retrofit-version>
<rxjava-version>1.3.0</rxjava-version> <rxjava-version>1.3.0</rxjava-version>
<threetenbp-version>1.3.5</threetenbp-version> <threetenbp-version>1.3.5</threetenbp-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>

2
samples/client/petstore/java/retrofit2rx2/pom.xml
View File

@ -252,7 +252,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-version> <gson-fire-version>1.8.0</gson-fire-version>
<swagger-annotations-version>1.5.21</swagger-annotations-version> <swagger-annotations-version>1.5.21</swagger-annotations-version>
<retrofit-version>2.3.0</retrofit-version> <retrofit-version>2.5.0</retrofit-version>
<rxjava-version>2.1.1</rxjava-version> <rxjava-version>2.1.1</rxjava-version>
<threetenbp-version>1.3.5</threetenbp-version> <threetenbp-version>1.3.5</threetenbp-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>