Removing @deprecated methods marked for removal on feign 10 (#739)

Author: velo

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### Version 10.0
 * Feign baseline is now JDK 8
+* Removed @Deprecated methods marked for removal on feign 10
 
 ### Version 9.6
 * Feign builder now supports flag `doNotCloseAfterDecode` to support lazy iteration of responses.

benchmark/src/main/java/feign/benchmark/WhatShouldWeCacheBenchmarks.java

@@ -65,7 +65,13 @@ public List<MethodMetadata> parseAndValidatateMetadata(Class<?> declaring) {
     fakeClient = new Client() {
       public Response execute(Request request, Request.Options options) throws IOException {
         Map<String, Collection<String>> headers = new LinkedHashMap<String, Collection<String>>();
-        return Response.create(200, "ok", headers, (byte[]) null);
+        return Response.builder()
+            .body((byte[]) null)
+            .status(200)
+            .headers(headers)
+            .reason("ok")
+            .request(request)
+            .build();
       }
     };
     cachedFakeFeign = Feign.builder().client(fakeClient).build();

core/src/main/java/feign/Contract.java

@@ -197,19 +197,6 @@ protected abstract boolean processAnnotationsOnParameter(MethodMetadata data,
                                                              Annotation[] annotations,
                                                              int paramIndex);
 
-    /**
-     * @deprecated dead-code will remove in feign 10
-     */
-    @Deprecated
-    // deprecated as only used in a sub-type
-    protected Collection<String> addTemplatedParam(Collection<String> possiblyNull, String name) {
-      if (possiblyNull == null) {
-        possiblyNull = new ArrayList<String>();
-      }
-      possiblyNull.add(String.format("{%s}", name));
-      return possiblyNull;
-    }
-
     /**
      * links a parameter name to its index in the method signature.
      */

core/src/main/java/feign/Response.java

@@ -52,72 +52,6 @@ private Response(Builder builder) {
     this.request = builder.request; // nullable
   }
 
-  /**
-   * @deprecated To be removed in Feign 10
-   */
-  @Deprecated
-  public static Response create(int status,
-                                String reason,
-                                Map<String, Collection<String>> headers,
-                                InputStream inputStream,
-                                Integer length) {
-    return Response.builder()
-        .status(status)
-        .reason(reason)
-        .headers(headers)
-        .body(InputStreamBody.orNull(inputStream, length))
-        .build();
-  }
-
-  /**
-   * @deprecated To be removed in Feign 10
-   */
-  @Deprecated
-  public static Response create(int status,
-                                String reason,
-                                Map<String, Collection<String>> headers,
-                                byte[] data) {
-    return Response.builder()
-        .status(status)
-        .reason(reason)
-        .headers(headers)
-        .body(ByteArrayBody.orNull(data))
-        .build();
-  }
-
-  /**
-   * @deprecated To be removed in Feign 10
-   */
-  @Deprecated
-  public static Response create(int status,
-                                String reason,
-                                Map<String, Collection<String>> headers,
-                                String text,
-                                Charset charset) {
-    return Response.builder()
-        .status(status)
-        .reason(reason)
-        .headers(headers)
-        .body(ByteArrayBody.orNull(text, charset))
-        .build();
-  }
-
-  /**
-   * @deprecated To be removed in Feign 10
-   */
-  @Deprecated
-  public static Response create(int status,
-                                String reason,
-                                Map<String, Collection<String>> headers,
-                                Body body) {
-    return Response.builder()
-        .status(status)
-        .reason(reason)
-        .headers(headers)
-        .body(body)
-        .build();
-  }
-
   public Builder toBuilder() {
     return new Builder(this);
   }

core/src/main/java/feign/SynchronousMethodHandler.java

@@ -94,8 +94,6 @@ Object executeAndDecode(RequestTemplate template) throws Throwable {
     long start = System.nanoTime();
     try {
       response = client.execute(request, options);
-      // ensure the request is set. TODO: remove in Feign 10
-      response.toBuilder().request(request).build();
     } catch (IOException e) {
       if (logLevel != Logger.Level.NONE) {
         logger.logIOException(metadata.configKey(), logLevel, e, elapsedTime(start));
@@ -109,8 +107,6 @@ Object executeAndDecode(RequestTemplate template) throws Throwable {
       if (logLevel != Logger.Level.NONE) {
         response =
             logger.logAndRebufferResponse(metadata.configKey(), logLevel, response, elapsedTime);
-        // ensure the request is set. TODO: remove in Feign 10
-        response.toBuilder().request(request).build();
       }
       if (Response.class == metadata.returnType()) {
         if (response.body() == null) {

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

@@ -90,10 +90,12 @@ HttpUriRequest toHttpUriRequest(Request request, Request.Options options)
     RequestBuilder requestBuilder = RequestBuilder.create(request.method());
 
     // per request timeouts
-    RequestConfig requestConfig = (client instanceof Configurable ? RequestConfig.copy(((Configurable) client).getConfig()) : RequestConfig.custom())
-        .setConnectTimeout(options.connectTimeoutMillis())
-        .setSocketTimeout(options.readTimeoutMillis())
-        .build();
+    RequestConfig requestConfig =
+        (client instanceof Configurable ? RequestConfig.copy(((Configurable) client).getConfig())
+            : RequestConfig.custom())
+                .setConnectTimeout(options.connectTimeoutMillis())
+                .setSocketTimeout(options.readTimeoutMillis())
+                .build();
     requestBuilder.setConfig(requestConfig);
 
     URI uri = new URIBuilder(request.url()).build();

slf4j/src/test/java/feign/slf4j/Slf4jLoggerTest.java

@@ -43,7 +43,8 @@ public class Slf4jLoggerTest {
   @Test
   public void useFeignLoggerByDefault() throws Exception {
     slf4j.logLevel("debug");
-    slf4j.expectMessages("DEBUG feign.Logger - [someMethod] This is my message" + System.lineSeparator());
+    slf4j.expectMessages(
+        "DEBUG feign.Logger - [someMethod] This is my message" + System.lineSeparator());
 
     logger = new Slf4jLogger();
     logger.log(CONFIG_KEY, "This is my message");
@@ -52,7 +53,8 @@ public void useFeignLoggerByDefault() throws Exception {
   @Test
   public void useLoggerByNameIfRequested() throws Exception {
     slf4j.logLevel("debug");
-    slf4j.expectMessages("DEBUG named.logger - [someMethod] This is my message" + System.lineSeparator());
+    slf4j.expectMessages(
+        "DEBUG named.logger - [someMethod] This is my message" + System.lineSeparator());
 
     logger = new Slf4jLogger("named.logger");
     logger.log(CONFIG_KEY, "This is my message");
@@ -61,7 +63,8 @@ public void useLoggerByNameIfRequested() throws Exception {
   @Test
   public void useLoggerByClassIfRequested() throws Exception {
     slf4j.logLevel("debug");
-    slf4j.expectMessages("DEBUG feign.Feign - [someMethod] This is my message" + System.lineSeparator());
+    slf4j.expectMessages(
+        "DEBUG feign.Feign - [someMethod] This is my message" + System.lineSeparator());
 
     logger = new Slf4jLogger(Feign.class);
     logger.log(CONFIG_KEY, "This is my message");
@@ -70,7 +73,8 @@ public void useLoggerByClassIfRequested() throws Exception {
   @Test
   public void useSpecifiedLoggerIfRequested() throws Exception {
     slf4j.logLevel("debug");
-    slf4j.expectMessages("DEBUG specified.logger - [someMethod] This is my message" + System.lineSeparator());
+    slf4j.expectMessages(
+        "DEBUG specified.logger - [someMethod] This is my message" + System.lineSeparator());
 
     logger = new Slf4jLogger(LoggerFactory.getLogger("specified.logger"));
     logger.log(CONFIG_KEY, "This is my message");
@@ -89,8 +93,8 @@ public void logOnlyIfDebugEnabled() throws Exception {
   @Test
   public void logRequestsAndResponses() throws Exception {
     slf4j.logLevel("debug");
-    slf4j.expectMessages("DEBUG feign.Logger - [someMethod] A message with 2 formatting tokens." 
-        + System.lineSeparator() + 
+    slf4j.expectMessages("DEBUG feign.Logger - [someMethod] A message with 2 formatting tokens."
+        + System.lineSeparator() +
         "DEBUG feign.Logger - [someMethod] ---> GET http://api.example.com HTTP/1.1"
         + System.lineSeparator() +
         "DEBUG feign.Logger - [someMethod] <--- HTTP/1.1 200 OK (273ms)"