Merge from develop.

.github/workflows/ci.yml

@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Continuous Integration
+name: "Continuous Integration"
 
 on:
   push:
@@ -13,34 +13,37 @@ permissions:
   contents: read # to fetch code (actions/checkout)
 
 jobs:
-  unix:
+  ci:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest]
         java: [8]
     steps:
-      - name: Cache Maven Repos
+      - name: "Cache Maven Repos"
         uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
-      - uses: actions/checkout@v3
-      - name: Set up JDK ${{ matrix.java }}
+      - name: "Checkout"
+        uses: actions/checkout@v3
+      - name: "Set up JDK ${{ matrix.java }}"
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
           distribution: 'zulu'
           architecture: x64
-      - name: Check with Maven
-        run: mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true
-      - name: Build with Maven
-        run: mvn -Prelease-nacos -Dmaven.test.skip=true clean install -U
-      - name: Test With Maven
-        run: mvn -Prelease-nacos clean test -DtrimStackTrace=false
-      - name: Codecov
+      - name: "Print maven version"
+        run: mvn -version
+      - name: "Check with Maven"
+        run: mvn -B clean package apache-rat:check findbugs:findbugs -DskipTests -e -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - name: "Build with Maven"
+        run: mvn -Prelease-nacos -DskipTests clean install -U -e -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - name: "Test With Maven"
+        run: mvn -Prelease-nacos clean test -DtrimStackTrace=false -e -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - name: "Codecov"
         uses: codecov/codecov-action@v3.1.0
         with:
           files: ./address/target/site/jacoco/jacoco.xml,./api/target/site/jacoco/jacoco.xml,./auth/target/site/jacoco/jacoco.xml,./client/target/site/jacoco/jacoco.xml,./common/target/site/jacoco/jacoco.xml,./consistency/target/site/jacoco/jacoco.xml,./console/target/site/jacoco/jacoco.xml,./core/target/site/jacoco/jacoco.xml,./naming/target/site/jacoco/jacoco.xml,./plugin-default-impl/target/site/jacoco/jacoco.xml,./plugin/auth/target/site/jacoco/jacoco.xml,./plugin/encryption/target/site/jacoco/jacoco.xml,./sys/target/site/jacoco/jacoco.xml

.github/workflows/it.yml

@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Integration Test
+name: "Integration Test"
 
 on:
   push:
@@ -13,33 +13,36 @@ permissions:
   contents: read # to fetch code (actions/checkout)
 
 jobs:
-  unix:
+  test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest]
         java: [8, 8.0.192, 11, 11.0.3]
     steps:
-      - name: Cache Maven Repos
+      - name: "Cache Maven Repos"
         uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
-      - uses: actions/checkout@v3
-      - name: Set up JDK ${{ matrix.java }}
+      - name: "Checkout"
+        uses: actions/checkout@v3
+      - name: "Set up JDK ${{ matrix.java }}"
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
           distribution: 'zulu'
           architecture: x64
-      - name: Test Config
-        run: mvn clean package -Pcit-test
-      - name: Clean Env
-        run: mvn clean -Premove-test-data
-      - name: Test Naming
-        run: mvn clean package -Pnit-test
-      - name: Clean Env
-        run: mvn clean -Premove-test-data
+      - name: "Print maven version"
+        run: mvn -version
+      - name: "Test Config"
+        run: mvn clean package -Pcit-test -e -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - name: "Clean Env"
+        run: mvn clean -Premove-test-data -e -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - name: "Test Naming"
+        run: mvn clean package -Pnit-test -e -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - name: "Clean Env"
+        run: mvn clean -Premove-test-data -e -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 

README.md

