style(springboot openfeign): add headers, clean import, refresh style

Signed-off-by: lony2003 <[email protected]>

Author: lony2003

dapr-spring/dapr-openfeign-client/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

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

@@ -89,31 +89,6 @@ public class DaprInvokeFeignClient implements Client {
 
   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.
    *
@@ -155,6 +130,31 @@ public DaprInvokeFeignClient(DaprClient daprClient, int timeout, int retry) {
     this.retry = retry;
   }
 
+  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;
+  }
+
   @Override
   public Response execute(Request request, Request.Options options) throws IOException {
     URI uri;

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

@@ -14,54 +14,53 @@
 package io.dapr.feign;
 
 
-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;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-
 import feign.Feign;
 import feign.Headers;
 import feign.RequestLine;
 import feign.Response;
 import io.dapr.client.DaprClient;
 import io.dapr.client.domain.InvokeBindingRequest;
 import io.dapr.utils.TypeRef;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
 import reactor.core.publisher.Mono;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 @ExtendWith(MockitoExtension.class)
 public class DaprFeignClientBindingTest {
 
-    @Mock
-    DaprClient daprClient;
+  @Mock
+  DaprClient daprClient;
 
-    @Test
-    void DaprFeignClient_testMockBindingInvoke() {
-        DaprFeignClientTestInterface repository =
-                newBuilder().target(DaprFeignClientTestInterface.class, "http://binding.myBinding");
+  @Test
+  void DaprFeignClient_testMockBindingInvoke() {
+    DaprFeignClientTestInterface repository =
+        newBuilder().target(DaprFeignClientTestInterface.class, "http://binding.myBinding");
 
-        assertEquals(200, repository.getWithContentType().status());
-        assertEquals(0, repository.post().body().length());
-    }
+    assertEquals(200, repository.getWithContentType().status());
+    assertEquals(0, repository.post().body().length());
+  }
 
-    public Feign.Builder newBuilder() {
-        Mockito.when(daprClient.invokeBinding(Mockito.any(InvokeBindingRequest.class), Mockito.eq(TypeRef.BYTE_ARRAY)))
-                .thenReturn(Mono.just(new byte[0]));
+  public Feign.Builder newBuilder() {
+    Mockito.when(daprClient.invokeBinding(Mockito.any(InvokeBindingRequest.class), Mockito.eq(TypeRef.BYTE_ARRAY)))
+        .thenReturn(Mono.just(new byte[0]));
 
-        return Feign.builder().client(new DaprInvokeFeignClient(daprClient));
-    }
+    return Feign.builder().client(new DaprInvokeFeignClient(daprClient));
+  }
 
-    public interface DaprFeignClientTestInterface {
+  public interface DaprFeignClientTestInterface {
 
-        @RequestLine("GET /create")
-        @Headers({"Accept: text/plain", "Content-Type: text/plain"})
-        Response getWithContentType();
+    @RequestLine("GET /create")
+    @Headers({"Accept: text/plain", "Content-Type: text/plain"})
+    Response getWithContentType();
 
-        @RequestLine("POST /get")
-        @Body("test")
-        Response post();
-    }
+    @RequestLine("POST /get")
+    @Body("test")
+    Response post();
+  }
 }

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

@@ -14,56 +14,55 @@
 package io.dapr.feign;
 
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-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;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-
 import feign.Feign;
 import feign.Headers;
 import feign.RequestLine;
 import feign.Response;
 import io.dapr.client.DaprClient;
 import io.dapr.client.domain.InvokeMethodRequest;
 import io.dapr.utils.TypeRef;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
 import reactor.core.publisher.Mono;
 
+import java.nio.charset.StandardCharsets;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 @ExtendWith(MockitoExtension.class)
 public class DaprFeignClientMethodTest {
 
-    @Mock
-    DaprClient daprClient;
+  @Mock
+  DaprClient daprClient;
 
-    @Test
-    void DaprFeignClient_testMockMethodInvoke() {
-        DaprFeignClientTestInterface repository =
-                newBuilder().target(DaprFeignClientTestInterface.class, "http://method.myApp/");
+  @Test
+  void DaprFeignClient_testMockMethodInvoke() {
+    DaprFeignClientTestInterface repository =
+        newBuilder().target(DaprFeignClientTestInterface.class, "http://method.myApp/");
 
-        assertEquals(12, repository.getWithContentType().body().length());
-        assertEquals(200, repository.post().status());
-    }
+    assertEquals(12, repository.getWithContentType().body().length());
+    assertEquals(200, repository.post().status());
+  }
 
-    public Feign.Builder newBuilder() {
-        Mockito.when(daprClient.invokeMethod(Mockito.any(InvokeMethodRequest.class), Mockito.eq(TypeRef.BYTE_ARRAY)))
-                .thenReturn(Mono.just("hello world!".getBytes(StandardCharsets.UTF_8)));
+  public Feign.Builder newBuilder() {
+    Mockito.when(daprClient.invokeMethod(Mockito.any(InvokeMethodRequest.class), Mockito.eq(TypeRef.BYTE_ARRAY)))
+        .thenReturn(Mono.just("hello world!".getBytes(StandardCharsets.UTF_8)));
 
-        return Feign.builder().client(new DaprInvokeFeignClient(daprClient));
-    }
+    return Feign.builder().client(new DaprInvokeFeignClient(daprClient));
+  }
 
-    public interface DaprFeignClientTestInterface {
+  public interface DaprFeignClientTestInterface {
 
-        @RequestLine("GET /getAll")
-        @Headers({"Accept: text/plain", "Content-Type: text/plain"})
-        Response getWithContentType();
+    @RequestLine("GET /getAll")
+    @Headers({"Accept: text/plain", "Content-Type: text/plain"})
+    Response getWithContentType();
 
-        @RequestLine("POST /abc/")
-        @Body("test")
-        Response post();
-    }
+    @RequestLine("POST /abc/")
+    @Body("test")
+    Response post();
+  }
 }

dapr-spring/dapr-spring-openfeign/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

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

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2025 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
 package io.dapr.spring.openfeign.autoconfigure;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;

dapr-spring/dapr-spring-openfeign/src/main/java/io/dapr/spring/openfeign/targeter/DaprClientTargeterBeanPostProcessor.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2025 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
 package io.dapr.spring.openfeign.targeter;
 
 import io.dapr.feign.DaprInvokeFeignClient;

dapr-spring/dapr-spring-openfeign/src/test/java/io/dapr/spring/openfeign/DaprOpenFeignClientTestApplication.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2025 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
 package io.dapr.spring.openfeign;
 
 import org.springframework.boot.SpringApplication;

dapr-spring/dapr-spring-openfeign/src/test/java/io/dapr/spring/openfeign/DaprOpenFeignClientTests.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2025 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
 package io.dapr.spring.openfeign;
 
 import io.dapr.client.DaprClient;

dapr-spring/dapr-spring-openfeign/src/test/java/io/dapr/spring/openfeign/client/DaprInvokeBindingClient.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2025 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
 package io.dapr.spring.openfeign.client;
 
 import io.dapr.spring.openfeign.annotation.UseDaprClient;

dapr-spring/dapr-spring-openfeign/src/test/java/io/dapr/spring/openfeign/client/DaprInvokeMethodClient.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2025 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
 package io.dapr.spring.openfeign.client;
 
 import io.dapr.spring.openfeign.annotation.UseDaprClient;

dapr-spring/dapr-spring-openfeign/src/test/java/io/dapr/spring/openfeign/client/DemoFeignClient.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2025 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
 package io.dapr.spring.openfeign.client;
 
 import org.springframework.cloud.openfeign.FeignClient;