diff --git a/redisson/src/main/java/org/redisson/RedissonAtomicDouble.java b/redisson/src/main/java/org/redisson/RedissonAtomicDouble.java index aa18211ee7f..6031c02a203 100644 --- a/redisson/src/main/java/org/redisson/RedissonAtomicDouble.java +++ b/redisson/src/main/java/org/redisson/RedissonAtomicDouble.java @@ -24,7 +24,7 @@ import org.redisson.client.codec.StringCodec; import org.redisson.client.protocol.RedisCommands; import org.redisson.client.protocol.RedisStrictCommand; -import org.redisson.client.protocol.convertor.SingleConvertor; +import org.redisson.client.protocol.convertor.Convertor; import org.redisson.command.CommandAsyncExecutor; /** @@ -110,7 +110,7 @@ public double getAndAdd(double delta) { @Override public RFuture getAndAddAsync(final double delta) { - return commandExecutor.writeAsync(getName(), StringCodec.INSTANCE, new RedisStrictCommand("INCRBYFLOAT", new SingleConvertor() { + return commandExecutor.writeAsync(getName(), StringCodec.INSTANCE, new RedisStrictCommand("INCRBYFLOAT", new Convertor() { @Override public Double convert(Object obj) { return Double.valueOf(obj.toString()) - delta; diff --git a/redisson/src/main/java/org/redisson/RedissonAtomicLong.java b/redisson/src/main/java/org/redisson/RedissonAtomicLong.java index bea90ab65fc..7c96e0dc4ab 100644 --- a/redisson/src/main/java/org/redisson/RedissonAtomicLong.java +++ b/redisson/src/main/java/org/redisson/RedissonAtomicLong.java @@ -23,7 +23,7 @@ import org.redisson.client.codec.StringCodec; import org.redisson.client.protocol.RedisCommands; import org.redisson.client.protocol.RedisStrictCommand; -import org.redisson.client.protocol.convertor.SingleConvertor; +import org.redisson.client.protocol.convertor.Convertor; import org.redisson.command.CommandAsyncExecutor; /** @@ -108,7 +108,7 @@ public long getAndAdd(long delta) { @Override public RFuture getAndAddAsync(final long delta) { - return commandExecutor.writeAsync(getName(), StringCodec.INSTANCE, new RedisStrictCommand("INCRBY", new SingleConvertor() { + return commandExecutor.writeAsync(getName(), StringCodec.INSTANCE, new RedisStrictCommand("INCRBY", new Convertor() { @Override public Long convert(Object obj) { return ((Long) obj) - delta; diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/BitsSizeReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/BitsSizeReplayConvertor.java index 23b1a368f4e..9841b1dcbc7 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/BitsSizeReplayConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/BitsSizeReplayConvertor.java @@ -15,7 +15,12 @@ */ package org.redisson.client.protocol.convertor; -public class BitsSizeReplayConvertor extends SingleConvertor { +/** + * + * @author Nikita Koksharov + * + */ +public class BitsSizeReplayConvertor implements Convertor { @Override public Long convert(Object obj) { diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanAmountReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanAmountReplayConvertor.java index ec031a4bf39..cff93124ae1 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanAmountReplayConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanAmountReplayConvertor.java @@ -15,7 +15,12 @@ */ package org.redisson.client.protocol.convertor; -public class BooleanAmountReplayConvertor extends SingleConvertor { +/** + * + * @author Nikita Koksharov + * + */ +public class BooleanAmountReplayConvertor implements Convertor { @Override public Boolean convert(Object obj) { diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNotNullReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNotNullReplayConvertor.java index c48bbe01e77..0a4af12eef5 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNotNullReplayConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNotNullReplayConvertor.java @@ -15,7 +15,12 @@ */ package org.redisson.client.protocol.convertor; -public class BooleanNotNullReplayConvertor extends SingleConvertor { +/** + * + * @author Nikita Koksharov + * + */ +public class BooleanNotNullReplayConvertor implements Convertor { @Override public Boolean convert(Object obj) { diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNullReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNullReplayConvertor.java index d98597d8719..f6c68e0dece 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNullReplayConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNullReplayConvertor.java @@ -15,7 +15,12 @@ */ package org.redisson.client.protocol.convertor; -public class BooleanNullReplayConvertor extends SingleConvertor { +/** + * + * @author Nikita Koksharov + * + */ +public class BooleanNullReplayConvertor implements Convertor { @Override public Boolean convert(Object obj) { diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNullSafeReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNullSafeReplayConvertor.java index 57349e1ceb0..f8cacaaac01 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNullSafeReplayConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNullSafeReplayConvertor.java @@ -15,7 +15,12 @@ */ package org.redisson.client.protocol.convertor; -public class BooleanNullSafeReplayConvertor extends SingleConvertor { +/** + * + * @author Nikita Koksharov + * + */ +public class BooleanNullSafeReplayConvertor implements Convertor { @Override public Boolean convert(Object obj) { diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNumberReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNumberReplayConvertor.java index 3d39cd3c449..42f236739cc 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNumberReplayConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNumberReplayConvertor.java @@ -15,7 +15,12 @@ */ package org.redisson.client.protocol.convertor; -public class BooleanNumberReplayConvertor extends SingleConvertor { +/** + * + * @author Nikita Koksharov + * + */ +public class BooleanNumberReplayConvertor implements Convertor { private long number; diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanReplayConvertor.java index d502e0a392a..9aa2e94156e 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanReplayConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanReplayConvertor.java @@ -20,7 +20,7 @@ * @author Nikita Koksharov * */ -public class BooleanReplayConvertor extends SingleConvertor { +public class BooleanReplayConvertor implements Convertor { @Override public Boolean convert(Object obj) { diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/Convertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/Convertor.java index 0408f1cc8af..eb0e39b6786 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/Convertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/Convertor.java @@ -23,8 +23,6 @@ */ public interface Convertor { - Object convertMulti(Object obj); - R convert(Object obj); } diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/DoubleReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/DoubleReplayConvertor.java index ee069073a05..57aa541e0e3 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/DoubleReplayConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/DoubleReplayConvertor.java @@ -15,7 +15,12 @@ */ package org.redisson.client.protocol.convertor; -public class DoubleReplayConvertor extends SingleConvertor { +/** + * + * @author Nikita Koksharov + * + */ +public class DoubleReplayConvertor implements Convertor { @Override public Double convert(Object obj) { diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/EmptyConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/EmptyConvertor.java index b2c10a5303d..cf152a2e748 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/EmptyConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/EmptyConvertor.java @@ -15,7 +15,13 @@ */ package org.redisson.client.protocol.convertor; -public class EmptyConvertor extends SingleConvertor { +/** + * + * @author Nikita Koksharov + * + * @param + */ +public class EmptyConvertor implements Convertor { @Override public R convert(Object obj) { diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/IntegerReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/IntegerReplayConvertor.java index aba02f0dee4..526b08a7396 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/IntegerReplayConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/IntegerReplayConvertor.java @@ -20,7 +20,7 @@ * @author Nikita Koksharov * */ -public class IntegerReplayConvertor extends SingleConvertor { +public class IntegerReplayConvertor implements Convertor { private Integer nullValue; diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/LongReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/LongReplayConvertor.java index c0f8ba6a0ea..e469771e3b2 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/LongReplayConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/LongReplayConvertor.java @@ -15,7 +15,12 @@ */ package org.redisson.client.protocol.convertor; -public class LongReplayConvertor extends SingleConvertor { +/** + * + * @author Nikita Koksharov + * + */ +public class LongReplayConvertor implements Convertor { @Override public Long convert(Object obj) { diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/NumberConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/NumberConvertor.java index 6a52f1dbac8..7a27ef7eeba 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/NumberConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/NumberConvertor.java @@ -17,7 +17,12 @@ import java.math.BigDecimal; -public class NumberConvertor extends SingleConvertor { +/** + * + * @author Nikita Koksharov + * + */ +public class NumberConvertor implements Convertor { private Class resultClass; diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/SingleConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/SingleConvertor.java deleted file mode 100644 index 3d175a043de..00000000000 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/SingleConvertor.java +++ /dev/null @@ -1,31 +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.protocol.convertor; - -/** - * - * @author Nikita Koksharov - * - * @param type - */ -public abstract class SingleConvertor implements Convertor { - - @Override - public Object convertMulti(Object obj) { - return obj; - } - -} diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/StreamIdConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/StreamIdConvertor.java index e37a1485a4a..c6f764c57f7 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/StreamIdConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/StreamIdConvertor.java @@ -22,7 +22,7 @@ * @author Nikita Koksharov * */ -public class StreamIdConvertor extends SingleConvertor { +public class StreamIdConvertor implements Convertor { @Override public StreamMessageId convert(Object id) { diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/StringToListConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/StringToListConvertor.java index d6e23db914d..fe2eda49727 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/StringToListConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/StringToListConvertor.java @@ -18,14 +18,12 @@ import java.util.ArrayList; import java.util.List; -import org.redisson.client.protocol.convertor.SingleConvertor; - /** * * @author Nikita Koksharov * */ -public class StringToListConvertor extends SingleConvertor> { +public class StringToListConvertor implements Convertor> { @Override public List convert(Object obj) { diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/TrueReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/TrueReplayConvertor.java index 761a5026dbe..c638c319cd4 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/TrueReplayConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/TrueReplayConvertor.java @@ -15,7 +15,12 @@ */ package org.redisson.client.protocol.convertor; -public class TrueReplayConvertor extends SingleConvertor { +/** + * + * @author Nikita Koksharov + * + */ +public class TrueReplayConvertor implements Convertor { @Override public Boolean convert(Object obj) { diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/TypeConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/TypeConvertor.java index 4a7bb70184b..b94565b26f9 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/TypeConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/TypeConvertor.java @@ -17,7 +17,12 @@ import org.redisson.api.RType; -public class TypeConvertor extends SingleConvertor { +/** + * + * @author Nikita Koksharov + * + */ +public class TypeConvertor implements Convertor { @Override public RType convert(Object obj) { diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/VoidReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/VoidReplayConvertor.java index 646f3d08d22..46d14832f6e 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/VoidReplayConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/VoidReplayConvertor.java @@ -15,7 +15,12 @@ */ package org.redisson.client.protocol.convertor; -public class VoidReplayConvertor extends SingleConvertor { +/** + * + * @author Nikita Koksharov + * + */ +public class VoidReplayConvertor implements Convertor { @Override public Void convert(Object obj) {