From 676e2a04f589b77915fe43f45bc44c8f8af627c2 Mon Sep 17 00:00:00 2001 From: Trent Albright Date: Wed, 7 Jun 2017 06:15:06 -0400 Subject: [PATCH] Fix issue with buffered sink handling in OkHttp (#5786) * 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 --- .../libraries/okhttp-gson/ProgressRequestBody.mustache | 8 +------- .../main/java/io/swagger/client/ProgressRequestBody.java | 8 +------- .../main/java/io/swagger/client/ProgressRequestBody.java | 8 +------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache index d6570bd0d3b..0f15c1f415d 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache @@ -23,8 +23,6 @@ public class ProgressRequestBody extends RequestBody { private final ProgressRequestListener progressListener; - private BufferedSink bufferedSink; - public ProgressRequestBody(RequestBody requestBody, ProgressRequestListener progressListener) { this.requestBody = requestBody; this.progressListener = progressListener; @@ -42,13 +40,9 @@ public class ProgressRequestBody extends RequestBody { @Override public void writeTo(BufferedSink sink) throws IOException { - if (bufferedSink == null) { - bufferedSink = Okio.buffer(sink(sink)); - } - + BufferedSink bufferedSink = Okio.buffer(sink(sink)); requestBody.writeTo(bufferedSink); bufferedSink.flush(); - } private Sink sink(Sink sink) { diff --git a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java index deca0211de6..ae835fb6085 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java +++ b/samples/client/petstore-security-test/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java @@ -34,8 +34,6 @@ public class ProgressRequestBody extends RequestBody { private final ProgressRequestListener progressListener; - private BufferedSink bufferedSink; - public ProgressRequestBody(RequestBody requestBody, ProgressRequestListener progressListener) { this.requestBody = requestBody; this.progressListener = progressListener; @@ -53,13 +51,9 @@ public class ProgressRequestBody extends RequestBody { @Override public void writeTo(BufferedSink sink) throws IOException { - if (bufferedSink == null) { - bufferedSink = Okio.buffer(sink(sink)); - } - + BufferedSink bufferedSink = Okio.buffer(sink(sink)); requestBody.writeTo(bufferedSink); bufferedSink.flush(); - } private Sink sink(Sink sink) { diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java index a06ea04a4d0..d6d76e7de98 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ProgressRequestBody.java @@ -34,8 +34,6 @@ public class ProgressRequestBody extends RequestBody { private final ProgressRequestListener progressListener; - private BufferedSink bufferedSink; - public ProgressRequestBody(RequestBody requestBody, ProgressRequestListener progressListener) { this.requestBody = requestBody; this.progressListener = progressListener; @@ -53,13 +51,9 @@ public class ProgressRequestBody extends RequestBody { @Override public void writeTo(BufferedSink sink) throws IOException { - if (bufferedSink == null) { - bufferedSink = Okio.buffer(sink(sink)); - } - + BufferedSink bufferedSink = Okio.buffer(sink(sink)); requestBody.writeTo(bufferedSink); bufferedSink.flush(); - } private Sink sink(Sink sink) {