From 5c1aba46044cf997dcf1e435a6e1a50973373c13 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Fri, 9 Apr 2021 11:16:20 +0300
Subject: [PATCH] Feature - nameMapper setting added. #3103

---
 .../src/main/java/org/redisson/RedissonExecutorService.java | 6 +++---
 .../main/java/org/redisson/remote/BaseRemoteService.java    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/RedissonExecutorService.java b/redisson/src/main/java/org/redisson/RedissonExecutorService.java
index 5a27675ce..4f471b96b 100644
--- a/redisson/src/main/java/org/redisson/RedissonExecutorService.java
+++ b/redisson/src/main/java/org/redisson/RedissonExecutorService.java
@@ -108,7 +108,7 @@ public class RedissonExecutorService implements RScheduledExecutorService {
         this.codec = codec;
         this.commandExecutor = commandExecutor;
         this.connectionManager = commandExecutor.getConnectionManager();
-        this.name = name;
+        this.name = commandExecutor.getConnectionManager().getConfig().getNameMapper().map(name);
         this.redisson = redisson;
         this.queueTransferService = queueTransferService;
         this.responses = responses;
@@ -357,7 +357,7 @@ public class RedissonExecutorService implements RScheduledExecutorService {
     }
 
     private TasksBatchService createBatchService() {
-        TasksBatchService executorRemoteService = new TasksBatchService(codec, name, commandExecutor, executorId, responses);
+        TasksBatchService executorRemoteService = new TasksBatchService(codec, getName(), commandExecutor, executorId, responses);
         executorRemoteService.setTasksExpirationTimeName(tasksExpirationTimeName);
         executorRemoteService.setTerminationTopicName(terminationTopic.getChannelNames().get(0));
         executorRemoteService.setTasksCounterName(tasksCounterName);
@@ -489,7 +489,7 @@ public class RedissonExecutorService implements RScheduledExecutorService {
 
     @Override
     public String getName() {
-        return name;
+        return commandExecutor.getConnectionManager().getConfig().getNameMapper().unmap(name);
     }
     
     @Override
diff --git a/redisson/src/main/java/org/redisson/remote/BaseRemoteService.java b/redisson/src/main/java/org/redisson/remote/BaseRemoteService.java
index a117f9815..820ce5bc6 100644
--- a/redisson/src/main/java/org/redisson/remote/BaseRemoteService.java
+++ b/redisson/src/main/java/org/redisson/remote/BaseRemoteService.java
@@ -69,7 +69,7 @@ public abstract class BaseRemoteService {
 
     public BaseRemoteService(Codec codec, String name, CommandAsyncExecutor commandExecutor, String executorId, ConcurrentMap<String, ResponseEntry> responses) {
         this.codec = codec;
-        this.name = name;
+        this.name = commandExecutor.getConnectionManager().getConfig().getNameMapper().map(name);
         this.commandExecutor = commandExecutor;
         this.executorId = executorId;
         this.responses = responses;