diff --git a/redisson/checkstyle.xml b/redisson/checkstyle.xml index 8eaf697e4..a5b7af0f3 100644 --- a/redisson/checkstyle.xml +++ b/redisson/checkstyle.xml @@ -19,7 +19,7 @@ + "https://checkstyle.org/dtds/configuration_1_3.dtd"> + @@ -170,7 +171,7 @@ - + @@ -187,7 +188,6 @@ - @@ -216,6 +216,7 @@ + diff --git a/redisson/pom.xml b/redisson/pom.xml index 4c7176cdd..1e6eba019 100644 --- a/redisson/pom.xml +++ b/redisson/pom.xml @@ -360,7 +360,7 @@ - **/org/redisson/api/**/*.java,**/org/redisson/cache/**/*.java + **/org/redisson/api/**/*.java,**/org/redisson/cache/**/*.java,**/org/redisson/client/**/*.java true false /checkstyle.xml diff --git a/redisson/src/main/java/org/redisson/client/ChannelName.java b/redisson/src/main/java/org/redisson/client/ChannelName.java index 492b0950b..880944da0 100644 --- a/redisson/src/main/java/org/redisson/client/ChannelName.java +++ b/redisson/src/main/java/org/redisson/client/ChannelName.java @@ -60,7 +60,7 @@ public class ChannelName implements CharSequence { return true; } if (obj instanceof ChannelName) { - return Arrays.equals(name, ((ChannelName)obj).name); + return Arrays.equals(name, ((ChannelName) obj).name); } if (obj instanceof CharSequence) { return toString().equals(obj); diff --git a/redisson/src/main/java/org/redisson/client/RedisClient.java b/redisson/src/main/java/org/redisson/client/RedisClient.java index aa72ad156..71935fe67 100644 --- a/redisson/src/main/java/org/redisson/client/RedisClient.java +++ b/redisson/src/main/java/org/redisson/client/RedisClient.java @@ -58,7 +58,7 @@ import io.netty.util.concurrent.FutureListener; * @author Nikita Koksharov * */ -public class RedisClient { +public final class RedisClient { private final AtomicReference> resolvedAddrFuture = new AtomicReference>(); private final Bootstrap bootstrap; diff --git a/redisson/src/main/java/org/redisson/client/RedisConnection.java b/redisson/src/main/java/org/redisson/client/RedisConnection.java index 8158072ec..4d85bbd0f 100644 --- a/redisson/src/main/java/org/redisson/client/RedisConnection.java +++ b/redisson/src/main/java/org/redisson/client/RedisConnection.java @@ -46,7 +46,7 @@ public class RedisConnection implements RedisCommands { private static final AttributeKey CONNECTION = AttributeKey.valueOf("connection"); - protected final RedisClient redisClient; + final RedisClient redisClient; private volatile RPromise fastReconnect; private volatile boolean closed; @@ -97,10 +97,10 @@ public class RedisConnection implements RedisCommands { return (C) channel.attr(RedisConnection.CONNECTION).get(); } - public CommandData getCurrentCommand() { + public CommandData getCurrentCommand() { QueueCommand command = channel.attr(CommandsQueue.CURRENT_COMMAND).get(); if (command instanceof CommandData) { - return (CommandData)command; + return (CommandData) command; } return null; } @@ -143,7 +143,7 @@ public class RedisConnection implements RedisCommands { try { if (!l.await(redisClient.getCommandTimeout(), TimeUnit.MILLISECONDS)) { - RPromise promise = (RPromise)future; + RPromise promise = (RPromise) future; RedisTimeoutException ex = new RedisTimeoutException("Command execution timeout for " + redisClient.getAddr()); promise.tryFailure(ex); throw ex; diff --git a/redisson/src/main/java/org/redisson/client/RedisPubSubConnection.java b/redisson/src/main/java/org/redisson/client/RedisPubSubConnection.java index 8d4313fb3..7899f2d2b 100644 --- a/redisson/src/main/java/org/redisson/client/RedisPubSubConnection.java +++ b/redisson/src/main/java/org/redisson/client/RedisPubSubConnection.java @@ -99,14 +99,14 @@ public class RedisPubSubConnection extends RedisConnection { async(new PubSubPatternMessageDecoder(codec.getValueDecoder()), RedisCommands.PSUBSCRIBE, channels); } - public void unsubscribe(final ChannelName... channels) { + public void unsubscribe(ChannelName... channels) { synchronized (this) { for (ChannelName ch : channels) { this.channels.remove(ch); unsubscibedChannels.add(ch); } } - ChannelFuture future = async((MultiDecoder)null, RedisCommands.UNSUBSCRIBE, channels); + ChannelFuture future = async((MultiDecoder) null, RedisCommands.UNSUBSCRIBE, channels); future.addListener(new FutureListener() { @Override public void operationComplete(Future future) throws Exception { @@ -145,14 +145,14 @@ public class RedisPubSubConnection extends RedisConnection { } } - public void punsubscribe(final ChannelName... channels) { + public void punsubscribe(ChannelName... channels) { synchronized (this) { for (ChannelName ch : channels) { patternChannels.remove(ch); punsubscibedChannels.add(ch); } } - ChannelFuture future = async((MultiDecoder)null, RedisCommands.PUNSUBSCRIBE, channels); + ChannelFuture future = async((MultiDecoder) null, RedisCommands.PUNSUBSCRIBE, channels); future.addListener(new FutureListener() { @Override public void operationComplete(Future future) throws Exception { diff --git a/redisson/src/main/java/org/redisson/client/codec/BaseCodec.java b/redisson/src/main/java/org/redisson/client/codec/BaseCodec.java index c3e05699d..18c261357 100644 --- a/redisson/src/main/java/org/redisson/client/codec/BaseCodec.java +++ b/redisson/src/main/java/org/redisson/client/codec/BaseCodec.java @@ -15,6 +15,9 @@ */ package org.redisson.client.codec; +import java.util.Arrays; +import java.util.List; + import org.redisson.cache.LocalCachedMessageCodec; import org.redisson.client.protocol.Decoder; import org.redisson.client.protocol.Encoder; @@ -27,16 +30,20 @@ import org.redisson.jcache.JCacheEventCodec; */ public abstract class BaseCodec implements Codec { + private static final List> SKIPPED_CODECS = Arrays.asList(StringCodec.class, + ByteArrayCodec.class, LocalCachedMessageCodec.class, BitSetCodec.class, JCacheEventCodec.class); + public static Codec copy(ClassLoader classLoader, Codec codec) { - if (codec instanceof StringCodec - || codec instanceof ByteArrayCodec - || codec instanceof LocalCachedMessageCodec - || codec instanceof BitSetCodec - || codec instanceof JCacheEventCodec - || codec == null) { + if (codec == null) { return codec; } + for (Class clazz : SKIPPED_CODECS) { + if (clazz.isAssignableFrom(codec.getClass())) { + return codec; + } + } + try { return codec.getClass().getConstructor(ClassLoader.class, codec.getClass()).newInstance(classLoader, codec); } catch (Exception e) { diff --git a/redisson/src/main/java/org/redisson/client/codec/ByteArrayCodec.java b/redisson/src/main/java/org/redisson/client/codec/ByteArrayCodec.java index 0fd796c09..2dd314afc 100644 --- a/redisson/src/main/java/org/redisson/client/codec/ByteArrayCodec.java +++ b/redisson/src/main/java/org/redisson/client/codec/ByteArrayCodec.java @@ -36,7 +36,7 @@ public class ByteArrayCodec extends BaseCodec { private final Encoder encoder = new Encoder() { @Override public ByteBuf encode(Object in) throws IOException { - return Unpooled.wrappedBuffer((byte[])in); + return Unpooled.wrappedBuffer((byte[]) in); } }; diff --git a/redisson/src/main/java/org/redisson/client/codec/DoubleCodec.java b/redisson/src/main/java/org/redisson/client/codec/DoubleCodec.java index 2f90dc370..fa7865852 100644 --- a/redisson/src/main/java/org/redisson/client/codec/DoubleCodec.java +++ b/redisson/src/main/java/org/redisson/client/codec/DoubleCodec.java @@ -31,7 +31,7 @@ public class DoubleCodec extends StringCodec { public static final DoubleCodec INSTANCE = new DoubleCodec(); - public final Decoder decoder = new Decoder() { + private final Decoder decoder = new Decoder() { @Override public Object decode(ByteBuf buf, State state) throws IOException { String str = (String) DoubleCodec.super.getValueDecoder().decode(buf, state); diff --git a/redisson/src/main/java/org/redisson/client/codec/IntegerCodec.java b/redisson/src/main/java/org/redisson/client/codec/IntegerCodec.java index ac4f4cf27..a806e715d 100644 --- a/redisson/src/main/java/org/redisson/client/codec/IntegerCodec.java +++ b/redisson/src/main/java/org/redisson/client/codec/IntegerCodec.java @@ -31,7 +31,7 @@ public class IntegerCodec extends StringCodec { public static final IntegerCodec INSTANCE = new IntegerCodec(); - public final Decoder decoder = new Decoder() { + private final Decoder decoder = new Decoder() { @Override public Object decode(ByteBuf buf, State state) throws IOException { String str = (String) IntegerCodec.super.getValueDecoder().decode(buf, state); diff --git a/redisson/src/main/java/org/redisson/client/codec/JsonJacksonMapCodec.java b/redisson/src/main/java/org/redisson/client/codec/JsonJacksonMapCodec.java index 44ab5c5ba..ad84ae089 100644 --- a/redisson/src/main/java/org/redisson/client/codec/JsonJacksonMapCodec.java +++ b/redisson/src/main/java/org/redisson/client/codec/JsonJacksonMapCodec.java @@ -52,7 +52,7 @@ public class JsonJacksonMapCodec extends JsonJacksonCodec { ByteBuf out = ByteBufAllocator.DEFAULT.buffer(); try { ByteBufOutputStream os = new ByteBufOutputStream(out); - mapObjectMapper.writeValue((OutputStream)os, in); + mapObjectMapper.writeValue((OutputStream) os, in); return os.buffer(); } catch (IOException e) { out.release(); @@ -65,9 +65,9 @@ public class JsonJacksonMapCodec extends JsonJacksonCodec { @Override public Object decode(ByteBuf buf, State state) throws IOException { if (valueClass != null) { - return mapObjectMapper.readValue((InputStream)new ByteBufInputStream(buf), valueClass); + return mapObjectMapper.readValue((InputStream) new ByteBufInputStream(buf), valueClass); } - return mapObjectMapper.readValue((InputStream)new ByteBufInputStream(buf), valueTypeReference); + return mapObjectMapper.readValue((InputStream) new ByteBufInputStream(buf), valueTypeReference); } }; @@ -75,9 +75,9 @@ public class JsonJacksonMapCodec extends JsonJacksonCodec { @Override public Object decode(ByteBuf buf, State state) throws IOException { if (keyClass != null) { - return mapObjectMapper.readValue((InputStream)new ByteBufInputStream(buf), keyClass); + return mapObjectMapper.readValue((InputStream) new ByteBufInputStream(buf), keyClass); } - return mapObjectMapper.readValue((InputStream)new ByteBufInputStream(buf), keyTypeReference); + return mapObjectMapper.readValue((InputStream) new ByteBufInputStream(buf), keyTypeReference); } }; diff --git a/redisson/src/main/java/org/redisson/client/codec/LongCodec.java b/redisson/src/main/java/org/redisson/client/codec/LongCodec.java index 5b7b48b89..c59f8c0bf 100644 --- a/redisson/src/main/java/org/redisson/client/codec/LongCodec.java +++ b/redisson/src/main/java/org/redisson/client/codec/LongCodec.java @@ -31,7 +31,7 @@ public class LongCodec extends StringCodec { public static final LongCodec INSTANCE = new LongCodec(); - public final Decoder decoder = new Decoder() { + private final Decoder decoder = new Decoder() { @Override public Object decode(ByteBuf buf, State state) throws IOException { String str = (String) LongCodec.super.getValueDecoder().decode(buf, state); diff --git a/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java b/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java index e68fee006..873d5b375 100644 --- a/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java +++ b/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java @@ -102,7 +102,7 @@ public class CommandDecoder extends ReplayingDecoder { } - protected final Logger log = LoggerFactory.getLogger(getClass()); + final Logger log = LoggerFactory.getLogger(getClass()); private static final char CR = '\r'; private static final char LF = '\n'; @@ -181,7 +181,7 @@ public class CommandDecoder extends ReplayingDecoder { protected void decodeCommand(Channel channel, ByteBuf in, QueueCommand data) throws Exception { if (data instanceof CommandData) { - CommandData cmd = (CommandData)data; + CommandData cmd = (CommandData) data; try { decode(in, cmd, null, channel, false, null); sendNext(channel, data); @@ -193,7 +193,7 @@ public class CommandDecoder extends ReplayingDecoder { throw e; } } else if (data instanceof CommandsData) { - CommandsData commands = (CommandsData)data; + CommandsData commands = (CommandsData) data; try { decodeCommandBatch(channel, in, data, commands); } catch (Exception e) { @@ -364,7 +364,7 @@ public class CommandDecoder extends ReplayingDecoder { handleResult(data, parts, result, false, channel); } else if (code == '*') { long size = readLong(in); - List respParts = new ArrayList(Math.max((int)size, 0)); + List respParts = new ArrayList(Math.max((int) size, 0)); state.get().incLevel(); diff --git a/redisson/src/main/java/org/redisson/client/handler/CommandEncoder.java b/redisson/src/main/java/org/redisson/client/handler/CommandEncoder.java index f9d6c2b6a..6d2806b4e 100644 --- a/redisson/src/main/java/org/redisson/client/handler/CommandEncoder.java +++ b/redisson/src/main/java/org/redisson/client/handler/CommandEncoder.java @@ -119,13 +119,13 @@ public class CommandEncoder extends MessageToByteEncoder> { private ByteBuf encode(Object in) { if (in instanceof byte[]) { - return Unpooled.wrappedBuffer((byte[])in); + return Unpooled.wrappedBuffer((byte[]) in); } if (in instanceof ByteBuf) { return (ByteBuf) in; } if (in instanceof ChannelName) { - return Unpooled.wrappedBuffer(((ChannelName)in).getName()); + return Unpooled.wrappedBuffer(((ChannelName) in).getName()); } String payload = in.toString(); diff --git a/redisson/src/main/java/org/redisson/client/handler/CommandPubSubDecoder.java b/redisson/src/main/java/org/redisson/client/handler/CommandPubSubDecoder.java index 07b247b8b..95c976ab4 100644 --- a/redisson/src/main/java/org/redisson/client/handler/CommandPubSubDecoder.java +++ b/redisson/src/main/java/org/redisson/client/handler/CommandPubSubDecoder.java @@ -82,7 +82,7 @@ public class CommandPubSubDecoder extends CommandDecoder { throw e; } } else if (data instanceof CommandData) { - CommandData cmd = (CommandData)data; + CommandData cmd = (CommandData) data; try { while (in.writerIndex() > in.readerIndex()) { decode(in, cmd, null, channel, false, null); @@ -99,7 +99,7 @@ public class CommandPubSubDecoder extends CommandDecoder { @Override protected void decodeResult(CommandData data, List parts, Channel channel, - final Object result) throws IOException { + Object result) throws IOException { if (executor.isShutdown()) { return; } @@ -107,7 +107,7 @@ public class CommandPubSubDecoder extends CommandDecoder { if (result instanceof Message) { checkpoint(); - final RedisPubSubConnection pubSubConnection = RedisPubSubConnection.getFrom(channel); + RedisPubSubConnection pubSubConnection = RedisPubSubConnection.getFrom(channel); ChannelName channelName = ((Message) result).getChannel(); if (result instanceof PubSubStatusMessage) { String operation = ((PubSubStatusMessage) result).getType().name().toLowerCase(); @@ -121,7 +121,7 @@ public class CommandPubSubDecoder extends CommandDecoder { if (Arrays.asList(RedisCommands.PUNSUBSCRIBE.getName(), RedisCommands.UNSUBSCRIBE.getName()).contains(d.getCommand().getName())) { commands.remove(key); if (result instanceof PubSubPatternMessage) { - channelName = ((PubSubPatternMessage)result).getPattern(); + channelName = ((PubSubPatternMessage) result).getPattern(); } PubSubEntry entry = entries.remove(channelName); if (keepOrder) { @@ -133,7 +133,7 @@ public class CommandPubSubDecoder extends CommandDecoder { if (keepOrder) { if (result instanceof PubSubPatternMessage) { - channelName = ((PubSubPatternMessage)result).getPattern(); + channelName = ((PubSubPatternMessage) result).getPattern(); } PubSubEntry entry = entries.get(channelName); if (entry != null) { @@ -160,9 +160,9 @@ public class CommandPubSubDecoder extends CommandDecoder { } } - private void enqueueMessage(Object res, final RedisPubSubConnection pubSubConnection, final PubSubEntry entry) { + private void enqueueMessage(Object res, RedisPubSubConnection pubSubConnection, PubSubEntry entry) { if (res != null) { - entry.getQueue().add((Message)res); + entry.getQueue().add((Message) res); } if (entry.getSent().compareAndSet(false, true)) { diff --git a/redisson/src/main/java/org/redisson/client/handler/PingConnectionHandler.java b/redisson/src/main/java/org/redisson/client/handler/PingConnectionHandler.java index 7ea8214e3..8539c0f02 100644 --- a/redisson/src/main/java/org/redisson/client/handler/PingConnectionHandler.java +++ b/redisson/src/main/java/org/redisson/client/handler/PingConnectionHandler.java @@ -67,8 +67,8 @@ public class PingConnectionHandler extends ChannelInboundHandlerAdapter { @Override public void run(Timeout timeout) throws Exception { CommandData commandData = connection.getCurrentCommand(); - if ((commandData == null || !commandData.isBlockingCommand()) && - (future.cancel(false) || !future.isSuccess())) { + if ((commandData == null || !commandData.isBlockingCommand()) + && (future.cancel(false) || !future.isSuccess())) { ctx.channel().close(); log.debug("channel: {} closed due to PING response timeout set in {} ms", ctx.channel(), config.getPingConnectionInterval()); } else { diff --git a/redisson/src/main/java/org/redisson/client/protocol/CommandData.java b/redisson/src/main/java/org/redisson/client/protocol/CommandData.java index 88d8d6dac..c19de40b2 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/CommandData.java +++ b/redisson/src/main/java/org/redisson/client/protocol/CommandData.java @@ -91,7 +91,7 @@ public class CommandData implements QueueCommand { @Override public List> getPubSubOperations() { if (RedisCommands.PUBSUB_COMMANDS.contains(getCommand().getName())) { - return Collections.singletonList((CommandData)this); + return Collections.singletonList((CommandData) this); } return Collections.emptyList(); } diff --git a/redisson/src/main/java/org/redisson/client/protocol/CommandsData.java b/redisson/src/main/java/org/redisson/client/protocol/CommandsData.java index ad1d461a1..376045127 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/CommandsData.java +++ b/redisson/src/main/java/org/redisson/client/protocol/CommandsData.java @@ -85,8 +85,8 @@ public class CommandsData implements QueueCommand { public List> getPubSubOperations() { List> result = new ArrayList>(); for (CommandData commandData : commands) { - if (RedisCommands.PUBSUB_COMMANDS.equals(commandData.getCommand().getName())) { - result.add((CommandData)commandData); + if (RedisCommands.PUBSUB_COMMANDS.contains(commandData.getCommand().getName())) { + result.add((CommandData) commandData); } } return result; diff --git a/redisson/src/main/java/org/redisson/client/protocol/RedisCommand.java b/redisson/src/main/java/org/redisson/client/protocol/RedisCommand.java index c716e3109..f3babb979 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/RedisCommand.java +++ b/redisson/src/main/java/org/redisson/client/protocol/RedisCommand.java @@ -63,16 +63,16 @@ public class RedisCommand { } public RedisCommand(String name) { - this(name, (String)null); + this(name, (String) null); } public RedisCommand(String name, ValueType outParamType) { - this(name, (String)null); + this(name, (String) null); this.outParamType = outParamType; } public RedisCommand(String name, ValueType outParamType, Convertor convertor) { - this(name, (String)null); + this(name, (String) null); this.outParamType = outParamType; this.convertor = convertor; } diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanAmountReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanAmountReplayConvertor.java index 45c679a9f..5a98d189b 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanAmountReplayConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanAmountReplayConvertor.java @@ -24,7 +24,7 @@ public class BooleanAmountReplayConvertor implements Convertor { @Override public Boolean convert(Object obj) { - return (Long)obj > 0; + return (Long) obj > 0; } diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNumberReplayConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNumberReplayConvertor.java index 157a8745a..dcd8c9257 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNumberReplayConvertor.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/BooleanNumberReplayConvertor.java @@ -31,7 +31,7 @@ public class BooleanNumberReplayConvertor implements Convertor { @Override public Boolean convert(Object obj) { - return (Long)obj != number; + return (Long) obj != number; } diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/TimeObjectDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/TimeObjectDecoder.java index 25f9d0902..a7cd985a4 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/convertor/TimeObjectDecoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/TimeObjectDecoder.java @@ -37,7 +37,7 @@ public class TimeObjectDecoder implements MultiDecoder