Feature/replace deprecated body (#959)

In this pr the old `body()` method calls replaced with `requestBody().asBytes()` method which both exists in Request class. The intention is to remove deprecated code and keep source code clean.

Related to #857 

* replaced old body with new Body.asBytes()

Author: mstrYoda

core/src/main/java/feign/Client.java

@@ -114,7 +114,7 @@ HttpURLConnection convertAndSend(Request request, Options options) throws IOExce
         connection.addRequestProperty("Accept", "*/*");
       }
 
-      if (request.body() != null) {
+      if (request.requestBody().asBytes() != null) {
         if (contentLength != null) {
           connection.setFixedLengthStreamingMode(contentLength);
         } else {
@@ -128,7 +128,7 @@ HttpURLConnection convertAndSend(Request request, Options options) throws IOExce
           out = new DeflaterOutputStream(out);
         }
         try {
-          out.write(request.body());
+          out.write(request.requestBody().asBytes());
         } finally {
           try {
             out.close();

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

@@ -69,7 +69,7 @@ static FeignException errorReading(Request request, Response response, IOExcepti
         response.status(),
         format("%s reading %s %s", cause.getMessage(), request.httpMethod(), request.url()),
         cause,
-        request.body());
+        request.requestBody().asBytes());
   }
 
   public static FeignException errorStatus(String methodKey, Response response) {

core/src/main/java/feign/Logger.java

@@ -54,11 +54,13 @@ protected void logRequest(String configKey, Level logLevel, Request request) {
       }
 
       int bodyLength = 0;
-      if (request.body() != null) {
-        bodyLength = request.body().length;
+      if (request.requestBody().asBytes() != null) {
+        bodyLength = request.requestBody().asBytes().length;
         if (logLevel.ordinal() >= Level.FULL.ordinal()) {
           String bodyText =
-              request.charset() != null ? new String(request.body(), request.charset()) : null;
+              request.charset() != null
+                  ? new String(request.requestBody().asBytes(), request.charset())
+                  : null;
           log(configKey, ""); // CRLF
           log(configKey, "%s", bodyText != null ? bodyText : "Binary data");
         }

core/src/test/java/feign/TargetTest.java

@@ -61,7 +61,7 @@ public Request apply(RequestTemplate input) {
             urlEncoded.httpMethod(),
             urlEncoded.url().replace("%2F", "/"),
             urlEncoded.headers(),
-            urlEncoded.body(), urlEncoded.charset());
+            urlEncoded.requestBody().asBytes(), urlEncoded.charset());
       }
     };
 

httpclient/src/main/java/feign/httpclient/ApacheHttpClient.java

@@ -134,14 +134,14 @@ HttpUriRequest toHttpUriRequest(Request request, Request.Options options)
     }
 
     // request body
-    if (request.body() != null) {
+    if (request.requestBody().asBytes() != null) {
       HttpEntity entity = null;
       if (request.charset() != null) {
         ContentType contentType = getContentType(request);
-        String content = new String(request.body(), request.charset());
+        String content = new String(request.requestBody().asBytes(), request.charset());
         entity = new StringEntity(content, contentType);
       } else {
-        entity = new ByteArrayEntity(request.body());
+        entity = new ByteArrayEntity(request.requestBody().asBytes());
       }
 
       requestBuilder.setEntity(entity);

java11/src/main/java/feign/http2client/Http2Client.java

@@ -80,10 +80,10 @@ private Builder newRequestBuilder(Request request) throws IOException {
     }
 
     final BodyPublisher body;
-    if (request.body() == null) {
+    if (request.requestBody().asBytes() == null) {
       body = BodyPublishers.noBody();
     } else {
-      body = BodyPublishers.ofByteArray(request.body());
+      body = BodyPublishers.ofByteArray(request.requestBody().asBytes());
     }
 
     final Builder requestBuilder = HttpRequest.newBuilder()

jaxrs2/src/main/java/feign/jaxrs2/JAXRSClient.java

@@ -69,12 +69,12 @@ public feign.Response execute(feign.Request request, Options options) throws IOE
   }
 
   private Entity<byte[]> createRequestEntity(feign.Request request) {
-    if (request.body() == null) {
+    if (request.requestBody().asBytes() == null) {
       return null;
     }
 
     return Entity.entity(
-        request.body(),
+        request.requestBody().asBytes(),
         new Variant(mediaType(request.headers()), locale(request.headers()),
             encoding(request.charset())));
   }

mock/src/main/java/feign/mock/RequestKey.java

@@ -112,7 +112,7 @@ private RequestKey(Request request) {
     this.url = buildUrl(request);
     this.headers = RequestHeaders.of(request.headers());
     this.charset = request.charset();
-    this.body = request.body();
+    this.body = request.requestBody().asBytes();
   }
 
   public HttpMethod getMethod() {

mock/src/test/java/feign/mock/MockClientTest.java

@@ -165,7 +165,8 @@ public void verifyInvocation() {
         mockClient.verifyTimes(HttpMethod.POST, "/repos/netflix/feign/contributors", 1);
     assertThat(results, hasSize(1));
 
-    byte[] body = mockClient.verifyOne(HttpMethod.POST, "/repos/netflix/feign/contributors").body();
+    byte[] body = mockClient.verifyOne(HttpMethod.POST, "/repos/netflix/feign/contributors")
+        .requestBody().asBytes();
     assertThat(body, notNullValue());
 
     String message = new String(body);

okhttp/src/main/java/feign/okhttp/OkHttpClient.java

@@ -71,7 +71,7 @@ static Request toOkHttpRequest(feign.Request input) {
       requestBuilder.addHeader("Accept", "*/*");
     }
 
-    byte[] inputBody = input.body();
+    byte[] inputBody = input.requestBody().asBytes();
     boolean isMethodWithBody =
         HttpMethod.POST == input.httpMethod() || HttpMethod.PUT == input.httpMethod()
             || HttpMethod.PATCH == input.httpMethod();