RMapCache doesn't keep entries insertion order during iteration #666

redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectMapDecoder.java

@@ -16,7 +16,7 @@
 package org.redisson.client.protocol.decoder;
 
 import java.io.IOException;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -25,6 +25,11 @@ import org.redisson.client.handler.State;
 
 import io.netty.buffer.ByteBuf;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
 public class ObjectMapDecoder implements MultiDecoder<Map<Object, Object>> {
 
     private Codec codec;
@@ -46,7 +51,7 @@ public class ObjectMapDecoder implements MultiDecoder<Map<Object, Object>> {
 
     @Override
     public Map<Object, Object> decode(List<Object> parts, State state) {
-        Map<Object, Object> result = new HashMap<Object, Object>(parts.size()/2);
+        Map<Object, Object> result = new LinkedHashMap<Object, Object>(parts.size()/2);
         for (int i = 0; i < parts.size(); i++) {
             if (i % 2 != 0) {
                 result.put(parts.get(i-1), parts.get(i));

redisson/src/main/java/org/redisson/client/protocol/decoder/ObjectMapEntryReplayDecoder.java

@@ -15,7 +15,6 @@
  */
 package org.redisson.client.protocol.decoder;
 
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

redisson/src/test/java/org/redisson/RedissonMapCacheTest.java

@@ -7,6 +7,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentMap;
@@ -17,6 +18,7 @@ import java.util.concurrent.TimeUnit;
 import org.junit.Assert;
 import org.junit.Test;
 import org.redisson.api.RFuture;
+import org.redisson.api.RMap;
 import org.redisson.api.RMapCache;
 import org.redisson.codec.JsonJacksonCodec;
 import org.redisson.codec.MsgPackJacksonCodec;
@@ -127,6 +129,37 @@ public class RedissonMapCacheTest extends BaseTest {
 
     }
     
+    @Test
+    public void testOrdering() {
+        Map<String, String> map = new LinkedHashMap<String, String>();
+
+        // General player data
+        map.put("name", "123");
+        map.put("ip", "4124");
+        map.put("rank", "none");
+        map.put("tokens", "0");
+        map.put("coins", "0");
+
+        // Arsenal player statistics
+        map.put("ar_score", "0");
+        map.put("ar_gameswon", "0");
+        map.put("ar_gameslost", "0");
+        map.put("ar_kills", "0");
+        map.put("ar_deaths", "0");
+
+        RMap<String, String> rmap = redisson.getMapCache("123");
+        rmap.putAll(map);
+
+        assertThat(rmap.keySet()).containsExactlyElementsOf(map.keySet());
+        assertThat(rmap.readAllKeySet()).containsExactlyElementsOf(map.keySet());
+        
+        assertThat(rmap.values()).containsExactlyElementsOf(map.values());
+        assertThat(rmap.readAllValues()).containsExactlyElementsOf(map.values());
+        
+        assertThat(rmap.entrySet()).containsExactlyElementsOf(map.entrySet());
+        assertThat(rmap.readAllEntrySet()).containsExactlyElementsOf(map.entrySet());
+    }
+    
     @Test
     public void testCacheValues() {
         final RMapCache<String, String> map = redisson.getMapCache("testRMapCacheValues");