github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Code formatted according to checkstyle rules

Browse Source
pull/1923/head
Nikita Koksharov 6 years ago
parent 7126b0bef0
commit a5862933dc
15 changed files with 76 additions and 69 deletions
Show Stats Download Patch File Download Diff File

6
redisson/pom.xml
Unescape Escape View File

@ -366,7 +366,11 @@
**/org/redisson/client/**/*.java, **/org/redisson/client/**/*.java,
**/org/redisson/cluster/**/*.java, **/org/redisson/cluster/**/*.java,
**/org/redisson/codec/**/*.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,
</includes> </includes>
<consoleOutput>true</consoleOutput> <consoleOutput>true</consoleOutput>
<enableRSS>false</enableRSS> <enableRSS>false</enableRSS>

8
redisson/src/main/java/org/redisson/config/BaseMasterSlaveServersConfig.java
Unescape Escape View File

@ -102,7 +102,7 @@ public class BaseMasterSlaveServersConfig<T extends BaseMasterSlaveServersConfig
*/ */
public T setSlaveConnectionPoolSize(int slaveConnectionPoolSize) { public T setSlaveConnectionPoolSize(int slaveConnectionPoolSize) {
this.slaveConnectionPoolSize = slaveConnectionPoolSize; this.slaveConnectionPoolSize = slaveConnectionPoolSize;
return (T)this; return (T) this;
} }
public int getSlaveConnectionPoolSize() { public int getSlaveConnectionPoolSize() {
return slaveConnectionPoolSize; return slaveConnectionPoolSize;
@ -162,7 +162,7 @@ public class BaseMasterSlaveServersConfig<T extends BaseMasterSlaveServersConfig
*/ */
public T setMasterConnectionPoolSize(int masterConnectionPoolSize) { public T setMasterConnectionPoolSize(int masterConnectionPoolSize) {
this.masterConnectionPoolSize = masterConnectionPoolSize; this.masterConnectionPoolSize = masterConnectionPoolSize;
return (T)this; return (T) this;
} }
public int getMasterConnectionPoolSize() { public int getMasterConnectionPoolSize() {
return masterConnectionPoolSize; return masterConnectionPoolSize;
@ -181,7 +181,7 @@ public class BaseMasterSlaveServersConfig<T extends BaseMasterSlaveServersConfig
*/ */
public T setLoadBalancer(LoadBalancer loadBalancer) { public T setLoadBalancer(LoadBalancer loadBalancer) {
this.loadBalancer = loadBalancer; this.loadBalancer = loadBalancer;
return (T)this; return (T) this;
} }
public LoadBalancer getLoadBalancer() { public LoadBalancer getLoadBalancer() {
return loadBalancer; return loadBalancer;
@ -214,7 +214,7 @@ public class BaseMasterSlaveServersConfig<T extends BaseMasterSlaveServersConfig
*/ */
public T setSubscriptionConnectionPoolSize(int subscriptionConnectionPoolSize) { public T setSubscriptionConnectionPoolSize(int subscriptionConnectionPoolSize) {
this.subscriptionConnectionPoolSize = subscriptionConnectionPoolSize; this.subscriptionConnectionPoolSize = subscriptionConnectionPoolSize;
return (T)this; return (T) this;
} }
public int getSubscriptionConnectionPoolSize() { public int getSubscriptionConnectionPoolSize() {
return subscriptionConnectionPoolSize; return subscriptionConnectionPoolSize;

33
redisson/src/main/java/org/redisson/config/Config.java
Unescape Escape View File

@ -50,7 +50,7 @@ public class Config {
private ReplicatedServersConfig replicatedServersConfig; private ReplicatedServersConfig replicatedServersConfig;
private ConnectionManager connectionManager; private ConnectionManager connectionManager;
/** /**
* Threads amount shared between all redis node clients * Threads amount shared between all redis node clients
@ -132,7 +132,7 @@ public class Config {
setReplicatedServersConfig(new ReplicatedServersConfig(oldConf.getReplicatedServersConfig())); setReplicatedServersConfig(new ReplicatedServersConfig(oldConf.getReplicatedServersConfig()));
} }
if (oldConf.getConnectionManager() != null) { if (oldConf.getConnectionManager() != null) {
useCustomServers(oldConf.getConnectionManager()); useCustomServers(oldConf.getConnectionManager());
} }
} }
@ -236,27 +236,26 @@ public class Config {
} }
/** /**
* Returns the connection manager if supplied via * Returns the connection manager if supplied via
* {@link #useCustomServers(ConnectionManager)} * {@link #useCustomServers(ConnectionManager)}
* *
* @return ConnectionManager * @return ConnectionManager
*/ */
ConnectionManager getConnectionManager() { ConnectionManager getConnectionManager() {
return connectionManager; return connectionManager;
} }
/** /**
* This is an extension point to supply custom connection manager. * This is an extension point to supply custom connection manager.
* *
* @see ReplicatedConnectionManager on how to implement a connection * @see ReplicatedConnectionManager on how to implement a connection
* manager. * manager.
* @param connectionManager for supply * @param connectionManager for supply
*/ */
public void useCustomServers(ConnectionManager connectionManager) { public void useCustomServers(ConnectionManager connectionManager) {
this.connectionManager = connectionManager; this.connectionManager = connectionManager;
} }
/** /**
* Init single server configuration. * Init single server configuration.
* *
@ -415,6 +414,7 @@ public class Config {
this.transportMode = transportMode; this.transportMode = transportMode;
return this; return this;
} }
public TransportMode getTransportMode() { public TransportMode getTransportMode() {
return transportMode; return transportMode;
} }
@ -500,6 +500,7 @@ public class Config {
this.lockWatchdogTimeout = lockWatchdogTimeout; this.lockWatchdogTimeout = lockWatchdogTimeout;
return this; return this;
} }
public long getLockWatchdogTimeout() { public long getLockWatchdogTimeout() {
return lockWatchdogTimeout; return lockWatchdogTimeout;
} }
@ -519,6 +520,7 @@ public class Config {
this.keepPubSubOrder = keepPubSubOrder; this.keepPubSubOrder = keepPubSubOrder;
return this; return this;
} }
public boolean isKeepPubSubOrder() { public boolean isKeepPubSubOrder() {
return keepPubSubOrder; return keepPubSubOrder;
} }
@ -534,6 +536,7 @@ public class Config {
this.addressResolverGroupFactory = addressResolverGroupFactory; this.addressResolverGroupFactory = addressResolverGroupFactory;
return this; return this;
} }
public AddressResolverGroupFactory getAddressResolverGroupFactory() { public AddressResolverGroupFactory getAddressResolverGroupFactory() {
return addressResolverGroupFactory; return addressResolverGroupFactory;
} }
@ -713,6 +716,7 @@ public class Config {
this.useScriptCache = useScriptCache; this.useScriptCache = useScriptCache;
return this; return this;
} }
public boolean isUseScriptCache() { public boolean isUseScriptCache() {
return useScriptCache; return useScriptCache;
} }
@ -720,6 +724,7 @@ public class Config {
public boolean isDecodeInExecutor() { public boolean isDecodeInExecutor() {
return decodeInExecutor; return decodeInExecutor;
} }
/** /**
* Defines whether to decode data by <code>codec</code> in executor's threads or netty's threads. * Defines whether to decode data by <code>codec</code> 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. * If decoding data process takes long time and netty thread is used then `RedisTimeoutException` could arise time to time.

1
redisson/src/main/java/org/redisson/config/ConfigSupport.java
Unescape Escape View File

@ -16,7 +16,6 @@
package org.redisson.config; package org.redisson.config;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

6
redisson/src/main/java/org/redisson/connection/CRC16.java
Unescape Escape View File

@ -18,9 +18,9 @@ package org.redisson.connection;
/** /**
* @author <a href="mailto:mpaluch@paluch.biz">Mark Paluch</a> * @author <a href="mailto:mpaluch@paluch.biz">Mark Paluch</a>
**/ **/
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, 0x70E7, 0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF, 0x1231, 0x0210, 0x3273,
0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6, 0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6, 0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF,
0xE3DE, 0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485, 0xA56A, 0xB54B, 0x8528, 0xE3DE, 0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485, 0xA56A, 0xB54B, 0x8528,
@ -50,7 +50,7 @@ public class CRC16 {
int crc = 0x0000; int crc = 0x0000;
for (byte b : bytes) { 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; return crc & 0xFFFF;
} }

10
redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
Unescape Escape View File

@ -347,7 +347,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
} }
startDNSMonitoring(f.getNow()); startDNSMonitoring(f.getNow());
} catch (RuntimeException e) { } catch (Exception e) {
stopThreads(); stopThreads();
throw e; throw e;
} }
@ -555,9 +555,9 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
return RedissonPromise.newFailedFuture(ex); return RedissonPromise.newFailedFuture(ex);
} }
// fix for https://github.com/redisson/redisson/issues/1548 // fix for https://github.com/redisson/redisson/issues/1548
if (source.getRedirect() != null && if (source.getRedirect() != null
!URIBuilder.compare(entry.getClient().getAddr(), source.getAddr()) && && !URIBuilder.compare(entry.getClient().getAddr(), source.getAddr())
entry.hasSlave(source.getAddr())) { && entry.hasSlave(source.getAddr())) {
return entry.redirectedConnectionWriteOp(command, source.getAddr()); return entry.redirectedConnectionWriteOp(command, source.getAddr());
} }
return entry.connectionWriteOp(command); return entry.connectionWriteOp(command);
@ -619,7 +619,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
@Override @Override
public void shutdown() { public void shutdown() {
shutdown(0, 2, TimeUnit.SECONDS);//default netty value shutdown(0, 2, TimeUnit.SECONDS); //default netty value
} }
@Override @Override

2
redisson/src/main/java/org/redisson/connection/ReplicatedConnectionManager.java
Unescape Escape View File

@ -107,7 +107,7 @@ public class ReplicatedConnectionManager extends MasterSlaveConnectionManager {
@Override @Override
protected MasterSlaveServersConfig create(BaseMasterSlaveServersConfig<?> cfg) { protected MasterSlaveServersConfig create(BaseMasterSlaveServersConfig<?> cfg) {
MasterSlaveServersConfig res = super.create(cfg); MasterSlaveServersConfig res = super.create(cfg);
res.setDatabase(((ReplicatedServersConfig)cfg).getDatabase()); res.setDatabase(((ReplicatedServersConfig) cfg).getDatabase());
return res; return res;
} }

2
redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
Unescape Escape View File

@ -529,7 +529,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
@Override @Override
protected MasterSlaveServersConfig create(BaseMasterSlaveServersConfig<?> cfg) { protected MasterSlaveServersConfig create(BaseMasterSlaveServersConfig<?> cfg) {
MasterSlaveServersConfig res = super.create(cfg); MasterSlaveServersConfig res = super.create(cfg);
res.setDatabase(((SentinelServersConfig)cfg).getDatabase()); res.setDatabase(((SentinelServersConfig) cfg).getDatabase());
return res; return res;
} }

4
redisson/src/main/java/org/redisson/connection/balancer/LoadBalancerManager.java
Unescape Escape View File

@ -156,6 +156,7 @@ public class LoadBalancerManager {
return freeze(connectionEntry, freezeReason); return freeze(connectionEntry, freezeReason);
} }
@SuppressWarnings("BooleanExpressionComplexity")
public ClientConnectionsEntry freeze(ClientConnectionsEntry connectionEntry, FreezeReason freezeReason) { public ClientConnectionsEntry freeze(ClientConnectionsEntry connectionEntry, FreezeReason freezeReason) {
if (connectionEntry == null || (connectionEntry.isFailed() if (connectionEntry == null || (connectionEntry.isFailed()
&& connectionEntry.getFreezeReason() == FreezeReason.RECONNECT && connectionEntry.getFreezeReason() == FreezeReason.RECONNECT
@ -169,8 +170,7 @@ public class LoadBalancerManager {
|| connectionEntry.getFreezeReason() == FreezeReason.RECONNECT || connectionEntry.getFreezeReason() == FreezeReason.RECONNECT
|| (freezeReason == FreezeReason.MANAGER || (freezeReason == FreezeReason.MANAGER
&& connectionEntry.getFreezeReason() != FreezeReason.MANAGER && connectionEntry.getFreezeReason() != FreezeReason.MANAGER
&& connectionEntry.getNodeType() == NodeType.SLAVE && connectionEntry.getNodeType() == NodeType.SLAVE)) {
)) {
connectionEntry.setFreezed(true); connectionEntry.setFreezed(true);
connectionEntry.setFreezeReason(freezeReason); connectionEntry.setFreezeReason(freezeReason);
return connectionEntry; return connectionEntry;

4
redisson/src/main/java/org/redisson/connection/decoder/MapCacheGetAllDecoder.java
Unescape Escape View File

@ -15,18 +15,14 @@
*/ */
package org.redisson.connection.decoder; package org.redisson.connection.decoder;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.redisson.client.codec.LongCodec;
import org.redisson.client.handler.State; import org.redisson.client.handler.State;
import org.redisson.client.protocol.Decoder; import org.redisson.client.protocol.Decoder;
import org.redisson.client.protocol.decoder.MultiDecoder; import org.redisson.client.protocol.decoder.MultiDecoder;
import io.netty.buffer.ByteBuf;
/** /**
* *
* @author Nikita Koksharov * @author Nikita Koksharov

9
redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java
Unescape Escape View File

@ -19,7 +19,6 @@ import java.net.InetSocketAddress;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@ -63,7 +62,7 @@ abstract class ConnectionPool<T extends RedisConnection> {
final MasterSlaveEntry masterSlaveEntry; final MasterSlaveEntry masterSlaveEntry;
public ConnectionPool(MasterSlaveServersConfig config, ConnectionManager connectionManager, MasterSlaveEntry masterSlaveEntry) { ConnectionPool(MasterSlaveServersConfig config, ConnectionManager connectionManager, MasterSlaveEntry masterSlaveEntry) {
this.config = config; this.config = config;
this.masterSlaveEntry = masterSlaveEntry; this.masterSlaveEntry = masterSlaveEntry;
this.connectionManager = connectionManager; this.connectionManager = connectionManager;
@ -189,8 +188,8 @@ abstract class ConnectionPool<T extends RedisConnection> {
List<ClientConnectionsEntry> entriesCopy = new LinkedList<ClientConnectionsEntry>(entries); List<ClientConnectionsEntry> entriesCopy = new LinkedList<ClientConnectionsEntry>(entries);
for (Iterator<ClientConnectionsEntry> iterator = entriesCopy.iterator(); iterator.hasNext();) { for (Iterator<ClientConnectionsEntry> iterator = entriesCopy.iterator(); iterator.hasNext();) {
ClientConnectionsEntry entry = iterator.next(); ClientConnectionsEntry entry = iterator.next();
if (!((!entry.isFreezed() || entry.isMasterForRead()) && if (!((!entry.isFreezed() || entry.isMasterForRead())
tryAcquireConnection(entry))) { && tryAcquireConnection(entry))) {
iterator.remove(); iterator.remove();
} }
} }
@ -225,7 +224,7 @@ abstract class ConnectionPool<T extends RedisConnection> {
return acquireConnection(command, entry); return acquireConnection(command, entry);
} }
public static abstract class AcquireCallback<T> implements Runnable, BiConsumer<T, Throwable> { public abstract static class AcquireCallback<T> implements Runnable, BiConsumer<T, Throwable> {
} }

4
redisson/src/main/java/org/redisson/eviction/EvictionTask.java
Unescape Escape View File

@ -70,7 +70,7 @@ abstract class EvictionTask implements Runnable {
if (sizeHistory.size() == 2) { if (sizeHistory.size() == 2) {
if (sizeHistory.peekFirst() > sizeHistory.peekLast() if (sizeHistory.peekFirst() > sizeHistory.peekLast()
&& sizeHistory.peekLast() > size) { && sizeHistory.peekLast() > size) {
delay = Math.min(maxDelay, (int)(delay*1.5)); delay = Math.min(maxDelay, (int) (delay*1.5));
} }
// if (sizeHistory.peekFirst() < sizeHistory.peekLast() // if (sizeHistory.peekFirst() < sizeHistory.peekLast()
@ -84,7 +84,7 @@ abstract class EvictionTask implements Runnable {
delay = Math.max(minDelay, delay/4); delay = Math.max(minDelay, delay/4);
} }
if (size == 0) { if (size == 0) {
delay = Math.min(maxDelay, (int)(delay*1.5)); delay = Math.min(maxDelay, (int) (delay*1.5));
} }
} }

4
redisson/src/main/java/org/redisson/executor/CronExpression.java
Unescape Escape View File

@ -50,6 +50,9 @@ import java.util.TreeSet;
* @author Contributions from Mads Henderson * @author Contributions from Mads Henderson
* @author Refactoring from CronTrigger to CronExpression by Aaron Craven * @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 { public final class CronExpression implements Serializable, Cloneable {
private static final long serialVersionUID = 12423409423L; private static final long serialVersionUID = 12423409423L;
@ -1499,6 +1502,7 @@ public final class CronExpression implements Serializable, Cloneable {
} }
} }
@SuppressWarnings("VisibilityModifier")
class ValueSet { class ValueSet {
public int value; public int value;

2
redisson/src/main/java/org/redisson/executor/TasksBatchService.java
Unescape Escape View File

@ -50,7 +50,7 @@ public class TasksBatchService extends TasksService {
} }
public RFuture<List<Boolean>> executeAddAsync() { public RFuture<List<Boolean>> executeAddAsync() {
return (RFuture<List<Boolean>>)(Object)batchCommandService.executeAsync(); return (RFuture<List<Boolean>>) (Object) batchCommandService.executeAsync();
} }

12
redisson/src/main/java/org/redisson/executor/TasksRunnerService.java
Unescape Escape View File

@ -64,7 +64,7 @@ import io.netty.util.TimerTask;
*/ */
public class TasksRunnerService implements RemoteExecutorService { public class TasksRunnerService implements RemoteExecutorService {
private static final Map<HashValue, Codec> codecs = new LRUCacheMap<HashValue, Codec>(500, 0, 0); private static final Map<HashValue, Codec> CODECS = new LRUCacheMap<HashValue, Codec>(500, 0, 0);
private final Codec codec; private final Codec codec;
private final String name; private final String name;
@ -125,7 +125,7 @@ public class TasksRunnerService implements RemoteExecutorService {
RFuture<Void> future = asyncScheduledServiceAtFixed(params.getExecutorId(), params.getRequestId()).scheduleAtFixedRate(params); RFuture<Void> future = asyncScheduledServiceAtFixed(params.getExecutorId(), params.getRequestId()).scheduleAtFixedRate(params);
try { try {
executeRunnable(params); executeRunnable(params);
} catch (RuntimeException e) { } catch (Exception e) {
// cancel task if it throws an exception // cancel task if it throws an exception
future.cancel(true); future.cancel(true);
throw e; throw e;
@ -145,7 +145,7 @@ public class TasksRunnerService implements RemoteExecutorService {
} }
try { try {
executeRunnable(params, nextStartDate == null); executeRunnable(params, nextStartDate == null);
} catch (RuntimeException e) { } catch (Exception e) {
// cancel task if it throws an exception // cancel task if it throws an exception
if (future != null) { if (future != null) {
future.cancel(true); future.cancel(true);
@ -216,7 +216,7 @@ public class TasksRunnerService implements RemoteExecutorService {
} }
protected void scheduleRetryTimeRenewal(final String requestId) { protected void scheduleRetryTimeRenewal(final String requestId) {
((Redisson)redisson).getConnectionManager().newTimeout(new TimerTask() { ((Redisson) redisson).getConnectionManager().newTimeout(new TimerTask() {
@Override @Override
public void run(Timeout timeout) throws Exception { public void run(Timeout timeout) throws Exception {
renewRetryTime(requestId); renewRetryTime(requestId);
@ -263,13 +263,13 @@ public class TasksRunnerService implements RemoteExecutorService {
ByteBuf stateBuf = Unpooled.wrappedBuffer(params.getState()); ByteBuf stateBuf = Unpooled.wrappedBuffer(params.getState());
try { try {
HashValue hash = new HashValue(Hash.hash128(classBodyBuf)); HashValue hash = new HashValue(Hash.hash128(classBodyBuf));
Codec classLoaderCodec = codecs.get(hash); Codec classLoaderCodec = CODECS.get(hash);
if (classLoaderCodec == null) { if (classLoaderCodec == null) {
RedissonClassLoader cl = new RedissonClassLoader(codec.getClassLoader()); RedissonClassLoader cl = new RedissonClassLoader(codec.getClassLoader());
cl.loadClass(params.getClassName(), params.getClassBody()); cl.loadClass(params.getClassName(), params.getClassBody());
classLoaderCodec = this.codec.getClass().getConstructor(ClassLoader.class).newInstance(cl); classLoaderCodec = this.codec.getClass().getConstructor(ClassLoader.class).newInstance(cl);
codecs.put(hash, classLoaderCodec); CODECS.put(hash, classLoaderCodec);
} }
T task; T task;

Write Preview
Loading…
Cancel
Save