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

@@ -68,7 +68,13 @@ public List<MethodMetadata> parseAndValidatateMetadata(Class<?> declaring) {
           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

@@ -202,19 +202,6 @@ protected abstract void processAnnotationOnMethod(
     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. */
     protected void nameParam(MethodMetadata data, String name, int i) {
       Collection<String> names =

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

@@ -51,65 +51,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

@@ -103,8 +103,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));
@@ -118,8 +116,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) {