From 4ba48f541fd39cb44e1a61f3dfaede04a6ee9243 Mon Sep 17 00:00:00 2001 From: "zhang.jie" Date: Tue, 15 Jun 2021 15:08:08 +0800 Subject: [PATCH 1/4] add cache for scan result. (#7477) --- .../DubboClassPathBeanDefinitionScanner.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java index 1ed2f321c2c..03b516e6c1d 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java @@ -16,6 +16,7 @@ */ 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; @@ -23,7 +24,10 @@ import org.springframework.core.env.Environment; import org.springframework.core.io.ResourceLoader; +import java.util.Objects; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import static org.springframework.context.annotation.AnnotationConfigUtils.registerAnnotationConfigProcessors; @@ -36,6 +40,11 @@ */ public class DubboClassPathBeanDefinitionScanner extends ClassPathBeanDefinitionScanner { + /** + * key is package to scan, value is BeanDefinition + */ + private final ConcurrentMap> beanDefinitionMap = new ConcurrentHashMap<>(); + public DubboClassPathBeanDefinitionScanner(BeanDefinitionRegistry registry, boolean useDefaultFilters, Environment environment, ResourceLoader resourceLoader) { @@ -67,4 +76,15 @@ public boolean checkCandidate(String beanName, BeanDefinition beanDefinition) th return super.checkCandidate(beanName, beanDefinition); } + @Override + public Set findCandidateComponents(String basePackage) { + Set beanDefinitions = beanDefinitionMap.get(basePackage); + // if beanDefinitions size eq 0 => don't scan + // if beanDefinitions size is null => scan + if (Objects.isNull(beanDefinitions)) { + beanDefinitions = super.findCandidateComponents(basePackage); + beanDefinitionMap.put(basePackage, beanDefinitions); + } + return beanDefinitions; + } } From 6e000c31ad730a91125922efd7920eaec263eb08 Mon Sep 17 00:00:00 2001 From: "zhang.jie" Date: Wed, 16 Jun 2021 09:12:25 +0800 Subject: [PATCH 2/4] remove unused method and delete Unused import. (#8049) --- .../annotation/DubboClassPathBeanDefinitionScanner.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java index 03b516e6c1d..f1ca7669ab3 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java @@ -16,9 +16,7 @@ */ 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.context.annotation.ClassPathBeanDefinitionScanner; import org.springframework.core.env.Environment; @@ -66,11 +64,6 @@ public DubboClassPathBeanDefinitionScanner(BeanDefinitionRegistry registry, Envi } - @Override - public Set doScan(String... basePackages) { - return super.doScan(basePackages); - } - @Override public boolean checkCandidate(String beanName, BeanDefinition beanDefinition) throws IllegalStateException { return super.checkCandidate(beanName, beanDefinition); @@ -79,7 +72,7 @@ public boolean checkCandidate(String beanName, BeanDefinition beanDefinition) th @Override public Set findCandidateComponents(String basePackage) { Set beanDefinitions = beanDefinitionMap.get(basePackage); - // if beanDefinitions size eq 0 => don't scan + // if beanDefinitions size ge 0 => don't scan // if beanDefinitions size is null => scan if (Objects.isNull(beanDefinitions)) { beanDefinitions = super.findCandidateComponents(basePackage); From 720cc53990148abd6745c7f94e0e8124be4818b1 Mon Sep 17 00:00:00 2001 From: "zhang.jie" Date: Wed, 16 Jun 2021 12:35:17 +0800 Subject: [PATCH 3/4] delete checkCandidate method. --- .../annotation/DubboClassPathBeanDefinitionScanner.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java index f1ca7669ab3..8b727129afc 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java @@ -64,11 +64,6 @@ public DubboClassPathBeanDefinitionScanner(BeanDefinitionRegistry registry, Envi } - @Override - public boolean checkCandidate(String beanName, BeanDefinition beanDefinition) throws IllegalStateException { - return super.checkCandidate(beanName, beanDefinition); - } - @Override public Set findCandidateComponents(String basePackage) { Set beanDefinitions = beanDefinitionMap.get(basePackage); From 2782e22dd2e5e96594cbfee7d2e7d559c4c55031 Mon Sep 17 00:00:00 2001 From: "zhang.jie" Date: Wed, 16 Jun 2021 14:46:17 +0800 Subject: [PATCH 4/4] Please remove redundant comments. --- .../context/annotation/DubboClassPathBeanDefinitionScanner.java | 1 - 1 file changed, 1 deletion(-) diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java index 8b727129afc..fc8953bab54 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboClassPathBeanDefinitionScanner.java @@ -67,7 +67,6 @@ public DubboClassPathBeanDefinitionScanner(BeanDefinitionRegistry registry, Envi @Override public Set findCandidateComponents(String basePackage) { Set beanDefinitions = beanDefinitionMap.get(basePackage); - // if beanDefinitions size ge 0 => don't scan // if beanDefinitions size is null => scan if (Objects.isNull(beanDefinitions)) { beanDefinitions = super.findCandidateComponents(basePackage);