[ISSUE alibaba#6487] [nacos-api] export the constant in the directory…

… naming. (alibaba#6540)
dongYES · Aug 4, 2021 · 831bea1 · 831bea1
1 parent 1119d03
commit 831bea1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/api/src/main/java/com/alibaba/nacos/api/common/Constants.java b/api/src/main/java/com/alibaba/nacos/api/common/Constants.java
@@ -219,4 +219,14 @@ public static class Config {
 
         public static final String NOTIFY_HEADER = "notify";
     }
+
+    /**
+     * The constants in naming directory.
+     */
+    public static class Naming {
+
+        public static final String NAMING_MODULE = "naming";
+
+        public static final String CMDB_CONTEXT_TYPE = "CMDB";
+    }
 }
diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/remote/request/AbstractNamingRequest.java b/api/src/main/java/com/alibaba/nacos/api/naming/remote/request/AbstractNamingRequest.java
@@ -18,15 +18,15 @@
 
 import com.alibaba.nacos.api.remote.request.Request;
 
+import static com.alibaba.nacos.api.common.Constants.Naming.NAMING_MODULE;
+
 /**
  * Uniform remote request of naming module.
  *
  * @author liuzunfei
  */
 public abstract class AbstractNamingRequest extends Request {
 
-    private static final String MODULE = "naming";
-
     private String namespace;
 
     private String serviceName;
@@ -44,7 +44,7 @@ public AbstractNamingRequest(String namespace, String serviceName, String groupN
 
     @Override
     public String getModule() {
-        return MODULE;
+        return NAMING_MODULE;
     }
 
     public String getNamespace() {

diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/remote/request/NotifySubscriberRequest.java b/api/src/main/java/com/alibaba/nacos/api/naming/remote/request/NotifySubscriberRequest.java
@@ -19,15 +19,15 @@
 import com.alibaba.nacos.api.naming.pojo.ServiceInfo;
 import com.alibaba.nacos.api.remote.request.ServerRequest;
 
+import static com.alibaba.nacos.api.common.Constants.Naming.NAMING_MODULE;
+
 /**
  * Notify subscriber response.
  *
  * @author xiweng.yy
  */
 public class NotifySubscriberRequest extends ServerRequest {
 
-    private static final String MODULE = "naming";
-
     private String namespace;
 
     private String serviceName;
@@ -41,7 +41,7 @@ public NotifySubscriberRequest() {
 
     @Override
     public String getModule() {
-        return MODULE;
+        return NAMING_MODULE;
     }
 
     private NotifySubscriberRequest(ServiceInfo serviceInfo, String message) {

diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/selector/AbstractCmdbSelector.java b/api/src/main/java/com/alibaba/nacos/api/naming/selector/AbstractCmdbSelector.java
@@ -22,6 +22,8 @@
 
 import java.util.List;
 
+import static com.alibaba.nacos.api.common.Constants.Naming.CMDB_CONTEXT_TYPE;
+
 /**
  * {@link AbstractCmdbSelector} will provide one default implement of {@link Selector}, users can implement it to use the {@link CmdbContext}.
  * And return the result as default subclass of {@link Instance}.
@@ -31,8 +33,6 @@
  */
 public abstract class AbstractCmdbSelector<T extends Instance> implements Selector<List<T>, CmdbContext<T>, String> {
 
-    private static final String DEFAULT_CONTEXT_TYPE = "CMDB";
-
     @Override
     public List<T> select(CmdbContext<T> context) {
         return doSelect(context);
@@ -48,6 +48,6 @@ public List<T> select(CmdbContext<T> context) {
 
     @Override
     public String getContextType() {
-        return DEFAULT_CONTEXT_TYPE;
+        return CMDB_CONTEXT_TYPE;
     }
 }