Re-create csc.util package

Author: sazzad16

src/main/java/redis/clients/jedis/csc/ClientSideCache.java

@@ -12,8 +12,8 @@
 
 /**
  * The class to manage the client-side caching. User can provide any of implementation of this class to the client
- * object; e.g. {@link redis.clients.jedis.csc.CaffeineCSC CaffeineCSC} or
- * {@link redis.clients.jedis.csc.GuavaCSC GuavaCSC} or a custom implementation of their own.
+ * object; e.g. {@link redis.clients.jedis.csc.util.CaffeineCSC CaffeineCSC} or
+ * {@link redis.clients.jedis.csc.util.GuavaCSC GuavaCSC} or a custom implementation of their own.
  */
 public abstract class ClientSideCache {
 

src/main/java/redis/clients/jedis/csc/CaffeineCSC.java renamed to src/main/java/redis/clients/jedis/csc/util/CaffeineCSC.java

@@ -1,29 +1,33 @@
-package redis.clients.jedis.csc;
+package redis.clients.jedis.csc.util;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import java.util.concurrent.TimeUnit;
 import net.openhft.hashing.LongHashFunction;
+
 import redis.clients.jedis.CommandObject;
 import redis.clients.jedis.args.Rawable;
+import redis.clients.jedis.csc.ClientSideCache;
+import redis.clients.jedis.csc.ClientSideCacheable;
+import redis.clients.jedis.csc.DefaultClientSideCacheable;
 
 public class CaffeineCSC extends ClientSideCache {
 
   private static final LongHashFunction DEFAULT_HASH_FUNCTION = LongHashFunction.xx3();
 
   private final Cache<Long, Object> cache;
-  private final LongHashFunction function;
+  private final LongHashFunction hashFunction;
 
   public CaffeineCSC(Cache<Long, Object> caffeineCache, LongHashFunction hashFunction) {
     super();
     this.cache = caffeineCache;
-    this.function = hashFunction;
+    this.hashFunction = hashFunction;
   }
 
   public CaffeineCSC(Cache<Long, Object> caffeineCache, LongHashFunction function, ClientSideCacheable cacheable) {
     super(cacheable);
     this.cache = caffeineCache;
-    this.function = function;
+    this.hashFunction = function;
   }
 
   @Override
@@ -51,10 +55,10 @@ protected final long getHash(CommandObject command) {
     long[] nums = new long[command.getArguments().size() + 1];
     int idx = 0;
     for (Rawable raw : command.getArguments()) {
-      nums[idx++] = function.hashBytes(raw.getRaw());
+      nums[idx++] = hashFunction.hashBytes(raw.getRaw());
     }
-    nums[idx] = function.hashInt(command.getBuilder().hashCode());
-    return function.hashLongs(nums);
+    nums[idx] = hashFunction.hashInt(command.getBuilder().hashCode());
+    return hashFunction.hashLongs(nums);
   }
 
   public static Builder builder() {

src/main/java/redis/clients/jedis/csc/GuavaCSC.java renamed to src/main/java/redis/clients/jedis/csc/util/GuavaCSC.java

@@ -1,18 +1,22 @@
-package redis.clients.jedis.csc;
+package redis.clients.jedis.csc.util;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hasher;
 import java.util.concurrent.TimeUnit;
+
 import redis.clients.jedis.CommandObject;
+import redis.clients.jedis.csc.ClientSideCache;
+import redis.clients.jedis.csc.ClientSideCacheable;
+import redis.clients.jedis.csc.DefaultClientSideCacheable;
 
 public class GuavaCSC extends ClientSideCache {
 
   private static final HashFunction DEFAULT_HASH_FUNCTION = com.google.common.hash.Hashing.fingerprint2011();
 
   private final Cache<Long, Object> cache;
-  private final HashFunction function;
+  private final HashFunction hashFunction;
 
   public GuavaCSC(Cache<Long, Object> guavaCache) {
     this(guavaCache, DEFAULT_HASH_FUNCTION);
@@ -21,7 +25,7 @@ public GuavaCSC(Cache<Long, Object> guavaCache) {
   public GuavaCSC(Cache<Long, Object> guavaCache, HashFunction hashFunction) {
     super();
     this.cache = guavaCache;
-    this.function = hashFunction;
+    this.hashFunction = hashFunction;
   }
 
   public GuavaCSC(Cache<Long, Object> guavaCache, ClientSideCacheable cacheable) {
@@ -31,7 +35,7 @@ public GuavaCSC(Cache<Long, Object> guavaCache, ClientSideCacheable cacheable) {
   public GuavaCSC(Cache<Long, Object> cache, HashFunction function, ClientSideCacheable cacheable) {
     super(cacheable);
     this.cache = cache;
-    this.function = function;
+    this.hashFunction = function;
   }
 
   @Override
@@ -56,7 +60,7 @@ protected Object getValue(long hash) {
 
   @Override
   protected final long getHash(CommandObject command) {
-    Hasher hasher = function.newHasher();
+    Hasher hasher = hashFunction.newHasher();
     command.getArguments().forEach(raw -> hasher.putBytes(raw.getRaw()));
     hasher.putInt(command.getBuilder().hashCode());
     return hasher.hash().asLong();

src/main/java/redis/clients/jedis/csc/StringWhiteListBlackListClientSideCacheable.java renamed to src/main/java/redis/clients/jedis/csc/util/StringWhiteListBlackListClientSideCacheable.java

@@ -1,7 +1,8 @@
-package redis.clients.jedis.csc;
+package redis.clients.jedis.csc.util;
 
 import java.util.Set;
 import redis.clients.jedis.commands.ProtocolCommand;
+import redis.clients.jedis.csc.ClientSideCacheable;
 
 public class StringWhiteListBlackListClientSideCacheable implements ClientSideCacheable {
 

src/main/java/redis/clients/jedis/util/JedisURIHelper.java

@@ -6,9 +6,9 @@
 import redis.clients.jedis.Protocol;
 import redis.clients.jedis.RedisProtocol;
 
-import redis.clients.jedis.csc.GuavaCSC;
-import redis.clients.jedis.csc.CaffeineCSC;
 import redis.clients.jedis.csc.ClientSideCache;
+import redis.clients.jedis.csc.util.GuavaCSC;
+import redis.clients.jedis.csc.util.CaffeineCSC;
 
 public final class JedisURIHelper {
 

src/test/java/redis/clients/jedis/csc/ClientSideCacheLibsTest.java

@@ -23,6 +23,8 @@
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisClientConfig;
 import redis.clients.jedis.JedisPooled;
+import redis.clients.jedis.csc.util.CaffeineCSC;
+import redis.clients.jedis.csc.util.GuavaCSC;
 
 public class ClientSideCacheLibsTest {
 

src/test/java/redis/clients/jedis/csc/WhiteListBlackListClientSideCacheTest.java

@@ -21,6 +21,7 @@
 import redis.clients.jedis.JedisClientConfig;
 import redis.clients.jedis.JedisPooled;
 import redis.clients.jedis.Protocol;
+import redis.clients.jedis.csc.util.StringWhiteListBlackListClientSideCacheable;
 
 public class WhiteListBlackListClientSideCacheTest {