Merge pull request OpenFeign#322 from pnepywoda/empty-body

adriancole · adriancole · commit 5281e6298303 · 2016-01-26T11:14:37.000+01:00
support PUT with empty body parameter
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### Version 8.15
+* Supports PUT without a body parameter
+
 ### Version 8.14
 * Add support for RxJava Observable and Single return types via the `HystrixFeign` builder.
 * Adds fallback implementation configuration to the `HystrixFeign` builder
diff --git a/core/src/test/java/feign/client/DefaultClientTest.java b/core/src/test/java/feign/client/DefaultClientTest.java
@@ -184,14 +184,24 @@ protected void log(String configKey, String format, Object... args) {
   }
 
   @Test
-  public void noResponseBody() {
+  public void noResponseBodyForPost() {
       server.enqueue(new MockResponse());
 
       TestInterface api = Feign.builder()
           .target(TestInterface.class, "http://localhost:" + server.getPort());
 
       api.noPostBody();
   }
+  
+  @Test
+  public void noResponseBodyForPut() {
+      server.enqueue(new MockResponse());
+      
+      TestInterface api = Feign.builder()
+              .target(TestInterface.class, "http://localhost:" + server.getPort());
+      
+      api.noPutBody();
+  }
 
   interface TestInterface {
 
@@ -209,5 +219,8 @@ interface TestInterface {
 
     @RequestLine("POST")
     String noPostBody();
+    
+    @RequestLine("PUT")
+    String noPutBody();
   }
 }
diff --git a/httpclient/src/test/java/feign/httpclient/ApacheHttpClientTest.java b/httpclient/src/test/java/feign/httpclient/ApacheHttpClientTest.java
@@ -153,7 +153,7 @@ protected void log(String configKey, String format, Object... args) {
   }
 
   @Test
-  public void noResponseBody() {
+  public void noResponseBodyForPost() {
       server.enqueue(new MockResponse());
 
       TestInterface api = Feign.builder()
@@ -162,6 +162,17 @@ public void noResponseBody() {
 
       api.noPostBody();
   }
+  
+  @Test
+  public void noResponseBodyForPut() {
+      server.enqueue(new MockResponse());
+      
+      TestInterface api = Feign.builder()
+              .client(new ApacheHttpClient())
+              .target(TestInterface.class, "http://localhost:" + server.getPort());
+      
+      api.noPutBody();
+  }
     @Test
     public void postWithSpacesInPath() throws IOException, InterruptedException {
         server.enqueue(new MockResponse().setBody("foo"));
@@ -193,6 +204,9 @@ interface TestInterface {
 
     @RequestLine("POST")
     String noPostBody();
+    
+    @RequestLine("PUT")
+    String noPutBody();
 
     @RequestLine("POST /path/{to}/resource")
     @Headers("Accept: text/plain")
diff --git a/okhttp/src/main/java/feign/okhttp/OkHttpClient.java b/okhttp/src/main/java/feign/okhttp/OkHttpClient.java
@@ -79,7 +79,8 @@ static Request toOkHttpRequest(feign.Request input) {
     }
 
     byte[] inputBody = input.body();
-    if ("POST".equals(input.method()) && inputBody == null) {
+    boolean isMethodWithBody = "POST".equals(input.method()) || "PUT".equals(input.method());
+    if (isMethodWithBody && inputBody == null) {
       // write an empty BODY to conform with okhttp 2.4.0+
       // http://johnfeng.github.io/blog/2015/06/30/okhttp-updates-post-wouldnt-be-allowed-to-have-null-body/
       inputBody = new byte[0];
diff --git a/okhttp/src/test/java/feign/okhttp/OkHttpClientTest.java b/okhttp/src/test/java/feign/okhttp/OkHttpClientTest.java
@@ -135,7 +135,7 @@ protected void log(String configKey, String format, Object... args) {
   }
 
   @Test
-  public void noResponseBody() {
+  public void noResponseBodyForPost() {
       server.enqueue(new MockResponse());
 
       TestInterface api = Feign.builder()
@@ -144,6 +144,17 @@ public void noResponseBody() {
 
       api.noPostBody();
   }
+  
+  @Test
+  public void noResponseBodyForPut() {
+      server.enqueue(new MockResponse());
+      
+      TestInterface api = Feign.builder()
+              .client(new OkHttpClient())
+              .target(TestInterface.class, "http://localhost:" + server.getPort());
+      
+      api.noPutBody();
+  }
 
   interface TestInterface {
 
@@ -161,5 +172,8 @@ interface TestInterface {
 
     @RequestLine("POST")
     String noPostBody();
+    
+    @RequestLine("PUT")
+    String noPutBody();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,8 @@ static Request toOkHttpRequest(feign.Request input) {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`byte[] inputBody = input.body();`
`82`		`- if ("POST".equals(input.method()) && inputBody == null) {`
	`82`	`+ boolean isMethodWithBody = "POST".equals(input.method()) \|\| "PUT".equals(input.method());`
	`83`	`+ if (isMethodWithBody && inputBody == null) {`
`83`	`84`	`// write an empty BODY to conform with okhttp 2.4.0+`
`84`	`85`	`// http://johnfeng.github.io/blog/2015/06/30/okhttp-updates-post-wouldnt-be-allowed-to-have-null-body/`
`85`	`86`	`inputBody = new byte[0];`