diff --git a/redisson/src/main/java/org/redisson/RedissonPatternTopic.java b/redisson/src/main/java/org/redisson/RedissonPatternTopic.java index bfe8819e3..e8102782f 100644 --- a/redisson/src/main/java/org/redisson/RedissonPatternTopic.java +++ b/redisson/src/main/java/org/redisson/RedissonPatternTopic.java @@ -27,7 +27,7 @@ import org.redisson.client.protocol.pubsub.PubSubType; import org.redisson.command.CommandAsyncExecutor; import org.redisson.config.MasterSlaveServersConfig; import org.redisson.misc.CompletableFutureWrapper; -import org.redisson.pubsub.AsyncSemaphore; +import org.redisson.misc.AsyncSemaphore; import org.redisson.pubsub.PubSubConnectionEntry; import org.redisson.pubsub.PublishSubscribeService; diff --git a/redisson/src/main/java/org/redisson/connection/ClientConnectionsEntry.java b/redisson/src/main/java/org/redisson/connection/ClientConnectionsEntry.java index c3ee6f5dc..c788ae3d8 100644 --- a/redisson/src/main/java/org/redisson/connection/ClientConnectionsEntry.java +++ b/redisson/src/main/java/org/redisson/connection/ClientConnectionsEntry.java @@ -21,7 +21,7 @@ import org.redisson.client.RedisConnection; import org.redisson.client.RedisPubSubConnection; import org.redisson.client.protocol.RedisCommand; import org.redisson.config.ReadMode; -import org.redisson.pubsub.AsyncSemaphore; +import org.redisson.misc.AsyncSemaphore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/redisson/src/main/java/org/redisson/connection/IdleConnectionWatcher.java b/redisson/src/main/java/org/redisson/connection/IdleConnectionWatcher.java index 1edafb8ff..5b2453156 100644 --- a/redisson/src/main/java/org/redisson/connection/IdleConnectionWatcher.java +++ b/redisson/src/main/java/org/redisson/connection/IdleConnectionWatcher.java @@ -22,7 +22,7 @@ import io.netty.util.concurrent.ScheduledFuture; import org.redisson.client.RedisConnection; import org.redisson.client.RedisPubSubConnection; import org.redisson.config.MasterSlaveServersConfig; -import org.redisson.pubsub.AsyncSemaphore; +import org.redisson.misc.AsyncSemaphore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/redisson/src/main/java/org/redisson/connection/SequentialDnsAddressResolverFactory.java b/redisson/src/main/java/org/redisson/connection/SequentialDnsAddressResolverFactory.java index f9c8b5360..052958340 100644 --- a/redisson/src/main/java/org/redisson/connection/SequentialDnsAddressResolverFactory.java +++ b/redisson/src/main/java/org/redisson/connection/SequentialDnsAddressResolverFactory.java @@ -25,7 +25,7 @@ import io.netty.resolver.dns.DnsAddressResolverGroup; import io.netty.resolver.dns.DnsServerAddressStreamProvider; import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.Promise; -import org.redisson.pubsub.AsyncSemaphore; +import org.redisson.misc.AsyncSemaphore; import java.net.InetAddress; import java.net.InetSocketAddress; diff --git a/redisson/src/main/java/org/redisson/pubsub/AsyncSemaphore.java b/redisson/src/main/java/org/redisson/misc/AsyncSemaphore.java similarity index 98% rename from redisson/src/main/java/org/redisson/pubsub/AsyncSemaphore.java rename to redisson/src/main/java/org/redisson/misc/AsyncSemaphore.java index 320a977b7..efb53d668 100644 --- a/redisson/src/main/java/org/redisson/pubsub/AsyncSemaphore.java +++ b/redisson/src/main/java/org/redisson/misc/AsyncSemaphore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.redisson.pubsub; +package org.redisson.misc; import java.util.*; import java.util.concurrent.*; diff --git a/redisson/src/main/java/org/redisson/pubsub/PublishSubscribe.java b/redisson/src/main/java/org/redisson/pubsub/PublishSubscribe.java index c7c525452..7046a1803 100644 --- a/redisson/src/main/java/org/redisson/pubsub/PublishSubscribe.java +++ b/redisson/src/main/java/org/redisson/pubsub/PublishSubscribe.java @@ -21,6 +21,7 @@ import org.redisson.client.ChannelName; import org.redisson.client.RedisPubSubListener; import org.redisson.client.codec.LongCodec; import org.redisson.client.protocol.pubsub.PubSubType; +import org.redisson.misc.AsyncSemaphore; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; diff --git a/redisson/src/main/java/org/redisson/pubsub/PublishSubscribeService.java b/redisson/src/main/java/org/redisson/pubsub/PublishSubscribeService.java index cb1843ffc..6282bdbc6 100644 --- a/redisson/src/main/java/org/redisson/pubsub/PublishSubscribeService.java +++ b/redisson/src/main/java/org/redisson/pubsub/PublishSubscribeService.java @@ -23,6 +23,7 @@ import org.redisson.client.protocol.pubsub.PubSubType; import org.redisson.config.MasterSlaveServersConfig; import org.redisson.connection.ConnectionManager; import org.redisson.connection.MasterSlaveEntry; +import org.redisson.misc.AsyncSemaphore; import org.slf4j.Logger; import org.slf4j.LoggerFactory;