diff --git a/redisson/pom.xml b/redisson/pom.xml index bbcba5669..845d9e444 100644 --- a/redisson/pom.xml +++ b/redisson/pom.xml @@ -366,7 +366,11 @@ **/org/redisson/client/**/*.java, **/org/redisson/cluster/**/*.java, **/org/redisson/codec/**/*.java, - **/org/redisson/command/**/*.java + **/org/redisson/command/**/*.java, + **/org/redisson/config/**/*.java, + **/org/redisson/connection/**/*.java, + **/org/redisson/eviction/**/*.java, + **/org/redisson/executor/**/*.java, true false diff --git a/redisson/src/main/java/org/redisson/config/BaseMasterSlaveServersConfig.java b/redisson/src/main/java/org/redisson/config/BaseMasterSlaveServersConfig.java index bdf4e474a..4c8368e0a 100644 --- a/redisson/src/main/java/org/redisson/config/BaseMasterSlaveServersConfig.java +++ b/redisson/src/main/java/org/redisson/config/BaseMasterSlaveServersConfig.java @@ -102,7 +102,7 @@ public class BaseMasterSlaveServersConfig @@ -175,7 +175,7 @@ public class Config { public void setReferenceEnabled(boolean redissonReferenceEnabled) { this.referenceEnabled = redissonReferenceEnabled; } - + /** * Init cluster servers configuration * @@ -234,28 +234,27 @@ public class Config { void setReplicatedServersConfig(ReplicatedServersConfig replicatedServersConfig) { this.replicatedServersConfig = replicatedServersConfig; } - + /** - * Returns the connection manager if supplied via - * {@link #useCustomServers(ConnectionManager)} - * - * @return ConnectionManager - */ + * Returns the connection manager if supplied via + * {@link #useCustomServers(ConnectionManager)} + * + * @return ConnectionManager + */ ConnectionManager getConnectionManager() { return connectionManager; } /** - * This is an extension point to supply custom connection manager. - * - * @see ReplicatedConnectionManager on how to implement a connection - * manager. - * @param connectionManager for supply - */ + * This is an extension point to supply custom connection manager. + * + * @see ReplicatedConnectionManager on how to implement a connection + * manager. + * @param connectionManager for supply + */ public void useCustomServers(ConnectionManager connectionManager) { this.connectionManager = connectionManager; } - /** * Init single server configuration. @@ -347,7 +346,7 @@ public class Config { public boolean isClusterConfig() { return clusterServersConfig != null; } - + public boolean isSentinelConfig() { return sentinelServersConfig != null; } @@ -415,10 +414,11 @@ public class Config { this.transportMode = transportMode; return this; } + public TransportMode getTransportMode() { return transportMode; } - + /** * Threads amount shared between all redis clients used by Redisson. *

@@ -433,11 +433,11 @@ public class Config { this.nettyThreads = nettyThreads; return this; } - + public int getNettyThreads() { return nettyThreads; } - + /** * Use external ExecutorService. ExecutorService processes * all listeners of RTopic, @@ -453,7 +453,7 @@ public class Config { this.executor = executor; return this; } - + public ExecutorService getExecutor() { return executor; } @@ -500,6 +500,7 @@ public class Config { this.lockWatchdogTimeout = lockWatchdogTimeout; return this; } + public long getLockWatchdogTimeout() { return lockWatchdogTimeout; } @@ -519,6 +520,7 @@ public class Config { this.keepPubSubOrder = keepPubSubOrder; return this; } + public boolean isKeepPubSubOrder() { return keepPubSubOrder; } @@ -534,6 +536,7 @@ public class Config { this.addressResolverGroupFactory = addressResolverGroupFactory; return this; } + public AddressResolverGroupFactory getAddressResolverGroupFactory() { return addressResolverGroupFactory; } @@ -655,7 +658,7 @@ public class Config { public static Config fromYAML(File file) throws IOException { return fromYAML(file, null); } - + public static Config fromYAML(File file, ClassLoader classLoader) throws IOException { ConfigSupport support = new ConfigSupport(); return support.fromYAML(file, Config.class, classLoader); @@ -713,6 +716,7 @@ public class Config { this.useScriptCache = useScriptCache; return this; } + public boolean isUseScriptCache() { return useScriptCache; } @@ -720,6 +724,7 @@ public class Config { public boolean isDecodeInExecutor() { return decodeInExecutor; } + /** * Defines whether to decode data by codec in executor's threads or netty's threads. * If decoding data process takes long time and netty thread is used then `RedisTimeoutException` could arise time to time. diff --git a/redisson/src/main/java/org/redisson/config/ConfigSupport.java b/redisson/src/main/java/org/redisson/config/ConfigSupport.java index 2ec25fc4f..484fd38a5 100644 --- a/redisson/src/main/java/org/redisson/config/ConfigSupport.java +++ b/redisson/src/main/java/org/redisson/config/ConfigSupport.java @@ -16,7 +16,6 @@ package org.redisson.config; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.io.InputStream; diff --git a/redisson/src/main/java/org/redisson/connection/CRC16.java b/redisson/src/main/java/org/redisson/connection/CRC16.java index a8230c728..7a2e97c6d 100644 --- a/redisson/src/main/java/org/redisson/connection/CRC16.java +++ b/redisson/src/main/java/org/redisson/connection/CRC16.java @@ -18,9 +18,9 @@ package org.redisson.connection; /** * @author Mark Paluch **/ -public class CRC16 { +public final class CRC16 { - private static final int LOOKUP_TABLE[] = { 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, + private static final int[] LOOKUP_TABLE = { 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7, 0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF, 0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6, 0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE, 0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485, 0xA56A, 0xB54B, 0x8528, @@ -50,7 +50,7 @@ public class CRC16 { int crc = 0x0000; for (byte b : bytes) { - crc = ((crc << 8) ^ LOOKUP_TABLE[((crc >>> 8) ^ (b & 0xFF)) & 0xFF]); + crc = (crc << 8) ^ LOOKUP_TABLE[((crc >>> 8) ^ (b & 0xFF)) & 0xFF]; } return crc & 0xFFFF; } diff --git a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java index 251ce607b..ef11e05bc 100644 --- a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java +++ b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java @@ -347,7 +347,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager { } startDNSMonitoring(f.getNow()); - } catch (RuntimeException e) { + } catch (Exception e) { stopThreads(); throw e; } @@ -555,9 +555,9 @@ public class MasterSlaveConnectionManager implements ConnectionManager { return RedissonPromise.newFailedFuture(ex); } // fix for https://github.com/redisson/redisson/issues/1548 - if (source.getRedirect() != null && - !URIBuilder.compare(entry.getClient().getAddr(), source.getAddr()) && - entry.hasSlave(source.getAddr())) { + if (source.getRedirect() != null + && !URIBuilder.compare(entry.getClient().getAddr(), source.getAddr()) + && entry.hasSlave(source.getAddr())) { return entry.redirectedConnectionWriteOp(command, source.getAddr()); } return entry.connectionWriteOp(command); @@ -619,7 +619,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager { @Override public void shutdown() { - shutdown(0, 2, TimeUnit.SECONDS);//default netty value + shutdown(0, 2, TimeUnit.SECONDS); //default netty value } @Override diff --git a/redisson/src/main/java/org/redisson/connection/ReplicatedConnectionManager.java b/redisson/src/main/java/org/redisson/connection/ReplicatedConnectionManager.java index 2b158c46f..c4f116243 100644 --- a/redisson/src/main/java/org/redisson/connection/ReplicatedConnectionManager.java +++ b/redisson/src/main/java/org/redisson/connection/ReplicatedConnectionManager.java @@ -107,7 +107,7 @@ public class ReplicatedConnectionManager extends MasterSlaveConnectionManager { @Override protected MasterSlaveServersConfig create(BaseMasterSlaveServersConfig cfg) { MasterSlaveServersConfig res = super.create(cfg); - res.setDatabase(((ReplicatedServersConfig)cfg).getDatabase()); + res.setDatabase(((ReplicatedServersConfig) cfg).getDatabase()); return res; } diff --git a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java index 179a483e7..860cc968c 100755 --- a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java +++ b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java @@ -529,7 +529,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager { @Override protected MasterSlaveServersConfig create(BaseMasterSlaveServersConfig cfg) { MasterSlaveServersConfig res = super.create(cfg); - res.setDatabase(((SentinelServersConfig)cfg).getDatabase()); + res.setDatabase(((SentinelServersConfig) cfg).getDatabase()); return res; } diff --git a/redisson/src/main/java/org/redisson/connection/balancer/LoadBalancerManager.java b/redisson/src/main/java/org/redisson/connection/balancer/LoadBalancerManager.java index 4853b2d72..e23725a28 100644 --- a/redisson/src/main/java/org/redisson/connection/balancer/LoadBalancerManager.java +++ b/redisson/src/main/java/org/redisson/connection/balancer/LoadBalancerManager.java @@ -156,6 +156,7 @@ public class LoadBalancerManager { return freeze(connectionEntry, freezeReason); } + @SuppressWarnings("BooleanExpressionComplexity") public ClientConnectionsEntry freeze(ClientConnectionsEntry connectionEntry, FreezeReason freezeReason) { if (connectionEntry == null || (connectionEntry.isFailed() && connectionEntry.getFreezeReason() == FreezeReason.RECONNECT @@ -169,8 +170,7 @@ public class LoadBalancerManager { || connectionEntry.getFreezeReason() == FreezeReason.RECONNECT || (freezeReason == FreezeReason.MANAGER && connectionEntry.getFreezeReason() != FreezeReason.MANAGER - && connectionEntry.getNodeType() == NodeType.SLAVE - )) { + && connectionEntry.getNodeType() == NodeType.SLAVE)) { connectionEntry.setFreezed(true); connectionEntry.setFreezeReason(freezeReason); return connectionEntry; diff --git a/redisson/src/main/java/org/redisson/connection/decoder/MapCacheGetAllDecoder.java b/redisson/src/main/java/org/redisson/connection/decoder/MapCacheGetAllDecoder.java index 6b992154e..c9e3ce128 100644 --- a/redisson/src/main/java/org/redisson/connection/decoder/MapCacheGetAllDecoder.java +++ b/redisson/src/main/java/org/redisson/connection/decoder/MapCacheGetAllDecoder.java @@ -15,18 +15,14 @@ */ package org.redisson.connection.decoder; -import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.redisson.client.codec.LongCodec; import org.redisson.client.handler.State; import org.redisson.client.protocol.Decoder; import org.redisson.client.protocol.decoder.MultiDecoder; -import io.netty.buffer.ByteBuf; - /** * * @author Nikita Koksharov diff --git a/redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java b/redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java index 95da84bb8..ad0ce3aff 100644 --- a/redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java +++ b/redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java @@ -19,7 +19,6 @@ import java.net.InetSocketAddress; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.concurrent.CompletionStage; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; @@ -63,7 +62,7 @@ abstract class ConnectionPool { final MasterSlaveEntry masterSlaveEntry; - public ConnectionPool(MasterSlaveServersConfig config, ConnectionManager connectionManager, MasterSlaveEntry masterSlaveEntry) { + ConnectionPool(MasterSlaveServersConfig config, ConnectionManager connectionManager, MasterSlaveEntry masterSlaveEntry) { this.config = config; this.masterSlaveEntry = masterSlaveEntry; this.connectionManager = connectionManager; @@ -189,8 +188,8 @@ abstract class ConnectionPool { List entriesCopy = new LinkedList(entries); for (Iterator iterator = entriesCopy.iterator(); iterator.hasNext();) { ClientConnectionsEntry entry = iterator.next(); - if (!((!entry.isFreezed() || entry.isMasterForRead()) && - tryAcquireConnection(entry))) { + if (!((!entry.isFreezed() || entry.isMasterForRead()) + && tryAcquireConnection(entry))) { iterator.remove(); } } @@ -225,7 +224,7 @@ abstract class ConnectionPool { return acquireConnection(command, entry); } - public static abstract class AcquireCallback implements Runnable, BiConsumer { + public abstract static class AcquireCallback implements Runnable, BiConsumer { } diff --git a/redisson/src/main/java/org/redisson/eviction/EvictionTask.java b/redisson/src/main/java/org/redisson/eviction/EvictionTask.java index a632aa3ae..2ff9f4545 100644 --- a/redisson/src/main/java/org/redisson/eviction/EvictionTask.java +++ b/redisson/src/main/java/org/redisson/eviction/EvictionTask.java @@ -70,7 +70,7 @@ abstract class EvictionTask implements Runnable { if (sizeHistory.size() == 2) { if (sizeHistory.peekFirst() > sizeHistory.peekLast() && sizeHistory.peekLast() > size) { - delay = Math.min(maxDelay, (int)(delay*1.5)); + delay = Math.min(maxDelay, (int) (delay*1.5)); } // if (sizeHistory.peekFirst() < sizeHistory.peekLast() @@ -84,7 +84,7 @@ abstract class EvictionTask implements Runnable { delay = Math.max(minDelay, delay/4); } if (size == 0) { - delay = Math.min(maxDelay, (int)(delay*1.5)); + delay = Math.min(maxDelay, (int) (delay*1.5)); } } diff --git a/redisson/src/main/java/org/redisson/executor/CronExpression.java b/redisson/src/main/java/org/redisson/executor/CronExpression.java index 1393bec20..c2a026b0b 100644 --- a/redisson/src/main/java/org/redisson/executor/CronExpression.java +++ b/redisson/src/main/java/org/redisson/executor/CronExpression.java @@ -50,6 +50,9 @@ import java.util.TreeSet; * @author Contributions from Mads Henderson * @author Refactoring from CronTrigger to CronExpression by Aaron Craven */ +@SuppressWarnings({"EmptyStatement", "InnerAssignment", "ConstantName", + "BooleanExpressionComplexity", "NestedIfDepth", "ParenPad", + "MethodLength", "WhitespaceAfter", "SuperClone", "UnnecessaryParentheses"}) public final class CronExpression implements Serializable, Cloneable { private static final long serialVersionUID = 12423409423L; @@ -1499,6 +1502,7 @@ public final class CronExpression implements Serializable, Cloneable { } } +@SuppressWarnings("VisibilityModifier") class ValueSet { public int value; diff --git a/redisson/src/main/java/org/redisson/executor/TasksBatchService.java b/redisson/src/main/java/org/redisson/executor/TasksBatchService.java index 83e95b183..0b0bc889f 100644 --- a/redisson/src/main/java/org/redisson/executor/TasksBatchService.java +++ b/redisson/src/main/java/org/redisson/executor/TasksBatchService.java @@ -50,7 +50,7 @@ public class TasksBatchService extends TasksService { } public RFuture> executeAddAsync() { - return (RFuture>)(Object)batchCommandService.executeAsync(); + return (RFuture>) (Object) batchCommandService.executeAsync(); } diff --git a/redisson/src/main/java/org/redisson/executor/TasksRunnerService.java b/redisson/src/main/java/org/redisson/executor/TasksRunnerService.java index b1d4e1874..8d008c458 100644 --- a/redisson/src/main/java/org/redisson/executor/TasksRunnerService.java +++ b/redisson/src/main/java/org/redisson/executor/TasksRunnerService.java @@ -64,7 +64,7 @@ import io.netty.util.TimerTask; */ public class TasksRunnerService implements RemoteExecutorService { - private static final Map codecs = new LRUCacheMap(500, 0, 0); + private static final Map CODECS = new LRUCacheMap(500, 0, 0); private final Codec codec; private final String name; @@ -125,7 +125,7 @@ public class TasksRunnerService implements RemoteExecutorService { RFuture future = asyncScheduledServiceAtFixed(params.getExecutorId(), params.getRequestId()).scheduleAtFixedRate(params); try { executeRunnable(params); - } catch (RuntimeException e) { + } catch (Exception e) { // cancel task if it throws an exception future.cancel(true); throw e; @@ -145,7 +145,7 @@ public class TasksRunnerService implements RemoteExecutorService { } try { executeRunnable(params, nextStartDate == null); - } catch (RuntimeException e) { + } catch (Exception e) { // cancel task if it throws an exception if (future != null) { future.cancel(true); @@ -216,7 +216,7 @@ public class TasksRunnerService implements RemoteExecutorService { } protected void scheduleRetryTimeRenewal(final String requestId) { - ((Redisson)redisson).getConnectionManager().newTimeout(new TimerTask() { + ((Redisson) redisson).getConnectionManager().newTimeout(new TimerTask() { @Override public void run(Timeout timeout) throws Exception { renewRetryTime(requestId); @@ -263,13 +263,13 @@ public class TasksRunnerService implements RemoteExecutorService { ByteBuf stateBuf = Unpooled.wrappedBuffer(params.getState()); try { HashValue hash = new HashValue(Hash.hash128(classBodyBuf)); - Codec classLoaderCodec = codecs.get(hash); + Codec classLoaderCodec = CODECS.get(hash); if (classLoaderCodec == null) { RedissonClassLoader cl = new RedissonClassLoader(codec.getClassLoader()); cl.loadClass(params.getClassName(), params.getClassBody()); classLoaderCodec = this.codec.getClass().getConstructor(ClassLoader.class).newInstance(cl); - codecs.put(hash, classLoaderCodec); + CODECS.put(hash, classLoaderCodec); } T task;