Skip to content

[Java] Update dependencies to address vulnerabilities #1735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 23, 2018
Merged

[Java] Update dependencies to address vulnerabilities #1735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
597c47a
Update retrofit2
ackintosh Dec 22, 2018
00cae34
Update samples
ackintosh Dec 22, 2018
23cda7a
Implement okhttp3.Call#timeout
ackintosh Dec 22, 2018
41733ae
Update samples
ackintosh Dec 22, 2018
9917af6
Update Play26CallFactory
ackintosh Dec 22, 2018
3d56491
Fix indent
ackintosh Dec 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...i-generator/src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -96,18 +98,25 @@ public class Play25CallFactory implements okhttp3.Call.Factory {
private List<WSRequestFilter> filters;

private final Request request;
private final AsyncTimeout timeout;

public PlayWSCall(WSClient wsClient, List<WSRequestFilter> filters, Request request) {
this.wsClient = wsClient;
this.request = request;
this.filters = filters;
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;
Expand Down
9 changes: 9 additions & 0 deletions ...i-generator/src/main/resources/Java/libraries/retrofit2/play26/Play26CallFactory.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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<WSRequestFilter> filters, Request request) {
this.wsClient = wsClient;
this.request = request;
this.filters = filters;
this.timeout = new AsyncTimeout();

if (executor != null) {
this.executor = executor;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
<play-version>2.6.7</play-version>
{{/play26}}
{{/usePlayWS}}
<retrofit-version>2.3.0</retrofit-version>
<retrofit-version>2.5.0</retrofit-version>
{{#useRxJava}}
<rxjava-version>1.3.0</rxjava-version>
{{/useRxJava}}
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2-play24/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@
<swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-version>2.6.6</jackson-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>
<junit-version>4.12</junit-version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2-play25/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
<swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-version>2.7.8</jackson-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>
<oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version>
Expand Down
9 changes: 9 additions & 0 deletions ...tstore/java/retrofit2-play25/src/main/java/org/openapitools/client/Play25CallFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -96,18 +98,25 @@ static class PlayWSCall implements Call {
private List<WSRequestFilter> filters;

private final Request request;
private final AsyncTimeout timeout;

public PlayWSCall(WSClient wsClient, List<WSRequestFilter> filters, Request request) {
this.wsClient = wsClient;
this.request = request;
this.filters = filters;
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;
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2-play26/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
<swagger-annotations-version>1.5.21</swagger-annotations-version>
<jackson-version>2.8.11</jackson-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>
<oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version>
Expand Down
9 changes: 9 additions & 0 deletions ...tstore/java/retrofit2-play26/src/main/java/org/openapitools/client/Play26CallFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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<WSRequestFilter> filters, Request request) {
this.wsClient = wsClient;
this.request = request;
this.filters = filters;
this.timeout = new AsyncTimeout();

if (executor != null) {
this.executor = executor;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-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>
<oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2rx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-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>
<threetenbp-version>1.3.5</threetenbp-version>
<oltu-version>1.0.1</oltu-version>
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2rx2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.8.0</gson-fire-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>
<threetenbp-version>1.3.5</threetenbp-version>
<oltu-version>1.0.1</oltu-version>
Expand Down