support PATCH with empty body paramter. (OpenFeign#824)

alzipursky · velo · commit b6d8bb1a46d3 · 2018-10-27T09:39:41.000+13:00
Fixes OpenFeign#665
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### Version 10.1
+* Supports PATCH without a body paramter
+
 ### Version 10.0
 * Feign baseline is now JDK 8
   - Feign is now being built and tested with OpenJDK 11 as well. Releases and code base will use JDK 8, we are just testing compatibility with JDK 11.
diff --git a/core/src/test/java/feign/client/AbstractClientTest.java b/core/src/test/java/feign/client/AbstractClientTest.java
@@ -195,6 +195,20 @@ public void noResponseBodyForPut() {
     api.noPutBody();
   }
 
+  /**
+   * Some client implementation tests should override this test if the PATCH operation is
+   * unsupported.
+   */
+  @Test
+  public void noResponseBodyForPatch() {
+    server.enqueue(new MockResponse());
+
+    TestInterface api = newBuilder()
+        .target(TestInterface.class, "http://localhost:" + server.getPort());
+
+    api.noPatchBody();
+  }
+
   @Test
   public void parsesResponseMissingLength() throws IOException {
     server.enqueue(new MockResponse().setChunkedBody("foo", 1));
@@ -388,6 +402,9 @@ public interface TestInterface {
     @RequestLine("PUT")
     String noPutBody();
 
+    @RequestLine("PATCH")
+    String noPatchBody();
+
     @RequestLine("POST /?foo=bar&foo=baz&qux=")
     @Headers({"Foo: Bar", "Foo: Baz", "Qux: ", "Content-Type: {contentType}"})
     Response postWithContentType(String body, @Param("contentType") String contentType);
diff --git a/core/src/test/java/feign/client/DefaultClientTest.java b/core/src/test/java/feign/client/DefaultClientTest.java
@@ -83,6 +83,13 @@ public void testPatch() throws Exception {
     super.testPatch();
   }
 
+  @Test
+  @Override
+  public void noResponseBodyForPatch() {
+    thrown.expect(RetryableException.class);
+    thrown.expectCause(isA(ProtocolException.class));
+    super.noResponseBodyForPatch();
+  }
 
   @Test
   public void canOverrideHostnameVerifier() throws IOException, InterruptedException {
diff --git a/java11/src/test/java/feign/httpclient/test/Http2ClientTest.java b/java11/src/test/java/feign/httpclient/test/Http2ClientTest.java
@@ -31,6 +31,10 @@ public interface TestInterface {
     @RequestLine("PATCH /patch")
     @Headers({"Accept: text/plain"})
     String patch(String var1);
+
+    @RequestLine("PATCH /patch")
+    @Headers({"Accept: text/plain"})
+    String patch();
   }
 
   @Override
@@ -42,6 +46,14 @@ public void testPatch() throws Exception {
         .contains("https://nghttp2.org/httpbin/patch");
   }
 
+  @Override
+  @Test
+  public void noResponseBodyForPatch() {
+    final TestInterface api =
+        newBuilder().target(TestInterface.class, "https://nghttp2.org/httpbin/");
+    Assertions.assertThat(api.patch())
+        .contains("https://nghttp2.org/httpbin/patch");
+  }
 
   @Override
   @Test
diff --git a/jaxrs2/src/test/java/feign/jaxrs2/JAXRSClientTest.java b/jaxrs2/src/test/java/feign/jaxrs2/JAXRSClientTest.java
@@ -62,6 +62,15 @@ public void noResponseBodyForPut() {
     }
   }
 
+  @Override
+  public void noResponseBodyForPatch() {
+    try {
+      super.noResponseBodyForPatch();
+    } catch (final IllegalStateException e) {
+      Assume.assumeNoException("JaxRS client do not support PATCH requests", e);
+    }
+  }
+
   @Test
   public void reasonPhraseIsOptional() throws IOException, InterruptedException {
     server.enqueue(new MockResponse().setStatus("HTTP/1.1 " + 200));
diff --git a/okhttp/src/main/java/feign/okhttp/OkHttpClient.java b/okhttp/src/main/java/feign/okhttp/OkHttpClient.java
@@ -13,13 +13,6 @@
  */
 package feign.okhttp;
 
-import feign.Request.HttpMethod;
-import okhttp3.Headers;
-import okhttp3.MediaType;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -28,6 +21,8 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import feign.Client;
+import feign.Request.HttpMethod;
+import okhttp3.*;
 
 /**
  * This module directs Feign's http requests to
@@ -78,7 +73,8 @@ static Request toOkHttpRequest(feign.Request input) {
 
     byte[] inputBody = input.body();
     boolean isMethodWithBody =
-        HttpMethod.POST == input.httpMethod() || HttpMethod.PUT == input.httpMethod();
+        HttpMethod.POST == input.httpMethod() || HttpMethod.PUT == input.httpMethod()
+            || HttpMethod.PATCH == input.httpMethod();
     if (isMethodWithBody) {
       requestBuilder.removeHeader("Content-Type");
       if (inputBody == null) {
