- drop CustomCache in tests and use TestCache

- check null cacheable issue with defaultcache
- support both ctors in custom cache classes regarding to value of cacheconfig.cacheable

Author: atakavci

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

@@ -10,28 +10,33 @@ public final class CacheFactory {
 
     public static Cache getCache(CacheConfig config) {
         if (config.getCacheClass() == null) {
+            if (config.getCacheable() == null) {
+                throw new JedisCacheException("Cacheable is required to create the default cache!");
+            }
             return new DefaultCache(config.getMaxSize(), config.getCacheable(), getEvictionPolicy(config));
         }
         return instantiateCustomCache(config);
     }
 
-    private static  Cache instantiateCustomCache(CacheConfig config) {
+    private static Cache instantiateCustomCache(CacheConfig config) {
         try {
-            Constructor ctorWithCacheable = findConstructorWithCacheable(config.getCacheClass());
-            if (ctorWithCacheable != null) {
-                return (Cache) ctorWithCacheable.newInstance(config.getMaxSize(), getEvictionPolicy(config), config.getCacheable());
+            if (config.getCacheable() != null) {
+                Constructor ctorWithCacheable = findConstructorWithCacheable(config.getCacheClass());
+                if (ctorWithCacheable != null) {
+                    return (Cache) ctorWithCacheable.newInstance(config.getMaxSize(), getEvictionPolicy(config), config.getCacheable());
+                }
             }
             Constructor ctor = getConstructor(config.getCacheClass());
             return (Cache) ctor.newInstance(config.getMaxSize(), getEvictionPolicy(config));
-        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | SecurityException e) {
+        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
+                | SecurityException e) {
             throw new JedisCacheException("Failed to insantiate custom cache type!", e);
         }
     }
 
     private static Constructor findConstructorWithCacheable(Class customCacheType) {
         return Arrays.stream(customCacheType.getConstructors())
-                .filter(
-                    ctor -> Arrays.equals(ctor.getParameterTypes(), new Class[] { int.class, EvictionPolicy.class, Cacheable.class }))
+                .filter(ctor -> Arrays.equals(ctor.getParameterTypes(), new Class[] { int.class, EvictionPolicy.class, Cacheable.class }))
                 .findFirst().orElse(null);
     }
 

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

@@ -512,7 +512,7 @@ public void testNullValue() throws InterruptedException {
     String nonExisting = "non-existing-key";
     control.del(nonExisting);
 
-    try (JedisPooled jedis = new JedisPooled(hnp, clientConfig.get(), new CacheConfig().builder().maxSize(MAX_SIZE).build())) {
+    try (JedisPooled jedis = new JedisPooled(hnp, clientConfig.get(), CacheConfig.builder().maxSize(MAX_SIZE).build())) {
       Cache cache = jedis.getCache();
       CacheStats stats = cache.getStats();
 
@@ -539,16 +539,10 @@ public void testNullValue() throws InterruptedException {
     }
   }
 
-  public static class CustomCache extends TestCache {
-    public CustomCache(int maximumSize, EvictionPolicy evictionPolicy) {
-      super(maximumSize, evictionPolicy, DefaultCacheable.INSTANCE);
-    }
-  }
-
   @Test
   public void testCacheFactory() throws InterruptedException {
     // this checks the instantiation with parameters (int, EvictionPolicy, Cacheable)
-    try (JedisPooled jedis = new JedisPooled(hnp, clientConfig.get(), new CacheConfig().builder().cacheClass(TestCache.class).build())) {
+    try (JedisPooled jedis = new JedisPooled(hnp, clientConfig.get(), CacheConfig.builder().cacheClass(TestCache.class).build())) {
       Cache cache = jedis.getCache();
       CacheStats stats = cache.getStats();
 
@@ -562,7 +556,8 @@ public void testCacheFactory() throws InterruptedException {
     }
 
     // this checks the instantiation with parameters (int, EvictionPolicy)
-    try (JedisPooled jedis = new JedisPooled(hnp, clientConfig.get(), new CacheConfig().builder().cacheClass(CustomCache.class).build())) {
+    try (JedisPooled jedis = new JedisPooled(hnp, clientConfig.get(),
+        CacheConfig.builder().cacheClass(TestCache.class).cacheable(null).build())) {
       Cache cache = jedis.getCache();
       CacheStats stats = cache.getStats();
 
@@ -575,5 +570,4 @@ public void testCacheFactory() throws InterruptedException {
       assertEquals(1, stats.getMissCount());
     }
   }
-
 }

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

@@ -17,6 +17,10 @@ public TestCache(Map<CacheKey, CacheEntry> map, Cacheable cacheable) {
     super(10000, map, cacheable, new LRUEviction(10000));
   }
 
+  public TestCache(int maximumSize, EvictionPolicy evictionPolicy ) {
+    super(maximumSize, new HashMap<CacheKey, CacheEntry>(), DefaultCacheable.INSTANCE, evictionPolicy);
+  }
+
   public TestCache(int maximumSize, EvictionPolicy evictionPolicy, Cacheable cacheable ) {
     super(maximumSize, new HashMap<CacheKey, CacheEntry>(), cacheable, evictionPolicy);
   }

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

@@ -45,7 +45,6 @@ public void simple() {
 
   @Test
   public void simpleWithSimpleMap() {
-    // HashMap<CacheKey, CacheEntry> map = new HashMap<>();
     try (UnifiedJedis jedis = createCachedJedis(CacheConfig.builder().build())) {
       Cache cache = jedis.getCache();
       control.set("foo", "bar");