From d8416b24c3be75ed86eab1deb8be50b0410afbf5 Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Tue, 16 Feb 2021 12:22:20 +0300 Subject: [PATCH] checkstyle errors fixed --- .../org/redisson/RedissonPatternTopic.java | 7 ++-- .../main/java/org/redisson/RedissonTopic.java | 1 - .../pubsub/PublishSubscribeService.java | 35 ++++++++----------- 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/redisson/src/main/java/org/redisson/RedissonPatternTopic.java b/redisson/src/main/java/org/redisson/RedissonPatternTopic.java index 9457a2cf1..0b0d16ae8 100644 --- a/redisson/src/main/java/org/redisson/RedissonPatternTopic.java +++ b/redisson/src/main/java/org/redisson/RedissonPatternTopic.java @@ -15,9 +15,6 @@ */ package org.redisson; -import java.util.Collections; -import java.util.List; - import org.redisson.api.RFuture; import org.redisson.api.RPatternTopic; import org.redisson.api.listener.PatternMessageListener; @@ -31,11 +28,13 @@ import org.redisson.command.CommandAsyncExecutor; import org.redisson.config.MasterSlaveServersConfig; import org.redisson.misc.RPromise; import org.redisson.misc.RedissonPromise; -import org.redisson.misc.TransferListener; import org.redisson.pubsub.AsyncSemaphore; import org.redisson.pubsub.PubSubConnectionEntry; import org.redisson.pubsub.PublishSubscribeService; +import java.util.Collections; +import java.util.List; + /** * Distributed topic implementation. Messages are delivered to all message listeners across Redis cluster. * diff --git a/redisson/src/main/java/org/redisson/RedissonTopic.java b/redisson/src/main/java/org/redisson/RedissonTopic.java index 7b3ac8237..1ffb1cce4 100644 --- a/redisson/src/main/java/org/redisson/RedissonTopic.java +++ b/redisson/src/main/java/org/redisson/RedissonTopic.java @@ -31,7 +31,6 @@ import org.redisson.command.CommandAsyncExecutor; import org.redisson.config.MasterSlaveServersConfig; import org.redisson.misc.RPromise; import org.redisson.misc.RedissonPromise; -import org.redisson.misc.TransferListener; import org.redisson.pubsub.AsyncSemaphore; import org.redisson.pubsub.PubSubConnectionEntry; import org.redisson.pubsub.PublishSubscribeService; diff --git a/redisson/src/main/java/org/redisson/pubsub/PublishSubscribeService.java b/redisson/src/main/java/org/redisson/pubsub/PublishSubscribeService.java index 03d988211..edcf0acfc 100644 --- a/redisson/src/main/java/org/redisson/pubsub/PublishSubscribeService.java +++ b/redisson/src/main/java/org/redisson/pubsub/PublishSubscribeService.java @@ -15,24 +15,12 @@ */ package org.redisson.pubsub; -import java.util.Collection; -import java.util.EventListener; -import java.util.LinkedList; -import java.util.Queue; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; - +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelFutureListener; +import io.netty.util.Timeout; +import io.netty.util.TimerTask; import org.redisson.api.RFuture; -import org.redisson.api.listener.MessageListener; -import org.redisson.client.BaseRedisPubSubListener; -import org.redisson.client.ChannelName; -import org.redisson.client.RedisNodeNotFoundException; -import org.redisson.client.RedisPubSubConnection; -import org.redisson.client.RedisPubSubListener; -import org.redisson.client.SubscribeListener; +import org.redisson.client.*; import org.redisson.client.codec.Codec; import org.redisson.client.protocol.pubsub.PubSubStatusMessage; import org.redisson.client.protocol.pubsub.PubSubType; @@ -45,10 +33,15 @@ import org.redisson.misc.TransferListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelFutureListener; -import io.netty.util.Timeout; -import io.netty.util.TimerTask; +import java.util.Collection; +import java.util.EventListener; +import java.util.LinkedList; +import java.util.Queue; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; /** *