Fix ConfigCenter namespace read bug in apollo, etcd and so on. (apach…

…e#6717) 修复apollo、etcd等配置中心读取namespace错误的bug。 Co-authored-by: furao <furao@didiglobal.com>
AlbumenJ · Feb 25, 2021 · 04c70e5 · 04c70e5
1 parent d0b894d
commit 04c70e5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/Constants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/Constants.java
@@ -16,6 +16,7 @@
  */
 package org.apache.dubbo.common.config.configcenter;
 
+@Deprecated
 public interface Constants {
     String CONFIG_CLUSTER_KEY = "config.cluster";
     String CONFIG_NAMESPACE_KEY = "config.namespace";

diff --git a/...c/main/java/org/apache/dubbo/common/config/configcenter/TreePathDynamicConfiguration.java b/...c/main/java/org/apache/dubbo/common/config/configcenter/TreePathDynamicConfiguration.java
@@ -26,7 +26,7 @@
 
 import static java.util.Collections.emptySortedSet;
 import static java.util.Collections.unmodifiableSortedSet;
-import static org.apache.dubbo.common.config.configcenter.Constants.CONFIG_NAMESPACE_KEY;
+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.common.utils.CollectionUtils.isEmpty;
 import static org.apache.dubbo.common.utils.PathUtils.buildPath;

diff --git a/...rc/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java b/...rc/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java
@@ -42,7 +42,7 @@
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.stream.Collectors;
 
-import static org.apache.dubbo.common.config.configcenter.Constants.CONFIG_NAMESPACE_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.CONFIG_NAMESPACE_KEY;
 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;

diff --git a/...cd/src/main/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfiguration.java b/...cd/src/main/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfiguration.java
@@ -40,7 +40,7 @@
 import java.util.concurrent.ConcurrentMap;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.dubbo.common.config.configcenter.Constants.CONFIG_NAMESPACE_KEY;
+import static org.apache.dubbo.common.constants.CommonConstants.CONFIG_NAMESPACE_KEY;
 import static org.apache.dubbo.common.constants.CommonConstants.PATH_SEPARATOR;
 
 /**