refactoring

redisson/src/test/java/org/redisson/jcache/JCacheTest.java

@@ -45,7 +45,7 @@ public class JCacheTest {
     private static final GenericContainer<?> REDIS =
             new GenericContainer<>("redis:latest")
                     .withCreateContainerCmdModifier(cmd -> {
-                        cmd.withCmd("redis-server", "--save", "''");
+                        cmd.withCmd("redis-server", "--save", "''", "--notify-keyspace-events", "Eh");
                     })
                     .withExposedPorts(6379);
 
@@ -59,13 +59,16 @@ public class JCacheTest {
         assertThat(r.getExitCode()).isEqualTo(0);
     }
 
+    <K, V> MutableConfiguration<K, V> createConfig() {
+        return new MutableConfiguration<>();
+    }
 
     @Test
     public void testClose() throws IOException {
         URL configUrl = getClass().getResource("redisson-jcache.yaml");
         Config cfg = Config.fromYAML(configUrl);
 
-        MutableConfiguration c = new MutableConfiguration();
+        MutableConfiguration<String, String> c = createConfig();
         c.setStatisticsEnabled(true);
         Configuration<String, String> config = RedissonConfiguration.fromConfig(cfg, c);
         Cache<String, String> cache = Caching.getCachingProvider()
@@ -78,7 +81,7 @@ public class JCacheTest {
         URL configUrl = getClass().getResource("redisson-jcache.yaml");
         Config cfg = Config.fromYAML(configUrl);
 
-        MutableConfiguration c = new MutableConfiguration();
+        MutableConfiguration c = createConfig();
         c.setExpiryPolicyFactory(CreatedExpiryPolicy.factoryOf(new Duration(MILLISECONDS, 500)));
         Configuration<String, String> config = RedissonConfiguration.fromConfig(cfg, c);
         Cache<String, String> cache = Caching.getCachingProvider().getCacheManager()
@@ -261,7 +264,7 @@ public class JCacheTest {
         URL configUrl = getClass().getResource("redisson-jcache.yaml");
         Config cfg = Config.fromYAML(configUrl);
 
-        MutableConfiguration<String, String> jcacheConfig = new MutableConfiguration<>();
+        MutableConfiguration<String, String> jcacheConfig = createConfig();
         jcacheConfig.setReadThrough(true);
         jcacheConfig.setCacheLoaderFactory(new Factory<CacheLoader<String, String>>() {
             @Override
@@ -379,7 +382,7 @@ public class JCacheTest {
 
     @Test
     public void testExpiration() throws InterruptedException, IllegalArgumentException, URISyntaxException {
-        MutableConfiguration<String, String> config = new MutableConfiguration<>();
+        MutableConfiguration<String, String> config = createConfig();
         config.setExpiryPolicyFactory(CreatedExpiryPolicy.factoryOf(new Duration(TimeUnit.SECONDS, 1)));
         config.setStoreByValue(true);
 
@@ -407,7 +410,7 @@ public class JCacheTest {
 
     @Test
     public void testUpdate() throws InterruptedException, URISyntaxException {
-        MutableConfiguration<String, String> config = new MutableConfiguration<>();
+        MutableConfiguration<String, String> config = createConfig();
         config.setStoreByValue(true);
 
         URI configUri = getClass().getResource("redisson-jcache.yaml").toURI();
@@ -437,7 +440,7 @@ public class JCacheTest {
 
     @Test
     public void testUpdateAsync() throws InterruptedException, URISyntaxException {
-        MutableConfiguration<String, String> config = new MutableConfiguration<>();
+        MutableConfiguration<String, String> config = createConfig();
         config.setStoreByValue(true);
 
         URI configUri = getClass().getResource("redisson-jcache.yaml").toURI();
@@ -472,7 +475,7 @@ public class JCacheTest {
 
     @Test
     public void testUpdateWithoutOldValue() throws InterruptedException, URISyntaxException {
-        MutableConfiguration<String, String> config = new MutableConfiguration<>();
+        MutableConfiguration<String, String> config = createConfig();
         config.setStoreByValue(true);
 
         URI configUri = getClass().getResource("redisson-jcache.yaml").toURI();
@@ -502,7 +505,7 @@ public class JCacheTest {
 
     @Test
     public void testRemoveListener() throws InterruptedException, URISyntaxException {
-        MutableConfiguration<String, String> config = new MutableConfiguration<>();
+        MutableConfiguration<String, String> config = createConfig();
         config.setStoreByValue(true);
 
         URI configUri = getClass().getResource("redisson-jcache.yaml").toURI();