Iterate over entrySet of j.u.Map instead of keySet + get

jbgi · jbgi · commit 7790a18a976c · 2016-05-24T07:41:22.000+02:00
diff --git a/core/src/main/java/fj/data/HashMap.java b/core/src/main/java/fj/data/HashMap.java
@@ -63,8 +63,8 @@ public HashMap(final Equal<K> e, final Hash<K> h) {
 
   public HashMap(java.util.Map<K, V> map, final Equal<K> e, final Hash<K> h) {
     this(e, h);
-    for (K key : map.keySet()) {
-      set(key, map.get(key));
+    for (Map.Entry<K, V> entry : map.entrySet()) {
+      set(entry.getKey(), entry.getValue());
     }
   }
 
diff --git a/quickcheck/src/main/java/fj/test/Arbitrary.java b/quickcheck/src/main/java/fj/test/Arbitrary.java
@@ -928,8 +928,8 @@ public static <A> Arbitrary<PriorityQueue<A>> arbPriorityQueue(final Arbitrary<A
       arbitrary(arbHashtable(arbString, arbString).gen.map(ht -> {
         final Properties p = new Properties();
 
-        for (final String k : ht.keySet()) {
-          p.setProperty(k, ht.get(k));
+        for (final Map.Entry<String, String> entry : ht.entrySet()) {
+          p.setProperty(entry.getKey(), entry.getValue());
         }
 
         return p;
diff --git a/quickcheck/src/main/java/fj/test/Coarbitrary.java b/quickcheck/src/main/java/fj/test/Coarbitrary.java
@@ -33,6 +33,7 @@
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
+import java.util.Map;
 import java.util.PriorityQueue;
 import java.util.Properties;
 import java.util.Stack;
@@ -647,8 +648,8 @@ public static <K, V> Coarbitrary<Hashtable<K, V>> coarbHashtable(final Coarbitra
       public <B> Gen<B> coarbitrary(final Hashtable<K, V> h, final Gen<B> g) {
         List<P2<K, V>> x = nil();
 
-        for (final K k : h.keySet()) {
-          x = x.snoc(p(k, h.get(k)));
+        for (final Map.Entry<K, V> entry : h.entrySet()) {
+          x = x.snoc(p(entry.getKey(), entry.getValue()));
         }
 
         return coarbList(coarbP2(ck, cv)).coarbitrary(x, g);
diff --git a/quickcheck/src/main/java/fj/test/Shrink.java b/quickcheck/src/main/java/fj/test/Shrink.java
@@ -56,6 +56,7 @@
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
+import java.util.Map;
 import java.util.PriorityQueue;
 import java.util.Properties;
 import java.util.Stack;
@@ -411,8 +412,8 @@ public static <K, V> Shrink<Hashtable<K, V>> shrinkHashtable(final Shrink<K> sk,
     }, h -> {
       List<P2<K, V>> x = List.nil();
 
-      for (final K k : h.keySet()) {
-        x = x.snoc(p(k, h.get(k)));
+      for (final Map.Entry<K, V> entry : h.entrySet()) {
+        x = x.snoc(p(entry.getKey(), entry.getValue()));
       }
 
       return x;
@@ -478,8 +479,8 @@ public static <A> Shrink<PriorityQueue<A>> shrinkPriorityQueue(final Shrink<A> s
       .map(h -> {
         final Properties p = new Properties();
 
-        for (final String k : h.keySet()) {
-          p.setProperty(k, h.get(k));
+        for (final Map.Entry<String, String> entry : h.entrySet()) {
+          p.setProperty(entry.getKey(), entry.getValue());
         }
 
         return p;

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ public HashMap(final Equal<K> e, final Hash<K> h) {`
`63`	`63`
`64`	`64`	`public HashMap(java.util.Map<K, V> map, final Equal<K> e, final Hash<K> h) {`
`65`	`65`	`this(e, h);`
`66`		`- for (K key : map.keySet()) {`
`67`		`- set(key, map.get(key));`
	`66`	`+ for (Map.Entry<K, V> entry : map.entrySet()) {`
	`67`	`+ set(entry.getKey(), entry.getValue());`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -928,8 +928,8 @@ public static <A> Arbitrary<PriorityQueue<A>> arbPriorityQueue(final Arbitrary<A`
`928`	`928`	`arbitrary(arbHashtable(arbString, arbString).gen.map(ht -> {`
`929`	`929`	`final Properties p = new Properties();`
`930`	`930`
`931`		`- for (final String k : ht.keySet()) {`
`932`		`- p.setProperty(k, ht.get(k));`
	`931`	`+ for (final Map.Entry<String, String> entry : ht.entrySet()) {`
	`932`	`+ p.setProperty(entry.getKey(), entry.getValue());`
`933`	`933`	`}`
`934`	`934`
`935`	`935`	`return p;`