Update GitHubConnectorResponse.bodyStream() implementation

Author: bitwiseman

pom.xml

@@ -169,9 +169,6 @@
                       <!-- Unbridged test changes -->
                       <exclude>org.kohsuke.github.GHCommit.GHAuthor</exclude>
 
-                      <!-- Ignore default interface method coverage -->
-                      <exclude>org.kohsuke.github.connector.GitHubConnectorRequest</exclude>
-                      
                       <!-- TODO: Some coverage, but more needed -->
                       <exclude>org.kohsuke.github.GHIssue.PullRequest</exclude>
                       <exclude>org.kohsuke.github.GHCommitSearchBuilder</exclude>

src/main/java/org/kohsuke/github/connector/GitHubConnectorResponse.java

@@ -87,9 +87,9 @@ public String header(String name) {
     public abstract InputStream bodyStream() throws IOException;
 
     /**
-     * Gets the {@link GitHubConnectorRequest} for this response.
+     * Gets the {@link GitHubConnector} for this response.
      *
-     * @return the {@link GitHubConnectorRequest} for this response.
+     * @return the {@link GitHubConnector} for this response.
      */
     @Nonnull
     public GitHubConnectorRequest request() {
@@ -161,7 +161,6 @@ public abstract static class ByteArrayResponse extends GitHubConnectorResponse {
         private boolean inputStreamRead = false;
         private byte[] inputBytes = null;
         private boolean isClosed = false;
-        private boolean avoidBufferedResponseStream;
 
         /**
          * Constructor for ByteArray Response
@@ -177,7 +176,6 @@ protected ByteArrayResponse(@Nonnull GitHubConnectorRequest request,
                 int statusCode,
                 @Nonnull Map<String, List<String>> headers) {
             super(request, statusCode, headers);
-            avoidBufferedResponseStream = request.avoidBufferedResponseStream();
         }
 
         /**
@@ -190,29 +188,27 @@ public InputStream bodyStream() throws IOException {
                 throw new IOException("Response is closed");
             }
 
-            if (avoidBufferedResponseStream) {
-                synchronized (this) {
-                    if (inputStreamRead) {
-                        throw new IOException("Response is already consumed");
-                    }
-                    inputStreamRead = true;
-                    return wrapStream(rawBodyStream());
-                }
-            }
-
             synchronized (this) {
+                InputStream body;
                 if (!inputStreamRead) {
-                    InputStream rawStream = rawBodyStream();
-                    try (InputStream stream = wrapStream(rawStream)) {
-                        if (stream != null) {
-                            inputBytes = IOUtils.toByteArray(stream);
+                    body = wrapStream(rawBodyStream());
+                    if (!request().avoidBufferedResponseStream()) {
+                        try (InputStream stream = body) {
+                            if (stream != null) {
+                                inputBytes = IOUtils.toByteArray(stream);
+                            }
                         }
                     }
                     inputStreamRead = true;
+                    if (request().avoidBufferedResponseStream()) {
+                        return body;
+                    }
                 }
             }
 
-            if (inputBytes == null) {
+            if (request().avoidBufferedResponseStream()) {
+                throw new IOException("Response is already consumed");
+            } else if (inputBytes == null) {
                 throw new IOException("Response body missing, stream null");
             }
 

src/test/java/org/kohsuke/github/RequesterRetryTest.java

@@ -275,6 +275,9 @@ public void testGitHubIsApiUrlValid() throws Exception {
      */
     @Test
     public void testResponseCodeFailureExceptions() throws Exception {
+        // Cover default method in GitHubConnectorRequest
+        assertThat(IGNORED_EMPTY_REQUEST.avoidBufferedResponseStream(), equalTo(false));
+
         // No retry for these Exceptions
         GitHubConnector connector = new SendThrowingGitHubConnector<>(() -> {
             throw new IOException("Custom");