ensure gson does not attempt to decode void

adriancole · adriancole · commit 50e3cf54b7b2 · 2013-09-16T20:13:57.000-07:00
diff --git a/gson/src/main/java/feign/gson/GsonModule.java b/gson/src/main/java/feign/gson/GsonModule.java
@@ -103,7 +103,7 @@ static class GsonCodec implements Encoder, Decoder {
     }
 
     @Override public Object decode(Response response, Type type) throws IOException {
-      if (response.body() == null) {
+      if (void.class.equals(type) || response.body() == null) {
         return null;
       }
       Reader reader = response.body().asReader();
diff --git a/gson/src/test/java/feign/gson/GsonModuleTest.java b/gson/src/test/java/feign/gson/GsonModuleTest.java
@@ -133,6 +133,22 @@ static class DecoderBindings {
     }.getType()), zones);
   }
 
+  @Test public void voidDecodesToNull() throws Exception {
+    DecoderBindings bindings = new DecoderBindings();
+    ObjectGraph.create(bindings).inject(bindings);
+
+    Response response = Response.create(200, "OK", Collections.<String, Collection<String>>emptyMap(), zonesJson);
+    assertEquals(bindings.decoder.decode(response, void.class), null);
+  }
+
+  @Test public void nullBodyDecodesToNull() throws Exception {
+    DecoderBindings bindings = new DecoderBindings();
+    ObjectGraph.create(bindings).inject(bindings);
+
+    Response response = Response.create(204, "OK", Collections.<String, Collection<String>>emptyMap(), null);
+    assertEquals(bindings.decoder.decode(response, String.class), null);
+  }
+
   private String zonesJson = ""//
       + "[\n"//
       + "  {\n"//

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ static class GsonCodec implements Encoder, Decoder {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`@Override public Object decode(Response response, Type type) throws IOException {`
`106`		`- if (response.body() == null) {`
	`106`	`+ if (void.class.equals(type) \|\| response.body() == null) {`
`107`	`107`	`return null;`
`108`	`108`	`}`
`109`	`109`	`Reader reader = response.body().asReader();`