refactoring

redisson/src/main/java/org/redisson/RedissonLocalCachedMap.java

@@ -16,7 +16,6 @@
 package org.redisson;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.AbstractMap;
 import java.util.ArrayList;
@@ -40,6 +39,7 @@ import org.redisson.api.RLocalCachedMap;
 import org.redisson.api.RedissonClient;
 import org.redisson.cache.Cache;
 import org.redisson.cache.CacheKey;
+import org.redisson.cache.CacheValue;
 import org.redisson.cache.LocalCacheListener;
 import org.redisson.cache.LocalCacheView;
 import org.redisson.cache.LocalCachedMapClear;
@@ -70,50 +70,6 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
     public static final String DISABLED_KEYS_SUFFIX = "disabled-keys";
     public static final String DISABLED_ACK_SUFFIX = ":topic";
 
-    @SuppressWarnings("EqualsHashCode")
-    public static class CacheValue implements Serializable {
-        
-        private final Object key;
-        private final Object value;
-        
-        public CacheValue(Object key, Object value) {
-            super();
-            this.key = key;
-            this.value = value;
-        }
-        
-        public Object getKey() {
-            return key;
-        }
-        
-        public Object getValue() {
-            return value;
-        }
-        
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (obj == null)
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            CacheValue other = (CacheValue) obj;
-            if (value == null) {
-                if (other.value != null)
-                    return false;
-            } else if (!value.equals(other.value))
-                return false;
-            return true;
-        }
-
-        @Override
-        public String toString() {
-            return "CacheValue [key=" + key + ", value=" + value + "]";
-        }
-        
-    }
-
     private static final RedisCommand<Set<Object>> ALL_KEYS = new RedisCommand<Set<Object>>("EVAL", new ObjectSetReplayDecoder<Object>(), ValueType.MAP_KEY);
     private static final RedisCommand<Set<Entry<Object, Object>>> ALL_ENTRIES = new RedisCommand<Set<Entry<Object, Object>>>("EVAL", new ObjectMapEntryReplayDecoder(), ValueType.MAP);
     private static final RedisCommand<Map<Object, Object>> ALL_MAP = new RedisCommand<Map<Object, Object>>("EVAL", new ObjectMapReplayDecoder(), ValueType.MAP);

redisson/src/main/java/org/redisson/cache/CacheValue.java

@@ -0,0 +1,53 @@
+package org.redisson.cache;
+
+import java.io.Serializable;
+
+
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+@SuppressWarnings("EqualsHashCode")
+public class CacheValue implements Serializable {
+    
+    private final Object key;
+    private final Object value;
+    
+    public CacheValue(Object key, Object value) {
+        super();
+        this.key = key;
+        this.value = value;
+    }
+    
+    public Object getKey() {
+        return key;
+    }
+    
+    public Object getValue() {
+        return value;
+    }
+    
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        CacheValue other = (CacheValue) obj;
+        if (value == null) {
+            if (other.value != null)
+                return false;
+        } else if (!value.equals(other.value))
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "CacheValue [key=" + key + ", value=" + value + "]";
+    }
+    
+}

redisson/src/main/java/org/redisson/cache/LocalCacheListener.java

@@ -30,7 +30,6 @@ import org.redisson.RedissonListMultimapCache;
 import org.redisson.RedissonObject;
 import org.redisson.RedissonScoredSortedSet;
 import org.redisson.RedissonTopic;
-import org.redisson.RedissonLocalCachedMap.CacheValue;
 import org.redisson.api.LocalCachedMapOptions;
 import org.redisson.api.LocalCachedMapOptions.EvictionPolicy;
 import org.redisson.api.LocalCachedMapOptions.ReconnectionStrategy;

redisson/src/main/java/org/redisson/cache/LocalCacheView.java

@@ -24,9 +24,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.redisson.RedissonLocalCachedMap.CacheValue;
-import org.redisson.misc.Hash;
 import org.redisson.RedissonObject;
+import org.redisson.misc.Hash;
 
 import io.netty.buffer.ByteBuf;
 

redisson/src/test/java/org/redisson/RedissonLocalCachedMapTest.java

@@ -11,9 +11,7 @@ import java.util.concurrent.ExecutionException;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.redisson.RedissonLocalCachedMap.CacheValue;
 import org.redisson.api.LocalCachedMapOptions;
-import org.redisson.api.MapOptions;
 import org.redisson.api.LocalCachedMapOptions.EvictionPolicy;
 import org.redisson.api.LocalCachedMapOptions.ReconnectionStrategy;
 import org.redisson.api.LocalCachedMapOptions.SyncStrategy;
@@ -22,6 +20,7 @@ import org.redisson.api.RLocalCachedMap;
 import org.redisson.api.RMap;
 import org.redisson.cache.Cache;
 import org.redisson.cache.CacheKey;
+import org.redisson.cache.CacheValue;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.codec.DoubleCodec;
 import org.redisson.client.codec.IntegerCodec;