format code

aizcn · Jun 26, 2019 · 34025a5 · 34025a5
1 parent 781273f
commit 34025a5
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 45 deletions.
diff --git a/client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java b/client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
@@ -56,7 +56,7 @@ public class NacosConfigService implements ConfigService {
 
     private static final Logger LOGGER = LogUtils.logger(NacosConfigService.class);
 
-    private final long POST_TIMEOUT = 3000L;
+    private static final long POST_TIMEOUT = 3000L;
 
     private static final String EMPTY = "";
 

diff --git a/client/src/main/java/com/alibaba/nacos/client/config/impl/Limiter.java b/client/src/main/java/com/alibaba/nacos/client/config/impl/Limiter.java
@@ -34,8 +34,8 @@ public class Limiter {
 
     private static final Logger LOGGER = LogUtils.logger(Limiter.class);
 
-    private static int CAPACITY_SIZE = 1000;
-    private static int LIMIT_TIME = 1000;
+    private static final int CAPACITY_SIZE = 1000;
+    private static final int LIMIT_TIME = 1000;
     private static Cache<String, RateLimiter> cache = CacheBuilder.newBuilder()
         .initialCapacity(CAPACITY_SIZE).expireAfterAccess(1, TimeUnit.MINUTES)
         .build();

diff --git a/client/src/main/java/com/alibaba/nacos/client/config/impl/SpasAdapter.java b/client/src/main/java/com/alibaba/nacos/client/config/impl/SpasAdapter.java
@@ -100,6 +100,6 @@ public static String signWithhmacSHA1Encrypt(String encryptText, String encryptK
         }
     }
 
-    private static String GROUP_KEY = "group";
-    private static String TENANT_KEY = "tenant";
+    private static final String GROUP_KEY = "group";
+    private static final String TENANT_KEY = "tenant";
 }
diff --git a/client/src/main/java/com/alibaba/nacos/client/config/utils/JVMUtil.java b/client/src/main/java/com/alibaba/nacos/client/config/utils/JVMUtil.java
@@ -36,7 +36,7 @@ public static Boolean isMultiInstance() {
     }
 
     private static Boolean isMultiInstance = false;
