feat(springboot openfeign): An OpenFeign Client for Dapr Invokes

A OpenFeign Client and it's AutoConfiguration using Dapr Invoke APIs.

Splited into two librarys, dapr-openfeign-client is the pure client of OpenFeign, and dapr-spring-openfeign is the plugin of Spring Cloud OpenFeign.

Currently only HTTP Invoke Method and Invoke Binding supported, and Invoke Binding is not always recommend to use this client, depends on what binding component is.

Signed-off-by: lony2003 <zhangke200377@outlook.com>

Author: lony2003

dapr-spring/dapr-openfeign-client/src/main/java/io/dapr/feign/DaprInvokeFeignClient.java

@@ -80,13 +80,40 @@
  */
 public class DaprInvokeFeignClient implements Client {
 
+  private static final Map<String, HttpExtension> httpExtensionMap = generateHttpExtensionMap();
+
   private static final String DOT = "\\.";
 
   private final int retry;
   private final int timeout;
 
   private final DaprClient daprClient;
 
+  private static Map<String, HttpExtension> generateHttpExtensionMap() {
+    Map<String, HttpExtension> tempHttpExtensionMap = new HashMap<>();
+
+    tempHttpExtensionMap.put("none",
+        HttpExtension.NONE);
+    tempHttpExtensionMap.put("put",
+        HttpExtension.PUT);
+    tempHttpExtensionMap.put("post",
+        HttpExtension.POST);
+    tempHttpExtensionMap.put("delete",
+        HttpExtension.DELETE);
+    tempHttpExtensionMap.put("head",
+        HttpExtension.HEAD);
+    tempHttpExtensionMap.put("connect",
+        HttpExtension.CONNECT);
+    tempHttpExtensionMap.put("options",
+        HttpExtension.OPTIONS);
+    tempHttpExtensionMap.put("trace",
+        HttpExtension.TRACE);
+    tempHttpExtensionMap.put("get",
+        HttpExtension.GET);
+
+    return tempHttpExtensionMap;
+  }
+
   /**
    * Default Client creation with no arguments.
    *
@@ -119,8 +146,8 @@ public DaprInvokeFeignClient(DaprClient daprClient) {
    * Client creation with DaprClient, wait time, retry time Specified.
    *
    * @param daprClient client sepcified
-   * @param timeout   wait time (ms)
-   * @param retry  retry times
+   * @param timeout    wait time (ms)
+   * @param retry      retry times
    */
   public DaprInvokeFeignClient(DaprClient daprClient, int timeout, int retry) {
     this.daprClient = daprClient;
@@ -250,28 +277,10 @@ private InvokeMethodRequest toInvokeMethodHTTPRequest(URI uri, Request request)
   }
 
   private HttpExtension toHttpExtension(String method) throws IOException {
-    switch (method) {
-      case "none":
-        return HttpExtension.NONE;
-      case "put":
-        return HttpExtension.PUT;
-      case "post":
-        return HttpExtension.POST;
-      case "delete":
-        return HttpExtension.DELETE;
-      case "head":
-        return HttpExtension.HEAD;
-      case "connect":
-        return HttpExtension.CONNECT;
-      case "options":
-        return HttpExtension.OPTIONS;
-      case "trace":
-        return HttpExtension.TRACE;
-      case "get":
-        return HttpExtension.GET;
-      default:
-        throw new IOException("Method '" + method + "' is not supported");
+    if (!httpExtensionMap.containsKey(method)) {
+      throw new IOException("Method '" + method + "' is not supported");
     }
+    return httpExtensionMap.get(method);
   }
 
   private String getContentType(Request request) {

dapr-spring/dapr-openfeign-client/src/test/java/io/dapr/feign/DaprFeignClientBindingTest.java

@@ -16,6 +16,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import feign.Body;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -43,7 +44,7 @@ void DaprFeignClient_testMockBindingInvoke() {
                 newBuilder().target(DaprFeignClientTestInterface.class, "http://binding.myBinding");
 
         assertEquals(200, repository.getWithContentType().status());
-        assertEquals(0, repository.get().body().length());
+        assertEquals(0, repository.post().body().length());
     }
 
     public Feign.Builder newBuilder() {
@@ -59,7 +60,8 @@ public interface DaprFeignClientTestInterface {
         @Headers({"Accept: text/plain", "Content-Type: text/plain"})
         Response getWithContentType();
 
-        @RequestLine("GET /get")
-        Response get();
+        @RequestLine("POST /get")
+        @Body("test")
+        Response post();
     }
 }

dapr-spring/dapr-openfeign-client/src/test/java/io/dapr/feign/DaprFeignClientMethodTest.java

@@ -18,6 +18,7 @@
 
 import java.nio.charset.StandardCharsets;
 
+import feign.Body;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -45,6 +46,7 @@ void DaprFeignClient_testMockMethodInvoke() {
                 newBuilder().target(DaprFeignClientTestInterface.class, "http://method.myApp/");
 
         assertEquals(12, repository.getWithContentType().body().length());
+        assertEquals(200, repository.post().status());
     }
 
     public Feign.Builder newBuilder() {
@@ -60,7 +62,8 @@ public interface DaprFeignClientTestInterface {
         @Headers({"Accept: text/plain", "Content-Type: text/plain"})
         Response getWithContentType();
 
-        @RequestLine("GET /abc")
-        Response get();
+        @RequestLine("POST /abc/")
+        @Body("test")
+        Response post();
     }
 }

dapr-spring/dapr-spring-openfeign/src/main/java/io/dapr/spring/openfeign/autoconfigure/DaprFeignClientAutoConfiguration.java

@@ -36,9 +36,15 @@ public Targeter targeter(DaprInvokeFeignClient daprInvokeFeignClient) {
     return new DaprClientTargeter(daprInvokeFeignClient);
   }
 
+  @SuppressWarnings("checkstyle:MissingJavadocMethod")
   @Bean
   @ConditionalOnMissingBean
-  public DaprInvokeFeignClient daprInvokeFeignClient(DaprClient daprClient) {
-    return new DaprInvokeFeignClient(daprClient);
+  public DaprInvokeFeignClient daprInvokeFeignClient(DaprClient daprClient,
+                                                     DaprFeignClientProperties daprFeignClientProperties) {
+    return new DaprInvokeFeignClient(
+        daprClient,
+        daprFeignClientProperties.getTimeout(),
+        daprFeignClientProperties.getRetries()
+    );
   }
 }

dapr-spring/dapr-spring-openfeign/src/main/java/io/dapr/spring/openfeign/autoconfigure/DaprFeignClientProperties.java

@@ -7,9 +7,9 @@ public class DaprFeignClientProperties {
 
   public static final String PROPERTY_PREFIX = "dapr.feign";
 
-  private boolean enabled;
-  private Integer timeout;
-  private Integer retries;
+  private boolean enabled = true;
+  private Integer timeout = 2000;
+  private Integer retries = 3;
 
   public boolean isEnabled() {
     return enabled;