/**
 * Copyright 2014 Nikita Koksharov, Nickolay Borbit
 *
 * 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.client.codec;

import java.io.IOException;

import org.redisson.client.handler.State;
import org.redisson.client.protocol.Decoder;
import org.redisson.client.protocol.Encoder;

import io.netty.buffer.ByteBuf;
import io.netty.util.CharsetUtil;

public class StringCodec implements Codec {

    public static final StringCodec INSTANCE = new StringCodec();

    private final Encoder encoder = new Encoder() {
        @Override
        public byte[] encode(Object in) throws IOException {
            return in.toString().getBytes("UTF-8");
        }
    };

    private final Decoder<Object> decoder = new Decoder<Object>() {
        @Override
        public Object decode(ByteBuf buf, State state) {
            String str = buf.toString(CharsetUtil.UTF_8);
            buf.readerIndex(buf.readableBytes());
            return str;
        }
    };

    @Override
    public Decoder<Object> getValueDecoder() {
        return decoder;
    }

    @Override
    public Encoder getValueEncoder() {
        return encoder;
    }

    @Override
    public Decoder<Object> getMapValueDecoder() {
        return getValueDecoder();
    }

    @Override
    public Encoder getMapValueEncoder() {
        return getValueEncoder();
    }

    @Override
    public Decoder<Object> getMapKeyDecoder() {
        return getValueDecoder();
    }

    @Override
    public Encoder getMapKeyEncoder() {
        return getValueEncoder();
    }

}

@@ -673,16 +673,49 @@
 ception;
+%0Aimport java.nio.charset.Charset;
 %0A%0Aimport
@@ -1020,16 +1020,52 @@
 dec();%0A%0A
+    private final Charset charset;%0A%0A
     priv
@@ -1233,15 +1233,15 @@
 tes(
-%22UTF-8%22
+charset
 );%0A 
@@ -1442,25 +1442,15 @@
 ing(
-C
+c
 harset
-Util.UTF_8
 );%0A 
@@ -1528,32 +1528,32 @@
 ;%0A        %7D%0A
-
     %7D;%0A%0A
     @Overrid
@@ -1536,24 +1536,261 @@
   %7D%0A    %7D;%0A%0A
+    public StringCodec() %7B%0A        this(CharsetUtil.UTF_8);%0A    %7D%0A%0A    public StringCodec(String charsetName) %7B%0A%09this(Charset.forName(charsetName));%0A    %7D%0A%0A    public StringCodec(Charset charset) %7B%0A        this.charset = charset;%0A    %7D%0A%0A
     @Overrid

Add a constructor to StringCodec that allows for a supplied codec.