From d60ac52f1860d2476cf3bb13855135160167add0 Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Wed, 15 Jan 2025 12:38:58 +0300 Subject: [PATCH] refactoring --- .../org/redisson/micronaut/session/RedissonSessionStore.java | 2 +- .../org/redisson/micronaut/session/RedissonSessionStore.java | 2 +- .../org/redisson/micronaut/session/RedissonSessionStore.java | 2 +- .../main/java/org/redisson/tomcat/RedissonSessionManager.java | 2 +- .../main/java/org/redisson/tomcat/RedissonSessionManager.java | 2 +- .../main/java/org/redisson/tomcat/RedissonSessionManager.java | 2 +- .../main/java/org/redisson/tomcat/RedissonSessionManager.java | 2 +- .../main/java/org/redisson/tomcat/RedissonSessionManager.java | 2 +- redisson/src/main/java/org/redisson/RedissonNode.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/redisson-micronaut/redisson-micronaut-20/src/main/java/org/redisson/micronaut/session/RedissonSessionStore.java b/redisson-micronaut/redisson-micronaut-20/src/main/java/org/redisson/micronaut/session/RedissonSessionStore.java index 44efa5a28..fa5c9e46f 100644 --- a/redisson-micronaut/redisson-micronaut-20/src/main/java/org/redisson/micronaut/session/RedissonSessionStore.java +++ b/redisson-micronaut/redisson-micronaut-20/src/main/java/org/redisson/micronaut/session/RedissonSessionStore.java @@ -245,7 +245,7 @@ public class RedissonSessionStore implements SessionStore, Patt } private RTopic getTopic(String name, Codec codec) { - PublishSubscribeService ss = ((Redisson) redisson).getConnectionManager().getSubscribeService(); + PublishSubscribeService ss = ((Redisson) redisson).getCommandExecutor().getConnectionManager().getSubscribeService(); if (ss.isShardingSupported()) { return redisson.getShardedTopic(name, codec); } diff --git a/redisson-micronaut/redisson-micronaut-30/src/main/java/org/redisson/micronaut/session/RedissonSessionStore.java b/redisson-micronaut/redisson-micronaut-30/src/main/java/org/redisson/micronaut/session/RedissonSessionStore.java index 090fd7f3e..4780403e4 100644 --- a/redisson-micronaut/redisson-micronaut-30/src/main/java/org/redisson/micronaut/session/RedissonSessionStore.java +++ b/redisson-micronaut/redisson-micronaut-30/src/main/java/org/redisson/micronaut/session/RedissonSessionStore.java @@ -245,7 +245,7 @@ public class RedissonSessionStore implements SessionStore, Patt } private RTopic getTopic(String name, Codec codec) { - PublishSubscribeService ss = ((Redisson) redisson).getConnectionManager().getSubscribeService(); + PublishSubscribeService ss = ((Redisson) redisson).getCommandExecutor().getConnectionManager().getSubscribeService(); if (ss.isShardingSupported()) { return redisson.getShardedTopic(name, codec); } diff --git a/redisson-micronaut/redisson-micronaut-40/src/main/java/org/redisson/micronaut/session/RedissonSessionStore.java b/redisson-micronaut/redisson-micronaut-40/src/main/java/org/redisson/micronaut/session/RedissonSessionStore.java index 090fd7f3e..4780403e4 100644 --- a/redisson-micronaut/redisson-micronaut-40/src/main/java/org/redisson/micronaut/session/RedissonSessionStore.java +++ b/redisson-micronaut/redisson-micronaut-40/src/main/java/org/redisson/micronaut/session/RedissonSessionStore.java @@ -245,7 +245,7 @@ public class RedissonSessionStore implements SessionStore, Patt } private RTopic getTopic(String name, Codec codec) { - PublishSubscribeService ss = ((Redisson) redisson).getConnectionManager().getSubscribeService(); + PublishSubscribeService ss = ((Redisson) redisson).getCommandExecutor().getConnectionManager().getSubscribeService(); if (ss.isShardingSupported()) { return redisson.getShardedTopic(name, codec); } diff --git a/redisson-tomcat/redisson-tomcat-10/src/main/java/org/redisson/tomcat/RedissonSessionManager.java b/redisson-tomcat/redisson-tomcat-10/src/main/java/org/redisson/tomcat/RedissonSessionManager.java index 46e06a70d..da96f1651 100644 --- a/redisson-tomcat/redisson-tomcat-10/src/main/java/org/redisson/tomcat/RedissonSessionManager.java +++ b/redisson-tomcat/redisson-tomcat-10/src/main/java/org/redisson/tomcat/RedissonSessionManager.java @@ -159,7 +159,7 @@ public class RedissonSessionManager extends ManagerBase { public RTopic getTopic() { String separator = keyPrefix == null || keyPrefix.isEmpty() ? "" : ":"; final String name = keyPrefix + separator + "redisson:tomcat_session_updates:" + getContext().getName(); - PublishSubscribeService ss = ((Redisson) redisson).getConnectionManager().getSubscribeService(); + PublishSubscribeService ss = ((Redisson) redisson).getCommandExecutor().getConnectionManager().getSubscribeService(); if (ss.isShardingSupported()) { return redisson.getShardedTopic(name); } diff --git a/redisson-tomcat/redisson-tomcat-11/src/main/java/org/redisson/tomcat/RedissonSessionManager.java b/redisson-tomcat/redisson-tomcat-11/src/main/java/org/redisson/tomcat/RedissonSessionManager.java index 467535ecb..71278cc63 100644 --- a/redisson-tomcat/redisson-tomcat-11/src/main/java/org/redisson/tomcat/RedissonSessionManager.java +++ b/redisson-tomcat/redisson-tomcat-11/src/main/java/org/redisson/tomcat/RedissonSessionManager.java @@ -159,7 +159,7 @@ public class RedissonSessionManager extends ManagerBase { public RTopic getTopic() { String separator = keyPrefix == null || keyPrefix.isEmpty() ? "" : ":"; final String name = keyPrefix + separator + "redisson:tomcat_session_updates:" + getContext().getName(); - PublishSubscribeService ss = ((Redisson) redisson).getConnectionManager().getSubscribeService(); + PublishSubscribeService ss = ((Redisson) redisson).getCommandExecutor().getConnectionManager().getSubscribeService(); if (ss.isShardingSupported()) { return redisson.getShardedTopic(name); } diff --git a/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java b/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java index 3e3539978..04071a51f 100644 --- a/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java +++ b/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java @@ -159,7 +159,7 @@ public class RedissonSessionManager extends ManagerBase { public RTopic getTopic() { String separator = keyPrefix == null || keyPrefix.isEmpty() ? "" : ":"; String name = keyPrefix + separator + "redisson:tomcat_session_updates:" + getContainer().getName(); - PublishSubscribeService ss = ((Redisson) redisson).getConnectionManager().getSubscribeService(); + PublishSubscribeService ss = ((Redisson) redisson).getCommandExecutor().getConnectionManager().getSubscribeService(); if (ss.isShardingSupported()) { return redisson.getShardedTopic(name); } diff --git a/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java b/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java index 470288c87..f15bac7b0 100644 --- a/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java +++ b/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java @@ -159,7 +159,7 @@ public class RedissonSessionManager extends ManagerBase { public RTopic getTopic() { String separator = keyPrefix == null || keyPrefix.isEmpty() ? "" : ":"; final String name = keyPrefix + separator + "redisson:tomcat_session_updates:" + getContext().getName(); - PublishSubscribeService ss = ((Redisson) redisson).getConnectionManager().getSubscribeService(); + PublishSubscribeService ss = ((Redisson) redisson).getCommandExecutor().getConnectionManager().getSubscribeService(); if (ss.isShardingSupported()) { return redisson.getShardedTopic(name); } diff --git a/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSessionManager.java b/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSessionManager.java index 73379f541..2b8546949 100644 --- a/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSessionManager.java +++ b/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSessionManager.java @@ -167,7 +167,7 @@ public class RedissonSessionManager extends ManagerBase { public RTopic getTopic() { String separator = keyPrefix == null || keyPrefix.isEmpty() ? "" : ":"; final String name = keyPrefix + separator + "redisson:tomcat_session_updates:" + getContext().getName(); - PublishSubscribeService ss = ((Redisson) redisson).getConnectionManager().getSubscribeService(); + PublishSubscribeService ss = ((Redisson) redisson).getCommandExecutor().getConnectionManager().getSubscribeService(); if (ss.isShardingSupported()) { return redisson.getShardedTopic(name); } diff --git a/redisson/src/main/java/org/redisson/RedissonNode.java b/redisson/src/main/java/org/redisson/RedissonNode.java index c017d6139..1a55333ed 100644 --- a/redisson/src/main/java/org/redisson/RedissonNode.java +++ b/redisson/src/main/java/org/redisson/RedissonNode.java @@ -183,7 +183,7 @@ public final class RedissonNode { } private void retrieveAddresses() { - ConnectionManager connectionManager = ((Redisson) redisson).getConnectionManager(); + ConnectionManager connectionManager = ((Redisson) redisson).getCommandExecutor().getConnectionManager(); for (MasterSlaveEntry entry : connectionManager.getEntrySet()) { CompletionStage readFuture = entry.connectionReadOp(null, false); RedisConnection readConnection = null;