@@ -5,6 +5,7 @@
 
 [![Gitter](https://badges.gitter.im/alibaba/nacos.svg)](https://gitter.im/alibaba/nacos?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)   [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 [![Gitter](https://travis-ci.org/alibaba/nacos.svg?branch=master)](https://travis-ci.org/alibaba/nacos)
+[![](https://img.shields.io/badge/Nacos-Check%20Your%20Contribution-orange)](https://opensource.alibaba.com/contribution_leaderboard/details?projectValue=nacos)
 
 -------
 
@@ -118,9 +119,9 @@ Contributors are welcomed to join Nacos project. Please check [CONTRIBUTING](./C
      * users-nacos@googlegroups.com: Nacos usage general discussion.
      * dev-nacos@googlegroups.com: Nacos developer discussion (APIs, feature design, etc).
      * commits-nacos@googlegroups.com: Commits notice, very high frequency.
-* Join us from DingDing(Group 1: 21708933(full), Group 2: 30438813). 
+* Join us from DingDing(Group 1: 21708933(full), Group 2: 30438813(full), Group 3: 31222241(full), Group 4: 12810027056). 
 
- ![Nacos](https://nacos.io/img/nacos_dingding.jpg)
+ ![Nacos](https://img.alicdn.com/imgextra/i1/O1CN01ULSVXu1DRbANwVC6r_!!6000000000213-2-tps-666-884.png)
 
 ## Enterprise Service
 If you need Nacos enterprise service support, or purchase cloud product services, you can join the discussion by scanning the following DingTalk group. It can also be directly activated and used through the microservice engine (MSE) provided by Alibaba Cloud.

REPORTING-BUGS.md

@@ -1,6 +1,6 @@
 # How to report bugs
 
-If any part of the Nacos project has bugs or documentation mistakes, please let us know by [opening an issue][Nacos-issue]. We treat bugs and mistakes very seriously and believe no issue is too small, anyOne is implement. Before creating a bug report, please check that an issue reporting the same problem does not already exist.
+If any part of the Nacos project has bugs or documentation mistakes, please let us know by [opening an issue][Nacos-issue]. We treat bugs and mistakes very seriously and believe no issue is too small, anyone is implement. Before creating a bug report, please check that an issue reporting the same problem does not already exist.
 
 To make the bug report accurate and easy to understand, please try to create bug reports that are:
 

address/pom.xml

@@ -27,13 +27,7 @@
     <packaging>jar</packaging>
 
     <name>nacos-address ${project.version}</name>
-    <url>http://nacos.io</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
+    <url>https://nacos.io</url>
 
     <dependencies>
         <dependency>

api/pom.xml

@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
 
     <name>nacos-api ${project.version}</name>
-    <url>http://nacos.io</url>
+    <url>https://nacos.io</url>
     <build>
         <plugins>
             <!--  reuse when you need to update grpc model  -->
@@ -50,22 +50,9 @@
                      </execution>
                  </executions>
              </plugin>-->
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>8</source>
-                    <target>8</target>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -105,11 +92,6 @@
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>protoc-gen-grpc-java</artifactId>
-            <type>pom</type>
-        </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>

api/src/main/java/com/alibaba/nacos/api/model/v2/Result.java

@@ -75,7 +75,7 @@ public static <T> Result<T> success(T data) {
      * @return Result
      */
     public static Result<String> failure(String message) {
-        return Result.failure(ErrorCode.SERVER_ERROR, message);
+        return new Result<>(ErrorCode.SERVER_ERROR.getCode(), message);
     }
 
     /**

api/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java

@@ -25,6 +25,7 @@
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Instance.
@@ -209,7 +210,7 @@ public int hashCode() {
     }
 
     private static boolean strEquals(final String str1, final String str2) {
-        return str1 == null ? str2 == null : str1.equals(str2);
+        return Objects.equals(str1, str2);
     }
 
     public long getInstanceHeartBeatInterval() {

api/src/main/java/com/alibaba/nacos/api/naming/pojo/ServiceInfo.java

@@ -24,7 +24,6 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -36,15 +35,22 @@
 @JsonInclude(Include.NON_NULL)
 public class ServiceInfo {
 
+    /**
+     * file name pattern: groupName@@name@clusters.
+     */
+    private static final int GROUP_POSITION = 0;
+
+    private static final int SERVICE_POSITION = 1;
+
+    private static final int CLUSTER_POSITION = 2;
+
+    private static final int FILE_NAME_PARTS = 3;
+
     @JsonIgnore
     private String jsonFromServer = EMPTY;
 
     private static final String EMPTY = "";
 
-    private static final String ALL_IPS = "000--00-ALL_IPS--00--000";
-
-    public static final String SPLITER = "@@";
-
     private static final String DEFAULT_CHARSET = "UTF-8";
 
     private String name;
@@ -80,20 +86,15 @@ public void setAllIPs(boolean allIPs) {
      * There is only one form of the key:groupName@@name@clusters. This constructor used by DiskCache.read(String) and
      * FailoverReactor.FailoverFileReader,you should know that 'groupName' must not be null,and 'clusters' can be null.
      */
-    public ServiceInfo(String key) {
-        int maxIndex = 2;
-        int clusterIndex = 2;
-        int serviceNameIndex = 1;
-        int groupIndex = 0;
-
+    public ServiceInfo(final String key) {
         String[] keys = key.split(Constants.SERVICE_INFO_SPLITER);
-        if (keys.length >= maxIndex + 1) {
-            this.groupName = keys[groupIndex];
-            this.name = keys[serviceNameIndex];
-            this.clusters = keys[clusterIndex];
-        } else if (keys.length == maxIndex) {
-            this.groupName = keys[groupIndex];
-            this.name = keys[serviceNameIndex];
+        if (keys.length >= FILE_NAME_PARTS) {
+            this.groupName = keys[GROUP_POSITION];
+            this.name = keys[SERVICE_POSITION];
+            this.clusters = keys[CLUSTER_POSITION];
+        } else if (keys.length == CLUSTER_POSITION) {
+            this.groupName = keys[GROUP_POSITION];
+            this.name = keys[SERVICE_POSITION];
         } else {
             //defensive programming
             throw new IllegalArgumentException("Can't parse out 'groupName',but it must not be null!");
@@ -231,8 +232,7 @@ public String getKeyEncoded() {
         String serviceName = getGroupedServiceName();
         try {
             serviceName = URLEncoder.encode(serviceName, DEFAULT_CHARSET);
-        } catch (UnsupportedEncodingException e) {
-            //do nothing
+        } catch (UnsupportedEncodingException ignored) {
         }
         return getKey(serviceName, clusters);
     }
@@ -251,19 +251,8 @@ private String getGroupedServiceName() {
      * @param key key of service info
      * @return new service info
      */
-    public static ServiceInfo fromKey(String key) {
-        ServiceInfo serviceInfo = new ServiceInfo();
-        int maxSegCount = 3;
-        String[] segs = key.split(Constants.SERVICE_INFO_SPLITER);
-        if (segs.length == maxSegCount - 1) {
-            serviceInfo.setGroupName(segs[0]);
-            serviceInfo.setName(segs[1]);
-        } else if (segs.length == maxSegCount) {
-            serviceInfo.setGroupName(segs[0]);
-            serviceInfo.setName(segs[1]);
-            serviceInfo.setClusters(segs[2]);
-        }
-        return serviceInfo;
+    public static ServiceInfo fromKey(final String key) {
+        return new ServiceInfo(key);
     }
 
     @Override
@@ -283,18 +272,10 @@ private static boolean isEmpty(String str) {
         return str == null || str.length() == 0;
     }
 
-    private static boolean isEmpty(Collection coll) {
-        return (coll == null || coll.isEmpty());
-    }
-
-    private static boolean strEquals(String str1, String str2) {
-        return str1 == null ? str2 == null : str1.equals(str2);
-    }
-
     public boolean isReachProtectionThreshold() {
         return reachProtectionThreshold;
     }
-
+    
     public void setReachProtectionThreshold(boolean reachProtectionThreshold) {
         this.reachProtectionThreshold = reachProtectionThreshold;
     }

api/src/main/java/com/alibaba/nacos/api/naming/pojo/healthcheck/impl/Http.java

@@ -21,10 +21,10 @@
 import com.alibaba.nacos.api.utils.StringUtils;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import java.util.Objects;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Implementation of health checker for HTTP.
@@ -100,10 +100,6 @@ public boolean equals(final Object obj) {
 
         final Http other = (Http) obj;
 
-        if (!StringUtils.equals(type, other.getType())) {
-            return false;
-        }
-
         if (!StringUtils.equals(path, other.getPath())) {
             return false;
         }