From bd4c70ebd68ce202c9ae5217304dea6282087db4 Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Mon, 18 Feb 2019 13:31:49 +0300 Subject: [PATCH] Code formatted according to checkstyle rules --- redisson/pom.xml | 6 ++ .../java/org/redisson/RedissonFairLock.java | 4 +- .../main/java/org/redisson/RedissonLock.java | 4 +- .../java/org/redisson/RedissonReadLock.java | 4 +- .../java/org/redisson/RedissonWriteLock.java | 4 +- .../redisson/mapreduce/MapReduceExecutor.java | 2 +- .../org/redisson/misc/CompositeIterator.java | 66 +++++++++---------- .../src/main/java/org/redisson/misc/Hash.java | 2 +- .../java/org/redisson/misc/HighwayHash.java | 1 + .../redisson/misc/InfinitySemaphoreLatch.java | 1 + .../java/org/redisson/misc/LogHelper.java | 7 +- .../java/org/redisson/misc/ProxyBuilder.java | 9 +-- .../main/java/org/redisson/misc/RPromise.java | 2 - .../org/redisson/misc/ReclosableLatch.java | 1 + .../org/redisson/misc/RedissonPromise.java | 8 +-- .../org/redisson/pubsub/AsyncSemaphore.java | 3 +- .../java/org/redisson/pubsub/LockPubSub.java | 8 +-- .../pubsub/PubSubConnectionEntry.java | 4 +- .../org/redisson/pubsub/PublishSubscribe.java | 2 +- .../pubsub/PublishSubscribeService.java | 2 +- .../reactive/MapReactiveIterator.java | 4 +- .../reactive/ReactiveProxyBuilder.java | 4 +- .../RedissonBlockingQueueReactive.java | 2 +- .../reactive/RedissonKeysReactive.java | 4 +- .../RedissonLexSortedSetReactive.java | 4 +- .../RedissonListMultimapReactive.java | 14 ++-- .../reactive/RedissonListReactive.java | 2 +- .../reactive/RedissonMapCacheReactive.java | 4 -- .../reactive/RedissonMapReactive.java | 14 ++-- .../RedissonScoredSortedSetReactive.java | 8 +-- .../reactive/RedissonSetCacheReactive.java | 22 ++----- .../reactive/RedissonSetMultimapReactive.java | 2 +- .../reactive/RedissonSetReactive.java | 22 +++---- .../reactive/SetReactiveIterator.java | 2 +- .../org/redisson/remote/RemoteServiceKey.java | 5 +- .../redisson/rx/CommandRxBatchService.java | 1 - .../redisson/rx/RedissonBlockingDequeRx.java | 3 - .../redisson/rx/RedissonBlockingQueueRx.java | 3 - .../java/org/redisson/rx/RedissonKeysRx.java | 5 +- .../redisson/rx/RedissonLexSortedSetRx.java | 6 +- .../redisson/rx/RedissonListMultimapRx.java | 8 ++- .../java/org/redisson/rx/RedissonListRx.java | 2 +- .../java/org/redisson/rx/RedissonMapRx.java | 12 ++-- .../redisson/rx/RedissonMapRxIterator.java | 2 +- .../rx/RedissonScoredSortedSetRx.java | 9 +-- .../org/redisson/rx/RedissonSetCacheRx.java | 14 ++-- .../redisson/rx/RedissonSetMultimapRx.java | 2 +- .../java/org/redisson/rx/RedissonSetRx.java | 16 ++--- .../java/org/redisson/rx/SetRxIterator.java | 2 +- 49 files changed, 158 insertions(+), 180 deletions(-) diff --git a/redisson/pom.xml b/redisson/pom.xml index 9fa90279c..ffe5ac3b5 100644 --- a/redisson/pom.xml +++ b/redisson/pom.xml @@ -373,6 +373,12 @@ **/org/redisson/executor/**/*.java, **/org/redisson/jcache/**/*.java, **/org/redisson/liveobject/**/*.java, + **/org/redisson/mapreduce/**/*.java, + **/org/redisson/misc/**/*.java, + **/org/redisson/pubsub/**/*.java, + **/org/redisson/reactive/**/*.java, + **/org/redisson/remote/**/*.java, + **/org/redisson/rx/**/*.java, true false diff --git a/redisson/src/main/java/org/redisson/RedissonFairLock.java b/redisson/src/main/java/org/redisson/RedissonFairLock.java index e91a5f5b2..6c6994134 100644 --- a/redisson/src/main/java/org/redisson/RedissonFairLock.java +++ b/redisson/src/main/java/org/redisson/RedissonFairLock.java @@ -218,7 +218,7 @@ public class RedissonFairLock extends RedissonLock implements RLock { "end; " + "return 1; ", Arrays.asList(getName(), threadsQueueName, timeoutSetName, getChannelName()), - LockPubSub.unlockMessage, internalLockLeaseTime, getLockName(threadId), System.currentTimeMillis()); + LockPubSub.UNLOCK_MESSAGE, internalLockLeaseTime, getLockName(threadId), System.currentTimeMillis()); } @Override @@ -296,7 +296,7 @@ public class RedissonFairLock extends RedissonLock implements RLock { "end; " + "return 0;", Arrays.asList(getName(), threadsQueueName, timeoutSetName, getChannelName()), - LockPubSub.unlockMessage, System.currentTimeMillis()); + LockPubSub.UNLOCK_MESSAGE, System.currentTimeMillis()); } } diff --git a/redisson/src/main/java/org/redisson/RedissonLock.java b/redisson/src/main/java/org/redisson/RedissonLock.java index 35ef414da..98cda4815 100644 --- a/redisson/src/main/java/org/redisson/RedissonLock.java +++ b/redisson/src/main/java/org/redisson/RedissonLock.java @@ -421,7 +421,7 @@ public class RedissonLock extends RedissonExpirable implements RLock { + "else " + "return 0 " + "end", - Arrays.asList(getName(), getChannelName()), LockPubSub.unlockMessage); + Arrays.asList(getName(), getChannelName()), LockPubSub.UNLOCK_MESSAGE); } @Override @@ -486,7 +486,7 @@ public class RedissonLock extends RedissonExpirable implements RLock { "return 1; "+ "end; " + "return nil;", - Arrays.asList(getName(), getChannelName()), LockPubSub.unlockMessage, internalLockLeaseTime, getLockName(threadId)); + Arrays.asList(getName(), getChannelName()), LockPubSub.UNLOCK_MESSAGE, internalLockLeaseTime, getLockName(threadId)); } diff --git a/redisson/src/main/java/org/redisson/RedissonReadLock.java b/redisson/src/main/java/org/redisson/RedissonReadLock.java index 414a669fe..8524ab809 100644 --- a/redisson/src/main/java/org/redisson/RedissonReadLock.java +++ b/redisson/src/main/java/org/redisson/RedissonReadLock.java @@ -129,7 +129,7 @@ public class RedissonReadLock extends RedissonLock implements RLock { "redis.call('publish', KEYS[2], ARGV[1]); " + "return 1; ", Arrays.asList(getName(), getChannelName(), timeoutPrefix, keyPrefix), - LockPubSub.unlockMessage, getLockName(threadId)); + LockPubSub.UNLOCK_MESSAGE, getLockName(threadId)); } protected String getKeyPrefix(long threadId, String timeoutPrefix) { @@ -180,7 +180,7 @@ public class RedissonReadLock extends RedissonLock implements RLock { "return 1; " + "end; " + "return 0; ", - Arrays.asList(getName(), getChannelName()), LockPubSub.unlockMessage); + Arrays.asList(getName(), getChannelName()), LockPubSub.UNLOCK_MESSAGE); } @Override diff --git a/redisson/src/main/java/org/redisson/RedissonWriteLock.java b/redisson/src/main/java/org/redisson/RedissonWriteLock.java index 31b68c803..8946caf51 100644 --- a/redisson/src/main/java/org/redisson/RedissonWriteLock.java +++ b/redisson/src/main/java/org/redisson/RedissonWriteLock.java @@ -107,7 +107,7 @@ public class RedissonWriteLock extends RedissonLock implements RLock { "end; " + "return nil;", Arrays.asList(getName(), getChannelName()), - LockPubSub.readUnlockMessage, internalLockLeaseTime, getLockName(threadId)); + LockPubSub.READ_UNLOCK_MESSAGE, internalLockLeaseTime, getLockName(threadId)); } @Override @@ -125,7 +125,7 @@ public class RedissonWriteLock extends RedissonLock implements RLock { "return 1; " + "end; " + "return 0; ", - Arrays.asList(getName(), getChannelName()), LockPubSub.readUnlockMessage); + Arrays.asList(getName(), getChannelName()), LockPubSub.READ_UNLOCK_MESSAGE); } @Override diff --git a/redisson/src/main/java/org/redisson/mapreduce/MapReduceExecutor.java b/redisson/src/main/java/org/redisson/mapreduce/MapReduceExecutor.java index 86f77950d..08ba0a24e 100644 --- a/redisson/src/main/java/org/redisson/mapreduce/MapReduceExecutor.java +++ b/redisson/src/main/java/org/redisson/mapreduce/MapReduceExecutor.java @@ -60,7 +60,7 @@ abstract class MapReduceExecutor implements RMapReduceExecut M mapper; long timeout; - public MapReduceExecutor(RObject object, RedissonClient redisson, ConnectionManager connectionManager) { + MapReduceExecutor(RObject object, RedissonClient redisson, ConnectionManager connectionManager) { this.objectName = object.getName(); this.objectCodec = object.getCodec(); this.objectClass = object.getClass(); diff --git a/redisson/src/main/java/org/redisson/misc/CompositeIterator.java b/redisson/src/main/java/org/redisson/misc/CompositeIterator.java index aa26a4313..ee4c38038 100644 --- a/redisson/src/main/java/org/redisson/misc/CompositeIterator.java +++ b/redisson/src/main/java/org/redisson/misc/CompositeIterator.java @@ -23,44 +23,44 @@ import java.util.NoSuchElementException; */ public class CompositeIterator implements Iterator { - private Iterator> listIterator; - private Iterator currentIterator; + private Iterator> listIterator; + private Iterator currentIterator; - public CompositeIterator(Iterator> iterators) { - listIterator = iterators; - } + public CompositeIterator(Iterator> iterators) { + listIterator = iterators; + } - @Override - public boolean hasNext() { - if (currentIterator == null || !currentIterator.hasNext()) { - while (listIterator.hasNext()) { - Iterator iterator = listIterator.next(); - currentIterator = iterator; - if (iterator.hasNext()) { - return true; - } - } - return false; - } + @Override + public boolean hasNext() { + if (currentIterator == null || !currentIterator.hasNext()) { + while (listIterator.hasNext()) { + Iterator iterator = listIterator.next(); + currentIterator = iterator; + if (iterator.hasNext()) { + return true; + } + } + return false; + } - return currentIterator.hasNext(); - } + return currentIterator.hasNext(); + } - @Override - public T next() { - if (!hasNext()) { - throw new NoSuchElementException(); - } + @Override + public T next() { + if (!hasNext()) { + throw new NoSuchElementException(); + } - return currentIterator.next(); - } + return currentIterator.next(); + } - @Override - public void remove() { - if (currentIterator == null) { - throw new IllegalStateException("next() has not yet been called"); - } + @Override + public void remove() { + if (currentIterator == null) { + throw new IllegalStateException("next() has not yet been called"); + } - currentIterator.remove(); - } + currentIterator.remove(); + } } diff --git a/redisson/src/main/java/org/redisson/misc/Hash.java b/redisson/src/main/java/org/redisson/misc/Hash.java index fe62dd6f1..d161861a2 100644 --- a/redisson/src/main/java/org/redisson/misc/Hash.java +++ b/redisson/src/main/java/org/redisson/misc/Hash.java @@ -25,7 +25,7 @@ import io.netty.util.CharsetUtil; * @author Nikita Koksharov * */ -public class Hash { +public final class Hash { private static final long[] KEY = {0x9e3779b97f4a7c15L, 0xf39cc0605cedc834L, 0x1082276bf3a27251L, 0xf86c6a11d0c18e95L}; diff --git a/redisson/src/main/java/org/redisson/misc/HighwayHash.java b/redisson/src/main/java/org/redisson/misc/HighwayHash.java index 11d20a3cb..fbf59beed 100644 --- a/redisson/src/main/java/org/redisson/misc/HighwayHash.java +++ b/redisson/src/main/java/org/redisson/misc/HighwayHash.java @@ -19,6 +19,7 @@ package org.redisson.misc; * HighwayHash algorithm. See * HighwayHash on GitHub */ +@SuppressWarnings({"OperatorWrap", "BooleanExpressionComplexity", "UnnecessaryParentheses", "WhitespaceAfter", "ParameterName", "LocalVariableName"}) public final class HighwayHash { private final long[] v0 = new long[4]; private final long[] v1 = new long[4]; diff --git a/redisson/src/main/java/org/redisson/misc/InfinitySemaphoreLatch.java b/redisson/src/main/java/org/redisson/misc/InfinitySemaphoreLatch.java index e276fa7d1..280396aaf 100644 --- a/redisson/src/main/java/org/redisson/misc/InfinitySemaphoreLatch.java +++ b/redisson/src/main/java/org/redisson/misc/InfinitySemaphoreLatch.java @@ -25,6 +25,7 @@ import java.util.concurrent.locks.AbstractQueuedSynchronizer; * @author Nikita Koksharov */ // TODO refactor to AbstractQueuedLongSynchronizer +@SuppressWarnings({"MultipleVariableDeclarations", "AvoidInlineConditionals", "UpperEll"}) public class InfinitySemaphoreLatch extends AbstractQueuedSynchronizer { private static final long serialVersionUID = 1744280161777661090l; diff --git a/redisson/src/main/java/org/redisson/misc/LogHelper.java b/redisson/src/main/java/org/redisson/misc/LogHelper.java index 2855eb1c9..731cd9fd6 100644 --- a/redisson/src/main/java/org/redisson/misc/LogHelper.java +++ b/redisson/src/main/java/org/redisson/misc/LogHelper.java @@ -22,16 +22,15 @@ import org.redisson.client.protocol.CommandData; import org.redisson.client.protocol.RedisCommands; import io.netty.buffer.ByteBuf; -import io.netty.util.CharsetUtil; /** * @author Philipp Marx */ -public class LogHelper { +public final class LogHelper { private static final int MAX_COLLECTION_LOG_SIZE = Integer.valueOf(System.getProperty("redisson.maxCollectionLogSize", "10")); private static final int MAX_STRING_LOG_SIZE = Integer.valueOf(System.getProperty("redisson.maxStringLogSize", "100")); - private static final int MAX_BYTEBUF_LOG_SIZE = Integer.valueOf(System.getProperty("redisson.maxByteBufLogSize", "1000")); +// private static final int MAX_BYTEBUF_LOG_SIZE = Integer.valueOf(System.getProperty("redisson.maxByteBufLogSize", "1000")); private LogHelper() { } @@ -46,7 +45,7 @@ public class LogHelper { } else if (object instanceof Collection) { return toCollectionString((Collection) object); } else if (object instanceof CommandData) { - CommandData cd = (CommandData)object; + CommandData cd = (CommandData) object; if (RedisCommands.AUTH.equals(cd.getCommand())) { return cd.getCommand() + ", params: (password masked)"; } diff --git a/redisson/src/main/java/org/redisson/misc/ProxyBuilder.java b/redisson/src/main/java/org/redisson/misc/ProxyBuilder.java index d3c6570ee..b91bd6eeb 100644 --- a/redisson/src/main/java/org/redisson/misc/ProxyBuilder.java +++ b/redisson/src/main/java/org/redisson/misc/ProxyBuilder.java @@ -42,13 +42,14 @@ public class ProxyBuilder { Method method; Class instanceClass; - public CacheKey(Method method, Class instanceClass) { + CacheKey(Method method, Class instanceClass) { super(); this.method = method; this.instanceClass = instanceClass; } @Override + @SuppressWarnings("AvoidInlineConditionals") public int hashCode() { final int prime = 31; int result = 1; @@ -81,14 +82,14 @@ public class ProxyBuilder { } - private static final ConcurrentMap methodsMapping = new ConcurrentHashMap(); + private static final ConcurrentMap METHODS_MAPPING = new ConcurrentHashMap(); public static T create(final Callback commandExecutor, final Object instance, final Object implementation, final Class clazz) { InvocationHandler handler = new InvocationHandler() { @Override public Object invoke(Object proxy, Method method, final Object[] args) throws Throwable { CacheKey key = new CacheKey(method, instance.getClass()); - Method instanceMethod = methodsMapping.get(key); + Method instanceMethod = METHODS_MAPPING.get(key); if (instanceMethod == null) { if (implementation != null) { try { @@ -108,7 +109,7 @@ public class ProxyBuilder { } } - methodsMapping.put(key, instanceMethod); + METHODS_MAPPING.put(key, instanceMethod); } final Method mm = instanceMethod; if (instanceMethod.getName().endsWith("Async")) { diff --git a/redisson/src/main/java/org/redisson/misc/RPromise.java b/redisson/src/main/java/org/redisson/misc/RPromise.java index 2daad06ba..f3d4a4aba 100644 --- a/redisson/src/main/java/org/redisson/misc/RPromise.java +++ b/redisson/src/main/java/org/redisson/misc/RPromise.java @@ -15,8 +15,6 @@ */ package org.redisson.misc; -import java.util.function.BiConsumer; - import org.redisson.api.RFuture; /** diff --git a/redisson/src/main/java/org/redisson/misc/ReclosableLatch.java b/redisson/src/main/java/org/redisson/misc/ReclosableLatch.java index 38199aae7..756579fbe 100644 --- a/redisson/src/main/java/org/redisson/misc/ReclosableLatch.java +++ b/redisson/src/main/java/org/redisson/misc/ReclosableLatch.java @@ -27,6 +27,7 @@ import java.util.concurrent.locks.AbstractQueuedSynchronizer; * @author Manik Surtani (manik@jboss.org) * @since 4.0 */ +@SuppressWarnings({"MultipleVariableDeclarations", "AvoidInlineConditionals", "UpperEll"}) public class ReclosableLatch extends AbstractQueuedSynchronizer { private static final long serialVersionUID = 1744280161777661090l; diff --git a/redisson/src/main/java/org/redisson/misc/RedissonPromise.java b/redisson/src/main/java/org/redisson/misc/RedissonPromise.java index 75e51a0fc..9ea104505 100644 --- a/redisson/src/main/java/org/redisson/misc/RedissonPromise.java +++ b/redisson/src/main/java/org/redisson/misc/RedissonPromise.java @@ -34,12 +34,12 @@ import io.netty.util.concurrent.Promise; */ public class RedissonPromise extends CompletableFuture implements RPromise { - private static final Field listenersField; + private static final Field LISTENERS_FIELD; static { try { - listenersField = DefaultPromise.class.getDeclaredField("listeners"); - listenersField.setAccessible(true); + LISTENERS_FIELD = DefaultPromise.class.getDeclaredField("listeners"); + LISTENERS_FIELD.setAccessible(true); } catch (Exception e) { throw new IllegalStateException(e); } @@ -165,7 +165,7 @@ public class RedissonPromise extends CompletableFuture implements RPromise @Override public boolean hasListeners() { try { - return listenersField.get(promise) != null || getNumberOfDependents() > 0; + return LISTENERS_FIELD.get(promise) != null || getNumberOfDependents() > 0; } catch (Exception e) { throw new IllegalStateException(e); } diff --git a/redisson/src/main/java/org/redisson/pubsub/AsyncSemaphore.java b/redisson/src/main/java/org/redisson/pubsub/AsyncSemaphore.java index 1a497e24b..66a0ef559 100644 --- a/redisson/src/main/java/org/redisson/pubsub/AsyncSemaphore.java +++ b/redisson/src/main/java/org/redisson/pubsub/AsyncSemaphore.java @@ -33,7 +33,7 @@ public class AsyncSemaphore { private Runnable runnable; private int permits; - public Entry(Runnable runnable, int permits) { + Entry(Runnable runnable, int permits) { super(); this.runnable = runnable; this.permits = permits; @@ -48,6 +48,7 @@ public class AsyncSemaphore { } @Override + @SuppressWarnings("AvoidInlineConditionals") public int hashCode() { final int prime = 31; int result = 1; diff --git a/redisson/src/main/java/org/redisson/pubsub/LockPubSub.java b/redisson/src/main/java/org/redisson/pubsub/LockPubSub.java index 9b61951d8..1f7ceafcc 100644 --- a/redisson/src/main/java/org/redisson/pubsub/LockPubSub.java +++ b/redisson/src/main/java/org/redisson/pubsub/LockPubSub.java @@ -25,8 +25,8 @@ import org.redisson.misc.RPromise; */ public class LockPubSub extends PublishSubscribe { - public static final Long unlockMessage = 0L; - public static final Long readUnlockMessage = 1L; + public static final Long UNLOCK_MESSAGE = 0L; + public static final Long READ_UNLOCK_MESSAGE = 1L; @Override protected RedissonLockEntry createEntry(RPromise newPromise) { @@ -35,14 +35,14 @@ public class LockPubSub extends PublishSubscribe { @Override protected void onMessage(RedissonLockEntry value, Long message) { - if (message.equals(unlockMessage)) { + if (message.equals(UNLOCK_MESSAGE)) { Runnable runnableToExecute = value.getListeners().poll(); if (runnableToExecute != null) { runnableToExecute.run(); } value.getLatch().release(); - } else if (message.equals(readUnlockMessage)) { + } else if (message.equals(READ_UNLOCK_MESSAGE)) { while (true) { Runnable runnableToExecute = value.getListeners().poll(); if (runnableToExecute == null) { diff --git a/redisson/src/main/java/org/redisson/pubsub/PubSubConnectionEntry.java b/redisson/src/main/java/org/redisson/pubsub/PubSubConnectionEntry.java index 428e10ebd..29f7ae53f 100644 --- a/redisson/src/main/java/org/redisson/pubsub/PubSubConnectionEntry.java +++ b/redisson/src/main/java/org/redisson/pubsub/PubSubConnectionEntry.java @@ -112,13 +112,13 @@ public class PubSubConnectionEntry { Queue> listeners = channelListeners.get(channelName); for (RedisPubSubListener listener : listeners) { if (listener instanceof PubSubMessageListener) { - if (((PubSubMessageListener)listener).getListener() == msgListener) { + if (((PubSubMessageListener) listener).getListener() == msgListener) { removeListener(channelName, listener); return true; } } if (listener instanceof PubSubPatternMessageListener) { - if (((PubSubPatternMessageListener)listener).getListener() == msgListener) { + if (((PubSubPatternMessageListener) listener).getListener() == msgListener) { removeListener(channelName, listener); return true; } diff --git a/redisson/src/main/java/org/redisson/pubsub/PublishSubscribe.java b/redisson/src/main/java/org/redisson/pubsub/PublishSubscribe.java index 5d4b73a08..42244cee7 100644 --- a/redisson/src/main/java/org/redisson/pubsub/PublishSubscribe.java +++ b/redisson/src/main/java/org/redisson/pubsub/PublishSubscribe.java @@ -120,7 +120,7 @@ abstract class PublishSubscribe> { return; } - PublishSubscribe.this.onMessage(value, (Long)message); + PublishSubscribe.this.onMessage(value, (Long) message); } @Override diff --git a/redisson/src/main/java/org/redisson/pubsub/PublishSubscribeService.java b/redisson/src/main/java/org/redisson/pubsub/PublishSubscribeService.java index 7ac80a869..39d33057f 100644 --- a/redisson/src/main/java/org/redisson/pubsub/PublishSubscribeService.java +++ b/redisson/src/main/java/org/redisson/pubsub/PublishSubscribeService.java @@ -245,7 +245,7 @@ public class PublishSubscribeService { RFuture connFuture = nextPubSubConnection(slot); promise.onComplete((res, e) -> { if (e != null) { - ((RPromise)connFuture).tryFailure(e); + ((RPromise) connFuture).tryFailure(e); } }); connFuture.onComplete((conn, e) -> { diff --git a/redisson/src/main/java/org/redisson/reactive/MapReactiveIterator.java b/redisson/src/main/java/org/redisson/reactive/MapReactiveIterator.java index f8401a6c0..8a20c4ea4 100644 --- a/redisson/src/main/java/org/redisson/reactive/MapReactiveIterator.java +++ b/redisson/src/main/java/org/redisson/reactive/MapReactiveIterator.java @@ -115,8 +115,8 @@ public class MapReactiveIterator implements Consumer> { return false; } - M getValue(final Entry entry) { - return (M)new AbstractMap.SimpleEntry((K)entry.getKey(), (V)entry.getValue()) { + M getValue(Entry entry) { + return (M) new AbstractMap.SimpleEntry((K) entry.getKey(), (V) entry.getValue()) { @Override public V setValue(V value) { diff --git a/redisson/src/main/java/org/redisson/reactive/ReactiveProxyBuilder.java b/redisson/src/main/java/org/redisson/reactive/ReactiveProxyBuilder.java index 23d2bdd95..86adbacf5 100644 --- a/redisson/src/main/java/org/redisson/reactive/ReactiveProxyBuilder.java +++ b/redisson/src/main/java/org/redisson/reactive/ReactiveProxyBuilder.java @@ -33,10 +33,10 @@ public class ReactiveProxyBuilder { return create(commandExecutor, instance, null, clazz); } - public static T create(final CommandReactiveExecutor commandExecutor, Object instance, Object implementation, Class clazz) { + public static T create(CommandReactiveExecutor commandExecutor, Object instance, Object implementation, Class clazz) { return ProxyBuilder.create(new Callback() { @Override - public Object execute(final Method mm, final Object instance, final Object[] args) { + public Object execute(Method mm, Object instance, Object[] args) { return commandExecutor.reactive(new Supplier>() { @Override public RFuture get() { diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonBlockingQueueReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonBlockingQueueReactive.java index d220d562c..f6ffc5c81 100644 --- a/redisson/src/main/java/org/redisson/reactive/RedissonBlockingQueueReactive.java +++ b/redisson/src/main/java/org/redisson/reactive/RedissonBlockingQueueReactive.java @@ -34,7 +34,7 @@ public class RedissonBlockingQueueReactive extends RedissonListReactive { private final RBlockingQueue queue; public RedissonBlockingQueueReactive(RBlockingQueue queue) { - super((RListAsync)queue); + super((RListAsync) queue); this.queue = queue; } diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonKeysReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonKeysReactive.java index c6f416c5a..984a213ba 100644 --- a/redisson/src/main/java/org/redisson/reactive/RedissonKeysReactive.java +++ b/redisson/src/main/java/org/redisson/reactive/RedissonKeysReactive.java @@ -86,7 +86,7 @@ public class RedissonKeysReactive { client = res.getRedisClient(); long prevIterPos = nextIterPos; if (nextIterPos == 0 && firstValues == null) { - firstValues = (List)(Object)res.getValues(); + firstValues = (List) (Object) res.getValues(); } else if (res.getValues().equals(firstValues)) { emitter.complete(); currentIndex = 0; @@ -98,7 +98,7 @@ public class RedissonKeysReactive { nextIterPos = -1; } for (Object val : res.getValues()) { - emitter.next((String)val); + emitter.next((String) val); currentIndex--; if (currentIndex == 0) { emitter.complete(); diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonLexSortedSetReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonLexSortedSetReactive.java index 58367e774..8cc1211b4 100644 --- a/redisson/src/main/java/org/redisson/reactive/RedissonLexSortedSetReactive.java +++ b/redisson/src/main/java/org/redisson/reactive/RedissonLexSortedSetReactive.java @@ -42,7 +42,7 @@ public class RedissonLexSortedSetReactive { return new PublisherAdder() { @Override public RFuture add(Object e) { - return instance.addAsync((String)e); + return instance.addAsync((String) e); } }.addAll(c); } @@ -51,7 +51,7 @@ public class RedissonLexSortedSetReactive { return Flux.create(new SetReactiveIterator() { @Override protected RFuture> scanIterator(final RedisClient client, final long nextIterPos) { - return ((RedissonScoredSortedSet)instance).scanIteratorAsync(client, nextIterPos, pattern, count); + return ((RedissonScoredSortedSet) instance).scanIteratorAsync(client, nextIterPos, pattern, count); } }); } diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonListMultimapReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonListMultimapReactive.java index d1037756c..dffbf8fb9 100644 --- a/redisson/src/main/java/org/redisson/reactive/RedissonListMultimapReactive.java +++ b/redisson/src/main/java/org/redisson/reactive/RedissonListMultimapReactive.java @@ -15,10 +15,6 @@ */ package org.redisson.reactive; -import java.util.List; -import java.util.function.Supplier; - -import org.reactivestreams.Publisher; import org.redisson.RedissonListMultimap; import org.redisson.api.RList; import org.redisson.api.RListMultimap; @@ -34,21 +30,23 @@ import org.redisson.client.codec.Codec; */ public class RedissonListMultimapReactive { - private CommandReactiveExecutor commandExecutor; - private RedissonListMultimap instance; + private final CommandReactiveExecutor commandExecutor; + private final RedissonListMultimap instance; public RedissonListMultimapReactive(CommandReactiveExecutor commandExecutor, String name) { this.instance = new RedissonListMultimap(commandExecutor, name); + this.commandExecutor = commandExecutor; } public RedissonListMultimapReactive(Codec codec, CommandReactiveExecutor commandExecutor, String name) { this.instance = new RedissonListMultimap(codec, commandExecutor, name); + this.commandExecutor = commandExecutor; } public RListReactive get(K key) { - RList list = ((RListMultimap)instance).get(key); + RList list = ((RListMultimap) instance).get(key); return ReactiveProxyBuilder.create(commandExecutor, instance, new RedissonListReactive(instance.getCodec(), commandExecutor, list.getName()), RListReactive.class); } - } +} diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonListReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonListReactive.java index cb09dc7e1..2f0f74197 100644 --- a/redisson/src/main/java/org/redisson/reactive/RedissonListReactive.java +++ b/redisson/src/main/java/org/redisson/reactive/RedissonListReactive.java @@ -118,7 +118,7 @@ public class RedissonListReactive { @Override public RFuture add(Object o) { - return instance.addAsync((V)o); + return instance.addAsync((V) o); } }.addAll(c); diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonMapCacheReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonMapCacheReactive.java index bb4155d19..8edc5b933 100644 --- a/redisson/src/main/java/org/redisson/reactive/RedissonMapCacheReactive.java +++ b/redisson/src/main/java/org/redisson/reactive/RedissonMapCacheReactive.java @@ -17,16 +17,12 @@ package org.redisson.reactive; import java.util.Map; import java.util.Map.Entry; -import java.util.function.BiFunction; -import java.util.function.Function; -import java.util.function.Supplier; import org.reactivestreams.Publisher; import org.redisson.RedissonMap; import org.redisson.api.RMapCache; import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; /** * diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonMapReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonMapReactive.java index 36d5453b0..98839b1bc 100644 --- a/redisson/src/main/java/org/redisson/reactive/RedissonMapReactive.java +++ b/redisson/src/main/java/org/redisson/reactive/RedissonMapReactive.java @@ -17,9 +17,6 @@ package org.redisson.reactive; import java.util.Map; import java.util.Map.Entry; -import java.util.function.BiFunction; -import java.util.function.Function; -import java.util.function.Supplier; import org.reactivestreams.Publisher; import org.redisson.RedissonMap; @@ -31,7 +28,6 @@ import org.redisson.api.RSemaphoreReactive; import org.redisson.api.RedissonReactiveClient; import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; /** * Distributed and concurrent implementation of {@link java.util.concurrent.ConcurrentMap} @@ -111,27 +107,27 @@ public class RedissonMapReactive { } public RPermitExpirableSemaphoreReactive getPermitExpirableSemaphore(K key) { - String name = ((RedissonMap)instance).getLockName(key, "permitexpirablesemaphore"); + String name = ((RedissonMap) instance).getLockName(key, "permitexpirablesemaphore"); return redisson.getPermitExpirableSemaphore(name); } public RSemaphoreReactive getSemaphore(K key) { - String name = ((RedissonMap)instance).getLockName(key, "semaphore"); + String name = ((RedissonMap) instance).getLockName(key, "semaphore"); return redisson.getSemaphore(name); } public RLockReactive getFairLock(K key) { - String name = ((RedissonMap)instance).getLockName(key, "fairlock"); + String name = ((RedissonMap) instance).getLockName(key, "fairlock"); return redisson.getFairLock(name); } public RReadWriteLockReactive getReadWriteLock(K key) { - String name = ((RedissonMap)instance).getLockName(key, "rw_lock"); + String name = ((RedissonMap) instance).getLockName(key, "rw_lock"); return redisson.getReadWriteLock(name); } public RLockReactive getLock(K key) { - String name = ((RedissonMap)instance).getLockName(key, "lock"); + String name = ((RedissonMap) instance).getLockName(key, "lock"); return redisson.getLock(name); } diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonScoredSortedSetReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonScoredSortedSetReactive.java index 98ebfc35c..dc5f42718 100644 --- a/redisson/src/main/java/org/redisson/reactive/RedissonScoredSortedSetReactive.java +++ b/redisson/src/main/java/org/redisson/reactive/RedissonScoredSortedSetReactive.java @@ -70,17 +70,17 @@ public class RedissonScoredSortedSetReactive { }); } - private Flux scanIteratorReactive(final String pattern, final int count) { + private Flux scanIteratorReactive(String pattern, int count) { return Flux.create(new SetReactiveIterator() { @Override - protected RFuture> scanIterator(final RedisClient client, final long nextIterPos) { - return ((RedissonScoredSortedSet)instance).scanIteratorAsync(client, nextIterPos, pattern, count); + protected RFuture> scanIterator(RedisClient client, long nextIterPos) { + return ((RedissonScoredSortedSet) instance).scanIteratorAsync(client, nextIterPos, pattern, count); } }); } public String getName() { - return ((RedissonScoredSortedSet)instance).getName(); + return ((RedissonScoredSortedSet) instance).getName(); } public Flux iterator() { diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonSetCacheReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonSetCacheReactive.java index b8bacb4b7..b9cccc646 100644 --- a/redisson/src/main/java/org/redisson/reactive/RedissonSetCacheReactive.java +++ b/redisson/src/main/java/org/redisson/reactive/RedissonSetCacheReactive.java @@ -15,12 +15,6 @@ */ package org.redisson.reactive; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.function.Supplier; - import org.reactivestreams.Publisher; import org.redisson.RedissonSetCache; import org.redisson.ScanIterator; @@ -34,9 +28,7 @@ import org.redisson.api.RedissonReactiveClient; import org.redisson.client.RedisClient; import org.redisson.client.protocol.decoder.ListScanResult; -import io.netty.buffer.ByteBuf; import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; /** * @@ -58,7 +50,7 @@ public class RedissonSetCacheReactive { return Flux.create(new SetReactiveIterator() { @Override protected RFuture> scanIterator(RedisClient client, long nextIterPos) { - return ((ScanIterator)instance).scanIteratorAsync(instance.getName(), client, nextIterPos, null, 10); + return ((ScanIterator) instance).scanIteratorAsync(instance.getName(), client, nextIterPos, null, 10); } }); } @@ -67,33 +59,33 @@ public class RedissonSetCacheReactive { return new PublisherAdder() { @Override public RFuture add(Object o) { - return instance.addAsync((V)o); + return instance.addAsync((V) o); } }.addAll(c); } public RPermitExpirableSemaphoreReactive getPermitExpirableSemaphore(V value) { - String name = ((RedissonSetCache)instance).getLockName(value, "permitexpirablesemaphore"); + String name = ((RedissonSetCache) instance).getLockName(value, "permitexpirablesemaphore"); return redisson.getPermitExpirableSemaphore(name); } public RSemaphoreReactive getSemaphore(V value) { - String name = ((RedissonSetCache)instance).getLockName(value, "semaphore"); + String name = ((RedissonSetCache) instance).getLockName(value, "semaphore"); return redisson.getSemaphore(name); } public RLockReactive getFairLock(V value) { - String name = ((RedissonSetCache)instance).getLockName(value, "fairlock"); + String name = ((RedissonSetCache) instance).getLockName(value, "fairlock"); return redisson.getFairLock(name); } public RReadWriteLockReactive getReadWriteLock(V value) { - String name = ((RedissonSetCache)instance).getLockName(value, "rw_lock"); + String name = ((RedissonSetCache) instance).getLockName(value, "rw_lock"); return redisson.getReadWriteLock(name); } public RLockReactive getLock(V value) { - String name = ((RedissonSetCache)instance).getLockName(value, "lock"); + String name = ((RedissonSetCache) instance).getLockName(value, "lock"); return redisson.getLock(name); } diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonSetMultimapReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonSetMultimapReactive.java index 1f071cba6..807d10b19 100644 --- a/redisson/src/main/java/org/redisson/reactive/RedissonSetMultimapReactive.java +++ b/redisson/src/main/java/org/redisson/reactive/RedissonSetMultimapReactive.java @@ -48,7 +48,7 @@ public class RedissonSetMultimapReactive { } public RSetReactive get(K key) { - RSet set = ((RSetMultimap)instance).get(key); + RSet set = ((RSetMultimap) instance).get(key); return ReactiveProxyBuilder.create(commandExecutor, set, new RedissonSetReactive(set, redisson), RSetReactive.class); } diff --git a/redisson/src/main/java/org/redisson/reactive/RedissonSetReactive.java b/redisson/src/main/java/org/redisson/reactive/RedissonSetReactive.java index 2d91b247f..369280715 100644 --- a/redisson/src/main/java/org/redisson/reactive/RedissonSetReactive.java +++ b/redisson/src/main/java/org/redisson/reactive/RedissonSetReactive.java @@ -15,12 +15,6 @@ */ package org.redisson.reactive; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.function.Supplier; - import org.reactivestreams.Publisher; import org.redisson.RedissonSet; import org.redisson.api.RFuture; @@ -56,7 +50,7 @@ public class RedissonSetReactive { return new PublisherAdder() { @Override public RFuture add(Object e) { - return instance.addAsync((V)e); + return instance.addAsync((V) e); } }.addAll(c); } @@ -69,11 +63,11 @@ public class RedissonSetReactive { return iterator(pattern, 10); } - public Publisher iterator(final String pattern, final int count) { + public Publisher iterator(String pattern, int count) { return Flux.create(new SetReactiveIterator() { @Override protected RFuture> scanIterator(RedisClient client, long nextIterPos) { - return ((RedissonSet)instance).scanIteratorAsync(instance.getName(), client, nextIterPos, pattern, count); + return ((RedissonSet) instance).scanIteratorAsync(instance.getName(), client, nextIterPos, pattern, count); } }); } @@ -83,27 +77,27 @@ public class RedissonSetReactive { } public RPermitExpirableSemaphoreReactive getPermitExpirableSemaphore(V value) { - String name = ((RedissonSet)instance).getLockName(value, "permitexpirablesemaphore"); + String name = ((RedissonSet) instance).getLockName(value, "permitexpirablesemaphore"); return redisson.getPermitExpirableSemaphore(name); } public RSemaphoreReactive getSemaphore(V value) { - String name = ((RedissonSet)instance).getLockName(value, "semaphore"); + String name = ((RedissonSet) instance).getLockName(value, "semaphore"); return redisson.getSemaphore(name); } public RLockReactive getFairLock(V value) { - String name = ((RedissonSet)instance).getLockName(value, "fairlock"); + String name = ((RedissonSet) instance).getLockName(value, "fairlock"); return redisson.getFairLock(name); } public RReadWriteLockReactive getReadWriteLock(V value) { - String name = ((RedissonSet)instance).getLockName(value, "rw_lock"); + String name = ((RedissonSet) instance).getLockName(value, "rw_lock"); return redisson.getReadWriteLock(name); } public RLockReactive getLock(V value) { - String name = ((RedissonSet)instance).getLockName(value, "lock"); + String name = ((RedissonSet) instance).getLockName(value, "lock"); return redisson.getLock(name); } diff --git a/redisson/src/main/java/org/redisson/reactive/SetReactiveIterator.java b/redisson/src/main/java/org/redisson/reactive/SetReactiveIterator.java index 734952ce3..a7c2bd897 100644 --- a/redisson/src/main/java/org/redisson/reactive/SetReactiveIterator.java +++ b/redisson/src/main/java/org/redisson/reactive/SetReactiveIterator.java @@ -71,7 +71,7 @@ public abstract class SetReactiveIterator implements Consumer> { nextIterPos = res.getPos(); for (Object val : res.getValues()) { - emitter.next((V)val); + emitter.next((V) val); elementsRead.incrementAndGet(); } diff --git a/redisson/src/main/java/org/redisson/remote/RemoteServiceKey.java b/redisson/src/main/java/org/redisson/remote/RemoteServiceKey.java index a15e2bd0a..ca1d629bf 100644 --- a/redisson/src/main/java/org/redisson/remote/RemoteServiceKey.java +++ b/redisson/src/main/java/org/redisson/remote/RemoteServiceKey.java @@ -15,8 +15,6 @@ */ package org.redisson.remote; -import java.lang.reflect.Method; -import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -51,6 +49,7 @@ public class RemoteServiceKey { } @Override + @SuppressWarnings("AvoidInlineConditionals") public int hashCode() { final int prime = 31; int result = 1; @@ -76,7 +75,7 @@ public class RemoteServiceKey { return false; } else if (!signatures.equals(other.signatures)) { return false; - } if (serviceInterface == null) { + } else if (serviceInterface == null) { if (other.serviceInterface != null) return false; } else if (!serviceInterface.equals(other.serviceInterface)) diff --git a/redisson/src/main/java/org/redisson/rx/CommandRxBatchService.java b/redisson/src/main/java/org/redisson/rx/CommandRxBatchService.java index 379b72bff..9bc0fd072 100644 --- a/redisson/src/main/java/org/redisson/rx/CommandRxBatchService.java +++ b/redisson/src/main/java/org/redisson/rx/CommandRxBatchService.java @@ -20,7 +20,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentLinkedQueue; import org.reactivestreams.Publisher; -import org.reactivestreams.Subscription; import org.redisson.api.BatchOptions; import org.redisson.api.BatchResult; import org.redisson.api.RFuture; diff --git a/redisson/src/main/java/org/redisson/rx/RedissonBlockingDequeRx.java b/redisson/src/main/java/org/redisson/rx/RedissonBlockingDequeRx.java index 564e67eab..34a461fb1 100644 --- a/redisson/src/main/java/org/redisson/rx/RedissonBlockingDequeRx.java +++ b/redisson/src/main/java/org/redisson/rx/RedissonBlockingDequeRx.java @@ -15,10 +15,7 @@ */ package org.redisson.rx; -import java.util.concurrent.Callable; - import org.redisson.RedissonBlockingDeque; -import org.redisson.api.RFuture; import io.reactivex.Flowable; diff --git a/redisson/src/main/java/org/redisson/rx/RedissonBlockingQueueRx.java b/redisson/src/main/java/org/redisson/rx/RedissonBlockingQueueRx.java index a2e0c4278..c8371ab30 100644 --- a/redisson/src/main/java/org/redisson/rx/RedissonBlockingQueueRx.java +++ b/redisson/src/main/java/org/redisson/rx/RedissonBlockingQueueRx.java @@ -15,10 +15,7 @@ */ package org.redisson.rx; -import java.util.concurrent.Callable; - import org.redisson.api.RBlockingQueueAsync; -import org.redisson.api.RFuture; import org.redisson.api.RListAsync; import io.reactivex.Flowable; diff --git a/redisson/src/main/java/org/redisson/rx/RedissonKeysRx.java b/redisson/src/main/java/org/redisson/rx/RedissonKeysRx.java index b310eea42..2f1c47e6a 100644 --- a/redisson/src/main/java/org/redisson/rx/RedissonKeysRx.java +++ b/redisson/src/main/java/org/redisson/rx/RedissonKeysRx.java @@ -35,7 +35,6 @@ import io.reactivex.processors.ReplayProcessor; public class RedissonKeysRx { private final CommandRxExecutor commandExecutor; - private final RedissonKeys instance; public RedissonKeysRx(CommandRxExecutor commandExecutor) { @@ -81,7 +80,7 @@ public class RedissonKeysRx { client = res.getRedisClient(); long prevIterPos = nextIterPos; if (nextIterPos == 0 && firstValues == null) { - firstValues = (List)(Object)res.getValues(); + firstValues = (List) (Object) res.getValues(); } else if (res.getValues().equals(firstValues)) { p.onComplete(); currentIndex = 0; @@ -93,7 +92,7 @@ public class RedissonKeysRx { nextIterPos = -1; } for (Object val : res.getValues()) { - p.onNext((String)val); + p.onNext((String) val); currentIndex--; if (currentIndex == 0) { p.onComplete(); diff --git a/redisson/src/main/java/org/redisson/rx/RedissonLexSortedSetRx.java b/redisson/src/main/java/org/redisson/rx/RedissonLexSortedSetRx.java index 44c7b9bb6..959f35e5d 100644 --- a/redisson/src/main/java/org/redisson/rx/RedissonLexSortedSetRx.java +++ b/redisson/src/main/java/org/redisson/rx/RedissonLexSortedSetRx.java @@ -41,15 +41,15 @@ public class RedissonLexSortedSetRx { return new PublisherAdder() { @Override public RFuture add(Object e) { - return instance.addAsync((String)e); + return instance.addAsync((String) e); } }.addAll(c); } - private Flowable scanIteratorReactive(final String pattern, final int count) { + private Flowable scanIteratorReactive(String pattern, int count) { return new SetRxIterator() { @Override - protected RFuture> scanIterator(final RedisClient client, final long nextIterPos) { + protected RFuture> scanIterator(RedisClient client, long nextIterPos) { return ((RedissonScoredSortedSet)instance).scanIteratorAsync(client, nextIterPos, pattern, count); } }.create(); diff --git a/redisson/src/main/java/org/redisson/rx/RedissonListMultimapRx.java b/redisson/src/main/java/org/redisson/rx/RedissonListMultimapRx.java index f05765990..64de41794 100644 --- a/redisson/src/main/java/org/redisson/rx/RedissonListMultimapRx.java +++ b/redisson/src/main/java/org/redisson/rx/RedissonListMultimapRx.java @@ -30,19 +30,21 @@ import org.redisson.client.codec.Codec; */ public class RedissonListMultimapRx { - private CommandRxExecutor commandExecutor; - private RedissonListMultimap instance; + private final CommandRxExecutor commandExecutor; + private final RedissonListMultimap instance; public RedissonListMultimapRx(CommandRxExecutor commandExecutor, String name) { this.instance = new RedissonListMultimap(commandExecutor, name); + this.commandExecutor = commandExecutor; } public RedissonListMultimapRx(Codec codec, CommandRxExecutor commandExecutor, String name) { this.instance = new RedissonListMultimap(codec, commandExecutor, name); + this.commandExecutor = commandExecutor; } public RListRx get(K key) { - RedissonList list = (RedissonList) ((RListMultimap)instance).get(key); + RedissonList list = (RedissonList) ((RListMultimap) instance).get(key); return RxProxyBuilder.create(commandExecutor, instance, new RedissonListRx(list), RListRx.class); } diff --git a/redisson/src/main/java/org/redisson/rx/RedissonListRx.java b/redisson/src/main/java/org/redisson/rx/RedissonListRx.java index 962c7f82b..2d11f8de6 100644 --- a/redisson/src/main/java/org/redisson/rx/RedissonListRx.java +++ b/redisson/src/main/java/org/redisson/rx/RedissonListRx.java @@ -98,7 +98,7 @@ public class RedissonListRx { @Override public RFuture add(Object o) { - return instance.addAsync((V)o); + return instance.addAsync((V) o); } }.addAll(c); diff --git a/redisson/src/main/java/org/redisson/rx/RedissonMapRx.java b/redisson/src/main/java/org/redisson/rx/RedissonMapRx.java index cb09c21de..44696c5a1 100644 --- a/redisson/src/main/java/org/redisson/rx/RedissonMapRx.java +++ b/redisson/src/main/java/org/redisson/rx/RedissonMapRx.java @@ -40,7 +40,7 @@ import org.redisson.api.RedissonRxClient; public class RedissonMapRx { private final RedissonMap instance; - private RedissonRxClient redisson; + private final RedissonRxClient redisson; public RedissonMapRx(RMap instance, RedissonRx redisson) { this.instance = (RedissonMap) instance; @@ -106,27 +106,27 @@ public class RedissonMapRx { } public RPermitExpirableSemaphoreRx getPermitExpirableSemaphore(K key) { - String name = ((RedissonMap)instance).getLockName(key, "permitexpirablesemaphore"); + String name = ((RedissonMap) instance).getLockName(key, "permitexpirablesemaphore"); return redisson.getPermitExpirableSemaphore(name); } public RSemaphoreRx getSemaphore(K key) { - String name = ((RedissonMap)instance).getLockName(key, "semaphore"); + String name = ((RedissonMap) instance).getLockName(key, "semaphore"); return redisson.getSemaphore(name); } public RLockRx getFairLock(K key) { - String name = ((RedissonMap)instance).getLockName(key, "fairlock"); + String name = ((RedissonMap) instance).getLockName(key, "fairlock"); return redisson.getFairLock(name); } public RReadWriteLockRx getReadWriteLock(K key) { - String name = ((RedissonMap)instance).getLockName(key, "rw_lock"); + String name = ((RedissonMap) instance).getLockName(key, "rw_lock"); return redisson.getReadWriteLock(name); } public RLockRx getLock(K key) { - String name = ((RedissonMap)instance).getLockName(key, "lock"); + String name = ((RedissonMap) instance).getLockName(key, "lock"); return redisson.getLock(name); } diff --git a/redisson/src/main/java/org/redisson/rx/RedissonMapRxIterator.java b/redisson/src/main/java/org/redisson/rx/RedissonMapRxIterator.java index 1ed29086e..ee73177a0 100644 --- a/redisson/src/main/java/org/redisson/rx/RedissonMapRxIterator.java +++ b/redisson/src/main/java/org/redisson/rx/RedissonMapRxIterator.java @@ -115,7 +115,7 @@ public class RedissonMapRxIterator { } M getValue(Entry entry) { - return (M)new AbstractMap.SimpleEntry((K)entry.getKey(), (V)entry.getValue()) { + return (M) new AbstractMap.SimpleEntry((K) entry.getKey(), (V) entry.getValue()) { @Override public V setValue(V value) { diff --git a/redisson/src/main/java/org/redisson/rx/RedissonScoredSortedSetRx.java b/redisson/src/main/java/org/redisson/rx/RedissonScoredSortedSetRx.java index b40971647..a41afb791 100644 --- a/redisson/src/main/java/org/redisson/rx/RedissonScoredSortedSetRx.java +++ b/redisson/src/main/java/org/redisson/rx/RedissonScoredSortedSetRx.java @@ -17,6 +17,7 @@ package org.redisson.rx; import org.redisson.RedissonScoredSortedSet; import org.redisson.api.RFuture; +import org.redisson.api.RObject; import org.redisson.api.RScoredSortedSetAsync; import org.redisson.client.RedisClient; import org.redisson.client.protocol.decoder.ListScanResult; @@ -37,11 +38,11 @@ public class RedissonScoredSortedSetRx { this.instance = instance; } - private Flowable scanIteratorReactive(final String pattern, final int count) { + private Flowable scanIteratorReactive(String pattern, int count) { return new SetRxIterator() { @Override - protected RFuture> scanIterator(final RedisClient client, final long nextIterPos) { - return ((RedissonScoredSortedSet)instance).scanIteratorAsync(client, nextIterPos, pattern, count); + protected RFuture> scanIterator(RedisClient client, long nextIterPos) { + return ((RedissonScoredSortedSet) instance).scanIteratorAsync(client, nextIterPos, pattern, count); } }.create(); } @@ -59,7 +60,7 @@ public class RedissonScoredSortedSetRx { } public String getName() { - return ((RedissonScoredSortedSet)instance).getName(); + return ((RObject) instance).getName(); } public Flowable iterator() { diff --git a/redisson/src/main/java/org/redisson/rx/RedissonSetCacheRx.java b/redisson/src/main/java/org/redisson/rx/RedissonSetCacheRx.java index 106d8af80..17f6866d5 100644 --- a/redisson/src/main/java/org/redisson/rx/RedissonSetCacheRx.java +++ b/redisson/src/main/java/org/redisson/rx/RedissonSetCacheRx.java @@ -48,7 +48,7 @@ public class RedissonSetCacheRx { return new SetRxIterator() { @Override protected RFuture> scanIterator(RedisClient client, long nextIterPos) { - return ((ScanIterator)instance).scanIteratorAsync(instance.getName(), client, nextIterPos, null, 10); + return ((ScanIterator) instance).scanIteratorAsync(instance.getName(), client, nextIterPos, null, 10); } }.create(); } @@ -57,33 +57,33 @@ public class RedissonSetCacheRx { return new PublisherAdder() { @Override public RFuture add(Object o) { - return instance.addAsync((V)o); + return instance.addAsync((V) o); } }.addAll(c); } public RPermitExpirableSemaphoreRx getPermitExpirableSemaphore(V value) { - String name = ((RedissonSetCache)instance).getLockName(value, "permitexpirablesemaphore"); + String name = ((RedissonSetCache) instance).getLockName(value, "permitexpirablesemaphore"); return redisson.getPermitExpirableSemaphore(name); } public RSemaphoreRx getSemaphore(V value) { - String name = ((RedissonSetCache)instance).getLockName(value, "semaphore"); + String name = ((RedissonSetCache) instance).getLockName(value, "semaphore"); return redisson.getSemaphore(name); } public RLockRx getFairLock(V value) { - String name = ((RedissonSetCache)instance).getLockName(value, "fairlock"); + String name = ((RedissonSetCache) instance).getLockName(value, "fairlock"); return redisson.getFairLock(name); } public RReadWriteLockRx getReadWriteLock(V value) { - String name = ((RedissonSetCache)instance).getLockName(value, "rw_lock"); + String name = ((RedissonSetCache) instance).getLockName(value, "rw_lock"); return redisson.getReadWriteLock(name); } public RLockRx getLock(V value) { - String name = ((RedissonSetCache)instance).getLockName(value, "lock"); + String name = ((RedissonSetCache) instance).getLockName(value, "lock"); return redisson.getLock(name); } diff --git a/redisson/src/main/java/org/redisson/rx/RedissonSetMultimapRx.java b/redisson/src/main/java/org/redisson/rx/RedissonSetMultimapRx.java index 3a140dcfa..7a7346250 100644 --- a/redisson/src/main/java/org/redisson/rx/RedissonSetMultimapRx.java +++ b/redisson/src/main/java/org/redisson/rx/RedissonSetMultimapRx.java @@ -48,7 +48,7 @@ public class RedissonSetMultimapRx { } public RSetRx get(K key) { - RedissonSet set = (RedissonSet) ((RSetMultimap)instance).get(key); + RedissonSet set = (RedissonSet) ((RSetMultimap) instance).get(key); return RxProxyBuilder.create(commandExecutor, set, new RedissonSetRx(set, redisson), RSetRx.class); } diff --git a/redisson/src/main/java/org/redisson/rx/RedissonSetRx.java b/redisson/src/main/java/org/redisson/rx/RedissonSetRx.java index 0725ad8e0..ba509c47a 100644 --- a/redisson/src/main/java/org/redisson/rx/RedissonSetRx.java +++ b/redisson/src/main/java/org/redisson/rx/RedissonSetRx.java @@ -50,7 +50,7 @@ public class RedissonSetRx { return new PublisherAdder() { @Override public RFuture add(Object e) { - return instance.addAsync((V)e); + return instance.addAsync((V) e); } }.addAll(c); } @@ -63,11 +63,11 @@ public class RedissonSetRx { return iterator(pattern, 10); } - public Flowable iterator(final String pattern, final int count) { + public Flowable iterator(String pattern, int count) { return new SetRxIterator() { @Override protected RFuture> scanIterator(RedisClient client, long nextIterPos) { - return ((RedissonSet)instance).scanIteratorAsync(instance.getName(), client, nextIterPos, pattern, count); + return ((RedissonSet) instance).scanIteratorAsync(instance.getName(), client, nextIterPos, pattern, count); } }.create(); } @@ -77,27 +77,27 @@ public class RedissonSetRx { } public RPermitExpirableSemaphoreRx getPermitExpirableSemaphore(V value) { - String name = ((RedissonSet)instance).getLockName(value, "permitexpirablesemaphore"); + String name = ((RedissonSet) instance).getLockName(value, "permitexpirablesemaphore"); return redisson.getPermitExpirableSemaphore(name); } public RSemaphoreRx getSemaphore(V value) { - String name = ((RedissonSet)instance).getLockName(value, "semaphore"); + String name = ((RedissonSet) instance).getLockName(value, "semaphore"); return redisson.getSemaphore(name); } public RLockRx getFairLock(V value) { - String name = ((RedissonSet)instance).getLockName(value, "fairlock"); + String name = ((RedissonSet) instance).getLockName(value, "fairlock"); return redisson.getFairLock(name); } public RReadWriteLockRx getReadWriteLock(V value) { - String name = ((RedissonSet)instance).getLockName(value, "rw_lock"); + String name = ((RedissonSet) instance).getLockName(value, "rw_lock"); return redisson.getReadWriteLock(name); } public RLockRx getLock(V value) { - String name = ((RedissonSet)instance).getLockName(value, "lock"); + String name = ((RedissonSet) instance).getLockName(value, "lock"); return redisson.getLock(name); } diff --git a/redisson/src/main/java/org/redisson/rx/SetRxIterator.java b/redisson/src/main/java/org/redisson/rx/SetRxIterator.java index 8878bc43d..a60bbec06 100644 --- a/redisson/src/main/java/org/redisson/rx/SetRxIterator.java +++ b/redisson/src/main/java/org/redisson/rx/SetRxIterator.java @@ -71,7 +71,7 @@ public abstract class SetRxIterator { nextIterPos = res.getPos(); for (Object val : res.getValues()) { - p.onNext((V)val); + p.onNext((V) val); elementsRead.incrementAndGet(); }