From 28eedcda8bc153970f778f320356b88b988063ae Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Thu, 12 Apr 2018 13:53:56 +0300
Subject: [PATCH] refactoring

---
 .../org/redisson/RedissonLocalCachedMap.java  | 43 +------------------
 .../redisson/cache/LocalCacheListener.java    |  3 +-
 .../redisson/RedissonLocalCachedMapTest.java  |  2 +-
 3 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/RedissonLocalCachedMap.java b/redisson/src/main/java/org/redisson/RedissonLocalCachedMap.java
index 3e0a05d6f..47e2b3fb1 100644
--- a/redisson/src/main/java/org/redisson/RedissonLocalCachedMap.java
+++ b/redisson/src/main/java/org/redisson/RedissonLocalCachedMap.java
@@ -39,6 +39,7 @@ import org.redisson.api.RFuture;
 import org.redisson.api.RLocalCachedMap;
 import org.redisson.api.RedissonClient;
 import org.redisson.cache.Cache;
+import org.redisson.cache.CacheKey;
 import org.redisson.cache.LFUCacheMap;
 import org.redisson.cache.LRUCacheMap;
 import org.redisson.cache.LocalCacheListener;
@@ -80,49 +81,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
     public static final String TOPIC_SUFFIX = "topic";
     public static final String DISABLED_KEYS_SUFFIX = "disabled-keys";
     public static final String DISABLED_ACK_SUFFIX = ":topic";
-    
-    public static class CacheKey implements Serializable {
-        
-        private final byte[] keyHash;
-
-        public CacheKey(byte[] keyHash) {
-            super();
-            this.keyHash = keyHash;
-        }
-
-        public byte[] getKeyHash() {
-            return keyHash;
-        }
-        
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Arrays.hashCode(keyHash);
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (obj == null)
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            CacheKey other = (CacheKey) obj;
-            if (!Arrays.equals(keyHash, other.keyHash))
-                return false;
-            return true;
-        }
-
-        @Override
-        public String toString() {
-            return "CacheKey [keyHash=" + Arrays.toString(keyHash) + "]";
-        }
         
-    }
-    
     public static class CacheValue implements Serializable {
         
         private final Object key;
diff --git a/redisson/src/main/java/org/redisson/cache/LocalCacheListener.java b/redisson/src/main/java/org/redisson/cache/LocalCacheListener.java
index c5592c15d..bfbdd117f 100644
--- a/redisson/src/main/java/org/redisson/cache/LocalCacheListener.java
+++ b/redisson/src/main/java/org/redisson/cache/LocalCacheListener.java
@@ -25,14 +25,13 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
 import org.redisson.RedissonListMultimapCache;
-import org.redisson.RedissonLocalCachedMap.CacheKey;
 import org.redisson.RedissonObject;
 import org.redisson.RedissonScoredSortedSet;
 import org.redisson.RedissonTopic;
 import org.redisson.api.LocalCachedMapOptions;
-import org.redisson.api.RFuture;
 import org.redisson.api.LocalCachedMapOptions.ReconnectionStrategy;
 import org.redisson.api.LocalCachedMapOptions.SyncStrategy;
+import org.redisson.api.RFuture;
 import org.redisson.api.RListMultimapCache;
 import org.redisson.api.RObject;
 import org.redisson.api.RScoredSortedSet;
diff --git a/redisson/src/test/java/org/redisson/RedissonLocalCachedMapTest.java b/redisson/src/test/java/org/redisson/RedissonLocalCachedMapTest.java
index 65ead14bc..e28d92280 100644
--- a/redisson/src/test/java/org/redisson/RedissonLocalCachedMapTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonLocalCachedMapTest.java
@@ -11,7 +11,6 @@ import java.util.concurrent.ExecutionException;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.redisson.RedissonLocalCachedMap.CacheKey;
 import org.redisson.RedissonLocalCachedMap.CacheValue;
 import org.redisson.api.LocalCachedMapOptions;
 import org.redisson.api.LocalCachedMapOptions.EvictionPolicy;
@@ -20,6 +19,7 @@ import org.redisson.api.LocalCachedMapOptions.SyncStrategy;
 import org.redisson.api.RLocalCachedMap;
 import org.redisson.api.RMap;
 import org.redisson.cache.Cache;
+import org.redisson.cache.CacheKey;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.codec.StringCodec;