diff --git a/redisson/checkstyle.xml b/redisson/checkstyle.xml index 6746db6fc..ba40a4c95 100644 --- a/redisson/checkstyle.xml +++ b/redisson/checkstyle.xml @@ -187,7 +187,58 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/redisson/pom.xml b/redisson/pom.xml index 708b137ca..837a8de8b 100644 --- a/redisson/pom.xml +++ b/redisson/pom.xml @@ -431,7 +431,7 @@ com.puppycrawl.tools checkstyle - [8.18,) + 10.3 diff --git a/redisson/src/main/java/org/redisson/RedissonExecutorService.java b/redisson/src/main/java/org/redisson/RedissonExecutorService.java index 1bf665452..56d1131b2 100644 --- a/redisson/src/main/java/org/redisson/RedissonExecutorService.java +++ b/redisson/src/main/java/org/redisson/RedissonExecutorService.java @@ -339,7 +339,7 @@ public class RedissonExecutorService implements RScheduledExecutorService { } @Override - public void execute(Runnable...tasks) { + public void execute(Runnable... tasks) { if (tasks.length == 0) { throw new NullPointerException("Tasks are not defined"); } @@ -591,7 +591,7 @@ public class RedissonExecutorService implements RScheduledExecutorService { } @Override - public RExecutorBatchFuture submit(Callable...tasks) { + public RExecutorBatchFuture submit(Callable... tasks) { if (tasks.length == 0) { throw new NullPointerException("Tasks are not defined"); } @@ -630,7 +630,7 @@ public class RedissonExecutorService implements RScheduledExecutorService { } @Override - public RExecutorBatchFuture submitAsync(Callable...tasks) { + public RExecutorBatchFuture submitAsync(Callable... tasks) { if (tasks.length == 0) { throw new NullPointerException("Tasks are not defined"); } @@ -713,7 +713,7 @@ public class RedissonExecutorService implements RScheduledExecutorService { } @Override - public RExecutorBatchFuture submit(Runnable...tasks) { + public RExecutorBatchFuture submit(Runnable... tasks) { if (tasks.length == 0) { throw new NullPointerException("Tasks are not defined"); } @@ -740,7 +740,7 @@ public class RedissonExecutorService implements RScheduledExecutorService { } @Override - public RExecutorBatchFuture submitAsync(Runnable...tasks) { + public RExecutorBatchFuture submitAsync(Runnable... tasks) { if (tasks.length == 0) { throw new NullPointerException("Tasks are not defined"); } diff --git a/redisson/src/main/java/org/redisson/RedissonList.java b/redisson/src/main/java/org/redisson/RedissonList.java index 4764df783..044f48aed 100644 --- a/redisson/src/main/java/org/redisson/RedissonList.java +++ b/redisson/src/main/java/org/redisson/RedissonList.java @@ -300,7 +300,7 @@ public class RedissonList extends RedissonExpirable implements RList { return commandExecutor.readAsync(getRawName(), codec, LINDEX, getRawName(), index); } - public List get(int...indexes) { + public List get(int... indexes) { return get(getAsync(indexes)); } @@ -352,7 +352,7 @@ public class RedissonList extends RedissonExpirable implements RList { Arrays.asList(getRawName(), iteratorName), count); } - public RFuture> getAsync(int...indexes) { + public RFuture> getAsync(int... indexes) { List params = new ArrayList(); for (Integer index : indexes) { params.add(index); @@ -918,7 +918,7 @@ public class RedissonList extends RedissonExpirable implements RList { return addListener("__keyevent@*:linsert", (ListInsertListener) listener, ListInsertListener::onListInsert); } return super.addListener(listener); - }; + } @Override public RFuture addListenerAsync(ObjectListener listener) { diff --git a/redisson/src/main/java/org/redisson/RedissonListMultimapValues.java b/redisson/src/main/java/org/redisson/RedissonListMultimapValues.java index 86f2f2461..edfea8e7f 100644 --- a/redisson/src/main/java/org/redisson/RedissonListMultimapValues.java +++ b/redisson/src/main/java/org/redisson/RedissonListMultimapValues.java @@ -349,7 +349,7 @@ public class RedissonListMultimapValues extends RedissonExpirable implements } @Override - public List get(int...indexes) { + public List get(int... indexes) { return get(getAsync(indexes)); } @@ -412,7 +412,7 @@ public class RedissonListMultimapValues extends RedissonExpirable implements } @Override - public RFuture> getAsync(int...indexes) { + public RFuture> getAsync(int... indexes) { List params = new ArrayList(); params.add(System.currentTimeMillis()); params.add(encodeMapKey(key)); diff --git a/redisson/src/main/java/org/redisson/RedissonObject.java b/redisson/src/main/java/org/redisson/RedissonObject.java index 99dd89a37..77f64ac26 100644 --- a/redisson/src/main/java/org/redisson/RedissonObject.java +++ b/redisson/src/main/java/org/redisson/RedissonObject.java @@ -403,7 +403,7 @@ public abstract class RedissonObject implements RObject { return addListener("__keyevent@*:del", (DeletedObjectListener) listener, DeletedObjectListener::onDeleted); } throw new IllegalArgumentException(); - }; + } @Override public RFuture addListenerAsync(ObjectListener listener) { diff --git a/redisson/src/main/java/org/redisson/RedissonPatternTopic.java b/redisson/src/main/java/org/redisson/RedissonPatternTopic.java index 058272b93..4fff86bb3 100644 --- a/redisson/src/main/java/org/redisson/RedissonPatternTopic.java +++ b/redisson/src/main/java/org/redisson/RedissonPatternTopic.java @@ -65,7 +65,7 @@ public class RedissonPatternTopic implements RPatternTopic { @Override public int addListener(PatternStatusListener listener) { return addListener(new PubSubPatternStatusListener(listener, name)); - }; + } @Override public int addListener(Class type, PatternMessageListener listener) { diff --git a/redisson/src/main/java/org/redisson/RedissonPriorityQueue.java b/redisson/src/main/java/org/redisson/RedissonPriorityQueue.java index bccc03fd3..60763726e 100644 --- a/redisson/src/main/java/org/redisson/RedissonPriorityQueue.java +++ b/redisson/src/main/java/org/redisson/RedissonPriorityQueue.java @@ -272,7 +272,7 @@ public class RedissonPriorityQueue extends RedissonList implements RPriori return wrapLockedAsync(() -> { return commandExecutor.writeAsync(getRawName(), codec, command, params); }); - }; + } protected final RFuture wrapLockedAsync(Supplier> callable) { long threadId = Thread.currentThread().getId(); diff --git a/redisson/src/main/java/org/redisson/RedissonScoredSortedSet.java b/redisson/src/main/java/org/redisson/RedissonScoredSortedSet.java index 8eaf83f84..80a5a55fd 100644 --- a/redisson/src/main/java/org/redisson/RedissonScoredSortedSet.java +++ b/redisson/src/main/java/org/redisson/RedissonScoredSortedSet.java @@ -1829,7 +1829,7 @@ public class RedissonScoredSortedSet extends RedissonExpirable implements RSc return addListener("__keyevent@*:zadd", (ScoredSortedSetAddListener) listener, ScoredSortedSetAddListener::onAdd); } return super.addListener(listener); - }; + } @Override public RFuture addListenerAsync(ObjectListener listener) { diff --git a/redisson/src/main/java/org/redisson/RedissonTopic.java b/redisson/src/main/java/org/redisson/RedissonTopic.java index de4cb16ea..090147431 100644 --- a/redisson/src/main/java/org/redisson/RedissonTopic.java +++ b/redisson/src/main/java/org/redisson/RedissonTopic.java @@ -102,7 +102,7 @@ public class RedissonTopic implements RTopic { public int addListener(StatusListener listener) { RFuture future = addListenerAsync(listener); return commandExecutor.get(future.toCompletableFuture()); - }; + } @Override public int addListener(Class type, MessageListener listener) { diff --git a/redisson/src/main/java/org/redisson/api/RExecutorService.java b/redisson/src/main/java/org/redisson/api/RExecutorService.java index a48fdad90..9f2a209e3 100644 --- a/redisson/src/main/java/org/redisson/api/RExecutorService.java +++ b/redisson/src/main/java/org/redisson/api/RExecutorService.java @@ -69,7 +69,7 @@ public interface RExecutorService extends ExecutorService, RExecutorServiceAsync * @param tasks - tasks to execute * @return Future object */ - RExecutorBatchFuture submit(Callable...tasks); + RExecutorBatchFuture submit(Callable... tasks); /** * Synchronously submits a Runnable task for execution asynchronously @@ -116,7 +116,7 @@ public interface RExecutorService extends ExecutorService, RExecutorServiceAsync * @param tasks - tasks to execute * @return Future object */ - RExecutorBatchFuture submit(Runnable...tasks); + RExecutorBatchFuture submit(Runnable... tasks); /** * Returns executor name @@ -200,6 +200,6 @@ public interface RExecutorService extends ExecutorService, RExecutorServiceAsync * * @param tasks - tasks to execute */ - void execute(Runnable...tasks); + void execute(Runnable... tasks); } diff --git a/redisson/src/main/java/org/redisson/api/RExecutorServiceAsync.java b/redisson/src/main/java/org/redisson/api/RExecutorServiceAsync.java index 05fbbac61..aa59cd483 100644 --- a/redisson/src/main/java/org/redisson/api/RExecutorServiceAsync.java +++ b/redisson/src/main/java/org/redisson/api/RExecutorServiceAsync.java @@ -98,7 +98,7 @@ public interface RExecutorServiceAsync { * @param tasks - tasks to execute * @return Future object */ - RExecutorBatchFuture submitAsync(Callable...tasks); + RExecutorBatchFuture submitAsync(Callable... tasks); /** * Submits task for execution asynchronously @@ -128,6 +128,6 @@ public interface RExecutorServiceAsync { * @param tasks - tasks to execute * @return Future object */ - RExecutorBatchFuture submitAsync(Runnable...tasks); + RExecutorBatchFuture submitAsync(Runnable... tasks); } diff --git a/redisson/src/main/java/org/redisson/api/RList.java b/redisson/src/main/java/org/redisson/api/RList.java index 68d29eb53..db92c2038 100644 --- a/redisson/src/main/java/org/redisson/api/RList.java +++ b/redisson/src/main/java/org/redisson/api/RList.java @@ -36,7 +36,7 @@ public interface RList extends List, RExpirable, RListAsync, RSortable< * @param indexes of elements * @return list of elements */ - List get(int...indexes); + List get(int... indexes); /** * Returns element iterator that can be shared across multiple applications. diff --git a/redisson/src/main/java/org/redisson/api/RListAsync.java b/redisson/src/main/java/org/redisson/api/RListAsync.java index 57795fdde..b913b87a2 100644 --- a/redisson/src/main/java/org/redisson/api/RListAsync.java +++ b/redisson/src/main/java/org/redisson/api/RListAsync.java @@ -34,7 +34,7 @@ public interface RListAsync extends RCollectionAsync, RSortableAsync> getAsync(int...indexes); + RFuture> getAsync(int... indexes); /** * Inserts element after elementToFind diff --git a/redisson/src/main/java/org/redisson/api/RListReactive.java b/redisson/src/main/java/org/redisson/api/RListReactive.java index 43c32bea8..9c63924c4 100644 --- a/redisson/src/main/java/org/redisson/api/RListReactive.java +++ b/redisson/src/main/java/org/redisson/api/RListReactive.java @@ -37,7 +37,7 @@ public interface RListReactive extends RCollectionReactive, RSortableReact * @param indexes of elements * @return elements */ - Mono> get(int...indexes); + Mono> get(int... indexes); /** * Add element after elementToFind diff --git a/redisson/src/main/java/org/redisson/api/RListRx.java b/redisson/src/main/java/org/redisson/api/RListRx.java index 6034d27a8..658a2ff05 100644 --- a/redisson/src/main/java/org/redisson/api/RListRx.java +++ b/redisson/src/main/java/org/redisson/api/RListRx.java @@ -39,7 +39,7 @@ public interface RListRx extends RCollectionRx, RSortableRx> { * @param indexes of elements * @return elements */ - Single> get(int...indexes); + Single> get(int... indexes); /** * Add element after elementToFind diff --git a/redisson/src/main/java/org/redisson/client/handler/RedisChannelInitializer.java b/redisson/src/main/java/org/redisson/client/handler/RedisChannelInitializer.java index 21bd8495b..3c2786836 100644 --- a/redisson/src/main/java/org/redisson/client/handler/RedisChannelInitializer.java +++ b/redisson/src/main/java/org/redisson/client/handler/RedisChannelInitializer.java @@ -190,7 +190,7 @@ public class RedisChannelInitializer extends ChannelInitializer { @Override public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception { - if (!sslInitDone && (evt instanceof SslHandshakeCompletionEvent)) { + if (!sslInitDone && evt instanceof SslHandshakeCompletionEvent) { SslHandshakeCompletionEvent e = (SslHandshakeCompletionEvent) evt; if (e.isSuccess()) { sslInitDone = true; diff --git a/redisson/src/main/java/org/redisson/codec/JsonJacksonCodec.java b/redisson/src/main/java/org/redisson/codec/JsonJacksonCodec.java index 123cd9557..e9584103f 100755 --- a/redisson/src/main/java/org/redisson/codec/JsonJacksonCodec.java +++ b/redisson/src/main/java/org/redisson/codec/JsonJacksonCodec.java @@ -161,7 +161,7 @@ public class JsonJacksonCodec extends BaseCodec { } // fall through case OBJECT_AND_NON_CONCRETE: - return (t.getRawClass() == Object.class) || !t.isConcrete(); + return t.getRawClass() == Object.class || !t.isConcrete(); case NON_FINAL: while (t.isArrayType()) { t = t.getContentType(); diff --git a/redisson/src/main/java/org/redisson/rx/RedissonMapRxIterator.java b/redisson/src/main/java/org/redisson/rx/RedissonMapRxIterator.java index 8a9fec047..28403a52f 100644 --- a/redisson/src/main/java/org/redisson/rx/RedissonMapRxIterator.java +++ b/redisson/src/main/java/org/redisson/rx/RedissonMapRxIterator.java @@ -65,7 +65,7 @@ public class RedissonMapRxIterator { nextValues(); completed = false; } - }; + } protected void nextValues() { map.scanIteratorAsync(map.getRawName(), client, nextIterPos, pattern, count).whenComplete((res, e) -> {