issue #506 have thenConsume pass on a basic response with no body so that other things like retry logic and interceptors can function properly

Author: ryber

unirest-bdd-tests/src/test/java/BehaviorTests/RetryTest.java

@@ -37,6 +37,7 @@
 import java.nio.file.StandardCopyOption;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.function.Function;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -167,6 +168,18 @@ void canCustomizeRetrySignal() {
         MockServer.assertRequestCount(3);
     }
 
+    @Test
+    void whenBodyIsConsumed() {
+        MockServer.retryTimes(10, 429, .01);
+
+        var consumer = new ConsumingCounter();
+
+        Unirest.get(MockServer.GET)
+                .thenConsume(consumer);
+
+        assertEquals(10, consumer.callCount);
+    }
+
     private void clearFile(Path path) {
         try {
             Files.delete(path);
@@ -191,4 +204,11 @@ private <R> R doWithRetry(int status, Function<HttpRequest, HttpResponse<R>> bod
         return response.getBody();
     }
 
+    private class ConsumingCounter implements Consumer<RawResponse> {
+        int callCount = 0;
+        @Override
+        public void accept(RawResponse rawResponse) {
+            callCount++;
+        }
+    }
 }

unirest/src/main/java/kong/unirest/core/BaseRequest.java

@@ -384,7 +384,7 @@ private <T> CompletableFuture<HttpResponse<T>> requestAsync(HttpRequest request,
     private Function<RawResponse, HttpResponse<Object>> getConsumer(Consumer<RawResponse> consumer) {
         return r -> {
             consumer.accept(r);
-            return null;
+            return new BasicResponse<>(r);
         };
     }
 

unirest/src/main/java/kong/unirest/core/RetryStrategy.java

@@ -87,8 +87,7 @@ public Standard(int maxAttempts){
 
         @Override
         public boolean isRetryable(HttpResponse response) {
-            return response != null &&
-                    RETRY_CODES.contains(response.getStatus())
+            return response != null && RETRY_CODES.contains(response.getStatus())
                     && response.getHeaders().containsKey(RETRY_AFTER);
         }