refactoring

redisson/src/main/java/org/redisson/RedissonSet.java

@@ -53,7 +53,7 @@ public class RedissonSet<V> extends RedissonExpirable implements RSet<V>, ScanIt
 
     RedissonClient redisson;
     
-    protected RedissonSet(CommandAsyncExecutor commandExecutor, String name, RedissonClient redisson) {
+    public RedissonSet(CommandAsyncExecutor commandExecutor, String name, RedissonClient redisson) {
         super(commandExecutor, name);
         this.redisson = redisson;
     }

redisson/src/main/java/org/redisson/api/LocalCachedMapOptions.java

@@ -21,7 +21,7 @@ import org.redisson.api.map.MapLoader;
 import org.redisson.api.map.MapWriter;
 
 /**
- * RLocalCachedMap options object. Used to specify RLocalCachedMap settings.
+ * Configuration for LocalCachedMap object.
  * 
  * @author Nikita Koksharov
  *

redisson/src/main/java/org/redisson/api/MapOptions.java

@@ -19,7 +19,7 @@ import org.redisson.api.map.MapLoader;
 import org.redisson.api.map.MapWriter;
 
 /**
- * RMap options object.
+ * Configuration for Map object.
  * 
  * @author Nikita Koksharov
  *

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

@@ -235,16 +235,13 @@ public class CommandBatchService extends CommandAsyncService {
                     List<Object> responses = new ArrayList<Object>(entries.size());
                     int syncedSlaves = 0;
                     for (BatchCommandData<?, ?> commandEntry : entries) {
-                        if (!isWaitCommand(commandEntry)
-                                && !commandEntry.getCommand().getName().equals(RedisCommands.MULTI.getName())
+                        if (isWaitCommand(commandEntry)) {
+                            syncedSlaves = (Integer) commandEntry.getPromise().getNow();
+                        } else if (!commandEntry.getCommand().getName().equals(RedisCommands.MULTI.getName())
                                 && !commandEntry.getCommand().getName().equals(RedisCommands.EXEC.getName())) {
                             Object entryResult = commandEntry.getPromise().getNow();
                             entryResult = tryHandleReference(entryResult);
                             responses.add(entryResult);
-                        } else {
-                            if (isWaitCommand(commandEntry)) {
-                                syncedSlaves = (Integer) commandEntry.getPromise().getNow();
-                            }
                         }
                     }
                     

redisson/src/main/java/org/redisson/config/Config.java

@@ -604,9 +604,11 @@ public class Config {
      * Switch to round robin {@link io.netty.resolver.dns.RoundRobinDnsAddressResolverGroup} when you need to optimize the url resolving.
      * 
      * @param addressResolverGroupFactory
+     * @return config
      */
-    public void setAddressResolverGroupFactory(AddressResolverGroupFactory addressResolverGroupFactory) {
+    public Config setAddressResolverGroupFactory(AddressResolverGroupFactory addressResolverGroupFactory) {
         this.addressResolverGroupFactory = addressResolverGroupFactory;
+        return this;
     }
     public AddressResolverGroupFactory getAddressResolverGroupFactory() {
         return addressResolverGroupFactory;

redisson/src/main/java/org/redisson/connection/MasterSlaveEntry.java

@@ -418,7 +418,7 @@ public class MasterSlaveEntry {
      * Shutdown old master client.
      * 
      * @param address of Redis
-     * @return 
+     * @return client 
      */
     public RFuture<RedisClient> changeMaster(URI address) {
         final ClientConnectionsEntry oldMaster = masterEntry;