Merge pull request #336 from msgpack/map-builder-preserves-order

xerial · xerial · commit fec54e44336c · 2016-01-22T10:59:40.000+09:00
ValueFactory.MapBuilder is preferred to preserve value order
diff --git a/msgpack-core/src/main/java/org/msgpack/value/ValueFactory.java b/msgpack-core/src/main/java/org/msgpack/value/ValueFactory.java
@@ -29,7 +29,7 @@
 import java.math.BigInteger;
 import java.util.AbstractMap;
 import java.util.Arrays;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -191,10 +191,8 @@ public static ImmutableArrayValue emptyArray()
     ImmutableMapValue newMap(Map<K, V> map)
     {
         Value[] kvs = new Value[map.size() * 2];
-        Iterator<Map.Entry<K, V>> ite = map.entrySet().iterator();
         int index = 0;
-        while (ite.hasNext()) {
-            Map.Entry<K, V> pair = ite.next();
+        for (Map.Entry<K, V> pair : map.entrySet()) {
             kvs[index] = pair.getKey();
             index++;
             kvs[index] = pair.getValue();
@@ -253,7 +251,7 @@ public static Map.Entry<Value, Value> newMapEntry(Value key, Value value)
 
     public static class MapBuilder
     {
-        private final Map<Value, Value> map = new HashMap<Value, Value>();
+        private final Map<Value, Value> map = new LinkedHashMap<Value, Value>();
 
         public MapBuilder() {}
 
