From ac89d45c902a3ebc3453b6afb39e8d1e2b3454c4 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Mon, 20 Feb 2023 10:51:48 +0300
Subject: [PATCH] refactoring

---
 .../src/main/java/org/redisson/QueueTransferTask.java  |  9 +++++----
 .../main/java/org/redisson/RedissonDelayedQueue.java   |  2 +-
 .../java/org/redisson/RedissonExecutorService.java     | 10 ++++------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/QueueTransferTask.java b/redisson/src/main/java/org/redisson/QueueTransferTask.java
index 41129a6d0..a82a7d1dc 100644
--- a/redisson/src/main/java/org/redisson/QueueTransferTask.java
+++ b/redisson/src/main/java/org/redisson/QueueTransferTask.java
@@ -23,6 +23,7 @@ import org.redisson.api.RTopic;
 import org.redisson.api.listener.BaseStatusListener;
 import org.redisson.api.listener.MessageListener;
 import org.redisson.connection.ConnectionManager;
+import org.redisson.connection.ServiceManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -61,11 +62,11 @@ public abstract class QueueTransferTask {
     
     private int usage = 1;
     private final AtomicReference<TimeoutTask> lastTimeout = new AtomicReference<TimeoutTask>();
-    private final ConnectionManager connectionManager;
+    private final ServiceManager serviceManager;
     
-    public QueueTransferTask(ConnectionManager connectionManager) {
+    public QueueTransferTask(ServiceManager serviceManager) {
         super();
-        this.connectionManager = connectionManager;
+        this.serviceManager = serviceManager;
     }
 
     public void incUsage() {
@@ -115,7 +116,7 @@ public abstract class QueueTransferTask {
         
         long delay = startTime - System.currentTimeMillis();
         if (delay > 10) {
-            Timeout timeout = connectionManager.getServiceManager().newTimeout(new TimerTask() {
+            Timeout timeout = serviceManager.newTimeout(new TimerTask() {
                 @Override
                 public void run(Timeout timeout) throws Exception {
                     pushTask();
diff --git a/redisson/src/main/java/org/redisson/RedissonDelayedQueue.java b/redisson/src/main/java/org/redisson/RedissonDelayedQueue.java
index d744b92cb..27a20ad4c 100644
--- a/redisson/src/main/java/org/redisson/RedissonDelayedQueue.java
+++ b/redisson/src/main/java/org/redisson/RedissonDelayedQueue.java
@@ -52,7 +52,7 @@ public class RedissonDelayedQueue<V> extends RedissonExpirable implements RDelay
         queueName = prefixName("redisson_delay_queue", getRawName());
         timeoutSetName = prefixName("redisson_delay_queue_timeout", getRawName());
         
-        QueueTransferTask task = new QueueTransferTask(commandExecutor.getConnectionManager()) {
+        QueueTransferTask task = new QueueTransferTask(commandExecutor.getServiceManager()) {
             
             @Override
             protected RFuture<Long> pushTaskAsync() {
diff --git a/redisson/src/main/java/org/redisson/RedissonExecutorService.java b/redisson/src/main/java/org/redisson/RedissonExecutorService.java
index b86b9e125..cb3499683 100644
--- a/redisson/src/main/java/org/redisson/RedissonExecutorService.java
+++ b/redisson/src/main/java/org/redisson/RedissonExecutorService.java
@@ -58,7 +58,6 @@ public class RedissonExecutorService implements RScheduledExecutorService {
     public static final int TERMINATED_STATE = 2;
     
     private final CommandAsyncExecutor commandExecutor;
-    private final ConnectionManager connectionManager;
     private final Codec codec;
     private final Redisson redisson;
     
@@ -107,16 +106,15 @@ public class RedissonExecutorService implements RScheduledExecutorService {
         super();
         this.codec = codec;
         this.commandExecutor = commandExecutor;
-        this.connectionManager = commandExecutor.getConnectionManager();
         this.name = commandExecutor.getServiceManager().getConfig().getNameMapper().map(name);
         this.redisson = redisson;
         this.queueTransferService = queueTransferService;
         this.responses = responses;
 
-        if (codec == connectionManager.getServiceManager().getCfg().getCodec()) {
-            this.executorId = connectionManager.getServiceManager().getId();
+        if (codec == commandExecutor.getServiceManager().getCfg().getCodec()) {
+            this.executorId = commandExecutor.getServiceManager().getId();
         } else {
-            this.executorId = connectionManager.getServiceManager().getId() + ":" + RemoteExecutorServiceAsync.class.getName() + ":" + name;
+            this.executorId = commandExecutor.getServiceManager().getId() + ":" + RemoteExecutorServiceAsync.class.getName() + ":" + name;
         }
         
         remoteService = new RedissonExecutorRemoteService(codec, name, commandExecutor, executorId, responses);
@@ -242,7 +240,7 @@ public class RedissonExecutorService implements RScheduledExecutorService {
             throw new IllegalArgumentException("workers amount can't be zero");
         }
         
-        QueueTransferTask task = new QueueTransferTask(connectionManager) {
+        QueueTransferTask task = new QueueTransferTask(commandExecutor.getServiceManager()) {
             @Override
             protected RTopic getTopic() {
                 return RedissonTopic.createRaw(LongCodec.INSTANCE, commandExecutor, schedulerChannelName);