add cache for scan result. (apache#7477)

zhangjiezhang · Jun 16, 2021 · 31f99d6 · 31f99d6
1 parent 1e3e5f5
commit 31f99d6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 35 deletions.
diff --git a/...va/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceClassPostProcessor.java b/...va/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceClassPostProcessor.java
@@ -162,9 +162,13 @@ private void registerServiceBeans(Set<String> packagesToScan, BeanDefinitionRegi
         });
 
         for (String packageToScan : packagesToScan) {
-
+
+            // Registers @Service Bean first
+            scanner.scan(packageToScan);
+
             // Finds all BeanDefinitionHolders of @Service whether @ComponentScan scans or not.
-            Set<BeanDefinitionHolder> beanDefinitionHolders = scanner.doScan(registry, beanNameGenerator, packageToScan);
+            Set<BeanDefinitionHolder> beanDefinitionHolders =
+                    findServiceBeanDefinitionHolders(scanner, packageToScan, registry, beanNameGenerator);
 
             if (!CollectionUtils.isEmpty(beanDefinitionHolders)) {
 

diff --git a/...rg/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java b/...rg/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java
@@ -16,17 +16,13 @@
  */
 package org.apache.dubbo.config.spring.context.annotation;
 
-import org.apache.dubbo.common.utils.CollectionUtils;
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.BeanNameGenerator;
 import org.springframework.context.annotation.ClassPathBeanDefinitionScanner;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
 
-import java.util.LinkedHashSet;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -42,6 +38,9 @@
  */
 public class DubboClassPathBeanDefinitionScanner extends ClassPathBeanDefinitionScanner {
 
+    /**
+     * key is package, value is BeanDefinition
+     */
     private final ConcurrentMap<String, Set<BeanDefinition>> beanDefinitionMap = new ConcurrentHashMap<>();
 
     public DubboClassPathBeanDefinitionScanner(BeanDefinitionRegistry registry, boolean useDefaultFilters, Environment environment,
@@ -64,11 +63,6 @@ public DubboClassPathBeanDefinitionScanner(BeanDefinitionRegistry registry, Envi
 
     }
 
-    @Override
-    public Set<BeanDefinitionHolder> doScan(String... basePackages) {
-        return super.doScan(basePackages);
-    }
-
     @Override
     public boolean checkCandidate(String beanName, BeanDefinition beanDefinition) throws IllegalStateException {
         return super.checkCandidate(beanName, beanDefinition);
@@ -77,32 +71,12 @@ public boolean checkCandidate(String beanName, BeanDefinition beanDefinition) th
     @Override
     public Set<BeanDefinition> findCandidateComponents(String basePackage) {
         Set<BeanDefinition> beanDefinitions = beanDefinitionMap.get(basePackage);
-        if (CollectionUtils.isEmpty(beanDefinitions)) {
+        // if beanDefinitions size ge 0 => don't scan
+        // if beanDefinitions size is null => scan
+        if (Objects.isNull(beanDefinitions)) {
             beanDefinitions = super.findCandidateComponents(basePackage);
             beanDefinitionMap.put(basePackage, beanDefinitions);
         }
         return beanDefinitions;
     }
-
-    /**
-     * Registers @Service Bean and Finds all BeanDefinitionHolders of @Service
-     *
-     * @param registry              BeanDefinitionRegistry
-     * @param beanNameGenerator     BeanNameGenerator
-     * @param basePackage           basePackage
-     * @return                      all BeanDefinitionHolders of @Service
-     */
-    public Set<BeanDefinitionHolder> doScan(BeanDefinitionRegistry registry, BeanNameGenerator beanNameGenerator, String basePackage) {
-        // Registers @Service Bean first
-        super.doScan(basePackage);
-        Set<BeanDefinition> beanDefinitions = findCandidateComponents(basePackage);
-        Set<BeanDefinitionHolder> beanDefinitionHolders = new LinkedHashSet<BeanDefinitionHolder>(beanDefinitions.size());
-        for (BeanDefinition beanDefinition : beanDefinitions) {
-            String beanName = beanNameGenerator.generateBeanName(beanDefinition, registry);
-            BeanDefinitionHolder beanDefinitionHolder = new BeanDefinitionHolder(beanDefinition, beanName);
-            beanDefinitionHolders.add(beanDefinitionHolder);
-        }
-        return beanDefinitionHolders;
-    }
-
 }