From c942640fba4934d8fa64f851af902e35673bc487 Mon Sep 17 00:00:00 2001 From: Nikita Date: Fri, 11 May 2018 12:13:57 +0300 Subject: [PATCH] refactoring --- .../java/org/redisson/RedissonBuckets.java | 4 +- .../client/codec/DelegateDecoderCodec.java | 39 ------------------- 2 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 redisson/src/main/java/org/redisson/client/codec/DelegateDecoderCodec.java diff --git a/redisson/src/main/java/org/redisson/RedissonBuckets.java b/redisson/src/main/java/org/redisson/RedissonBuckets.java index ca248fb72..82585ccdc 100644 --- a/redisson/src/main/java/org/redisson/RedissonBuckets.java +++ b/redisson/src/main/java/org/redisson/RedissonBuckets.java @@ -29,8 +29,10 @@ import org.redisson.api.RBuckets; import org.redisson.api.RFuture; import org.redisson.client.codec.Codec; import org.redisson.client.codec.DelegateDecoderCodec; +import org.redisson.client.codec.StringCodec; import org.redisson.client.protocol.RedisCommand; import org.redisson.client.protocol.RedisCommands; +import org.redisson.codec.CompositeCodec; import org.redisson.command.CommandExecutor; import org.redisson.connection.decoder.MapGetAllDecoder; import org.redisson.misc.RedissonPromise; @@ -95,7 +97,7 @@ public class RedissonBuckets implements RBuckets { } RedisCommand> command = new RedisCommand>("MGET", new MapGetAllDecoder(Arrays.asList(keys), 0)); - return commandExecutor.readAsync(keys[0], new DelegateDecoderCodec(codec), command, keys); + return commandExecutor.readAsync(keys[0], new CompositeCodec(StringCodec.INSTANCE, codec, codec), command, keys); } @Override diff --git a/redisson/src/main/java/org/redisson/client/codec/DelegateDecoderCodec.java b/redisson/src/main/java/org/redisson/client/codec/DelegateDecoderCodec.java deleted file mode 100644 index 7509762c0..000000000 --- a/redisson/src/main/java/org/redisson/client/codec/DelegateDecoderCodec.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Copyright 2018 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.client.codec; - -import org.redisson.client.protocol.Decoder; - -/** - * - * @author Nikita Koksharov - * - */ -public class DelegateDecoderCodec extends StringCodec { - - private final Codec delegate; - - public DelegateDecoderCodec(Codec delegate) { - super(); - this.delegate = delegate; - } - - @Override - public Decoder getValueDecoder() { - return delegate.getValueDecoder(); - } - -}