From 38d0b6bdbe1e3919a92ecc005c195f38d016246b Mon Sep 17 00:00:00 2001 From: pengzhengfa <33858082+pengzhengfa@users.noreply.github.com> Date: Thu, 18 Jun 2020 16:32:14 +0800 Subject: [PATCH] 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 --- .../naming/consistency/ConsistencyService.java | 2 +- .../DelegateConsistencyServiceImpl.java | 4 ++-- .../distro/DistroConsistencyServiceImpl.java | 2 +- .../raft/RaftConsistencyServiceImpl.java | 4 ++-- .../consistency/persistent/raft/RaftCore.java | 2 +- .../com/alibaba/nacos/naming/core/Cluster.java | 18 +++++++++--------- .../nacos/naming/core/ServiceManager.java | 2 +- 7 files changed, 17 insertions(+), 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 index 76f9a41ad33..ae27e97bc5c 100644 --- 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/naming/src/main/java/com/alibaba/nacos/naming/consistency/DelegateConsistencyServiceImpl.java b/naming/src/main/java/com/alibaba/nacos/naming/consistency/DelegateConsistencyServiceImpl.java index 4e3d059cefe..8ff8e916394 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/consistency/DelegateConsistencyServiceImpl.java +++ b/naming/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/naming/src/main/java/com/alibaba/nacos/naming/consistency/ephemeral/distro/DistroConsistencyServiceImpl.java b/naming/src/main/java/com/alibaba/nacos/naming/consistency/ephemeral/distro/DistroConsistencyServiceImpl.java index 51508ff5f3f..572f7c9566f 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/consistency/ephemeral/distro/DistroConsistencyServiceImpl.java +++ b/naming/src/main/java/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/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftConsistencyServiceImpl.java b/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftConsistencyServiceImpl.java index 8ce6ff0f3e9..c50241b710e 100644 --- a/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftConsistencyServiceImpl.java +++ b/naming/src/main/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 index 7ec7f8fa9b9..6a5d56e0d35 100644 --- 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 index 3380a34ebf3..ed876582195 100644 --- 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 updatedIps(Collection newInstance, Collection intersectMap = new ConcurrentHashMap<>(newInstance.size() + oldInstance.size()); - Map instanceMap = new ConcurrentHashMap<>(newInstance.size()); - Map instanceMap1 = new ConcurrentHashMap<>(newInstance.size()); + Map updatedInstancesMap = new ConcurrentHashMap<>(newInstance.size()); + Map newInstancesMap = new ConcurrentHashMap<>(newInstance.size()); for (Instance instance : oldInstance) { if (stringIpAddressMap.containsKey(instance.getIp() + ":" + instance.getPort())) { @@ -330,7 +330,7 @@ private List updatedIps(Collection newInstance, Collection updatedIps(Collection newInstance, Collection(instanceMap.values()); + return new ArrayList<>(updatedInstancesMap.values()); } - + private List subtract(Collection oldIp, Collection ips) { Map ipsMap = new HashMap<>(ips.size()); for (Instance instance : ips) { ipsMap.put(instance.getIp() + ":" + instance.getPort(), instance); } - + List 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 index 4b2dea6f1ca..2b98048af48 100644 --- 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()); }