From f6c0cfb495e02adf76959a7f48eec72f4a69167a Mon Sep 17 00:00:00 2001
From: ZhangJian He <shoothzj@gmail.com>
Date: Wed, 27 Apr 2022 08:36:05 +0800
Subject: [PATCH] [SCB-2466] Fix spotbugs WMI_WRONG_MAP_ITERATOR

---
 ci/spotbugs/exclude.xml                                |  4 ----
 .../config/common/ConfigurationChangedEvent.java       |  7 ++++---
 .../java/org/apache/servicecomb/config/ConfigUtil.java | 10 ++++++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ci/spotbugs/exclude.xml b/ci/spotbugs/exclude.xml
index d37d28e2b7f..b6d4626b9ce 100644
--- a/ci/spotbugs/exclude.xml
+++ b/ci/spotbugs/exclude.xml
@@ -191,8 +191,4 @@
         <Bug pattern="VA_FORMAT_STRING_USES_NEWLINE"/>
     </Match>
 
-    <Match>
-        <Bug pattern="WMI_WRONG_MAP_ITERATOR"/>
-    </Match>
-
 </FindBugsFilter>
diff --git a/clients/config-common/src/main/java/org/apache/servicecomb/config/common/ConfigurationChangedEvent.java b/clients/config-common/src/main/java/org/apache/servicecomb/config/common/ConfigurationChangedEvent.java
index a3514d004d4..e24d061a65a 100644
--- a/clients/config-common/src/main/java/org/apache/servicecomb/config/common/ConfigurationChangedEvent.java
+++ b/clients/config-common/src/main/java/org/apache/servicecomb/config/common/ConfigurationChangedEvent.java
@@ -46,12 +46,13 @@ public static ConfigurationChangedEvent createIncremental(Map<String, Object> la
     Map<String, Object> itemsModified = new HashMap<>();
     boolean changed = false;
 
-    for (String itemKey : latest.keySet()) {
+    for (Map.Entry<String, Object> entry : latest.entrySet()) {
+      String itemKey = entry.getKey();
       if (!last.containsKey(itemKey)) {
-        itemsCreated.put(itemKey, latest.get(itemKey));
+        itemsCreated.put(itemKey, entry.getValue());
         changed = true;
       } else if (!Objects.equals(last.get(itemKey), latest.get(itemKey))) {
-        itemsModified.put(itemKey, latest.get(itemKey));
+        itemsModified.put(itemKey, entry.getValue());
         changed = true;
       }
     }
diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java
index 88c49859d92..d0e7730ffc4 100644
--- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java
+++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java
@@ -291,10 +291,11 @@ private static class ServiceCombPropertyUpdateListener implements WatchedUpdateL
     public void updateConfiguration(WatchedUpdateResult watchedUpdateResult) {
       Map<String, Object> adds = watchedUpdateResult.getAdded();
       if (adds != null) {
-        for (String add : adds.keySet()) {
+        for (Map.Entry<String, Object> entry : adds.entrySet()) {
+          String add = entry.getKey();
           if (add.startsWith(CONFIG_CSE_PREFIX)) {
             String key = CONFIG_SERVICECOMB_PREFIX + add.substring(add.indexOf(".") + 1);
-            injectConfig.addProperty(key, adds.get(add));
+            injectConfig.addProperty(key, entry.getValue());
           }
         }
       }
@@ -310,10 +311,11 @@ public void updateConfiguration(WatchedUpdateResult watchedUpdateResult) {
 
       Map<String, Object> changes = watchedUpdateResult.getChanged();
       if (changes != null) {
-        for (String change : changes.keySet()) {
+        for (Map.Entry<String, Object> entry : changes.entrySet()) {
+          String change = entry.getKey();
           if (change.startsWith(CONFIG_CSE_PREFIX)) {
             String key = CONFIG_SERVICECOMB_PREFIX + change.substring(change.indexOf(".") + 1);
-            injectConfig.setProperty(key, changes.get(change));
+            injectConfig.setProperty(key, entry.getValue());
           }
         }
       }