[dubbo] branch master updated: Adjusted the code to make it cleaner. (#10208)

[albumenj]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/master by this push:
     new 2a758e2d57 Adjusted the code to make it cleaner. (#10208)
2a758e2d57 is described below

commit 2a758e2d57bb1e9cd598a3494d9ee47a1569517e
Author: blake.qiu <46370663+martian...@users.noreply.github.com>
AuthorDate: Fri Jun 24 16:56:43 2022 +0800

    Adjusted the code to make it cleaner. (#10208)
    
    Co-authored-by: blake.qiu <blake....@ly.com>
---
 .../listener/ServiceInstancesChangedListener.java   | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
index 25f96a4289..297ac934b3 100644
--- 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
+++ 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
@@ -98,7 +98,7 @@ public class ServiceInstancesChangedListener implements 
ConditionalEventListener
 
         Map<String, List<ServiceInstance>> revisionToInstances = new 
HashMap<>();
         Map<String, Set<String>> localServiceToRevisions = new HashMap<>();
-        Map<Set<String>, List<URL>> revisionsToUrls = new HashMap();
+        Map<Set<String>, List<URL>> revisionsToUrls = new HashMap<>();
         Map<String, List<URL>> tmpServiceUrls = new HashMap<>();
         for (Map.Entry<String, List<ServiceInstance>> entry : 
allInstances.entrySet()) {
             List<ServiceInstance> instances = entry.getValue();
@@ -117,8 +117,6 @@ public class ServiceInstancesChangedListener implements 
ConditionalEventListener
                     logger.info("MetadataInfo for instance " + 
instance.getAddress() + "?revision=" + revision + " is " + metadata);
                     if (metadata != null) {
                         revisionToMetadata.put(revision, metadata);
-                    } else {
-
                     }
                 }
 
@@ -126,18 +124,11 @@ public class ServiceInstancesChangedListener implements 
ConditionalEventListener
                     parseMetadata(revision, metadata, localServiceToRevisions);
                     ((DefaultServiceInstance) 
instance).setServiceMetadata(metadata);
                 }
-//                else {
-//                    logger.error("Failed to load service metadata for 
instance " + instance);
-//                    Set<String> set = 
localServiceToRevisions.computeIfAbsent(url.getServiceKey(), k -> new 
TreeSet<>());
-//                    set.add(revision);
-//                }
             }
 
             localServiceToRevisions.forEach((serviceKey, revisions) -> {
                 List<URL> urls = revisionsToUrls.get(revisions);
-                if (urls != null) {
-                    tmpServiceUrls.put(serviceKey, urls);
-                } else {
+                if (urls == null) {
                     urls = new ArrayList<>();
                     for (String r : revisions) {
                         for (ServiceInstance i : revisionToInstances.get(r)) {
@@ -145,8 +136,8 @@ public class ServiceInstancesChangedListener implements 
ConditionalEventListener
                         }
                     }
                     revisionsToUrls.put(revisions, urls);
-                    tmpServiceUrls.put(serviceKey, urls);
                 }
+                tmpServiceUrls.put(serviceKey, urls);
             });
         }
 
@@ -191,11 +182,7 @@ public class ServiceInstancesChangedListener implements 
ConditionalEventListener
     }
 
     private void notifyAddressChanged() {
-        listeners.forEach((key, notifyListeners) -> {
-            notifyListeners.forEach(notifyListener -> {
-                notifyListener.notify(toUrlsWithEmpty(serviceUrls.get(key)));
-            });
-        });
+        listeners.forEach((key, notifyListeners) -> 
notifyListeners.forEach(notifyListener -> 
notifyListener.notify(toUrlsWithEmpty(serviceUrls.get(key)))));
     }
 
     private List<URL> toUrlsWithEmpty(List<URL> urls) {