You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/08/29 04:54:27 UTC
[dubbo] branch 3.0-multi-instances updated: Add default Scope for
AbstractConfig when init
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0-multi-instances
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0-multi-instances by this push:
new 04b7068 Add default Scope for AbstractConfig when init
04b7068 is described below
commit 04b7068b072f2c7c55f1d5f7ebd73952122270d7
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Sun Aug 29 12:54:12 2021 +0800
Add default Scope for AbstractConfig when init
---
.../src/main/java/org/apache/dubbo/config/AbstractConfig.java | 6 +++++-
.../src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java | 3 +++
.../src/main/java/org/apache/dubbo/config/ServiceConfigBase.java | 3 +++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java
index dedb0b0..d41f073 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java
@@ -31,9 +31,9 @@ import org.apache.dubbo.common.utils.ReflectUtils;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.config.context.ConfigManager;
import org.apache.dubbo.config.support.Parameter;
-import org.apache.dubbo.rpc.model.ScopeModel;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.ModuleModel;
+import org.apache.dubbo.rpc.model.ScopeModel;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
@@ -105,6 +105,10 @@ public abstract class AbstractConfig implements Serializable {
*/
protected ScopeModel scopeModel;
+ public AbstractConfig() {
+ setScopeModel(ApplicationModel.defaultModel());
+ }
+
public static String getTagName(Class<?> cls) {
return tagNameCache.computeIfAbsent(cls, (key) -> {
String tag = cls.getSimpleName();
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java b/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java
index 09abf83..30eb70d 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java
@@ -22,6 +22,7 @@ import org.apache.dubbo.common.utils.RegexProperties;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.config.annotation.Reference;
import org.apache.dubbo.config.support.Parameter;
+import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.ServiceMetadata;
import org.apache.dubbo.rpc.service.GenericService;
import org.apache.dubbo.rpc.support.ProtocolUtils;
@@ -75,6 +76,7 @@ public abstract class ReferenceConfigBase<T> extends AbstractReferenceConfig {
public ReferenceConfigBase() {
serviceMetadata = new ServiceMetadata();
serviceMetadata.addAttribute("ORIGIN_CONFIG", this);
+ setScopeModel(ApplicationModel.defaultModel().getDefaultModule());
}
public ReferenceConfigBase(Reference reference) {
@@ -82,6 +84,7 @@ public abstract class ReferenceConfigBase<T> extends AbstractReferenceConfig {
serviceMetadata.addAttribute("ORIGIN_CONFIG", this);
appendAnnotation(Reference.class, reference);
setMethods(MethodConfig.constructMethodConfig(reference.methods()));
+ setScopeModel(ApplicationModel.defaultModel().getDefaultModule());
}
public boolean shouldCheck() {
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java b/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
index 8e99615..c283146 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ServiceConfigBase.java
@@ -21,6 +21,7 @@ import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.config.annotation.Service;
import org.apache.dubbo.config.support.Parameter;
+import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.ServiceMetadata;
import org.apache.dubbo.rpc.service.GenericService;
import org.apache.dubbo.rpc.support.ProtocolUtils;
@@ -83,6 +84,7 @@ public abstract class ServiceConfigBase<T> extends AbstractServiceConfig {
public ServiceConfigBase() {
serviceMetadata = new ServiceMetadata();
serviceMetadata.addAttribute("ORIGIN_CONFIG", this);
+ setScopeModel(ApplicationModel.defaultModel().getDefaultModule());
}
public ServiceConfigBase(Service service) {
@@ -90,6 +92,7 @@ public abstract class ServiceConfigBase<T> extends AbstractServiceConfig {
serviceMetadata.addAttribute("ORIGIN_CONFIG", this);
appendAnnotation(Service.class, service);
setMethods(MethodConfig.constructMethodConfig(service.methods()));
+ setScopeModel(ApplicationModel.defaultModel().getDefaultModule());
}
@Deprecated