[inlong] branch master updated: [INLONG-8617][Manager] Optimize compatibility of SortSdk config interface (#8618)

[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 1485b141e6 [INLONG-8617][Manager] Optimize compatibility of SortSdk 
config interface (#8618)
1485b141e6 is described below

commit 1485b141e667ecf92e8f9e755cedc14a612db7ee
Author: vernedeng <verned...@apache.org>
AuthorDate: Tue Aug 1 19:09:28 2023 +0800

    [INLONG-8617][Manager] Optimize compatibility of SortSdk config interface 
(#8618)
---
 .../inlong/manager/service/core/impl/SortSourceServiceImpl.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 39edbe3c41..c9fb4937ee 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
@@ -54,6 +54,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
@@ -81,7 +82,8 @@ public class SortSourceServiceImpl implements 
SortSourceService {
         }
     };
     private static final String KEY_AUTH = "authentication";
-    private static final String KEY_TENANT = "pulsarTenant";
+    private static final String KEY_OLD_TENANT = "tenant";
+    private static final String KEY_NEW_TENANT = "pulsarTenant";
 
     private static final int RESPONSE_CODE_SUCCESS = 0;
     private static final int RESPONSE_CODE_NO_UPDATE = 1;
@@ -386,7 +388,7 @@ public class SortSourceServiceImpl implements 
SortSourceService {
             SortSourceClusterInfo cluster,
             boolean isBackupTag) {
         Map<String, String> param = cluster.getExtParamsMap();
-        String tenant = param.get(KEY_TENANT);
+        String tenant = 
Optional.ofNullable(param.get(KEY_NEW_TENANT)).orElse(param.get(KEY_OLD_TENANT));
         String auth = param.get(KEY_AUTH);
         List<Topic> sdkTopics = sinks.stream()
                 .map(sink -> {