[inlong] branch master updated: [INLONG-5825][Manager] Remove the limitation of MQ type in SortSourceService (#5827)

[healchow]

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

healchow 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 14dfd7fb2 [INLONG-5825][Manager] Remove the limitation of MQ type in 
SortSourceService (#5827)
14dfd7fb2 is described below

commit 14dfd7fb2a6b565a9cc2d31423ff4ee14c2598e8
Author: vernedeng <deng...@pku.edu.cn>
AuthorDate: Fri Sep 9 10:07:14 2022 +0800

    [INLONG-5825][Manager] Remove the limitation of MQ type in 
SortSourceService (#5827)
---
 .../inlong/manager/service/core/impl/SortSourceServiceImpl.java       | 4 ++--
 1 file changed, 2 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 0510ce2f1..611e8d02e 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
@@ -45,6 +45,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -197,7 +198,6 @@ public class SortSourceServiceImpl implements 
SortSourceService {
         List<SortSourceGroupInfo> groupInfos = 
inlongGroupEntityMapper.selectAllGroups();
         Map<String, SortSourceGroupInfo> allId2GroupInfos = groupInfos.stream()
                 .filter(dto -> dto.getGroupId() != null)
-                .filter(group -> SUPPORTED_MQ_TYPE.contains(group.getMqType()))
                 .collect(Collectors.toMap(SortSourceGroupInfo::getGroupId, dto 
-> dto, (g1, g2) -> g1));
 
         // get all clusters. filter by type and check if consumable, then 
group by cluster tag.
@@ -205,7 +205,7 @@ public class SortSourceServiceImpl implements 
SortSourceService {
         Map<String, List<SortSourceClusterInfo>> allTag2ClusterInfos = 
clusterInfos.stream()
                 .filter(dto -> dto.getClusterTags() != null)
                 .filter(SortSourceClusterInfo::isConsumable)
-                .filter(cluster -> 
SUPPORTED_MQ_TYPE.contains(cluster.getType()))
+                .filter(cluster -> 
SUPPORTED_MQ_TYPE.contains(cluster.getType().toUpperCase(Locale.ROOT)))
                 
.collect(Collectors.groupingBy(SortSourceClusterInfo::getClusterTags));
 
         // group clusters by name.