fix(springboot openfeign): fix IT failed for tests that have two dapr client bean autowired

Job SDK ITs have a daprPreviewClient bean defined, as SpringBoot bean search will first get beans that impl the interface and get all beans that matches the bean's class, when openfeign autowire DaprClient, there is a conflict between daprClient and daprPreviewClient.

Change the AutoConfiguration behavior to make a more strict rule for making AutoConfiguration run

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

Author: lony2003

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

@@ -18,6 +18,7 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <spotbugs.exclude.filter.file>./spotbugs-exclude.xml</spotbugs.exclude.filter.file>
     </properties>
 
     <dependencies>

dapr-spring/dapr-spring-openfeign/spotbugs-exclude.xml

@@ -0,0 +1,16 @@
+<FindBugsFilter>
+    <Match>
+        <Package name="~io\.dapr\.spring.*"/>
+        <Bug pattern="EI_EXPOSE_REP"/>
+    </Match>
+
+    <Match>
+        <Package name="~io\.dapr\.spring.*"/>
+        <Bug pattern="EI_EXPOSE_REP2"/>
+    </Match>
+
+    <Match>
+        <Package name="~io\.dapr\.spring\.openfeign\.autoconfigure.*"/>
+        <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
+    </Match>
+</FindBugsFilter>

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

@@ -22,12 +22,13 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(DaprFeignClientProperties.class)
-@ConditionalOnProperty(name = "dapr.feign.enabled", matchIfMissing = true)
+@Conditional(FeignClientAnnoationEnabledCondition.class)
 @ConditionalOnClass(FeignAutoConfiguration.class)
 @Import(DaprClientTargeterBeanPostProcessor.class)
 public class DaprFeignClientAutoConfiguration {

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

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

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

@@ -0,0 +1,20 @@
+package io.dapr.spring.openfeign.autoconfigure;
+
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+public class FeignClientAnnoationEnabledCondition implements Condition {
+  @Override
+  public boolean matches(@NotNull ConditionContext context, @NotNull AnnotatedTypeMetadata metadata) {
+    if (context.getBeanFactory() == null) {
+      return false; // Return false if context or BeanFactory is null
+    }
+
+    String[] beanNames = context.getBeanFactory().getBeanNamesForAnnotation(EnableFeignClients.class);
+    return beanNames != null && beanNames.length > 0; // Check for null and non-empty array
+  }
+}

dapr-spring/dapr-spring-openfeign/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1,12 +1,5 @@
 {
   "properties": [
-    {
-      "name": "dapr.feign.enabled",
-      "type": "java.lang.Boolean",
-      "defaultValue": true,
-      "sourceType": "io.dapr.spring.openfeign.autoconfigure.DaprFeignClientProperties",
-      "description": "enable dapr openfeign or not."
-    },
     {
       "name": "dapr.feign.timeout",
       "type": "java.lang.Integer",

sdk-tests/src/test/java/io/dapr/it/spring/feign/DaprFeignIT.java

@@ -41,7 +41,6 @@
         DaprFeignTestApplication.class
     },
     properties = {
-        "dapr.feign.enabled=true",
         "dapr.feign.retries=1",
         "server.port=" + DaprFeignIT.APP_PORT
     }