centralize logic that ensures response body is closed

adriancole · adriancole · commit 4b8d6c326ccc · 2013-07-08T08:07:07.000-07:00
diff --git a/feign-core/src/main/java/feign/MethodHandler.java b/feign-core/src/main/java/feign/MethodHandler.java
@@ -28,6 +28,7 @@
 import static feign.FeignException.errorExecuting;
 import static feign.FeignException.errorReading;
 import static feign.Util.checkNotNull;
+import static feign.Util.ensureClosed;
 
 final class MethodHandler {
 
@@ -114,22 +115,13 @@ public Object executeAndDecode(String configKey, RequestTemplate template, Type
         throw errorDecoder.decode(configKey, response);
       }
     } catch (Throwable e) {
-      ensureBodyClosed(response);
+      ensureClosed(response.body());
       if (IOException.class.isInstance(e))
         throw errorReading(request, response, IOException.class.cast(e));
       throw e;
     }
   }
 
-  private void ensureBodyClosed(Response response) {
-    if (response.body() != null) {
-      try {
-        response.body().close();
-      } catch (IOException ignored) { // NOPMD
-      }
-    }
-  }
-
   private Response execute(Request request) {
     try {
       return client.execute(request, options);
diff --git a/feign-core/src/main/java/feign/Util.java b/feign-core/src/main/java/feign/Util.java
@@ -15,6 +15,7 @@
  */
 package feign;
 
+import java.io.IOException;
 import java.lang.reflect.Array;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
@@ -114,4 +115,13 @@ public static <T> T[] toArray(Iterable<? extends T> iterable, Class<T> type) {
   public static <T> Collection<T> valuesOrEmpty(Map<String, Collection<T>> map, String key) {
     return map.containsKey(key) ? map.get(key) : Collections.<T>emptyList();
   }
+
+  public static void ensureClosed(Response.Body body) {
+    if (body != null) {
+      try {
+        body.close();
+      } catch (IOException ignored) { // NOPMD
+      }
+    }
+  }
 }
diff --git a/feign-core/src/main/java/feign/Wire.java b/feign-core/src/main/java/feign/Wire.java
@@ -25,6 +25,7 @@
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
 
+import static feign.Util.ensureClosed;
 import static feign.Util.valuesOrEmpty;
 
 /*  Writes http headers and body. Plumb to your favorite log impl. */
@@ -138,10 +139,7 @@ Response wireAndRebufferResponse(Target<?> target, Response response) throws IOE
         }
         return Response.create(response.status(), response.reason(), response.headers(), buffered.toString());
       } finally {
-        try {
-          body.close();
-        } catch (IOException suppressed) { // NOPMD
-        }
+        ensureClosed(response.body());
       }
     }
     return response;
diff --git a/feign-core/src/main/java/feign/codec/Decoder.java b/feign-core/src/main/java/feign/codec/Decoder.java
@@ -21,6 +21,8 @@
 
 import feign.Response;
 
+import static feign.Util.ensureClosed;
+
 /**
  * Decodes an HTTP response into a given type. Invoked when
  * {@link Response#status()} is in the 2xx range.
@@ -73,10 +75,7 @@ public Object decode(String methodKey, Response response, Type type) throws Thro
     try {
       return decode(methodKey, reader, type);
     } finally {
-      try {
-        reader.close();
-      } catch (IOException suppressed) { // NOPMD
-      }
+      ensureClosed(body);
     }
   }
 
diff --git a/feign-core/src/main/java/feign/codec/ToStringDecoder.java b/feign-core/src/main/java/feign/codec/ToStringDecoder.java
@@ -22,6 +22,8 @@
 
 import feign.Response;
 
+import static feign.Util.ensureClosed;
+
 /**
  * Adapted from {@code com.google.common.io.CharStreams.toString()}.
  */
@@ -38,10 +40,7 @@ public Object decode(String methodKey, Response response, Type type) throws IOEx
     try {
       return decode(methodKey, reader, type);
     } finally {
-      try {
-        reader.close();
-      } catch (IOException suppressed) { // NOPMD
-      }
+      ensureClosed(body);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`import java.util.logging.Logger;`
`26`	`26`	`import java.util.logging.SimpleFormatter;`
`27`	`27`
	`28`	`+import static feign.Util.ensureClosed;`
`28`	`29`	`import static feign.Util.valuesOrEmpty;`
`29`	`30`
`30`	`31`	`/* Writes http headers and body. Plumb to your favorite log impl. */`
`@@ -138,10 +139,7 @@ Response wireAndRebufferResponse(Target<?> target, Response response) throws IOE`
`138`	`139`	`}`
`139`	`140`	`return Response.create(response.status(), response.reason(), response.headers(), buffered.toString());`
`140`	`141`	`} finally {`
`141`		`- try {`
`142`		`- body.close();`
`143`		`- } catch (IOException suppressed) { // NOPMD`
`144`		`- }`
	`142`	`+ ensureClosed(response.body());`
`145`	`143`	`}`
`146`	`144`	`}`
`147`	`145`	`return response;`