You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by vi...@apache.org on 2019/09/18 12:00:12 UTC
[dubbo] branch master updated: delete 'config.' prefix for url
generated from ConfigCenterConfig (#5078)
This is an automated email from the ASF dual-hosted git repository.
victory 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 a3c89e2 delete 'config.' prefix for url generated from ConfigCenterConfig (#5078)
a3c89e2 is described below
commit a3c89e2e47bcb4c690d454a7c2a6eca712b64a75
Author: ken.lj <ke...@gmail.com>
AuthorDate: Wed Sep 18 20:00:03 2019 +0800
delete 'config.' prefix for url generated from ConfigCenterConfig (#5078)
---
.../dubbo/common/constants/CommonConstants.java | 5 +++++
.../java/com/alibaba/dubbo/common/Constants.java | 1 -
.../apache/dubbo/config/ConfigCenterConfig.java | 16 +++------------
.../java/org/apache/dubbo/config/Constants.java | 5 -----
.../dubbo/config/ConfigCenterConfigTest.java | 6 +++---
.../org/apache/dubbo/configcenter/Constants.java | 24 ----------------------
.../support/apollo/ApolloDynamicConfiguration.java | 10 ++++-----
.../consul/ConsulDynamicConfiguration.java | 2 +-
.../support/etcd/EtcdDynamicConfiguration.java | 2 +-
.../zookeeper/ZookeeperDynamicConfiguration.java | 2 +-
.../ZookeeperDynamicConfigurationFactory.java | 1 -
11 files changed, 19 insertions(+), 55 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
index 15720ac..a058cca 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/CommonConstants.java
@@ -184,4 +184,9 @@ public interface CommonConstants {
String DUBBO_LABELS = "dubbo.labels";
String DUBBO_ENV_KEYS = "dubbo.env.keys";
+
+ String CONFIG_CONFIGFILE_KEY = "config-file";
+ String CONFIG_ENABLE_KEY = "highest-priority";
+ String CONFIG_NAMESPACE_KEY = "namespace";
+ String CHECK_KEY = "check";
}
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/Constants.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/Constants.java
index 7b489a3..6373c04 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/Constants.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/Constants.java
@@ -36,7 +36,6 @@ public class Constants implements CommonConstants,
org.apache.dubbo.rpc.Constants,
org.apache.dubbo.rpc.protocol.dubbo.Constants,
org.apache.dubbo.common.serialize.Constants,
- org.apache.dubbo.configcenter.Constants,
org.apache.dubbo.metadata.support.Constants,
org.apache.dubbo.rpc.protocol.rest.Constants,
org.apache.dubbo.registry.Constants {
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 28d3c5a..1198826 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
@@ -28,16 +28,11 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import static org.apache.dubbo.common.constants.CommonConstants.ANYHOST_VALUE;
+import static org.apache.dubbo.common.constants.CommonConstants.CONFIG_CONFIGFILE_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.CONFIG_ENABLE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PATH_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PROTOCOL_KEY;
-import static org.apache.dubbo.config.Constants.CONFIG_CONFIGFILE_KEY;
-import static org.apache.dubbo.config.Constants.CONFIG_ENABLE_KEY;
-import static org.apache.dubbo.config.Constants.CONFIG_TIMEOUT_KEY;
import static org.apache.dubbo.config.Constants.ZOOKEEPER_PROTOCOL;
-import static org.apache.dubbo.configcenter.Constants.CONFIG_CHECK_KEY;
-import static org.apache.dubbo.configcenter.Constants.CONFIG_CLUSTER_KEY;
-import static org.apache.dubbo.configcenter.Constants.CONFIG_GROUP_KEY;
-import static org.apache.dubbo.configcenter.Constants.CONFIG_NAMESPACE_KEY;
/**
* ConfigCenterConfig
@@ -82,7 +77,7 @@ public class ConfigCenterConfig extends AbstractConfig {
/* If the Config Center product you use have some special parameters that is not covered by this class, you can add it to here.
For example, with XML:
<dubbo:config-center>
- <dubbo:parameter key="config.{your key}" value="{your value}" />
+ <dubbo:parameter key="{your key}" value="{your value}" />
</dubbo:config-center>
*/
private Map<String, String> parameters;
@@ -133,7 +128,6 @@ public class ConfigCenterConfig extends AbstractConfig {
this.address = address;
}
- @Parameter(key = CONFIG_CLUSTER_KEY)
public String getCluster() {
return cluster;
}
@@ -142,7 +136,6 @@ public class ConfigCenterConfig extends AbstractConfig {
this.cluster = cluster;
}
- @Parameter(key = CONFIG_NAMESPACE_KEY)
public String getNamespace() {
return namespace;
}
@@ -151,7 +144,6 @@ public class ConfigCenterConfig extends AbstractConfig {
this.namespace = namespace;
}
- @Parameter(key = CONFIG_GROUP_KEY)
public String getGroup() {
return group;
}
@@ -160,7 +152,6 @@ public class ConfigCenterConfig extends AbstractConfig {
this.group = group;
}
- @Parameter(key = CONFIG_CHECK_KEY)
public Boolean isCheck() {
return check;
}
@@ -194,7 +185,6 @@ public class ConfigCenterConfig extends AbstractConfig {
this.password = password;
}
- @Parameter(key = CONFIG_TIMEOUT_KEY)
public Long getTimeout() {
return timeout;
}
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/Constants.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/Constants.java
index 97b0b93..610763e 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/Constants.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/Constants.java
@@ -73,11 +73,6 @@ public interface Constants {
*/
String PRODUCTION_ENVIRONMENT = "product";
- String CONFIG_CONFIGFILE_KEY = "config.config-file";
- String CONFIG_ENABLE_KEY = "config.highest-priority";
- String CONFIG_TIMEOUT_KEY = "config.timeout";
- String CONFIG_APPNAME_KEY = "config.app-name";
-
String MULTICAST = "multicast";
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java
index cf10ed5..6221d6e 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java
@@ -37,9 +37,9 @@ public class ConfigCenterConfigTest {
config.setGroup("group");
config.setAddress("zookeeper://127.0.0.1:2181");
- Assertions.assertEquals("zookeeper://127.0.0.1:2181/ConfigCenterConfig?config.check=true&" +
- "config.config-file=dubbo.properties&config.group=group&config.highest-priority=true&" +
- "config.namespace=namespace&config.timeout=3000",
+ Assertions.assertEquals("zookeeper://127.0.0.1:2181/ConfigCenterConfig?check=true&" +
+ "config-file=dubbo.properties&group=group&highest-priority=true&" +
+ "namespace=namespace&timeout=3000",
config.toUrl().toFullString()
);
}
diff --git a/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/Constants.java b/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/Constants.java
deleted file mode 100644
index fcf1a51..0000000
--- a/dubbo-configcenter/dubbo-configcenter-api/src/main/java/org/apache/dubbo/configcenter/Constants.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dubbo.configcenter;
-
-public interface Constants {
- String CONFIG_CLUSTER_KEY = "config.cluster";
- String CONFIG_NAMESPACE_KEY = "config.namespace";
- String CONFIG_GROUP_KEY = "config.group";
- String CONFIG_CHECK_KEY = "config.check";
-}
diff --git a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java
index f2ba351..4433412 100644
--- a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java
+++ b/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java
@@ -44,10 +44,10 @@ import java.util.stream.Collectors;
import static org.apache.dubbo.common.constants.CommonConstants.ANYHOST_VALUE;
import static org.apache.dubbo.common.constants.CommonConstants.APPLICATION_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.CHECK_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.CLUSTER_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.COMMA_SPLIT_PATTERN;
-import static org.apache.dubbo.configcenter.Constants.CONFIG_CHECK_KEY;
-import static org.apache.dubbo.configcenter.Constants.CONFIG_CLUSTER_KEY;
-import static org.apache.dubbo.configcenter.Constants.CONFIG_NAMESPACE_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.CONFIG_NAMESPACE_KEY;
/**
* Apollo implementation, https://github.com/ctripcorp/apollo
@@ -70,7 +70,7 @@ public class ApolloDynamicConfiguration implements DynamicConfiguration {
// Instead of using Dubbo's configuration, I would suggest use the original configuration method Apollo provides.
String configEnv = url.getParameter(APOLLO_ENV_KEY);
String configAddr = getAddressWithProtocolPrefix(url);
- String configCluster = url.getParameter(CONFIG_CLUSTER_KEY);
+ String configCluster = url.getParameter(CLUSTER_KEY);
if (configEnv != null) {
System.setProperty(APOLLO_ENV_KEY, configEnv);
}
@@ -84,7 +84,7 @@ public class ApolloDynamicConfiguration implements DynamicConfiguration {
dubboConfig = ConfigService.getConfig(url.getParameter(CONFIG_NAMESPACE_KEY, DEFAULT_GROUP));
dubboConfigFile = ConfigService.getConfigFile(url.getParameter(CONFIG_NAMESPACE_KEY, DEFAULT_GROUP), ConfigFileFormat.Properties);
// Decide to fail or to continue when failed to connect to remote server.
- boolean check = url.getParameter(CONFIG_CHECK_KEY, true);
+ boolean check = url.getParameter(CHECK_KEY, true);
if (dubboConfig.getSourceType() != ConfigSourceType.REMOTE) {
if (check) {
throw new IllegalStateException("Failed to connect to config center, the config center is Apollo, " +
diff --git a/dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java
index f57f639..c91994e 100644
--- a/dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java
+++ b/dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java
@@ -39,9 +39,9 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
import static java.util.concurrent.Executors.newCachedThreadPool;
+import static org.apache.dubbo.common.constants.CommonConstants.CONFIG_NAMESPACE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PATH_SEPARATOR;
import static org.apache.dubbo.configcenter.ConfigChangeType.ADDED;
-import static org.apache.dubbo.configcenter.Constants.CONFIG_NAMESPACE_KEY;
/**
* config center implementation for consul
diff --git a/dubbo-configcenter/dubbo-configcenter-etcd/src/main/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-etcd/src/main/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfiguration.java
index 1b10105..b902668 100644
--- a/dubbo-configcenter/dubbo-configcenter-etcd/src/main/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfiguration.java
+++ b/dubbo-configcenter/dubbo-configcenter-etcd/src/main/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfiguration.java
@@ -40,8 +40,8 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.dubbo.common.constants.CommonConstants.CONFIG_NAMESPACE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PATH_SEPARATOR;
-import static org.apache.dubbo.configcenter.Constants.CONFIG_NAMESPACE_KEY;
/**
* The etcd implementation of {@link DynamicConfiguration}
diff --git a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java
index 096b71c..f11bbe8 100644
--- a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java
+++ b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfiguration.java
@@ -32,8 +32,8 @@ import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import static org.apache.dubbo.common.constants.CommonConstants.CONFIG_NAMESPACE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PATH_SEPARATOR;
-import static org.apache.dubbo.configcenter.Constants.CONFIG_NAMESPACE_KEY;
/**
*
diff --git a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationFactory.java b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationFactory.java
index 4d78133..90a49be 100644
--- a/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationFactory.java
+++ b/dubbo-configcenter/dubbo-configcenter-zookeeper/src/main/java/org/apache/dubbo/configcenter/support/zookeeper/ZookeeperDynamicConfigurationFactory.java
@@ -32,7 +32,6 @@ public class ZookeeperDynamicConfigurationFactory extends AbstractDynamicConfigu
this.zookeeperTransporter = zookeeperTransporter;
}
-
@Override
protected DynamicConfiguration createDynamicConfiguration(URL url) {
return new ZookeeperDynamicConfiguration(url, zookeeperTransporter);