Merge branch 'master' into 3.0.0

redisson/src/main/java/org/redisson/codec/CompositeCodec.java

@@ -0,0 +1,74 @@
+/**
+ * Copyright 2016 Nikita Koksharov
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.redisson.codec;
+
+import org.redisson.client.codec.Codec;
+import org.redisson.client.protocol.Decoder;
+import org.redisson.client.protocol.Encoder;
+
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+public class CompositeCodec implements Codec {
+
+    private final Codec mapKeyCodec;
+    private final Codec mapValueCodec;
+    private final Codec valueCodec;
+    
+    public CompositeCodec(Codec mapKeyCodec, Codec mapValueCodec) {
+        this(mapKeyCodec, mapValueCodec, null);
+    }
+    
+    public CompositeCodec(Codec mapKeyCodec, Codec mapValueCodec, Codec valueCodec) {
+        super();
+        this.mapKeyCodec = mapKeyCodec;
+        this.mapValueCodec = mapValueCodec;
+        this.valueCodec = valueCodec;
+    }
+
+    @Override
+    public Decoder<Object> getMapValueDecoder() {
+        return mapValueCodec.getMapKeyDecoder();
+    }
+
+    @Override
+    public Encoder getMapValueEncoder() {
+        return mapValueCodec.getMapValueEncoder();
+    }
+
+    @Override
+    public Decoder<Object> getMapKeyDecoder() {
+        return mapKeyCodec.getMapKeyDecoder();
+    }
+
+    @Override
+    public Encoder getMapKeyEncoder() {
+        return mapKeyCodec.getMapKeyEncoder();
+    }
+
+    @Override
+    public Decoder<Object> getValueDecoder() {
+        return valueCodec.getValueDecoder();
+    }
+
+    @Override
+    public Encoder getValueEncoder() {
+        return valueCodec.getValueEncoder();
+    }
+
+}

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

@@ -32,6 +32,11 @@ import org.slf4j.LoggerFactory;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.FutureListener;
 
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
 public class ClientConnectionsEntry {
 
     final Logger log = LoggerFactory.getLogger(getClass());

redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java

@@ -204,7 +204,7 @@ abstract class ConnectionPool<T extends RedisConnection> {
         }
 
         RedisConnectionException exception = new RedisConnectionException(
-                "Can't aquire connection to " + entry.getClient().getAddr());
+                "Can't aquire connection to " + entry);
         return connectionManager.newFailedFuture(exception);
     }