You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2019/12/20 15:59:45 UTC
[dubbo] branch master updated: [Dubbo] Refactoring to remove
duplicate methods and feature envy. (#5506)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new fbaa4c6 [Dubbo] Refactoring to remove duplicate methods and feature envy. (#5506)
fbaa4c6 is described below
commit fbaa4c641a3eebb13e2cad4798818bdfd515ea17
Author: Kleber TarcĂsio <kl...@yahoo.com.br>
AuthorDate: Fri Dec 20 12:59:32 2019 -0300
[Dubbo] Refactoring to remove duplicate methods and feature envy. (#5506)
---
.../dubbo/config/AbstractInterfaceConfig.java | 33 ++++++++++++
.../apache/dubbo/config/ReferenceConfigBase.java | 36 -------------
.../org/apache/dubbo/config/ServiceConfigBase.java | 62 ++++++----------------
.../org/apache/dubbo/config/ReferenceConfig.java | 7 ++-
4 files changed, 56 insertions(+), 82 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
index 6495938..43bb593 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -307,6 +307,39 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
}
+ public void completeCompoundConfigs(AbstractInterfaceConfig interfaceConfig) {
+ if (interfaceConfig != null) {
+ if (application == null) {
+ setApplication(interfaceConfig.getApplication());
+ }
+ if (module == null) {
+ setModule(interfaceConfig.getModule());
+ }
+ if (registries == null) {
+ setRegistries(interfaceConfig.getRegistries());
+ }
+ if (monitor == null) {
+ setMonitor(interfaceConfig.getMonitor());
+ }
+ }
+ if (module != null) {
+ if (registries == null) {
+ setRegistries(module.getRegistries());
+ }
+ if (monitor == null) {
+ setMonitor(module.getMonitor());
+ }
+ }
+ if (application != null) {
+ if (registries == null) {
+ setRegistries(application.getRegistries());
+ }
+ if (monitor == null) {
+ setMonitor(application.getMonitor());
+ }
+ }
+ }
+
protected void computeValidRegistryIds() {
if (StringUtils.isEmpty(getRegistryIds())) {
if (getApplication() != null && StringUtils.isNotEmpty(getApplication().getRegistryIds())) {
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 3d52969..fe91632 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
@@ -122,42 +122,6 @@ public abstract class ReferenceConfigBase<T> extends AbstractReferenceConfig {
}));
}
- public void completeCompoundConfigs() {
- if (consumer != null) {
- if (application == null) {
- setApplication(consumer.getApplication());
- }
- if (module == null) {
- setModule(consumer.getModule());
- }
- if (registries == null) {
- setRegistries(consumer.getRegistries());
- }
- if (monitor == null) {
- setMonitor(consumer.getMonitor());
- }
- if (StringUtils.isEmpty(registryIds)) {
- setRegistryIds(consumer.getRegistryIds());
- }
- }
- if (module != null) {
- if (registries == null) {
- setRegistries(module.getRegistries());
- }
- if (monitor == null) {
- setMonitor(module.getMonitor());
- }
- }
- if (application != null) {
- if (registries == null) {
- setRegistries(application.getRegistries());
- }
- if (monitor == null) {
- setMonitor(application.getMonitor());
- }
- }
- }
-
public Class<?> getActualInterface() {
Class actualInterface = interfaceClass;
if (interfaceClass == GenericService.class) {
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 d7ee88b..fbbda9e 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
@@ -197,51 +197,6 @@ public abstract class ServiceConfigBase<T> extends AbstractServiceConfig {
return ref.getClass();
}
- public void completeCompoundConfigs() {
- if (provider != null) {
- if (application == null) {
- setApplication(provider.getApplication());
- }
- if (module == null) {
- setModule(provider.getModule());
- }
- if (registries == null) {
- setRegistries(provider.getRegistries());
- }
- if (monitor == null) {
- setMonitor(provider.getMonitor());
- }
- if (protocols == null) {
- setProtocols(provider.getProtocols());
- }
- if (configCenter == null) {
- setConfigCenter(provider.getConfigCenter());
- }
- if (StringUtils.isEmpty(registryIds)) {
- setRegistryIds(provider.getRegistryIds());
- }
- if (StringUtils.isEmpty(protocolIds)) {
- setProtocolIds(provider.getProtocolIds());
- }
- }
- if (module != null) {
- if (registries == null) {
- setRegistries(module.getRegistries());
- }
- if (monitor == null) {
- setMonitor(module.getMonitor());
- }
- }
- if (application != null) {
- if (registries == null) {
- setRegistries(application.getRegistries());
- }
- if (monitor == null) {
- setMonitor(application.getMonitor());
- }
- }
- }
-
public void checkDefault() {
createProviderIfAbsent();
}
@@ -268,6 +223,23 @@ public abstract class ServiceConfigBase<T> extends AbstractServiceConfig {
convertProtocolIdsToProtocols();
}
+ public void completeCompoundConfigs() {
+ super.completeCompoundConfigs(provider);
+ if(provider != null) {
+ if (protocols == null) {
+ setProtocols(provider.getProtocols());
+ }
+ if (configCenter == null) {
+ setConfigCenter(provider.getConfigCenter());
+ }
+ if (StringUtils.isEmpty(registryIds)) {
+ setRegistryIds(provider.getRegistryIds());
+ }
+ if (StringUtils.isEmpty(protocolIds)) {
+ setProtocolIds(provider.getProtocolIds());
+ }
+ }
+ }
private void convertProtocolIdsToProtocols() {
computeValidProtocolIds();
if (StringUtils.isEmpty(protocolIds)) {
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
index 17b8bea..ddde73d 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
@@ -368,7 +368,12 @@ public class ReferenceConfig<T> extends ReferenceConfigBase<T> {
if (StringUtils.isEmpty(interfaceName)) {
throw new IllegalStateException("<dubbo:reference interface=\"\" /> interface not allow null!");
}
- completeCompoundConfigs();
+ completeCompoundConfigs(consumer);
+ if (consumer != null) {
+ if (StringUtils.isEmpty(registryIds)) {
+ setRegistryIds(consumer.getRegistryIds());
+ }
+ }
// get consumer's global configuration
checkDefault();
this.refresh();