[inlong] branch master updated: [INLONG-8114][Manager] Fix the NEP that may appear when building Properties. (#8115)

[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 049eaf36b [INLONG-8114][Manager] Fix the NEP that may appear when 
building Properties. (#8115)
049eaf36b is described below

commit 049eaf36b3492d13e7cc33cc67392cc45ec6fa5a
Author: chestnufang <65438734+chestnu...@users.noreply.github.com>
AuthorDate: Mon May 29 19:31:37 2023 +0800

    [INLONG-8114][Manager] Fix the NEP that may appear when building 
Properties. (#8115)
    
    Co-authored-by: chestnufang <chestnuf...@tencent.com>
---
 .../org/apache/inlong/manager/client/api/impl/InlongClientImpl.java    | 3 ++-
 .../org/apache/inlong/manager/pojo/group/InlongGroupStatusInfo.java    | 1 +
 .../org/apache/inlong/manager/pojo/sort/util/ExtractNodeUtils.java     | 2 ++
 .../java/org/apache/inlong/manager/pojo/sort/util/LoadNodeUtils.java   | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

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 ab2e837d8..d9f752d71 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
@@ -149,7 +149,8 @@ public class InlongClientImpl implements InlongClient {
                         .inlongGroupId(briefInfo.getInlongGroupId())
                         .originalStatus(briefInfo.getStatus())
                         .simpleGroupStatus(groupStatus)
-                        .streamSources(sources).build();
+                        .streamSources(sources)
+                        .build();
                 groupStatusMap.put(groupId, statusInfo);
             });
         }
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 8afcf9f7f..3ca72d963 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
@@ -57,6 +57,7 @@ public class InlongGroupStatusInfo {
     @ApiModelProperty(value = "Sort job status of the group")
     private SortStatus sortStatus = SortStatus.UNKNOWN;
 
+    @Builder.Default
     @ApiModelProperty("Extended properties of the group")
     private Map<String, Object> properties = Maps.newHashMap();
 
diff --git 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/ExtractNodeUtils.java
 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/ExtractNodeUtils.java
index 26e2d44b6..5342e898c 100644
--- 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/ExtractNodeUtils.java
+++ 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/ExtractNodeUtils.java
@@ -69,6 +69,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -563,6 +564,7 @@ public class ExtractNodeUtils {
      */
     private static Map<String, String> parseProperties(Map<String, Object> 
properties) {
         return properties.entrySet().stream()
+                .filter(v -> Objects.nonNull(v.getValue()))
                 .collect(Collectors.toMap(Map.Entry::getKey, e -> 
e.getValue().toString()));
     }
 
diff --git 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/LoadNodeUtils.java
 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/LoadNodeUtils.java
index 26ec9ad4c..9209d19b5 100644
--- 
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/LoadNodeUtils.java
+++ 
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/util/LoadNodeUtils.java
@@ -89,6 +89,7 @@ import org.apache.commons.lang3.StringUtils;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -117,6 +118,7 @@ public class LoadNodeUtils {
                 .collect(Collectors.toList());
         List<FieldRelation> fieldRelations = 
parseSinkFields(streamSink.getSinkFieldList(), constantFieldMap);
         Map<String, String> properties = 
streamSink.getProperties().entrySet().stream()
+                .filter(v -> Objects.nonNull(v.getValue()))
                 .collect(Collectors.toMap(Map.Entry::getKey, e -> 
e.getValue().toString()));
         String sinkType = streamSink.getSinkType();
         switch (sinkType) {