Merge pull request alibaba#902 from alibaba/feature_naming_group

Feature naming group
LuanLouis · Mar 14, 2019 · e4255e1 · e4255e1
2 parents bd1fd2b + 86b5241
commit e4255e1
Show file tree

Hide file tree

Showing 201 changed files with 10,785 additions and 8,380 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>0.9.1</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/api/src/main/java/com/alibaba/nacos/api/cmdb/pojo/Entity.java b/api/src/main/java/com/alibaba/nacos/api/cmdb/pojo/Entity.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 
 /**
- * @author <a href="mailto:[email protected]">nkorange</a>
+ * @author nkorange
  * @since 0.7.0
  */
 public class Entity {

diff --git a/api/src/main/java/com/alibaba/nacos/api/cmdb/pojo/EntityEvent.java b/api/src/main/java/com/alibaba/nacos/api/cmdb/pojo/EntityEvent.java
@@ -16,7 +16,7 @@
 package com.alibaba.nacos.api.cmdb.pojo;
 
 /**
- * @author <a href="mailto:[email protected]">nkorange</a>
+ * @author nkorange
  * @since 0.7.0
  */
 public class EntityEvent {

diff --git a/api/src/main/java/com/alibaba/nacos/api/cmdb/pojo/EntityEventType.java b/api/src/main/java/com/alibaba/nacos/api/cmdb/pojo/EntityEventType.java
@@ -16,7 +16,7 @@
 package com.alibaba.nacos.api.cmdb.pojo;
 
 /**
- * @author <a href="mailto:[email protected]">nkorange</a>
+ * @author nkorange
  * @since 0.7.0
  */
 public enum EntityEventType {

diff --git a/api/src/main/java/com/alibaba/nacos/api/cmdb/pojo/Label.java b/api/src/main/java/com/alibaba/nacos/api/cmdb/pojo/Label.java
@@ -18,7 +18,7 @@
 import java.util.Set;
 
 /**
- * @author <a href="mailto:[email protected]">nkorange</a>
+ * @author nkorange
  * @since 0.7.0
  */
 public class Label {

diff --git a/api/src/main/java/com/alibaba/nacos/api/cmdb/pojo/PreservedEntityTypes.java b/api/src/main/java/com/alibaba/nacos/api/cmdb/pojo/PreservedEntityTypes.java
@@ -16,7 +16,7 @@
 package com.alibaba.nacos.api.cmdb.pojo;
 
 /**
- * @author <a href="mailto:[email protected]">nkorange</a>
+ * @author nkorange
  * @since 0.7.0
  */
 public enum PreservedEntityTypes {

diff --git a/api/src/main/java/com/alibaba/nacos/api/cmdb/spi/CmdbService.java b/api/src/main/java/com/alibaba/nacos/api/cmdb/spi/CmdbService.java
@@ -26,7 +26,7 @@
 /**
  * Service to visit CMDB store
  *
- * @author <a href="mailto:[email protected]">nkorange</a>
+ * @author nkorange
  * @since 0.7.0
  */
 public interface CmdbService {

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
@@ -22,8 +22,6 @@
  */
 public class Constants {
 
-    public static final String CLIENT_VERSION_HEADER = "Client-Version";
-
     public static final String CLIENT_VERSION = "3.0.0";
 
     public static int DATA_IN_BODY_VERSION = 204;
@@ -121,11 +119,13 @@ public class Constants {
     public static final int NAMING_INSTANCE_ID_SEG_COUNT = 4;
     public static final String NAMING_HTTP_HEADER_SPILIER = "\\|";
 
-    public static final String NAMING_DEFAULT_CLUSTER_NAME = "DEFAULT";
+    public static final String DEFAULT_CLUSTER_NAME = "DEFAULT";
+
+    public static final String DEFAULT_NAMESPACE_ID = "public";
+
+    public static final int WRITE_REDIRECT_CODE = 307;
+
+    public static final String SERVICE_INFO_SPLITER = "@@";
 
-    public static final String REQUEST_PARAM_NAMESPACE_ID = "namespaceId";
-    public static final String REQUEST_PARAM_DEFAULT_NAMESPACE_ID = "public";
-    public static final String REQUEST_PARAM_SERVICE_NAME = "serviceName";
-    public static final String REQUEST_PARAM_GROUP = "group";
-    public static final String REQUEST_PARAM_DEFAULT_GROUP = "DEFAULT_GROUP";
+    public static final String NULL_STRING = "null";
 }
diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/CommonParams.java b/api/src/main/java/com/alibaba/nacos/api/naming/CommonParams.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed 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 com.alibaba.nacos.api.naming;
+
+/**
+ * Common parameters for service discovery
+ *
+ * @author nkorange
+ * @since 1.0.0
+ */
+public class CommonParams {
+
+    public static final String SERVICE_NAME = "serviceName";
+
+    public static final String CLUSTER_NAME = "clusterName";
+
+    public static final String NAMESPACE_ID = "namespaceId";
+
+    public static final String GROUP_NAME = "groupName";
+
+}
diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/NamingFactory.java b/api/src/main/java/com/alibaba/nacos/api/naming/NamingFactory.java
@@ -23,7 +23,7 @@
 /**
  * Naming Factory
  *
- * @author dungu.zpf
+ * @author nkorange
  */
 public class NamingFactory {