loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-04 22:50:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with buffered sink handling in OkHttp (#5786)

Browse Source 
* Fix issue with buffered sink handling in okhttp

Fixes unexpected end of stream exceptions when using the okhttp-gson library
and making asynchronous calls.

* update petstore samples for okhttp-gson

$ ./bin/java-petstore-okhttp-gson.sh
$ ./bin/security/java-petstore-okhttp-gson.sh

* WIP: trigger ci
This commit is contained in:
Trent Albright 2017-06-07 06:15:06 -04:00 committed by wing328
parent 2bef56c7bd
commit 676e2a04f5
3 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache
View File

@ -23,8 +23,6 @@ public class ProgressRequestBody extends RequestBody {
private final ProgressRequestListener progressListener; private final ProgressRequestListener progressListener;
private BufferedSink bufferedSink;
public ProgressRequestBody(RequestBody requestBody, ProgressRequestListener progressListener) { public ProgressRequestBody(RequestBody requestBody, ProgressRequestListener progressListener) {
this.requestBody = requestBody; this.requestBody = requestBody;
this.progressListener = progressListener; this.progressListener = progressListener;
@ -42,13 +40,9 @@ public class ProgressRequestBody extends RequestBody {
@Override @Override
public void writeTo(BufferedSink sink) throws IOException { public void writeTo(BufferedSink sink) throws IOException {
if (bufferedSink == null) { BufferedSink bufferedSink = Okio.buffer(sink(sink));
bufferedSink = Okio.buffer(sink(sink));
}
requestBody.writeTo(bufferedSink); requestBody.writeTo(bufferedSink);
bufferedSink.flush(); bufferedSink.flush();
} }
private Sink sink(Sink sink) { private Sink sink(Sink sink) {

8
samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java
View File

@ -34,8 +34,6 @@ public class ProgressRequestBody extends RequestBody {
private final ProgressRequestListener progressListener; private final ProgressRequestListener progressListener;
private BufferedSink bufferedSink;
public ProgressRequestBody(RequestBody requestBody, ProgressRequestListener progressListener) { public ProgressRequestBody(RequestBody requestBody, ProgressRequestListener progressListener) {
this.requestBody = requestBody; this.requestBody = requestBody;
this.progressListener = progressListener; this.progressListener = progressListener;
@ -53,13 +51,9 @@ public class ProgressRequestBody extends RequestBody {
@Override @Override
public void writeTo(BufferedSink sink) throws IOException { public void writeTo(BufferedSink sink) throws IOException {
if (bufferedSink == null) { BufferedSink bufferedSink = Okio.buffer(sink(sink));
bufferedSink = Okio.buffer(sink(sink));
}
requestBody.writeTo(bufferedSink); requestBody.writeTo(bufferedSink);
bufferedSink.flush(); bufferedSink.flush();
} }
private Sink sink(Sink sink) { private Sink sink(Sink sink) {

8
samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java
View File

@ -34,8 +34,6 @@ public class ProgressRequestBody extends RequestBody {
private final ProgressRequestListener progressListener; private final ProgressRequestListener progressListener;
private BufferedSink bufferedSink;
public ProgressRequestBody(RequestBody requestBody, ProgressRequestListener progressListener) { public ProgressRequestBody(RequestBody requestBody, ProgressRequestListener progressListener) {
this.requestBody = requestBody; this.requestBody = requestBody;
this.progressListener = progressListener; this.progressListener = progressListener;
@ -53,13 +51,9 @@ public class ProgressRequestBody extends RequestBody {
@Override @Override
public void writeTo(BufferedSink sink) throws IOException { public void writeTo(BufferedSink sink) throws IOException {
if (bufferedSink == null) { BufferedSink bufferedSink = Okio.buffer(sink(sink));
bufferedSink = Okio.buffer(sink(sink));
}
requestBody.writeTo(bufferedSink); requestBody.writeTo(bufferedSink);
bufferedSink.flush(); bufferedSink.flush();
} }
private Sink sink(Sink sink) { private Sink sink(Sink sink) {