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/incubator-dubbo.git
commit 4bd2ed4979920bef7e04328b5711c662190a4f1a Author: ken.lj <[email protected]> AuthorDate: Sat Dec 22 14:07:31 2018 +0800 unify config format. --- .../java/org/apache/dubbo/common/Constants.java | 18 +++++------ .../org/apache/dubbo/config/AbstractConfig.java | 2 +- .../apache/dubbo/config/ConfigCenterConfig.java | 12 -------- .../apache/dubbo/config/MetadataReportConfig.java | 35 ++++++++++------------ .../apache/dubbo/config/RegistryDataConfig.java | 5 ---- .../annotation/DubboConfigConfiguration.java | 11 ++++--- 6 files changed, 31 insertions(+), 52 deletions(-) diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java index ef3f50c..5c1006b 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java @@ -470,23 +470,23 @@ public class Constants { * simple the registry for provider. * @since 2.7.0 */ - public static final String SIMPLE_PROVIDER_CONFIG_KEY = "simpleProviderConfig"; + public static final String SIMPLE_PROVIDER_CONFIG_KEY = "simple.provider.config"; /** * simple the registry for consumer. * @since 2.7.0 */ - public static final String SIMPLE_CONSUMER_CONFIG_KEY = "simpleConsumerConfig"; + public static final String SIMPLE_CONSUMER_CONFIG_KEY = "simple.consumer.config"; /** * After simplify the registry, should add some paramter individually for provider. * @since 2.7.0 */ - public static final String EXTRA_PROVIDER_CONFIG_KEYS_KEY = "extraProviderKeys"; + public static final String EXTRA_PROVIDER_CONFIG_KEYS_KEY = "extra.provider.keys"; /** * After simplify the registry, should add some paramter individually for consumer. * * @since 2.7.0 */ - public static final String EXTRA_CONSUMER_CONFIG_KEYS_KEY = "extraConsumerKeys"; + public static final String EXTRA_CONSUMER_CONFIG_KEYS_KEY = "extra.consumer.keys"; /** * To decide whether to exclude unavailable invoker from the cluster @@ -723,13 +723,13 @@ public class Constants { public static final String ADDRESS_KEY = "address"; - public static final String RETRY_TIMES_KEY = "retry-times"; + public static final String RETRY_TIMES_KEY = "retry.times"; - public static final String RETRY_PERIOD_KEY = "retry-period"; + public static final String RETRY_PERIOD_KEY = "retry.period"; - public static final String SYNC_REPORT_KEY = "sync-report"; + public static final String SYNC_REPORT_KEY = "sync.report"; - public static final String CYCLE_REPORT_KEY = "cycle-report"; + public static final String CYCLE_REPORT_KEY = "cycle.report"; public static final String CONFIG_VERSION_KEY = "configVersion"; @@ -745,8 +745,6 @@ public class Constants { public static final String REGISTRIES_SUFFIX = "dubbo.registries."; - public static final String CONFIGCENTERS_SUFFIX = "dubbo.configCenters."; - public static final String[] DEFAULT_REGISTER_PROVIDER_KEYS = {APPLICATION_KEY, CODEC_KEY, EXCHANGER_KEY, SERIALIZATION_KEY, CLUSTER_KEY, CONNECTIONS_KEY, DEPRECATED_KEY, GROUP_KEY, LOADBALANCE_KEY, MOCK_KEY, PATH_KEY, TIMEOUT_KEY, TOKEN_KEY, VERSION_KEY, WARMUP_KEY, WEIGHT_KEY, TIMESTAMP_KEY, DUBBO_VERSION_KEY, SPECIFICATION_VERSION_KEY}; diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java index f4abaf3..a64c73e 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java @@ -460,7 +460,7 @@ public abstract class AbstractConfig implements Serializable { && Modifier.isPublic(method.getModifiers()) && method.getParameterTypes().length == 0 && ClassHelper.isPrimitive(method.getReturnType())) { - String prop = calculatePropertyFromGetter(name); + String prop = calculateAttributeFromGetter(name); String key; Parameter parameter = method.getAnnotation(Parameter.class); if (parameter != null && parameter.key().length() > 0 && parameter.useKeyAsProperty()) { diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java index b4043e7..fe62fda 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConfigCenterConfig.java @@ -70,11 +70,6 @@ public class ConfigCenterConfig extends AbstractConfig { // give jvm properties the chance to override local configs, e.g., -Ddubbo.configcenter.highestPriority refresh(); - if (StringUtils.isNotEmpty(getId())) { - // read 'dubbo.configCenters.zookeeper.' - setPrefix(Constants.CONFIGCENTERS_SUFFIX); - refresh(); - } // try to use registryConfig as the default configcenter, only applies to zookeeper. if (!isValid() && registry != null && registry.isZookeeperProtocol()) { @@ -166,7 +161,6 @@ public class ConfigCenterConfig extends AbstractConfig { public void setProtocol(String protocol) { this.protocol = protocol; - this.updateIdIfAbsent(protocol); } @Parameter(excluded = true) @@ -176,12 +170,6 @@ public class ConfigCenterConfig extends AbstractConfig { public void setAddress(String address) { this.address = address; - if (address != null) { - int i = address.indexOf("://"); - if (i > 0) { - this.updateIdIfAbsent(address.substring(0, i)); - } - } } @Parameter(key = Constants.CONFIG_CLUSTER_KEY, useKeyAsProperty = false) diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java index 05112ac..a0928b6 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MetadataReportConfig.java @@ -44,13 +44,13 @@ public class MetadataReportConfig extends AbstractConfig { // customized parameters private Map<String, String> parameters; - private Integer retrytimes; + private Integer retryTimes; - private Integer retryperiod; + private Integer retryPeriod; /** * by default the metadatastore will store full metadata repeatly every day . */ - private Boolean cyclereport; + private Boolean cycleReport; /** * sync report, default async @@ -104,41 +104,36 @@ public class MetadataReportConfig extends AbstractConfig { this.parameters = parameters; } - @Parameter(key = "retry-times") - public Integer getRetrytimes() { - return retrytimes; + public Integer getRetryTimes() { + return retryTimes; } - public void setRetrytimes(Integer retrytimes) { - this.retrytimes = retrytimes; + public void setRetryTimes(Integer retryTimes) { + this.retryTimes = retryTimes; } - @Parameter(key = "retry-period") - public Integer getRetryperiod() { - return retryperiod; + public Integer getRetryPeriod() { + return retryPeriod; } - public void setRetryperiod(Integer retryperiod) { - this.retryperiod = retryperiod; + public void setRetryPeriod(Integer retryPeriod) { + this.retryPeriod = retryPeriod; } - @Parameter(key = "cycle-report") - public Boolean getCyclereport() { - return cyclereport; + public Boolean getCycleReport() { + return cycleReport; } - public void setCyclereport(Boolean cyclereport) { - this.cyclereport = cyclereport; + public void setCycleReport(Boolean cycleReport) { + this.cycleReport = cycleReport; } - @Override @Parameter(excluded = true) public boolean isValid() { return StringUtils.isNotEmpty(address); } - @Parameter(key = "sync-report") public Boolean getSyncReport() { return syncReport; } diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryDataConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryDataConfig.java index ce2f052..1b41e2e 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryDataConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryDataConfig.java @@ -18,7 +18,6 @@ package org.apache.dubbo.config; import org.apache.dubbo.common.Constants; import org.apache.dubbo.common.utils.StringUtils; -import org.apache.dubbo.config.support.Parameter; import java.util.HashMap; import java.util.Map; @@ -52,7 +51,6 @@ public class RegistryDataConfig extends AbstractConfig { return map; } - @Parameter(key = "simple-provider-config") public Boolean getSimpleProviderConfig() { return simpleProviderConfig; } @@ -61,7 +59,6 @@ public class RegistryDataConfig extends AbstractConfig { this.simpleProviderConfig = simpleProviderConfig; } - @Parameter(key = "simple-consumer-config") public Boolean getSimpleConsumerConfig() { return simpleConsumerConfig; } @@ -70,7 +67,6 @@ public class RegistryDataConfig extends AbstractConfig { this.simpleConsumerConfig = simpleConsumerConfig; } - @Parameter(key = "extra-provider-keys") public String getExtraProviderKeys() { return extraProviderKeys; } @@ -80,7 +76,6 @@ public class RegistryDataConfig extends AbstractConfig { } - @Parameter(key = "extra-consumer-keys") public String getExtraConsumerKeys() { return extraConsumerKeys; } diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigConfiguration.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigConfiguration.java index 4b74828..7ace9e1 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigConfiguration.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigConfiguration.java @@ -57,9 +57,11 @@ public class DubboConfigConfiguration { @EnableDubboConfigBinding(prefix = "dubbo.registry", type = RegistryConfig.class), @EnableDubboConfigBinding(prefix = "dubbo.protocol", type = ProtocolConfig.class), @EnableDubboConfigBinding(prefix = "dubbo.monitor", type = MonitorConfig.class), - @EnableDubboConfigBinding(prefix = "dubbo.provider", type = ProviderConfig.class), @EnableDubboConfigBinding(prefix = "dubbo.consumer", type = ConsumerConfig.class), @EnableDubboConfigBinding(prefix = "dubbo.configCenter", type = ConfigCenterBean.class), - @EnableDubboConfigBinding(prefix = "dubbo.registrydata", type = RegistryDataConfig.class), - @EnableDubboConfigBinding(prefix = "dubbo.metadatareport", type = MetadataReportConfig.class) + @EnableDubboConfigBinding(prefix = "dubbo.provider", type = ProviderConfig.class), + @EnableDubboConfigBinding(prefix = "dubbo.consumer", type = ConsumerConfig.class), + @EnableDubboConfigBinding(prefix = "dubbo.configCenter", type = ConfigCenterBean.class), + @EnableDubboConfigBinding(prefix = "dubbo.registryData", type = RegistryDataConfig.class), + @EnableDubboConfigBinding(prefix = "dubbo.metadataReport", type = MetadataReportConfig.class) }) public static class Single { @@ -75,7 +77,8 @@ public class DubboConfigConfiguration { @EnableDubboConfigBinding(prefix = "dubbo.protocols", type = ProtocolConfig.class, multiple = true), @EnableDubboConfigBinding(prefix = "dubbo.monitors", type = MonitorConfig.class, multiple = true), @EnableDubboConfigBinding(prefix = "dubbo.providers", type = ProviderConfig.class, multiple = true), - @EnableDubboConfigBinding(prefix = "dubbo.consumers", type = ConsumerConfig.class, multiple = true) + @EnableDubboConfigBinding(prefix = "dubbo.consumers", type = ConsumerConfig.class, multiple = true), + @EnableDubboConfigBinding(prefix = "dubbo.configCenters", type = ConfigCenterBean.class, multiple = true) }) public static class Multiple {
