Method name optimization (#3104)

* Instance eliminate module naming optimization * Solve PMD check failed * Method name optimization * Solve code space problem * Method name optimization * Optimize the naming of persistence layer
alibaba · Jun 18, 2020 · 38d0b6b · 38d0b6b
1 parent d24f36b
commit 38d0b6b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/consistency/ConsistencyService.java b/naming/src/main/java/com/alibaba/nacos/naming/consistency/ConsistencyService.java
@@ -75,7 +75,7 @@ public interface ConsistencyService {
      * @param listener callback of data change
      * @throws NacosException nacos exception
      */
-    void unlisten(String key, RecordListener listener) throws NacosException;
+    void unListen(String key, RecordListener listener) throws NacosException;
 
     /**
      * Tell the status of this consistency service.

diff --git a/...ng/src/main/java/com/alibaba/nacos/naming/consistency/DelegateConsistencyServiceImpl.java b/...ng/src/main/java/com/alibaba/nacos/naming/consistency/DelegateConsistencyServiceImpl.java
@@ -72,8 +72,8 @@ public void listen(String key, RecordListener listener) throws NacosException {
     }
 
     @Override
-    public void unlisten(String key, RecordListener listener) throws NacosException {
-        mapConsistencyService(key).unlisten(key, listener);
+    public void unListen(String key, RecordListener listener) throws NacosException {
+        mapConsistencyService(key).unListen(key, listener);
     }
 
     @Override

diff --git a/...a/com/alibaba/nacos/naming/consistency/ephemeral/distro/DistroConsistencyServiceImpl.java b/...a/com/alibaba/nacos/naming/consistency/ephemeral/distro/DistroConsistencyServiceImpl.java
@@ -359,7 +359,7 @@ public void listen(String key, RecordListener listener) throws NacosException {
     }
 
     @Override
-    public void unlisten(String key, RecordListener listener) throws NacosException {
+    public void unListen(String key, RecordListener listener) throws NacosException {
         if (!listeners.containsKey(key)) {
             return;
         }

diff --git a/...java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftConsistencyServiceImpl.java b/...java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftConsistencyServiceImpl.java
@@ -88,8 +88,8 @@ public void listen(String key, RecordListener listener) throws NacosException {
     }
 
     @Override
-    public void unlisten(String key, RecordListener listener) throws NacosException {
-        raftCore.unlisten(key, listener);
+    public void unListen(String key, RecordListener listener) throws NacosException {
+        raftCore.unListen(key, listener);
     }
 
     @Override

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java b/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java
@@ -904,7 +904,7 @@ public void listen(String key, RecordListener listener) {
      * @param key      key
      * @param listener listener
      */
-    public void unlisten(String key, RecordListener listener) {
+    public void unListen(String key, RecordListener listener) {
 
         if (!listeners.containsKey(key)) {
             return;

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java b/naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java
@@ -311,8 +311,8 @@ private List<Instance> updatedIps(Collection<Instance> newInstance, Collection<I
         }
 
         Map<String, Integer> intersectMap = new ConcurrentHashMap<>(newInstance.size() + oldInstance.size());
-        Map<String, Instance> instanceMap = new ConcurrentHashMap<>(newInstance.size());
-        Map<String, Instance> instanceMap1 = new ConcurrentHashMap<>(newInstance.size());
+        Map<String, Instance> updatedInstancesMap = new ConcurrentHashMap<>(newInstance.size());
+        Map<String, Instance> newInstancesMap = new ConcurrentHashMap<>(newInstance.size());
 
         for (Instance instance : oldInstance) {
             if (stringIpAddressMap.containsKey(instance.getIp() + ":" + instance.getPort())) {
@@ -330,7 +330,7 @@ private List<Instance> updatedIps(Collection<Instance> newInstance, Collection<I
                 }
             }
 
-            instanceMap1.put(instance.toString(), instance);
+            newInstancesMap.put(instance.toString(), instance);
 
         }
 
@@ -339,23 +339,23 @@ private List<Instance> updatedIps(Collection<Instance> newInstance, Collection<I
             Integer value = entry.getValue();
 
             if (value == 1) {
-                if (instanceMap1.containsKey(key)) {
-                    instanceMap.put(key, instanceMap1.get(key));
+                if (newInstancesMap.containsKey(key)) {
+                    updatedInstancesMap.put(key, newInstancesMap.get(key));
                 }
             }
         }
 
-        return new ArrayList<>(instanceMap.values());
+        return new ArrayList<>(updatedInstancesMap.values());
     }
-
+    
     private List<Instance> subtract(Collection<Instance> oldIp, Collection<Instance> ips) {
         Map<String, Instance> ipsMap = new HashMap<>(ips.size());
         for (Instance instance : ips) {
             ipsMap.put(instance.getIp() + ":" + instance.getPort(), instance);
         }
-
+        
         List<Instance> instanceResult = new ArrayList<>();
-
+        
         for (Instance instance : oldIp) {
             if (!ipsMap.containsKey(instance.getIp() + ":" + instance.getPort())) {
                 instanceResult.add(instance);

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java b/naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
@@ -234,7 +234,7 @@ public void onDelete(String key) throws Exception {
 
             consistencyService.remove(KeyBuilder.buildInstanceListKey(namespace, name, false));
 
-            consistencyService.unlisten(KeyBuilder.buildServiceMetaKey(namespace, name), service);
+            consistencyService.unListen(KeyBuilder.buildServiceMetaKey(namespace, name), service);
             Loggers.SRV_LOG.info("[DEAD-SERVICE] {}", service.toJson());
         }