Merge pull request #5241 from KomachiSion/2.0.0-bugfix

Upgrade to 2.0.0 bugfix
alibaba · Mar 30, 2021 · e6de274 · e6de274
2 parents 580f73e + 2c55f4f
commit e6de274
Show file tree

Hide file tree

Showing 79 changed files with 2,459 additions and 1,017 deletions.
diff --git a/address/pom.xml b/address/pom.xml
@@ -51,16 +51,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/core/ServerListManager.java b/client/src/main/java/com/alibaba/nacos/client/naming/core/ServerListManager.java
@@ -60,9 +60,9 @@ public class ServerListManager implements ServerListFactory, Closeable {
 
     private final AtomicInteger currentIndex = new AtomicInteger();
 
-    private List<String> serversFromEndpoint = new ArrayList<String>();
+    private final List<String> serverList = new ArrayList<>();
 
-    private List<String> serverList = new ArrayList<String>();
+    private List<String> serversFromEndpoint = new ArrayList<>();
 
     private ScheduledExecutorService refreshServerListExecutor;
 
@@ -85,12 +85,9 @@ private void initServerAddr(Properties properties) {
             this.serversFromEndpoint = getServerListFromEndpoint();
             refreshServerListExecutor = new ScheduledThreadPoolExecutor(1,
                     new NameThreadFactory("com.alibaba.nacos.client.naming.server.list.refresher"));
-            refreshServerListExecutor.scheduleWithFixedDelay(new Runnable() {
-                @Override
-                public void run() {
-                    refreshServerListIfNeed();
-                }
-            }, 0, refreshServerListInternal, TimeUnit.MILLISECONDS);
+            refreshServerListExecutor
+                    .scheduleWithFixedDelay(this::refreshServerListIfNeed, 0, refreshServerListInternal,
+                            TimeUnit.MILLISECONDS);
         } else {
             String serverListFromProps = properties.getProperty(PropertyKeyConst.SERVER_ADDR);
             if (StringUtils.isNotEmpty(serverListFromProps)) {
@@ -138,7 +135,7 @@ private void refreshServerListIfNeed() {
             if (CollectionUtils.isEmpty(list)) {
                 throw new Exception("Can not acquire Nacos list");
             }
-            if (!CollectionUtils.isEqualCollection(list, serversFromEndpoint)) {
+            if (null == serversFromEndpoint || !CollectionUtils.isEqualCollection(list, serversFromEndpoint)) {
                 NAMING_LOGGER.info("[SERVER-LIST] server list is updated: " + list);
             }
             serversFromEndpoint = list;
@@ -156,6 +153,7 @@ public String getNacosDomain() {
         return nacosDomain;
     }
 
+    @Override
     public List<String> getServerList() {
         return serverList.isEmpty() ? serversFromEndpoint : serverList;
     }

diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/utils/Chooser.java b/client/src/main/java/com/alibaba/nacos/client/naming/utils/Chooser.java
@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * Chooser.

diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/utils/JvmRandom.java b/client/src/main/java/com/alibaba/nacos/client/naming/utils/JvmRandom.java