[inlong] branch master updated: [INLONG-8066][Manager] Add sort extended properties when getting the status info of the InlongGroup (#8067)

[pacinogong]

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

pacinogong 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 d89f046b2 [INLONG-8066][Manager] Add sort extended properties when 
getting the status info of the InlongGroup (#8067)
d89f046b2 is described below

commit d89f046b25b9f865b0463acba4d16f867a93468d
Author: chestnufang <65438734+chestnu...@users.noreply.github.com>
AuthorDate: Tue May 23 14:07:39 2023 +0800

    [INLONG-8066][Manager] Add sort extended properties when getting the status 
info of the InlongGroup (#8067)
---
 .../manager/client/api/impl/InlongClientImpl.java    | 20 +++++++++++++++-----
 .../manager/pojo/group/InlongGroupStatusInfo.java    |  5 +++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git 
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongClientImpl.java
 
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongClientImpl.java
index ec77a1c94..68ce32cd4 100644
--- 
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongClientImpl.java
+++ 
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/InlongClientImpl.java
@@ -20,6 +20,7 @@ package org.apache.inlong.manager.client.api.impl;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import java.util.function.Function;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -32,6 +33,7 @@ import 
org.apache.inlong.manager.client.api.inner.client.ClientFactory;
 import org.apache.inlong.manager.client.api.inner.client.InlongClusterClient;
 import org.apache.inlong.manager.client.api.inner.client.InlongGroupClient;
 import org.apache.inlong.manager.client.api.util.ClientUtils;
+import org.apache.inlong.manager.common.consts.InlongConstants;
 import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
 import org.apache.inlong.manager.common.enums.SimpleGroupStatus;
 import org.apache.inlong.manager.common.enums.SimpleSourceStatus;
@@ -68,6 +70,7 @@ public class InlongClientImpl implements InlongClient {
 
     private static final String URL_SPLITTER = ",";
     private static final String HOST_SPLITTER = ":";
+
     @Getter
     private final ClientConfiguration configuration;
     private final InlongGroupClient groupClient;
@@ -163,12 +166,19 @@ public class InlongClientImpl implements InlongClient {
         List<SortStatusInfo> sortStatusInfos = 
groupClient.listSortStatus(statusRequest);
 
         if (CollectionUtils.isNotEmpty(sortStatusInfos)) {
-            Map<String, SortStatus> sortStatusMap = sortStatusInfos.stream()
-                    
.collect(Collectors.toMap(SortStatusInfo::getInlongGroupId, 
SortStatusInfo::getSortStatus));
-            groupStatusMap.forEach((groupId, groupStatusInfo) -> 
groupStatusInfo
-                    .setSortStatus(sortStatusMap.getOrDefault(groupId, 
SortStatus.NOT_EXISTS)));
+            Map<String, SortStatusInfo> sortStatusInfoMap = 
sortStatusInfos.stream()
+                    
.collect(Collectors.toMap(SortStatusInfo::getInlongGroupId, 
Function.identity()));
+            groupStatusMap.forEach((groupId, groupStatusInfo) -> {
+                groupStatusInfo.setSortStatus(SortStatus.NOT_EXISTS);
+                SortStatusInfo sortStatusInfo = sortStatusInfoMap.get(groupId);
+                if (sortStatusInfo != null) {
+                    // add sort status info to inlongGroup status info
+                    groupStatusInfo.getProperties()
+                            .put(InlongConstants.SORT_PROPERTIES, 
sortStatusInfo.getProperties());
+                    
groupStatusInfo.setSortStatus(sortStatusInfo.getSortStatus());
+                }
+            });
         }
-
         return groupStatusMap;
     }
 
diff --git 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupStatusInfo.java
 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupStatusInfo.java
index 9d62f0618..95b2566b9 100644
--- 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupStatusInfo.java
+++ 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupStatusInfo.java
@@ -17,8 +17,10 @@
 
 package org.apache.inlong.manager.pojo.group;
 
+import com.google.common.collect.Maps;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Map;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -54,4 +56,7 @@ public class InlongGroupStatusInfo {
     @ApiModelProperty(value = "Sort job status of the group")
     private SortStatus sortStatus = SortStatus.UNKNOWN;
 
+    @ApiModelProperty("Extended properties of the group")
+    private Map<String, Object> properties = Maps.newHashMap();
+
 }