refactoring

redisson · Dec 20, 2018 · 97e582a · 97e582a
1 parent cd4326d
commit 97e582a
Show file tree

Hide file tree

Showing 21 changed files with 87 additions and 56 deletions.
diff --git 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<Double> getAndAddAsync(final double delta) {
-        return commandExecutor.writeAsync(getName(), StringCodec.INSTANCE, new RedisStrictCommand<Double>("INCRBYFLOAT", new SingleConvertor<Double>() {
+        return commandExecutor.writeAsync(getName(), StringCodec.INSTANCE, new RedisStrictCommand<Double>("INCRBYFLOAT", new Convertor<Double>() {
             @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
@@ -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<Long> getAndAddAsync(final long delta) {
-        return commandExecutor.writeAsync(getName(), StringCodec.INSTANCE, new RedisStrictCommand<Long>("INCRBY", new SingleConvertor<Long>() {
+        return commandExecutor.writeAsync(getName(), StringCodec.INSTANCE, new RedisStrictCommand<Long>("INCRBY", new Convertor<Long>() {
             @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
@@ -15,7 +15,12 @@
  */
 package org.redisson.client.protocol.convertor;
 
-public class BitsSizeReplayConvertor extends SingleConvertor<Long> {
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+public class BitsSizeReplayConvertor implements Convertor<Long> {
 
     @Override
     public Long convert(Object obj) {

diff --git a/...on/src/main/java/org/redisson/client/protocol/convertor/BooleanAmountReplayConvertor.java b/...on/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<Boolean> {
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+public class BooleanAmountReplayConvertor implements Convertor<Boolean> {
 
     @Override
     public Boolean convert(Object obj) {

diff --git a/...n/src/main/java/org/redisson/client/protocol/convertor/BooleanNotNullReplayConvertor.java b/...n/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<Boolean> {
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+public class BooleanNotNullReplayConvertor implements Convertor<Boolean> {
 
     @Override
     public Boolean convert(Object obj) {

diff --git a/...sson/src/main/java/org/redisson/client/protocol/convertor/BooleanNullReplayConvertor.java b/...sson/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<Boolean> {
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+public class BooleanNullReplayConvertor implements Convertor<Boolean> {
 
     @Override
     public Boolean convert(Object obj) {

diff --git a/.../src/main/java/org/redisson/client/protocol/convertor/BooleanNullSafeReplayConvertor.java b/.../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<Boolean> {
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+public class BooleanNullSafeReplayConvertor implements Convertor<Boolean> {
 
     @Override
     public Boolean convert(Object obj) {

diff --git a/...on/src/main/java/org/redisson/client/protocol/convertor/BooleanNumberReplayConvertor.java b/...on/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<Boolean> {
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+public class BooleanNumberReplayConvertor implements Convertor<Boolean> {
 
     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
@@ -20,7 +20,7 @@
  * @author Nikita Koksharov
  *
  */
-public class BooleanReplayConvertor extends SingleConvertor<Boolean> {
+public class BooleanReplayConvertor implements Convertor<Boolean> {
 
     @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
@@ -23,8 +23,6 @@
  */
 public interface Convertor<R> {
 
-    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
@@ -15,7 +15,12 @@
  */
 package org.redisson.client.protocol.convertor;
 
-public class DoubleReplayConvertor extends SingleConvertor<Double> {
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+public class DoubleReplayConvertor implements Convertor<Double> {
 
     @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
@@ -15,7 +15,13 @@
  */
 package org.redisson.client.protocol.convertor;
 
-public class EmptyConvertor<R> extends SingleConvertor<R> {
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ * @param <R>
+ */
+public class EmptyConvertor<R> implements Convertor<R> {
 
     @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
@@ -20,7 +20,7 @@
  * @author Nikita Koksharov
  *
  */
-public class IntegerReplayConvertor extends SingleConvertor<Integer> {
+public class IntegerReplayConvertor implements Convertor<Integer> {
 
     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
@@ -15,7 +15,12 @@
  */
 package org.redisson.client.protocol.convertor;
 
-public class LongReplayConvertor extends SingleConvertor<Long> {
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+public class LongReplayConvertor implements Convertor<Long> {
 
     @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
@@ -17,7 +17,12 @@
 
 import java.math.BigDecimal;
 
-public class NumberConvertor extends SingleConvertor<Object> {
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+public class NumberConvertor implements Convertor<Object> {
 
     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
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
@@ -22,7 +22,7 @@
  * @author Nikita Koksharov
  *
  */
-public class StreamIdConvertor extends SingleConvertor<StreamMessageId> {
+public class StreamIdConvertor implements Convertor<StreamMessageId> {
 
     @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
@@ -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<List<String>> {
+public class StringToListConvertor implements Convertor<List<String>> {
 
     @Override
     public List<String> 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
@@ -15,7 +15,12 @@
  */
 package org.redisson.client.protocol.convertor;
 
-public class TrueReplayConvertor extends SingleConvertor<Boolean> {
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+public class TrueReplayConvertor implements Convertor<Boolean> {
 
     @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
@@ -17,7 +17,12 @@
 
 import org.redisson.api.RType;
 
-public class TypeConvertor extends SingleConvertor<RType> {
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+public class TypeConvertor implements Convertor<RType> {
 
     @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
@@ -15,7 +15,12 @@
  */
 package org.redisson.client.protocol.convertor;
 
-public class VoidReplayConvertor extends SingleConvertor<Void> {
+/**
+ * 
+ * @author Nikita Koksharov
+ *
+ */
+public class VoidReplayConvertor implements Convertor<Void> {
 
     @Override
     public Void convert(Object obj) {