make cachefactory methods static

Author: atakavci

Diff for: src/main/java/redis/clients/jedis/JedisCluster.java

@@ -223,7 +223,7 @@ private JedisCluster(ClusterConnectionProvider provider, int maxAttempts, Durati
 
   @Experimental
   public JedisCluster(Set<HostAndPort> hnp, JedisClientConfig jedisClientConfig, CacheConfig cacheConfig) {
-    this(hnp, jedisClientConfig, new CacheFactory().getCache(cacheConfig));
+    this(hnp, jedisClientConfig, CacheFactory.getCache(cacheConfig));
   }
 
   @Experimental

Diff for: src/main/java/redis/clients/jedis/JedisPooled.java

@@ -81,7 +81,7 @@ public JedisPooled(final HostAndPort hostAndPort, final JedisClientConfig client
 
   @Experimental
   public JedisPooled(final HostAndPort hostAndPort, final JedisClientConfig clientConfig, CacheConfig cacheConfig) {
-    this(hostAndPort, clientConfig, new CacheFactory().getCache(cacheConfig));
+    this(hostAndPort, clientConfig, CacheFactory.getCache(cacheConfig));
   }
 
   @Experimental
@@ -392,7 +392,7 @@ public JedisPooled(final HostAndPort hostAndPort, final JedisClientConfig client
   @Experimental
   public JedisPooled(final HostAndPort hostAndPort, final JedisClientConfig clientConfig, CacheConfig cacheConfig,
       final GenericObjectPoolConfig<Connection> poolConfig) {
-    this(hostAndPort, clientConfig, new CacheFactory().getCache(cacheConfig), poolConfig);
+    this(hostAndPort, clientConfig, CacheFactory.getCache(cacheConfig), poolConfig);
   }
 
   @Experimental

Diff for: src/main/java/redis/clients/jedis/JedisSentineled.java

@@ -19,7 +19,7 @@ public JedisSentineled(String masterName, final JedisClientConfig masterClientCo
   @Experimental
   public JedisSentineled(String masterName, final JedisClientConfig masterClientConfig, CacheConfig cacheConfig,
       Set<HostAndPort> sentinels, final JedisClientConfig sentinelClientConfig) {
-    this(masterName, masterClientConfig, new CacheFactory().getCache(cacheConfig),
+    this(masterName, masterClientConfig, CacheFactory.getCache(cacheConfig),
         sentinels, sentinelClientConfig);
   }
 

Diff for: src/main/java/redis/clients/jedis/UnifiedJedis.java

@@ -100,7 +100,7 @@ public UnifiedJedis(HostAndPort hostAndPort, JedisClientConfig clientConfig) {
 
   @Experimental
   public UnifiedJedis(HostAndPort hostAndPort, JedisClientConfig clientConfig, CacheConfig cacheConfig) {
-    this(hostAndPort, clientConfig, new CacheFactory().getCache(cacheConfig));
+    this(hostAndPort, clientConfig, CacheFactory.getCache(cacheConfig));
   }
 
   @Experimental

Diff for: src/main/java/redis/clients/jedis/csc/CacheFactory.java

@@ -6,16 +6,16 @@
 
 import redis.clients.jedis.exceptions.JedisCacheException;
 
-public class CacheFactory {
+public final class CacheFactory {
 
-    public Cache getCache(CacheConfig config) {
+    public static Cache getCache(CacheConfig config) {
         if (config.getCacheClass() == null) {
             return new DefaultCache(config.getMaxSize(), config.getCacheable(), getEvictionPolicy(config));
         }
         return instantiateCustomCache(config);
     }
 
-    private Cache instantiateCustomCache(CacheConfig config) {
+    private static  Cache instantiateCustomCache(CacheConfig config) {
         try {
             Constructor ctorWithCacheable = findConstructorWithCacheable(config.getCacheClass());
             if (ctorWithCacheable != null) {
@@ -28,14 +28,14 @@ private Cache instantiateCustomCache(CacheConfig config) {
         }
     }
 
-    private Constructor findConstructorWithCacheable(Class customCacheType) {
+    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 }))
                 .findFirst().orElse(null);
     }
 
-    private Constructor getConstructor(Class customCacheType) {
+    private static Constructor getConstructor(Class customCacheType) {
         try {
             return customCacheType.getConstructor(int.class, EvictionPolicy.class);
         } catch (NoSuchMethodException e) {
@@ -48,7 +48,7 @@ private Constructor getConstructor(Class customCacheType) {
         }
     }
 
-    private EvictionPolicy getEvictionPolicy(CacheConfig config) {
+    private static EvictionPolicy getEvictionPolicy(CacheConfig config) {
         if (config.getEvictionPolicy() == null) {
             // It will be default to LRUEviction, until we have other eviction implementations
             return new LRUEviction(config.getMaxSize());