(inlong) branch master updated: [INLONG-9773][Manager] SortSDK configuration support acquire tenant from InlongGroup (#9776)

[dockerzhang]

This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 7c4adbf564 [INLONG-9773][Manager] SortSDK configuration support 
acquire tenant from InlongGroup (#9776)
7c4adbf564 is described below

commit 7c4adbf564541746c198d882b3e25e4d08018fce
Author: vernedeng <verned...@apache.org>
AuthorDate: Thu Mar 7 15:26:28 2024 +0800

    [INLONG-9773][Manager] SortSDK configuration support acquire tenant from 
InlongGroup (#9776)
---
 .../manager/service/core/impl/SortSourceServiceImpl.java     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortSourceServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortSourceServiceImpl.java
index 43e07f985c..247f270685 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortSourceServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortSourceServiceImpl.java
@@ -23,6 +23,7 @@ import org.apache.inlong.common.pojo.sdk.CacheZone;
 import org.apache.inlong.common.pojo.sdk.CacheZoneConfig;
 import org.apache.inlong.common.pojo.sdk.SortSourceConfigResponse;
 import org.apache.inlong.common.pojo.sdk.Topic;
+import org.apache.inlong.manager.common.consts.InlongConstants;
 import org.apache.inlong.manager.common.enums.ClusterType;
 import org.apache.inlong.manager.common.exceptions.BusinessException;
 import org.apache.inlong.manager.common.util.Preconditions;
@@ -420,7 +421,16 @@ public class SortSourceServiceImpl implements 
SortSourceService {
                                 topic = 
backupStreamMqResource.get(groupId).get(streamId);
                             }
                         }
-                        String fullTopic = 
tenant.concat("/").concat(namespace).concat("/").concat(topic);
+                        String fullTopic = tenant + InlongConstants.SLASH + 
namespace + InlongConstants.SLASH + topic;
+
+                        Map<String, String> groupExt = 
groupInfo.getExtParamsMap();
+                        String groupTenant = Optional
+                                .ofNullable(groupExt.get(KEY_NEW_TENANT))
+                                .orElse(groupExt.get(KEY_OLD_TENANT));
+                        if (StringUtils.isNotBlank(groupTenant)) {
+                            fullTopic = groupTenant + InlongConstants.SLASH + 
namespace + InlongConstants.SLASH + topic;
+                        }
+
                         return Topic.builder()
                                 .topic(fullTopic)
                                 .topicProperties(sink.getExtParamsMap())