Improve several map iteration (#2938)

Author: biyuhao

dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalanceTest.java

@@ -31,8 +31,8 @@ public class ConsistentHashLoadBalanceTest extends LoadBalanceBaseTest {
     public void testConsistentHashLoadBalance() {
         int runs = 10000;
         Map<Invoker, AtomicLong> counter = getInvokeCounter(runs, ConsistentHashLoadBalance.NAME);
-        for (Invoker minvoker : counter.keySet()) {
-            Long count = counter.get(minvoker).get();
+        for (Map.Entry<Invoker, AtomicLong> entry : counter.entrySet()) {
+            Long count = entry.getValue().get();
             Assert.assertTrue("abs diff should < avg", Math.abs(count - runs / (0f + invokers.size())) < runs / (0f + invokers.size()));
         }
     }

dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveBalanceTest.java

@@ -30,8 +30,8 @@ public class LeastActiveBalanceTest extends LoadBalanceBaseTest {
     public void testLeastActiveLoadBalance_select() {
         int runs = 10000;
         Map<Invoker, AtomicLong> counter = getInvokeCounter(runs, LeastActiveLoadBalance.NAME);
-        for (Invoker minvoker : counter.keySet()) {
-            Long count = counter.get(minvoker).get();
+        for (Map.Entry<Invoker, AtomicLong> entry : counter.entrySet()) {
+            Long count = entry.getValue().get();
             //            System.out.println(count);
             Assert.assertTrue("abs diff shoud < avg",
                     Math.abs(count - runs / (0f + invokers.size())) < runs / (0f + invokers.size()));

dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RandomLoadBalanceTest.java

@@ -32,8 +32,8 @@ public class RandomLoadBalanceTest extends LoadBalanceBaseTest {
     public void testRandomLoadBalanceSelect() {
         int runs = 1000;
         Map<Invoker, AtomicLong> counter = getInvokeCounter(runs, RandomLoadBalance.NAME);
-        for (Invoker minvoker : counter.keySet()) {
-            Long count = counter.get(minvoker).get();
+        for (Map.Entry<Invoker, AtomicLong> entry : counter.entrySet()) {
+            Long count = entry.getValue().get();
             Assert.assertTrue("abs diff should < avg", Math.abs(count - runs / (0f + invokers.size())) < runs / (0f + invokers.size()));
         }
 
@@ -43,8 +43,8 @@ public void testRandomLoadBalanceSelect() {
             }
         }
         counter = getInvokeCounter(runs, LeastActiveLoadBalance.NAME);
-        for (Invoker minvoker : counter.keySet()) {
-            Long count = counter.get(minvoker).get();
+        for (Map.Entry<Invoker, AtomicLong> entry : counter.entrySet()) {
+            Long count = entry.getValue().get();
         }
         Assert.assertEquals(runs, counter.get(invoker1).intValue());
         Assert.assertEquals(0, counter.get(invoker2).intValue());

dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalanceTest.java

@@ -47,8 +47,8 @@ private void assertStrictWRRResult(int loop, Map<Invoker, InvokeResult> resultMa
     public void testRoundRobinLoadBalanceSelect() {
         int runs = 10000;
         Map<Invoker, AtomicLong> counter = getInvokeCounter(runs, RoundRobinLoadBalance.NAME);
-        for (Invoker minvoker : counter.keySet()) {
-            Long count = counter.get(minvoker).get();
+        for (Map.Entry<Invoker, AtomicLong> entry : counter.entrySet()) {
+            Long count = entry.getValue().get();
             Assert.assertTrue("abs diff should < 1", Math.abs(count - runs / (0f + invokers.size())) < 1f);
         }
     }

dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java

@@ -432,10 +432,10 @@ public void testSelectBalance() {
             counter.get(sinvoker).incrementAndGet();
         }
 
-        for (Invoker minvoker : counter.keySet()) {
-            Long count = counter.get(minvoker).get();
+        for (Map.Entry<Invoker, AtomicLong> entry : counter.entrySet()) {
+            Long count = entry.getValue().get();
 //            System.out.println(count);
-            if (minvoker.isAvailable())
+            if (entry.getKey().isAvailable())
                 Assert.assertTrue("count should > avg", count > runs / invokers.size());
         }
 

dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/Menu.java

@@ -30,8 +30,8 @@ public Menu() {
     }
 
     public Menu(Map<String, List<String>> menus) {
-        for (String key : menus.keySet()) {
-            this.menus.put(key, new ArrayList<String>(menus.get(key)));
+        for (Map.Entry<String, List<String>> entry : menus.entrySet()) {
+            this.menus.put(entry.getKey(), new ArrayList<String>(entry.getValue()));
         }
     }
 

dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvokerTest.java

@@ -161,11 +161,11 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
         merge(expected, firstMenuMap);
         merge(expected, secondMenuMap);
         assertEquals(expected.keySet(), menu.getMenus().keySet());
-        for (String key : expected.keySet()) {
+        for (Map.Entry<String, List<String>> entry : expected.entrySet()) {
             // FIXME: cannot guarantee the sequence of the merge result, check implementation in
             // MergeableClusterInvoker#invoke
-            List<String> values1 = new ArrayList<String>(expected.get(key));
-            List<String> values2 = new ArrayList<String>(menu.getMenus().get(key));
+            List<String> values1 = new ArrayList<String>(entry.getValue());
+            List<String> values2 = new ArrayList<String>(menu.getMenus().get(entry.getKey()));
             Collections.sort(values1);
             Collections.sort(values2);
             assertEquals(values1, values2);

dubbo-common/src/main/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtil.java

@@ -144,12 +144,11 @@ private static void serializeInternal(JavaBeanDescriptor descriptor, Object obj,
             }
         } else if (obj instanceof Map) {
             Map map = (Map) obj;
-            for (Object key : map.keySet()) {
-                Object value = map.get(key);
+            map.forEach((key, value) -> {
                 Object keyDescriptor = key == null ? null : createDescriptorIfAbsent(key, accessor, cache);
                 Object valueDescriptor = value == null ? null : createDescriptorIfAbsent(value, accessor, cache);
                 descriptor.setProperty(keyDescriptor, valueDescriptor);
-            } // ~ end of loop map
+            });// ~ end of loop map
         } else {
             if (JavaBeanAccessor.isAccessByMethod(accessor)) {
                 Map<String, Method> methods = ReflectUtils.getBeanPropertyReadMethods(obj.getClass());

dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/DefaultFuture.java

@@ -126,9 +126,9 @@ public static void sent(Channel channel, Request request) {
      * @param channel channel to close
      */
     public static void closeChannel(Channel channel) {
-        for (long id : CHANNELS.keySet()) {
-            if (channel.equals(CHANNELS.get(id))) {
-                DefaultFuture future = getFuture(id);
+        for (Map.Entry<Long, Channel> entry: CHANNELS.entrySet()) {
+            if (channel.equals(entry.getValue())) {
+                DefaultFuture future = getFuture(entry.getKey());
                 if (future != null && !future.isDone()) {
                     Response disconnectResponse = new Response(future.getId());
                     disconnectResponse.setStatus(Response.CHANNEL_INACTIVE);

dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/ExchangeCodecTest.java

@@ -41,6 +41,7 @@
 import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Map;
 
 import static org.junit.Assert.fail;
 
@@ -114,8 +115,8 @@ public void test_Decode_Error_MagicNum() throws IOException {
         inputBytes.put(new byte[]{MAGIC_HIGH, 0}, TelnetCodec.DecodeResult.NEED_MORE_INPUT);
         inputBytes.put(new byte[]{0, MAGIC_LOW}, TelnetCodec.DecodeResult.NEED_MORE_INPUT);
 
-        for (byte[] input : inputBytes.keySet()) {
-            testDecode_assertEquals(assemblyDataProtocol(input), inputBytes.get(input));
+        for (Map.Entry<byte[], Object> entry: inputBytes.entrySet()) {
+            testDecode_assertEquals(assemblyDataProtocol(entry.getKey()), entry.getValue());
         }
     }