refactoring

redisson/src/test/java/org/redisson/RedissonMapCacheTest.java

@@ -17,13 +17,14 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 
 import org.awaitility.Duration;
+import org.joor.Reflect;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
 import org.redisson.api.MapOptions;
+import org.redisson.api.MapOptions.WriteMode;
 import org.redisson.api.RMap;
 import org.redisson.api.RMapCache;
-import org.redisson.api.MapOptions.WriteMode;
 import org.redisson.api.map.event.EntryCreatedListener;
 import org.redisson.api.map.event.EntryEvent;
 import org.redisson.api.map.event.EntryExpiredListener;
@@ -37,8 +38,6 @@ import org.redisson.client.codec.StringCodec;
 import org.redisson.codec.CompositeCodec;
 import org.redisson.eviction.EvictionScheduler;
 
-import mockit.Deencapsulation;
-
 public class RedissonMapCacheTest extends BaseMapTest {
 
     @Test
@@ -46,7 +45,7 @@ public class RedissonMapCacheTest extends BaseMapTest {
         RMapCache<String, String> cache = redisson.getMapCache("test");
         
         EvictionScheduler evictionScheduler = ((Redisson)redisson).getEvictionScheduler();
-        Map<?, ?> map = Deencapsulation.getField(evictionScheduler, "tasks");
+        Map<?, ?> map = Reflect.on(evictionScheduler).get("tasks");
         assertThat(map.isEmpty()).isFalse();
         cache.destroy();
         assertThat(map.isEmpty()).isTrue();

redisson/src/test/java/org/redisson/RedissonSetCacheTest.java

@@ -13,13 +13,12 @@ import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
+import org.joor.Reflect;
 import org.junit.Assert;
 import org.junit.Test;
 import org.redisson.api.RSetCache;
 import org.redisson.eviction.EvictionScheduler;
 
-import mockit.Deencapsulation;
-
 public class RedissonSetCacheTest extends BaseTest {
 
     public static class SimpleBean implements Serializable {
@@ -41,7 +40,7 @@ public class RedissonSetCacheTest extends BaseTest {
         RSetCache<String> cache = redisson.getSetCache("test");
         
         EvictionScheduler evictionScheduler = ((Redisson)redisson).getEvictionScheduler();
-        Map<?, ?> map = Deencapsulation.getField(evictionScheduler, "tasks");
+        Map<?, ?> map = Reflect.on(evictionScheduler).get("tasks");
         assertThat(map.isEmpty()).isFalse();
         cache.destroy();
         assertThat(map.isEmpty()).isTrue();

redisson/src/test/java/org/redisson/executor/RedissonScheduledExecutorServiceTest.java

@@ -33,7 +33,6 @@ import org.redisson.api.annotation.RInject;
 import org.redisson.config.Config;
 import org.redisson.config.RedissonNodeConfig;
 
-import mockit.Deencapsulation;
 import mockit.Invocation;
 import mockit.Mock;
 import mockit.MockUp;