-    private static String TRUE = "true";
+    private static final String TRUE = "true";
     private static final Logger LOGGER = LogUtils.logger(JVMUtil.class);
 
     static {

diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java b/client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
@@ -32,8 +32,6 @@ public class BeatReactor {
 
     private ScheduledExecutorService executorService;
 
-    private volatile long clientBeatInterval = 5 * 1000;
-
     private NamingProxy serverProxy;
 
     public final Map<String, BeatInfo> dom2Beat = new ConcurrentHashMap<String, BeatInfo>();

diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java b/client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
@@ -195,7 +195,7 @@ public ServiceInfo processServiceJSON(String json) {
         return serviceInfo;
     }
 
-    private ServiceInfo getSerivceInfo0(String serviceName, String clusters) {
+    private ServiceInfo getServiceInfo0(String serviceName, String clusters) {
 
         String key = ServiceInfo.getKey(serviceName, clusters);
 
@@ -218,7 +218,7 @@ public ServiceInfo getServiceInfo(final String serviceName, final String cluster
             return failoverReactor.getService(key);
         }
 
-        ServiceInfo serviceObj = getSerivceInfo0(serviceName, clusters);
+        ServiceInfo serviceObj = getServiceInfo0(serviceName, clusters);
 
         if (null == serviceObj) {
             serviceObj = new ServiceInfo(serviceName, clusters);
@@ -264,7 +264,7 @@ public void scheduleUpdateIfAbsent(String serviceName, String clusters) {
     }
 
     public void updateServiceNow(String serviceName, String clusters) {
-        ServiceInfo oldService = getSerivceInfo0(serviceName, clusters);
+        ServiceInfo oldService = getServiceInfo0(serviceName, clusters);
         try {
 
             String result = serverProxy.queryList(serviceName, clusters, pushReceiver.getUDPPort(), false);

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
@@ -138,7 +138,7 @@ public void refresh() {
             }
 
             double doublePrecisionDelta = 0.0001;
-            if (index != 0 && !(Math.abs(weights[index - 1] - 1) < doublePrecisionDelta)) {
+            if (index == 0 || (Math.abs(weights[index - 1] - 1) < doublePrecisionDelta)) {
                 throw new IllegalStateException(
                     "Cumulative Weight caculate wrong , the sum of probabilities does not equals 1.");
             }

diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/utils/IoUtils.java b/client/src/main/java/com/alibaba/nacos/client/naming/utils/IoUtils.java
@@ -178,15 +178,22 @@ public static byte[] tryDecompress(byte[] raw) throws Exception {
         if (!isGzipStream(raw)) {
             return raw;
         }
+        GZIPInputStream gis = null;
+        ByteArrayOutputStream out = null;
 
-        GZIPInputStream gis
-            = new GZIPInputStream(new ByteArrayInputStream(raw));
-        ByteArrayOutputStream out
-            = new ByteArrayOutputStream();
-
-        IoUtils.copy(gis, out);
-
-        return out.toByteArray();
+        try {
+            gis = new GZIPInputStream(new ByteArrayInputStream(raw));
+            out = new ByteArrayOutputStream();
+            IoUtils.copy(gis, out);
+            return out.toByteArray();
+        } finally {
+            if (out != null) {
+                out.close();
+            }
+            if (gis != null) {
+                gis.close();
+            }
+        }
     }
 }
 
diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/utils/RandomUtils.java b/client/src/main/java/com/alibaba/nacos/client/naming/utils/RandomUtils.java
@@ -33,7 +33,7 @@ public class RandomUtils {
     /**
      * An instance of {@link JvmRandom}.
      */
-    public static final Random JVM_RANDOM = new JvmRandom();
+    private static final Random JVM_RANDOM = new JvmRandom();
 
     // should be possible for JVM_RANDOM?
     //    public static void nextBytes(byte[]) {

diff --git a/client/src/main/java/com/alibaba/nacos/client/utils/IPUtil.java b/client/src/main/java/com/alibaba/nacos/client/utils/IPUtil.java
@@ -26,31 +26,23 @@
 @SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
 public class IPUtil {
 
-    public static boolean isIPV4(String addr) {
-        if (null == addr) {
-            return false;
-        }
-        String rexp = "^((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}(25[0-5]|2[0-4]\\d|[01]?\\d\\d?)$";
+    private static final String IPV4_PATTERN = "^((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}(25[0-5]|2[0-4]\\d|[01]?\\d\\d?)$";
+    private static final String IPV6_PATTERN = "^([\\da-fA-F]{1,4}:){7}[\\da-fA-F]{1,4}$";
 
-        Pattern pat = Pattern.compile(rexp);
-
-        Matcher mat = pat.matcher(addr);
-
-        boolean ipAddress = mat.find();
-        return ipAddress;
+    public static boolean isIPV4(String addr) {
+        return isMatch(addr, IPV4_PATTERN);
     }
 
     public static boolean isIPV6(String addr) {
-        if (null == addr) {
+        return isMatch(addr, IPV6_PATTERN);
+    }
+
+    private static boolean isMatch(String data, String pattern) {
+        if (StringUtils.isBlank(data)) {
             return false;
         }
-        String rexp = "^([\\da-fA-F]{1,4}:){7}[\\da-fA-F]{1,4}$";
-
-        Pattern pat = Pattern.compile(rexp);
-
-        Matcher mat = pat.matcher(addr);
-
-        boolean ipAddress = mat.find();
-        return ipAddress;
+        Pattern pat = Pattern.compile(pattern);
+        Matcher mat = pat.matcher(data);
+        return mat.find();
     }
 }
diff --git a/client/src/main/java/com/alibaba/nacos/client/utils/JSONUtils.java b/client/src/main/java/com/alibaba/nacos/client/utils/JSONUtils.java
@@ -28,7 +28,7 @@
 @SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
 public class JSONUtils {
 
-    static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper = new ObjectMapper();
 
     static {
         mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);

diff --git a/client/src/main/java/com/alibaba/nacos/client/utils/StringUtils.java b/client/src/main/java/com/alibaba/nacos/client/utils/StringUtils.java
@@ -28,7 +28,7 @@
  */
 public class StringUtils {
 
-    public static final int INDEX_NOT_FOUND = -1;
+    private static final int INDEX_NOT_FOUND = -1;
 
     public static final String EMPTY = "";
 

diff --git a/cmdb/src/main/java/com/alibaba/nacos/cmdb/memory/CmdbProvider.java b/cmdb/src/main/java/com/alibaba/nacos/cmdb/memory/CmdbProvider.java
@@ -46,7 +46,7 @@ public class CmdbProvider implements CmdbReader, CmdbWriter {
 
     private CmdbService cmdbService;
 
-    ServiceLoader<CmdbService> serviceLoader = ServiceLoader.load(CmdbService.class);
+    private ServiceLoader<CmdbService> serviceLoader = ServiceLoader.load(CmdbService.class);
 
     private Map<String, Map<String, Entity>> entityMap = new ConcurrentHashMap<>();
 

diff --git a/cmdb/src/main/java/com/alibaba/nacos/cmdb/utils/UtilsAndCommons.java b/cmdb/src/main/java/com/alibaba/nacos/cmdb/utils/UtilsAndCommons.java
@@ -25,7 +25,7 @@
  */
 public class UtilsAndCommons {
 
-    public static final String NACOS_SERVER_VERSION = "/v1";
+    private static final String NACOS_SERVER_VERSION = "/v1";
 
     public static final String NACOS_CMDB_CONTEXT = NACOS_SERVER_VERSION + "/cmdb";