revert: move Request.Body streaming breaking changes off master, they belong to 14.x (#3409)

Signed-off-by: Marvin Froeder <velo.br@gmail.com>

Author: velo

MIGRATION-v14.md

@@ -45,7 +45,9 @@ class ExceptionGenerator {
             .status(500)
             .body((Response.Body) null)
             .headers(testHeaders)
-            .request(Request.create(Request.HttpMethod.GET, "http://test", testHeaders, null, null))
+            .request(
+                Request.create(
+                    Request.HttpMethod.GET, "http://test", testHeaders, Request.Body.empty(), null))
             .build();
   }
 

annotation-error-decoder/src/main/java/feign/error/ExceptionGenerator.java

@@ -45,7 +45,9 @@ Response testResponse(int status, String body, Map<String, Collection<String>> h
         .status(status)
         .body(body, StandardCharsets.UTF_8)
         .headers(headers)
-        .request(Request.create(Request.HttpMethod.GET, "http://test", headers, null, null))
+        .request(
+            Request.create(
+                Request.HttpMethod.GET, "http://test", headers, Request.Body.empty(), null))
         .build();
   }
 }

annotation-error-decoder/src/test/java/feign/error/AbstractAnnotationErrorDecoderTest.java

@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import feign.Request;
 import feign.codec.DefaultDecoder;
 import feign.error.AnnotationErrorDecoderExceptionConstructorsTest.TestClientInterfaceWithDifferentExceptionConstructors;
 import feign.error.AnnotationErrorDecoderExceptionConstructorsTest.TestClientInterfaceWithDifferentExceptionConstructors.DeclaredDefaultConstructorException;
@@ -55,7 +56,11 @@ public class AnnotationErrorDecoderExceptionConstructorsTest
   private static final String NON_NULL_BODY = "A GIVEN BODY";
   private static final feign.Request REQUEST =
       feign.Request.create(
-          feign.Request.HttpMethod.GET, "http://test", Collections.emptyMap(), null, null);
+          feign.Request.HttpMethod.GET,
+          "http://test",
+          Collections.emptyMap(),
+          Request.Body.empty(),
+          null);
   private static final feign.Request NO_REQUEST = null;
   private static final Map<String, Collection<String>> NON_NULL_HEADERS = new HashMap<>();
   private static final Map<String, Collection<String>> NO_HEADERS = null;

annotation-error-decoder/src/test/java/feign/error/AnnotationErrorDecoderExceptionConstructorsTest.java

@@ -82,7 +82,7 @@ public void buildResponse() {
         Response.builder()
             .status(200)
             .reason("OK")
-            .request(Request.create(HttpMethod.GET, "/", Collections.emptyMap(), null, null))
+            .request(Request.create(HttpMethod.GET, "/", Collections.emptyMap(), null, Util.UTF_8))
             .headers(Collections.emptyMap())
             .body(carsJson(Integer.parseInt(size)), Util.UTF_8)
             .build();

benchmark/src/main/java/feign/benchmark/DecoderIteratorsBenchmark.java

@@ -32,7 +32,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.TreeMap;
 import java.util.zip.DeflaterOutputStream;
 import java.util.zip.GZIPInputStream;
@@ -188,9 +187,9 @@ else if (field.equals(ACCEPT_ENCODING)) {
       connection.addRequestProperty("Accept", "*/*");
     }
 
-    Optional<Request.Body> body = request.body();
+    byte[] body = request.body();
 
-    if (body.isPresent()) {
+    if (body != null) {
       /*
        * Ignore disableRequestBuffering flag if the empty body was set, to ensure that internal
        * retry logic applies to such requests.
@@ -210,7 +209,7 @@ else if (field.equals(ACCEPT_ENCODING)) {
         out = new DeflaterOutputStream(out);
       }
       try {
-        body.get().writeTo(out);
+        out.write(body);
       } finally {
         try {
           out.close();
@@ -219,7 +218,7 @@ else if (field.equals(ACCEPT_ENCODING)) {
       }
     }
 
-    if (!body.isPresent() && request.httpMethod().isWithBody()) {
+    if (body == null && request.httpMethod().isWithBody()) {
       // To use this Header, set 'sun.net.http.allowRestrictedHeaders' property true.
       connection.addRequestProperty("Content-Length", "0");
     }

core/src/main/java/feign/DefaultClient.java

@@ -76,7 +76,7 @@ public DefaultContract() {
               "Body annotation was empty on method %s.",
               data.configKey());
           if (body.indexOf('{') == -1) {
-            data.template().body(Request.Body.of(body));
+            data.template().body(body);
           } else {
             data.template().bodyTemplate(body);
           }

core/src/main/java/feign/DefaultContract.java

@@ -15,9 +15,7 @@
  */
 package feign;
 
-import static feign.Util.UTF_8;
-import static feign.Util.caseInsensitiveCopyOf;
-import static feign.Util.checkNotNull;
+import static feign.Util.*;
 import static java.lang.String.format;
 import static java.util.regex.Pattern.CASE_INSENSITIVE;
 
@@ -184,7 +182,7 @@ static FeignException errorReading(Request request, Response response, IOExcepti
         format("%s reading %s %s", cause.getMessage(), request.httpMethod(), request.url()),
         request,
         cause,
-        null,
+        request.body(),
         request.headers());
   }
 

core/src/main/java/feign/FeignException.java

@@ -78,18 +78,16 @@ protected void logRequest(String configKey, Level logLevel, Request request) {
         }
       }
 
-      long bodyLength =
-          request
-              .body()
-              .map(
-                  body -> {
-                    if (logLevel.ordinal() >= Level.FULL.ordinal()) {
-                      log(configKey, ""); // CRLF
-                      log(configKey, "%s", body.toString());
-                    }
-                    return body.contentLength();
-                  })
-              .orElse(0L);
+      int bodyLength = 0;
+      if (request.body() != null) {
+        bodyLength = request.length();
+        if (logLevel.ordinal() >= Level.FULL.ordinal()) {
+          String bodyText =
+              request.charset() != null ? new String(request.body(), request.charset()) : null;
+          log(configKey, ""); // CRLF
+          log(configKey, "%s", bodyText != null ? bodyText : "Binary data");
+        }
+      }
       log(configKey, "---> END HTTP (%s-byte body)", bodyLength);
     }
   }