Fix apolloconfig#4152

`beanFactory.isTypeMatch` may lead to the initialization of FactoryBean, dubbo consumer is a ReferenceBean which implements FactoryBean. support spring 3 related to apolloconfig#2328 apolloconfig#3865 apolloconfig#4161 apolloconfig#4164
lonre · Dec 23, 2021 · 92bc1ac · 92bc1ac
1 parent 83e87ba
commit 92bc1ac
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/util/BeanRegistrationUtil.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/util/BeanRegistrationUtil.java
@@ -18,8 +18,8 @@
 
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 
-import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -29,6 +29,16 @@
  * @author Jason Song(song_s@ctrip.com)
  */
 public class BeanRegistrationUtil {
+  // reserved bean definitions, we should consider drop this if we will upgrade Spring version
+  private static final Map<String, String> RESERVED_BEAN_DEFINITIONS = new ConcurrentHashMap<>();
+
+  static {
+    RESERVED_BEAN_DEFINITIONS.put(
+        "org.springframework.context.support.PropertySourcesPlaceholderConfigurer",
+        "org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration#propertySourcesPlaceholderConfigurer"
+    );
+  }
+
   public static boolean registerBeanDefinitionIfNotExists(BeanDefinitionRegistry registry, String beanName,
       Class<?> beanClass) {
     return registerBeanDefinitionIfNotExists(registry, beanName, beanClass, null);
@@ -42,15 +52,16 @@ public static boolean registerBeanDefinitionIfNotExists(BeanDefinitionRegistry r
 
     String[] candidates = registry.getBeanDefinitionNames();
 
+    String reservedBeanDefinition = RESERVED_BEAN_DEFINITIONS.get(beanClass.getName());
     for (String candidate : candidates) {
       BeanDefinition beanDefinition = registry.getBeanDefinition(candidate);
       if (Objects.equals(beanDefinition.getBeanClassName(), beanClass.getName())) {
         return false;
       }
 
-      if (beanDefinition instanceof AnnotatedBeanDefinition) {
-        MethodMetadata metadata = ((AnnotatedBeanDefinition) beanDefinition).getFactoryMethodMetadata();
-        if (metadata != null && Objects.equals(metadata.getReturnTypeName(), beanClass.getName())) {
+      if (reservedBeanDefinition != null && beanDefinition.getSource() != null && beanDefinition.getSource() instanceof MethodMetadata) {
+        MethodMetadata metadata = (MethodMetadata) beanDefinition.getSource();
+        if (Objects.equals(reservedBeanDefinition, String.format("%s#%s", metadata.getDeclaringClassName(), metadata.getMethodName()))) {
           return false;
         }
       }