refactoring

redisson/src/main/java/org/redisson/command/BaseRedisBatchExecutor.java

@@ -20,12 +20,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.redisson.api.BatchOptions;
-import org.redisson.api.RFuture;
-import org.redisson.client.RedisConnection;
 import org.redisson.client.codec.Codec;
 import org.redisson.client.protocol.BatchCommandData;
 import org.redisson.client.protocol.RedisCommand;
-import org.redisson.client.protocol.RedisCommands;
 import org.redisson.command.CommandBatchService.ConnectionEntry;
 import org.redisson.command.CommandBatchService.Entry;
 import org.redisson.connection.ConnectionManager;

redisson/src/test/java/org/redisson/RedissonCollectionMapReduceTest.java

@@ -16,6 +16,7 @@ import org.redisson.api.RList;
 import org.redisson.api.RMap;
 import org.redisson.api.RQueue;
 import org.redisson.api.RedissonClient;
+import org.redisson.api.WorkerOptions;
 import org.redisson.api.annotation.RInject;
 import org.redisson.api.mapreduce.RCollator;
 import org.redisson.api.mapreduce.RCollectionMapReduce;
@@ -78,7 +79,7 @@ public class RedissonCollectionMapReduceTest extends BaseTest {
     
     @Before
     public void beforeTest() {
-        redisson.getExecutorService(RExecutorService.MAPREDUCE_NAME).registerWorkers(3);
+        redisson.getExecutorService(RExecutorService.MAPREDUCE_NAME).registerWorkers(WorkerOptions.defaults().workers(3));
     }
     
     @Test

redisson/src/test/java/org/redisson/RedissonMapReduceTest.java

@@ -18,6 +18,7 @@ import org.redisson.api.RFuture;
 import org.redisson.api.RMap;
 import org.redisson.api.RMapCache;
 import org.redisson.api.RedissonClient;
+import org.redisson.api.WorkerOptions;
 import org.redisson.api.annotation.RInject;
 import org.redisson.api.mapreduce.RCollator;
 import org.redisson.api.mapreduce.RCollector;
@@ -81,7 +82,7 @@ public class RedissonMapReduceTest extends BaseTest {
     
     @Before
     public void beforeTest() {
-        redisson.getExecutorService(RExecutorService.MAPREDUCE_NAME).registerWorkers(3);
+        redisson.getExecutorService(RExecutorService.MAPREDUCE_NAME).registerWorkers(WorkerOptions.defaults().workers(3));
     }
     
     @Test

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

@@ -29,6 +29,7 @@ import org.redisson.api.RScheduledExecutorService;
 import org.redisson.api.RScheduledFuture;
 import org.redisson.api.RedissonClient;
 import org.redisson.api.RemoteInvocationOptions;
+import org.redisson.api.WorkerOptions;
 import org.redisson.api.annotation.RInject;
 import org.redisson.config.Config;
 import org.redisson.config.RedissonNodeConfig;
@@ -373,7 +374,7 @@ public class RedissonScheduledExecutorServiceTest extends BaseTest {
     @Test
     public void testCancelAtFixedDelay2() throws InterruptedException, ExecutionException {
         RScheduledExecutorService executor = redisson.getExecutorService("test", ExecutorOptions.defaults().taskRetryInterval(30, TimeUnit.MINUTES));
-        executor.registerWorkers(5);
+        executor.registerWorkers(WorkerOptions.defaults().workers(5));
         RScheduledFuture<?> future1 = executor.scheduleWithFixedDelay(new ScheduledRunnableTask2("executed1"), 1, 2, TimeUnit.SECONDS);
         Thread.sleep(5000);
         assertThat(redisson.getAtomicLong("executed1").get()).isEqualTo(1);