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 13df48e7d [INLONG-5137][Manager] Refactor the pagination query for
inlong group and inlong stream (#5145)
13df48e7d is described below
commit 13df48e7df44eb7b7cffce2e16bef259f0fbe1f0
Author: healchow <[email protected]>
AuthorDate: Thu Jul 21 15:06:25 2022 +0800
[INLONG-5137][Manager] Refactor the pagination query for inlong group and
inlong stream (#5145)
---
.../inlong/manager/client/cli/DescribeCommand.java | 4 +-
.../inlong/manager/client/cli/ListCommand.java | 4 +-
.../manager/client/api/LowLevelInlongClient.java | 16 +--
.../manager/client/api/impl/InlongClientImpl.java | 24 ++--
.../client/api/impl/LowLevelInlongClientImpl.java | 4 +-
.../client/api/inner/client/InlongGroupClient.java | 18 +--
.../manager/client/api/service/InlongGroupApi.java | 4 +-
.../client/api/inner/ClientFactoryTest.java | 66 ++++-----
.../common/pojo/group/InlongGroupBriefInfo.java | 26 ++++
.../manager/common/pojo/group/InlongGroupInfo.java | 3 +
.../common/pojo/group/InlongGroupListResponse.java | 66 ---------
.../{SinkBriefResponse.java => SinkBriefInfo.java} | 6 +-
.../common/pojo/stream/InlongStreamBriefInfo.java | 16 ++-
.../pojo/stream/InlongStreamListResponse.java | 61 --------
.../pojo/stream/InlongStreamPageRequest.java | 8 +-
.../manager/dao/mapper/StreamSinkEntityMapper.java | 4 +-
.../resources/mappers/InlongStreamEntityMapper.xml | 3 +-
.../resources/mappers/StreamSinkEntityMapper.xml | 2 +-
.../manager/service/core/InlongStreamService.java | 45 +++---
.../service/core/impl/InlongStreamServiceImpl.java | 157 +++++++++------------
.../operation/InlongGroupProcessOperation.java | 2 +-
.../service/group/AbstractGroupOperator.java | 5 +-
.../manager/service/group/InlongGroupService.java | 6 +-
.../service/group/InlongGroupServiceImpl.java | 18 +--
.../manager/service/sink/StreamSinkService.java | 4 +-
.../service/sink/StreamSinkServiceImpl.java | 8 +-
.../listener/AbstractSourceOperateListener.java | 2 +-
.../web/controller/InlongGroupController.java | 6 +-
.../web/controller/InlongStreamController.java | 20 +--
29 files changed, 240 insertions(+), 368 deletions(-)
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/DescribeCommand.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/DescribeCommand.java
index 38edd6d3e..0367da168 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/DescribeCommand.java
+++
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/DescribeCommand.java
@@ -27,7 +27,7 @@ import
org.apache.inlong.manager.client.api.inner.client.StreamSourceClient;
import org.apache.inlong.manager.client.cli.pojo.GroupInfo;
import org.apache.inlong.manager.client.cli.util.ClientUtils;
import org.apache.inlong.manager.client.cli.util.PrintUtils;
-import org.apache.inlong.manager.common.pojo.group.InlongGroupListResponse;
+import org.apache.inlong.manager.common.pojo.group.InlongGroupBriefInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupPageRequest;
import org.apache.inlong.manager.common.pojo.sink.StreamSink;
import org.apache.inlong.manager.common.pojo.source.StreamSource;
@@ -97,7 +97,7 @@ public class DescribeCommand extends AbstractCommand {
InlongGroupClient groupClient =
ClientUtils.clientFactory.getGroupClient();
InlongGroupPageRequest pageRequest = new
InlongGroupPageRequest();
pageRequest.setKeyword(group);
- PageInfo<InlongGroupListResponse> pageInfo =
groupClient.listGroups(pageRequest);
+ PageInfo<InlongGroupBriefInfo> pageInfo =
groupClient.listGroups(pageRequest);
PrintUtils.print(pageInfo.getList(), GroupInfo.class);
} catch (Exception e) {
System.out.println(e.getMessage());
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/ListCommand.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/ListCommand.java
index a91e4925f..e2f474bac 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/ListCommand.java
+++
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/ListCommand.java
@@ -31,7 +31,7 @@ import org.apache.inlong.manager.client.cli.pojo.SourceInfo;
import org.apache.inlong.manager.client.cli.pojo.StreamInfo;
import org.apache.inlong.manager.client.cli.util.ClientUtils;
import org.apache.inlong.manager.client.cli.util.PrintUtils;
-import org.apache.inlong.manager.common.pojo.group.InlongGroupListResponse;
+import org.apache.inlong.manager.common.pojo.group.InlongGroupBriefInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupPageRequest;
import org.apache.inlong.manager.common.pojo.sink.StreamSink;
import org.apache.inlong.manager.common.pojo.source.StreamSource;
@@ -113,7 +113,7 @@ public class ListCommand extends AbstractCommand {
ClientUtils.initClientFactory();
InlongGroupClient groupClient =
ClientUtils.clientFactory.getGroupClient();
- PageInfo<InlongGroupListResponse> groupPageInfo =
groupClient.listGroups(pageRequest);
+ PageInfo<InlongGroupBriefInfo> groupPageInfo =
groupClient.listGroups(pageRequest);
PrintUtils.print(groupPageInfo.getList(), GroupInfo.class);
} catch (Exception e) {
System.out.println(e.getMessage());
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/LowLevelInlongClient.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/LowLevelInlongClient.java
index 4ab73e18c..adf6c9895 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/LowLevelInlongClient.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/LowLevelInlongClient.java
@@ -20,7 +20,7 @@ package org.apache.inlong.manager.client.api;
import com.github.pagehelper.PageInfo;
import org.apache.inlong.manager.client.api.impl.LowLevelInlongClientImpl;
import org.apache.inlong.manager.common.pojo.cluster.ClusterRequest;
-import org.apache.inlong.manager.common.pojo.group.InlongGroupListResponse;
+import org.apache.inlong.manager.common.pojo.group.InlongGroupBriefInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupPageRequest;
/**
@@ -41,21 +41,21 @@ public interface LowLevelInlongClient {
}
/**
- * Create component cluster for Inlong
+ * Create cluster.
*
* @param request cluster request
* @return cluster index
- * @throws Exception
+ * @throws Exception the exception may throw
*/
Integer saveCluster(ClusterRequest request) throws Exception;
/**
- * List group
+ * List inlong group.
*
- * @param request The request
- * @return PageInfo of group
- * @throws Exception The exception may throws
+ * @param request page request
+ * @return group info page
+ * @throws Exception the exception may throw
*/
- PageInfo<InlongGroupListResponse> listGroup(InlongGroupPageRequest
request) throws Exception;
+ PageInfo<InlongGroupBriefInfo> listGroup(InlongGroupPageRequest request)
throws Exception;
}
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 a03997a9f..2f95f99d0 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
@@ -32,8 +32,8 @@ import
org.apache.inlong.manager.client.api.enums.SimpleGroupStatus;
import org.apache.inlong.manager.client.api.enums.SimpleSourceStatus;
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.pojo.group.InlongGroupBriefInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
-import org.apache.inlong.manager.common.pojo.group.InlongGroupListResponse;
import org.apache.inlong.manager.common.pojo.group.InlongGroupPageRequest;
import org.apache.inlong.manager.common.pojo.source.StreamSource;
import org.apache.inlong.manager.common.util.HttpUtils;
@@ -86,13 +86,13 @@ public class InlongClientImpl implements InlongClient {
@Override
public List<InlongGroup> listGroup(String expr, int status, int pageNum,
int pageSize) {
- PageInfo<InlongGroupListResponse> responsePageInfo =
groupClient.listGroups(expr, status, pageNum,
+ PageInfo<InlongGroupBriefInfo> pageInfo = groupClient.listGroups(expr,
status, pageNum,
pageSize);
- if (CollectionUtils.isEmpty(responsePageInfo.getList())) {
+ if (CollectionUtils.isEmpty(pageInfo.getList())) {
return Lists.newArrayList();
} else {
- return responsePageInfo.getList().stream().map(response -> {
- String groupId = response.getInlongGroupId();
+ return pageInfo.getList().stream().map(briefInfo -> {
+ String groupId = briefInfo.getInlongGroupId();
InlongGroupInfo groupInfo = groupClient.getGroupInfo(groupId);
return new InlongGroupImpl(groupInfo, configuration);
}).collect(Collectors.toList());
@@ -105,14 +105,14 @@ public class InlongClientImpl implements InlongClient {
request.setGroupIdList(groupIds);
request.setListSources(true);
- PageInfo<InlongGroupListResponse> pageInfo =
groupClient.listGroups(request);
- List<InlongGroupListResponse> groupListResponses = pageInfo.getList();
+ PageInfo<InlongGroupBriefInfo> pageInfo =
groupClient.listGroups(request);
+ List<InlongGroupBriefInfo> briefInfos = pageInfo.getList();
Map<String, SimpleGroupStatus> groupStatusMap = Maps.newHashMap();
- if (CollectionUtils.isNotEmpty(groupListResponses)) {
- groupListResponses.forEach(response -> {
- String groupId = response.getInlongGroupId();
- SimpleGroupStatus groupStatus =
SimpleGroupStatus.parseStatusByCode(response.getStatus());
- List<StreamSource> sources = response.getStreamSources();
+ if (CollectionUtils.isNotEmpty(briefInfos)) {
+ briefInfos.forEach(briefInfo -> {
+ String groupId = briefInfo.getInlongGroupId();
+ SimpleGroupStatus groupStatus =
SimpleGroupStatus.parseStatusByCode(briefInfo.getStatus());
+ List<StreamSource> sources = briefInfo.getStreamSources();
groupStatus = recheckGroupStatus(groupStatus, sources);
groupStatusMap.put(groupId, groupStatus);
});
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/LowLevelInlongClientImpl.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/LowLevelInlongClientImpl.java
index dc9f05314..92a9b34f0 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/LowLevelInlongClientImpl.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/impl/LowLevelInlongClientImpl.java
@@ -28,7 +28,7 @@ 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.pojo.cluster.ClusterRequest;
-import org.apache.inlong.manager.common.pojo.group.InlongGroupListResponse;
+import org.apache.inlong.manager.common.pojo.group.InlongGroupBriefInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupPageRequest;
import org.apache.inlong.manager.common.util.HttpUtils;
@@ -79,7 +79,7 @@ public class LowLevelInlongClientImpl implements
LowLevelInlongClient {
}
@Override
- public PageInfo<InlongGroupListResponse> listGroup(InlongGroupPageRequest
request) {
+ public PageInfo<InlongGroupBriefInfo> listGroup(InlongGroupPageRequest
request) {
InlongGroupClient groupClient =
ClientUtils.getClientFactory(configuration).getGroupClient();
return groupClient.listGroups(request);
}
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongGroupClient.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongGroupClient.java
index 0aff6ef4b..87d165df3 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongGroupClient.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongGroupClient.java
@@ -25,8 +25,8 @@ import
org.apache.inlong.manager.client.api.enums.SimpleGroupStatus;
import org.apache.inlong.manager.client.api.service.InlongGroupApi;
import org.apache.inlong.manager.client.api.util.ClientUtils;
import org.apache.inlong.manager.common.beans.Response;
+import org.apache.inlong.manager.common.pojo.group.InlongGroupBriefInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
-import org.apache.inlong.manager.common.pojo.group.InlongGroupListResponse;
import org.apache.inlong.manager.common.pojo.group.InlongGroupPageRequest;
import org.apache.inlong.manager.common.pojo.group.InlongGroupRequest;
import org.apache.inlong.manager.common.pojo.group.InlongGroupResetRequest;
@@ -86,6 +86,7 @@ public class InlongGroupClient {
JSONObject groupInfoJson = JsonUtils.parseObject(
JsonUtils.toJsonString(JsonUtils.toJsonString(responseBody.getData())),
JSONObject.class);
+ assert groupInfoJson != null;
if (groupInfoJson.has(MQ_FIELD_OLD) &&
!groupInfoJson.has(MQ_FIELD)) {
groupInfoJson.put(MQ_FIELD, groupInfoJson.get(MQ_FIELD_OLD));
}
@@ -102,7 +103,7 @@ public class InlongGroupClient {
/**
* Get inlong group list.
*/
- public PageInfo<InlongGroupListResponse> listGroups(String keyword, int
status, int pageNum, int pageSize) {
+ public PageInfo<InlongGroupBriefInfo> listGroups(String keyword, int
status, int pageNum, int pageSize) {
InlongGroupPageRequest request = InlongGroupPageRequest.builder()
.keyword(keyword)
.status(status)
@@ -110,9 +111,8 @@ public class InlongGroupClient {
request.setPageNum(pageNum <= 0 ? 1 : pageNum);
request.setPageSize(pageSize);
- Response<PageInfo<InlongGroupListResponse>> pageInfoResponse =
ClientUtils.executeHttpCall(
+ Response<PageInfo<InlongGroupBriefInfo>> pageInfoResponse =
ClientUtils.executeHttpCall(
inlongGroupApi.listGroups(request));
-
if (pageInfoResponse.isSuccess()) {
return pageInfoResponse.getData();
}
@@ -126,14 +126,14 @@ public class InlongGroupClient {
/**
* List inlong group by the page request
*
- * @param pageRequest The pageRequest
+ * @param pageRequest page request
* @return Response encapsulate of inlong group list
*/
- public PageInfo<InlongGroupListResponse> listGroups(InlongGroupPageRequest
pageRequest) {
- Response<PageInfo<InlongGroupListResponse>> pageInfoResponse =
ClientUtils.executeHttpCall(
+ public PageInfo<InlongGroupBriefInfo> listGroups(InlongGroupPageRequest
pageRequest) {
+ Response<PageInfo<InlongGroupBriefInfo>> response =
ClientUtils.executeHttpCall(
inlongGroupApi.listGroups(pageRequest));
- ClientUtils.assertRespSuccess(pageInfoResponse);
- return pageInfoResponse.getData();
+ ClientUtils.assertRespSuccess(response);
+ return response.getData();
}
/**
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongGroupApi.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongGroupApi.java
index e7a1658bf..8941dfb22 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongGroupApi.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongGroupApi.java
@@ -19,7 +19,7 @@ package org.apache.inlong.manager.client.api.service;
import com.github.pagehelper.PageInfo;
import org.apache.inlong.manager.common.beans.Response;
-import org.apache.inlong.manager.common.pojo.group.InlongGroupListResponse;
+import org.apache.inlong.manager.common.pojo.group.InlongGroupBriefInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupPageRequest;
import org.apache.inlong.manager.common.pojo.group.InlongGroupRequest;
import org.apache.inlong.manager.common.pojo.group.InlongGroupResetRequest;
@@ -40,7 +40,7 @@ public interface InlongGroupApi {
Call<Response<Object>> getGroupInfo(@Path("id") String id);
@POST("group/list")
- Call<Response<PageInfo<InlongGroupListResponse>>> listGroups(@Body
InlongGroupPageRequest request);
+ Call<Response<PageInfo<InlongGroupBriefInfo>>> listGroups(@Body
InlongGroupPageRequest request);
@POST("group/save")
Call<Response<String>> createGroup(@Body InlongGroupRequest request);
diff --git
a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/ClientFactoryTest.java
b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/ClientFactoryTest.java
index de019484d..be00ab69f 100644
---
a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/ClientFactoryTest.java
+++
b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/inner/ClientFactoryTest.java
@@ -37,9 +37,9 @@ import org.apache.inlong.manager.common.beans.Response;
import org.apache.inlong.manager.common.enums.SinkType;
import org.apache.inlong.manager.common.pojo.cluster.ClusterRequest;
import
org.apache.inlong.manager.common.pojo.cluster.pulsar.PulsarClusterRequest;
+import org.apache.inlong.manager.common.pojo.group.InlongGroupBriefInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupExtInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
-import org.apache.inlong.manager.common.pojo.group.InlongGroupListResponse;
import org.apache.inlong.manager.common.pojo.group.InlongGroupResetRequest;
import org.apache.inlong.manager.common.pojo.group.pulsar.InlongPulsarInfo;
import org.apache.inlong.manager.common.pojo.group.pulsar.InlongPulsarRequest;
@@ -157,8 +157,8 @@ class ClientFactoryTest {
@Test
void testListGroup4AutoPushSource() {
- List<InlongGroupListResponse> groupListResponses = Lists.newArrayList(
- InlongGroupListResponse.builder()
+ List<InlongGroupBriefInfo> groupBriefInfos = Lists.newArrayList(
+ InlongGroupBriefInfo.builder()
.id(1)
.inlongGroupId("1")
.name("name")
@@ -178,19 +178,19 @@ class ClientFactoryTest {
stubFor(
post(urlMatching("/api/inlong/manager/group/list.*"))
.willReturn(
-
okJson(JsonUtils.toJsonString(Response.success(new
PageInfo<>(groupListResponses))))
+
okJson(JsonUtils.toJsonString(Response.success(new
PageInfo<>(groupBriefInfos))))
)
);
- PageInfo<InlongGroupListResponse> listResponse =
groupClient.listGroups("keyword", 1, 1, 10);
- Assertions.assertEquals(JsonUtils.toJsonString(groupListResponses),
- JsonUtils.toJsonString(listResponse.getList()));
+ PageInfo<InlongGroupBriefInfo> pageInfo =
groupClient.listGroups("keyword", 1, 1, 10);
+ Assertions.assertEquals(JsonUtils.toJsonString(groupBriefInfos),
+ JsonUtils.toJsonString(pageInfo.getList()));
}
@Test
void testListGroup4BinlogSource() {
- List<InlongGroupListResponse> groupListResponses = Lists.newArrayList(
- InlongGroupListResponse.builder()
+ List<InlongGroupBriefInfo> groupBriefInfos = Lists.newArrayList(
+ InlongGroupBriefInfo.builder()
.id(1)
.inlongGroupId("1")
.name("name")
@@ -214,19 +214,19 @@ class ClientFactoryTest {
stubFor(
post(urlMatching("/api/inlong/manager/group/list.*"))
.willReturn(
-
okJson(JsonUtils.toJsonString(Response.success(new
PageInfo<>(groupListResponses))))
+
okJson(JsonUtils.toJsonString(Response.success(new
PageInfo<>(groupBriefInfos))))
)
);
- PageInfo<InlongGroupListResponse> listResponse =
groupClient.listGroups("keyword", 1, 1, 10);
- Assertions.assertEquals(JsonUtils.toJsonString(groupListResponses),
- JsonUtils.toJsonString(listResponse.getList()));
+ PageInfo<InlongGroupBriefInfo> pageInfo =
groupClient.listGroups("keyword", 1, 1, 10);
+ Assertions.assertEquals(JsonUtils.toJsonString(groupBriefInfos),
+ JsonUtils.toJsonString(pageInfo.getList()));
}
@Test
void testListGroup4FileSource() {
- List<InlongGroupListResponse> groupListResponses = Lists.newArrayList(
- InlongGroupListResponse.builder()
+ List<InlongGroupBriefInfo> groupBriefInfos = Lists.newArrayList(
+ InlongGroupBriefInfo.builder()
.id(1)
.inlongGroupId("1")
.name("name")
@@ -252,19 +252,19 @@ class ClientFactoryTest {
stubFor(
post(urlMatching("/api/inlong/manager/group/list.*"))
.willReturn(
-
okJson(JsonUtils.toJsonString(Response.success(new
PageInfo<>(groupListResponses))))
+
okJson(JsonUtils.toJsonString(Response.success(new
PageInfo<>(groupBriefInfos))))
)
);
- PageInfo<InlongGroupListResponse> listResponse =
groupClient.listGroups("keyword", 1, 1, 10);
- Assertions.assertEquals(JsonUtils.toJsonString(groupListResponses),
- JsonUtils.toJsonString(listResponse.getList()));
+ PageInfo<InlongGroupBriefInfo> pageInfo =
groupClient.listGroups("keyword", 1, 1, 10);
+ Assertions.assertEquals(JsonUtils.toJsonString(groupBriefInfos),
+ JsonUtils.toJsonString(pageInfo.getList()));
}
@Test
void testListGroup4KafkaSource() {
- List<InlongGroupListResponse> groupListResponses = Lists.newArrayList(
- InlongGroupListResponse.builder()
+ List<InlongGroupBriefInfo> groupBriefInfos = Lists.newArrayList(
+ InlongGroupBriefInfo.builder()
.id(1)
.inlongGroupId("1")
.streamSources(
@@ -292,13 +292,13 @@ class ClientFactoryTest {
stubFor(
post(urlMatching("/api/inlong/manager/group/list.*"))
.willReturn(
-
okJson(JsonUtils.toJsonString(Response.success(new
PageInfo<>(groupListResponses))))
+
okJson(JsonUtils.toJsonString(Response.success(new
PageInfo<>(groupBriefInfos))))
)
);
- PageInfo<InlongGroupListResponse> listResponse =
groupClient.listGroups("keyword", 1, 1, 10);
- Assertions.assertEquals(JsonUtils.toJsonString(groupListResponses),
- JsonUtils.toJsonString(listResponse.getList()));
+ PageInfo<InlongGroupBriefInfo> pageInfo =
groupClient.listGroups("keyword", 1, 1, 10);
+ Assertions.assertEquals(JsonUtils.toJsonString(groupBriefInfos),
+ JsonUtils.toJsonString(pageInfo.getList()));
}
@Test
@@ -350,8 +350,8 @@ class ClientFactoryTest {
.primaryKey("primaryKey")
.build()
);
- List<InlongGroupListResponse> groupListResponses = Lists.newArrayList(
- InlongGroupListResponse.builder()
+ List<InlongGroupBriefInfo> groupBriefInfos = Lists.newArrayList(
+ InlongGroupBriefInfo.builder()
.id(1)
.inlongGroupId("1")
.name("name")
@@ -363,14 +363,14 @@ class ClientFactoryTest {
stubFor(
post(urlMatching("/api/inlong/manager/group/list.*"))
.willReturn(
-
okJson(JsonUtils.toJsonString(Response.success(new
PageInfo<>(groupListResponses)))
+
okJson(JsonUtils.toJsonString(Response.success(new PageInfo<>(groupBriefInfos)))
)
)
);
- PageInfo<InlongGroupListResponse> listResponse =
groupClient.listGroups("keyword", 1, 1, 10);
- Assertions.assertEquals(JsonUtils.toJsonString(groupListResponses),
- JsonUtils.toJsonString(listResponse.getList()));
+ PageInfo<InlongGroupBriefInfo> pageInfo =
groupClient.listGroups("keyword", 1, 1, 10);
+ Assertions.assertEquals(JsonUtils.toJsonString(groupBriefInfos),
+ JsonUtils.toJsonString(pageInfo.getList()));
}
@Test
@@ -384,8 +384,8 @@ class ClientFactoryTest {
)
);
- PageInfo<InlongGroupListResponse> listResponse =
groupClient.listGroups("keyword", 1, 1, 10);
- Assertions.assertNull(listResponse);
+ PageInfo<InlongGroupBriefInfo> pageInfo =
groupClient.listGroups("keyword", 1, 1, 10);
+ Assertions.assertNull(pageInfo);
}
@Test
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupBriefInfo.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupBriefInfo.java
index 924ca2d0d..7688a8b8d 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupBriefInfo.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupBriefInfo.java
@@ -20,14 +20,22 @@ package org.apache.inlong.manager.common.pojo.group;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.inlong.manager.common.pojo.source.StreamSource;
import java.util.Date;
+import java.util.List;
/**
* Inlong group brief info
*/
@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
@ApiModel("Inlong group brief info")
public class InlongGroupBriefInfo {
@@ -49,7 +57,25 @@ public class InlongGroupBriefInfo {
@ApiModelProperty(value = "Inlong cluster tag")
private String inlongClusterTag;
+ @ApiModelProperty(value = "Name of responsible person, separated by
commas")
+ private String inCharges;
+
+ @ApiModelProperty(value = "Status")
+ private Integer status;
+
+ @ApiModelProperty(value = "Name of creator")
+ private String creator;
+
+ @ApiModelProperty(value = "Name of modifier")
+ private String modifier;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
+ @ApiModelProperty(value = "Stream sources in the inlong group")
+ private List<StreamSource> streamSources;
+
}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupInfo.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupInfo.java
index e2e9a6760..e379192dd 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupInfo.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupInfo.java
@@ -96,10 +96,13 @@ public abstract class InlongGroupInfo {
@ApiModelProperty(value = "Name of followers, separated by commas")
private String followers;
+ @ApiModelProperty(value = "Status")
private Integer status;
+ @ApiModelProperty(value = "Name of creator")
private String creator;
+ @ApiModelProperty(value = "Name of modifier")
private String modifier;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupListResponse.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupListResponse.java
deleted file mode 100644
index fb236d0b1..000000000
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupListResponse.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.pojo.group;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.apache.inlong.manager.common.pojo.source.StreamSource;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * Inlong group list
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@ApiModel("Inlong group list")
-public class InlongGroupListResponse {
-
- @ApiModelProperty(value = "Primary key")
- private Integer id;
-
- @ApiModelProperty(value = "Inlong group id", required = true)
- private String inlongGroupId;
-
- @ApiModelProperty(value = "Inlong group name")
- private String name;
-
- @ApiModelProperty(value = "Name of responsible person, separated by
commas")
- private String inCharges;
-
- @ApiModelProperty(value = "Status")
- private Integer status;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date modifyTime;
-
- @ApiModelProperty(value = "Stream sources in the inlong group")
- private List<StreamSource> streamSources;
-
-}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkBriefResponse.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkBriefInfo.java
similarity index 93%
rename from
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkBriefResponse.java
rename to
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkBriefInfo.java
index ed3c8bef9..dffddb8b9 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkBriefResponse.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sink/SinkBriefInfo.java
@@ -22,11 +22,11 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
- * Brief response of the Sink
+ * Sink brief info
*/
@Data
-@ApiModel("Brief response of the Sink")
-public class SinkBriefResponse {
+@ApiModel("Sink brief info")
+public class SinkBriefInfo {
private Integer id;
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamBriefInfo.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamBriefInfo.java
index 71f5037ab..5d9a6750f 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamBriefInfo.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamBriefInfo.java
@@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.apache.inlong.manager.common.pojo.sink.SinkBriefResponse;
+import org.apache.inlong.manager.common.pojo.sink.SinkBriefInfo;
import java.util.Date;
import java.util.List;
@@ -48,10 +48,22 @@ public class InlongStreamBriefInfo {
@ApiModelProperty(value = "MQ resource")
private String mqResource;
+ @ApiModelProperty(value = "Status")
+ private Integer status;
+
+ @ApiModelProperty(value = "Name of creator")
+ private String creator;
+
+ @ApiModelProperty(value = "Name of modifier")
+ private String modifier;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
@ApiModelProperty(value = "Sink brief list")
- private List<SinkBriefResponse> sinkList;
+ private List<SinkBriefInfo> sinkList;
}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamListResponse.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamListResponse.java
deleted file mode 100644
index 2ea380d4d..000000000
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamListResponse.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.common.pojo.stream;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * Inlong stream list
- */
-@Data
-@ApiModel("Inlong stream list")
-public class InlongStreamListResponse {
-
- @ApiModelProperty(value = "Primary key")
- private Integer id;
-
- @ApiModelProperty(value = "Inlong group id")
- private String inlongGroupId;
-
- @ApiModelProperty(value = "Inlong stream id")
- private String inlongStreamId;
-
- @ApiModelProperty(value = "Inlong stream name")
- private String name;
-
- @ApiModelProperty(value = "Data type, TEXT, KEY-VALUE, PB, BON")
- private String dataType;
-
- @ApiModelProperty(value = "Sink type list")
- private List<String> sinkTypeList;
-
- @ApiModelProperty(value = "Status")
- private Integer status;
-
- private String modifier;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date modifyTime;
-
-}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamPageRequest.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamPageRequest.java
index 2fd583459..37ef5e8de 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamPageRequest.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamPageRequest.java
@@ -30,10 +30,10 @@ import org.apache.inlong.manager.common.beans.PageRequest;
* Inlong stream paging query conditions
*/
@Data
-@EqualsAndHashCode(callSuper = false)
@Builder
@NoArgsConstructor
@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
@ApiModel("Inlong stream paging query request")
public class InlongStreamPageRequest extends PageRequest {
@@ -43,12 +43,6 @@ public class InlongStreamPageRequest extends PageRequest {
@ApiModelProperty(value = "Keyword, can be stream id or name")
private String keyword;
- @ApiModelProperty(value = "Sink type to be created (which has no inlong
stream of this type)")
- private String sinkType;
-
- @ApiModelProperty(value = "Whether to get the sink type list, 0 (default):
not get, 1: get")
- private Integer needSinkList = 0;
-
@ApiModelProperty(value = "status")
private Integer status;
diff --git
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StreamSinkEntityMapper.java
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StreamSinkEntityMapper.java
index 724db3fbc..d12c069cf 100644
---
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StreamSinkEntityMapper.java
+++
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/StreamSinkEntityMapper.java
@@ -21,7 +21,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.inlong.manager.common.pojo.sortstandalone.SortIdInfo;
import
org.apache.inlong.manager.common.pojo.sortstandalone.SortSourceStreamInfo;
import org.apache.inlong.manager.common.pojo.sortstandalone.SortTaskInfo;
-import org.apache.inlong.manager.common.pojo.sink.SinkBriefResponse;
+import org.apache.inlong.manager.common.pojo.sink.SinkBriefInfo;
import org.apache.inlong.manager.common.pojo.sink.SinkInfo;
import org.apache.inlong.manager.common.pojo.sink.SinkPageRequest;
import org.apache.inlong.manager.dao.entity.StreamSinkEntity;
@@ -58,7 +58,7 @@ public interface StreamSinkEntityMapper {
/**
* Query the sink summary from the given groupId and streamId
*/
- List<SinkBriefResponse> selectSummary(@Param("groupId") String groupId,
+ List<SinkBriefInfo> selectSummary(@Param("groupId") String groupId,
@Param("streamId") String streamId);
/**
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
index e6f992473..ed616833f 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongStreamEntityMapper.xml
@@ -260,7 +260,8 @@
from inlong_stream stream, inlong_group grp
<where>
stream.is_deleted = 0
- and stream.inlong_group_id = grp.inlong_group_id and
grp.is_deleted = 0
+ and stream.inlong_group_id = grp.inlong_group_id
+ and grp.is_deleted = 0
<if test="request.inlongGroupId != null and request.inlongGroupId
!= ''">
and stream.inlong_group_id = #{request.inlongGroupId,
jdbcType=VARCHAR}
</if>
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
index 1ab8267ae..488bce6ba 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/StreamSinkEntityMapper.xml
@@ -110,7 +110,7 @@
</where>
</select>
<select id="selectSummary"
-
resultType="org.apache.inlong.manager.common.pojo.sink.SinkBriefResponse">
+
resultType="org.apache.inlong.manager.common.pojo.sink.SinkBriefInfo">
select s.id,
s.inlong_group_id,
s.inlong_stream_id,
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/InlongStreamService.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/InlongStreamService.java
index 09cc8a024..5c8b2ef27 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/InlongStreamService.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/InlongStreamService.java
@@ -21,7 +21,6 @@ import com.github.pagehelper.PageInfo;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamApproveRequest;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamBriefInfo;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamInfo;
-import org.apache.inlong.manager.common.pojo.stream.InlongStreamListResponse;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamPageRequest;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamRequest;
@@ -30,8 +29,8 @@ import java.util.List;
/**
* Inlong stream service layer interface
*
- * @apiNote It is associated with various sources, the upstream is
StreamSource, and the downstream is
- * StreamSink
+ * @apiNote InlongStream was associated with various sources, the upstream is
StreamSource,
+ * and the downstream is StreamSink
*/
public interface InlongStreamService {
@@ -71,12 +70,28 @@ public interface InlongStreamService {
Boolean exist(String groupId, String streamId);
/**
- * Query inlong stream list based on conditions
+ * Paging query inlong stream brief info list
*
- * @param request Inlong stream paging query request
- * @return Inlong stream paging list
+ * @param request query request
+ * @return inlong stream brief list
*/
- PageInfo<InlongStreamListResponse> listByCondition(InlongStreamPageRequest
request);
+ PageInfo<InlongStreamBriefInfo> listBrief(InlongStreamPageRequest request);
+
+ /**
+ * Paging query inlong stream full info list, and get all related sources
and sinks
+ *
+ * @param request query request
+ * @return inlong stream info list
+ */
+ PageInfo<InlongStreamInfo> listAll(InlongStreamPageRequest request);
+
+ /**
+ * Get the inlong stream brief list and related sink brief list.
+ *
+ * @param groupId inlong group id
+ * @return brief list of inlong stream
+ */
+ List<InlongStreamBriefInfo> listBriefWithSink(String groupId);
/**
* InlongStream info that needs to be modified
@@ -106,22 +121,6 @@ public interface InlongStreamService {
*/
Boolean logicDeleteAll(String groupId, String operator);
- /**
- * Obtain the flow of inlong stream according to groupId
- *
- * @param groupId Inlong group id
- * @return Summary list of inlong stream
- */
- List<InlongStreamBriefInfo> getBriefList(String groupId);
-
- /**
- * Paging query all data of the inlong stream page under the specified
groupId
- *
- * @param request Query
- * @return Paging list of all data on the inlong stream page
- */
- PageInfo<InlongStreamInfo> listAllWithGroupId(InlongStreamPageRequest
request);
-
/**
* According to the group id, query the number of valid inlong streams
belonging to this service
*
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/InlongStreamServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/InlongStreamServiceImpl.java
index e5c920fd8..830ff0b6b 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/InlongStreamServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/InlongStreamServiceImpl.java
@@ -27,14 +27,13 @@ import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
import org.apache.inlong.manager.common.enums.GroupStatus;
import org.apache.inlong.manager.common.enums.StreamStatus;
import org.apache.inlong.manager.common.exceptions.BusinessException;
-import org.apache.inlong.manager.common.pojo.sink.SinkBriefResponse;
+import org.apache.inlong.manager.common.pojo.sink.SinkBriefInfo;
import org.apache.inlong.manager.common.pojo.sink.StreamSink;
import org.apache.inlong.manager.common.pojo.source.StreamSource;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamApproveRequest;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamBriefInfo;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamExtInfo;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamInfo;
-import org.apache.inlong.manager.common.pojo.stream.InlongStreamListResponse;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamPageRequest;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamRequest;
import org.apache.inlong.manager.common.pojo.stream.StreamField;
@@ -199,39 +198,80 @@ public class InlongStreamServiceImpl implements
InlongStreamService {
}
@Override
- public PageInfo<InlongStreamListResponse>
listByCondition(InlongStreamPageRequest request) {
+ public PageInfo<InlongStreamBriefInfo> listBrief(InlongStreamPageRequest
request) {
LOGGER.debug("begin to list inlong stream page by {}", request);
PageHelper.startPage(request.getPageNum(), request.getPageSize());
Page<InlongStreamEntity> entityPage = (Page<InlongStreamEntity>)
streamMapper.selectByCondition(request);
- List<InlongStreamListResponse> streamList =
CommonBeanUtils.copyListProperties(entityPage,
- InlongStreamListResponse::new);
+ List<InlongStreamBriefInfo> streamList =
CommonBeanUtils.copyListProperties(entityPage,
+ InlongStreamBriefInfo::new);
- // Filter out inlong streams that do not have this sink type (only one
of each inlong stream can be created)
+ PageInfo<InlongStreamBriefInfo> page = new PageInfo<>(streamList);
+ page.setTotal(streamList.size());
+
+ LOGGER.debug("success to list inlong stream info for groupId={}",
request.getInlongGroupId());
+ return page;
+ }
+
+ @Override
+ public PageInfo<InlongStreamInfo> listAll(InlongStreamPageRequest request)
{
+ LOGGER.debug("begin to list full inlong stream page by {}", request);
+ Preconditions.checkNotNull(request, "request is empty");
String groupId = request.getInlongGroupId();
- String sinkType = request.getSinkType();
- if (StringUtils.isNotEmpty(sinkType)) {
- List<String> streamIdList =
streamList.stream().map(InlongStreamListResponse::getInlongStreamId)
- .distinct().collect(Collectors.toList());
- List<String> resultList =
sinkService.getExistsStreamIdList(groupId, sinkType, streamIdList);
- streamList.removeIf(entity ->
resultList.contains(entity.getInlongStreamId()));
- }
+ Preconditions.checkNotNull(groupId,
ErrorCodeEnum.GROUP_ID_IS_EMPTY.getMessage());
+ InlongGroupEntity groupEntity = groupMapper.selectByGroupId(groupId);
+ Preconditions.checkNotNull(groupEntity, "inlong group not found by
groupId=" + groupId);
+
+ // the person in charge of the inlong group has the authority of all
inlong streams,
+ // so do not filter by in charge person
+ PageHelper.startPage(request.getPageNum(), request.getPageSize());
+ Page<InlongStreamEntity> page = (Page<InlongStreamEntity>)
streamMapper.selectByCondition(request);
+ List<InlongStreamInfo> streamInfoList =
CommonBeanUtils.copyListProperties(page, InlongStreamInfo::new);
+
+ // Convert and encapsulate the paged results
+ for (InlongStreamInfo streamInfo : streamInfoList) {
+ // Set the field information of the inlong stream
+ String streamId = streamInfo.getInlongStreamId();
+ List<StreamField> streamFields = getStreamFields(groupId,
streamId);
+ streamInfo.setFieldList(streamFields);
+ List<InlongStreamExtInfo> streamExtInfos =
CommonBeanUtils.copyListProperties(
+ streamExtMapper.selectByRelatedId(groupId, streamId),
InlongStreamExtInfo::new);
+ streamInfo.setExtList(streamExtInfos);
+
+ // query all valid stream sources
+ List<StreamSource> sourceList = sourceService.listSource(groupId,
streamId);
+ streamInfo.setSourceList(sourceList);
- // Query all stream sink targets corresponding to each inlong stream
according to streamId
- if (request.getNeedSinkList() == 1) {
- streamList.forEach(stream -> {
- String streamId = stream.getInlongStreamId();
- List<String> sinkTypeList =
sinkService.getSinkTypeList(groupId, streamId);
- stream.setSinkTypeList(sinkTypeList);
- });
+ // query all valid stream sinks and its extended info, field info
+ List<StreamSink> sinkList = sinkService.listSink(groupId,
streamId);
+ streamInfo.setSinkList(sinkList);
}
- // Encapsulate the paging query results into the PageInfo object to
obtain related paging information
- PageInfo<InlongStreamListResponse> page = new PageInfo<>(streamList);
- page.setTotal(streamList.size());
+ PageInfo<InlongStreamInfo> pageInfo = new PageInfo<>(streamInfoList);
+ pageInfo.setTotal(pageInfo.getTotal());
- LOGGER.debug("success to list inlong stream info for groupId={}",
groupId);
- return page;
+ LOGGER.debug("success to list full inlong stream info by {}", request);
+ return pageInfo;
+ }
+
+ @Override
+ public List<InlongStreamBriefInfo> listBriefWithSink(String groupId) {
+ LOGGER.debug("begin to get inlong stream brief list by groupId={}",
groupId);
+ Preconditions.checkNotNull(groupId,
ErrorCodeEnum.GROUP_ID_IS_EMPTY.getMessage());
+
+ List<InlongStreamEntity> entityList =
streamMapper.selectByGroupId(groupId);
+ List<InlongStreamBriefInfo> briefInfoList = CommonBeanUtils
+ .copyListProperties(entityList, InlongStreamBriefInfo::new);
+
+ // query stream sinks based on groupId and streamId
+ for (InlongStreamBriefInfo briefInfo : briefInfoList) {
+ String streamId = briefInfo.getInlongStreamId();
+ List<SinkBriefInfo> sinkList = sinkService.listBrief(groupId,
streamId);
+ briefInfo.setSinkList(sinkList);
+ }
+
+ LOGGER.info("success to get inlong stream brief list for groupId={}",
groupId);
+ return briefInfoList;
}
@Transactional(rollbackFor = Throwable.class)
@@ -346,73 +386,6 @@ public class InlongStreamServiceImpl implements
InlongStreamService {
return true;
}
- @Override
- public List<InlongStreamBriefInfo> getBriefList(String groupId) {
- LOGGER.debug("begin to get inlong stream brief list by groupId={}",
groupId);
- Preconditions.checkNotNull(groupId,
ErrorCodeEnum.GROUP_ID_IS_EMPTY.getMessage());
-
- List<InlongStreamEntity> entityList =
streamMapper.selectByGroupId(groupId);
- List<InlongStreamBriefInfo> briefInfoList = CommonBeanUtils
- .copyListProperties(entityList, InlongStreamBriefInfo::new);
-
- // Query stream sinks based on groupId and streamId
- for (InlongStreamBriefInfo briefInfo : briefInfoList) {
- String streamId = briefInfo.getInlongStreamId();
- List<SinkBriefResponse> sinkList = sinkService.listBrief(groupId,
streamId);
- briefInfo.setSinkList(sinkList);
- }
-
- LOGGER.info("success to get inlong stream brief list for groupId={}",
groupId);
- return briefInfoList;
- }
-
- @Override
- public PageInfo<InlongStreamInfo>
listAllWithGroupId(InlongStreamPageRequest request) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("begin to list full inlong stream page by {}",
request);
- }
- Preconditions.checkNotNull(request, "request is empty");
- Preconditions.checkNotNull(request.getInlongGroupId(),
ErrorCodeEnum.GROUP_ID_IS_EMPTY.getMessage());
-
- // 1. Query all valid data sources under groupId
- String groupId = request.getInlongGroupId();
- // The person in charge of the inlong group has the authority of all
inlong streams
- InlongGroupEntity inlongGroupEntity =
groupMapper.selectByGroupId(groupId);
- Preconditions.checkNotNull(inlongGroupEntity, "inlong group not found
by groupId=" + groupId);
-
- String inCharges = inlongGroupEntity.getInCharges();
- request.setInCharges(inCharges);
-
- PageHelper.startPage(request.getPageNum(), request.getPageSize());
- Page<InlongStreamEntity> page = (Page<InlongStreamEntity>)
streamMapper.selectByCondition(request);
- List<InlongStreamInfo> streamInfoList =
CommonBeanUtils.copyListProperties(page, InlongStreamInfo::new);
-
- // Convert and encapsulate the paged results
- for (InlongStreamInfo streamInfo : streamInfoList) {
- // Set the field information of the inlong stream
- String streamId = streamInfo.getInlongStreamId();
- List<StreamField> streamFields = getStreamFields(groupId,
streamId);
- streamInfo.setFieldList(streamFields);
- List<InlongStreamExtInfo> streamExtInfos =
CommonBeanUtils.copyListProperties(
- streamExtMapper.selectByRelatedId(groupId, streamId),
InlongStreamExtInfo::new);
- streamInfo.setExtList(streamExtInfos);
-
- // Query stream sources information
- List<StreamSource> sourceList = sourceService.listSource(groupId,
streamId);
- streamInfo.setSourceList(sourceList);
-
- // Query various stream sinks and its extended information, field
information
- List<StreamSink> sinkList = sinkService.listSink(groupId,
streamId);
- streamInfo.setSinkList(sinkList);
- }
-
- PageInfo<InlongStreamInfo> pageInfo = new PageInfo<>(streamInfoList);
- pageInfo.setTotal(pageInfo.getTotal());
-
- LOGGER.debug("success to list full inlong stream info");
- return pageInfo;
- }
-
@Override
public int selectCountByGroupId(String groupId) {
LOGGER.debug("begin to get count by groupId={}", groupId);
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/operation/InlongGroupProcessOperation.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/operation/InlongGroupProcessOperation.java
index 5f8146531..88350aec3 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/operation/InlongGroupProcessOperation.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/operation/InlongGroupProcessOperation.java
@@ -295,7 +295,7 @@ public class InlongGroupProcessOperation {
ApplyGroupProcessForm form = new ApplyGroupProcessForm();
InlongGroupInfo groupInfo = groupService.get(groupId);
form.setGroupInfo(groupInfo);
- List<InlongStreamBriefInfo> infoList =
streamService.getBriefList(groupInfo.getInlongGroupId());
+ List<InlongStreamBriefInfo> infoList =
streamService.listBriefWithSink(groupInfo.getInlongGroupId());
form.setStreamInfoList(infoList);
return form;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/AbstractGroupOperator.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/AbstractGroupOperator.java
index ba736d65f..40e7c083e 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/AbstractGroupOperator.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/AbstractGroupOperator.java
@@ -56,7 +56,10 @@ public abstract class AbstractGroupOperator implements
InlongGroupOperator {
entity.setStatus(GroupStatus.TO_BE_SUBMIT.getCode());
entity.setIsDeleted(InlongConstants.UN_DELETED);
entity.setCreator(operator);
- entity.setCreateTime(new Date());
+ entity.setModifier(operator);
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setModifyTime(now);
groupMapper.insert(entity);
return groupId;
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
index b72ad7bfa..22841dad6 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
@@ -19,10 +19,10 @@ package org.apache.inlong.manager.service.group;
import com.github.pagehelper.PageInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupApproveRequest;
+import org.apache.inlong.manager.common.pojo.group.InlongGroupBriefInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupCountResponse;
import org.apache.inlong.manager.common.pojo.group.InlongGroupExtInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
-import org.apache.inlong.manager.common.pojo.group.InlongGroupListResponse;
import org.apache.inlong.manager.common.pojo.group.InlongGroupPageRequest;
import org.apache.inlong.manager.common.pojo.group.InlongGroupRequest;
import org.apache.inlong.manager.common.pojo.group.InlongGroupTopicInfo;
@@ -54,12 +54,12 @@ public interface InlongGroupService {
InlongGroupInfo get(String groupId);
/**
- * Page query inlong group list.
+ * Paging query inlong group brief info list
*
* @param request pagination query request
* @return group list
*/
- PageInfo<InlongGroupListResponse> listByPage(InlongGroupPageRequest
request);
+ PageInfo<InlongGroupBriefInfo> listBrief(InlongGroupPageRequest request);
/**
* Modify group information
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
index f90573811..24778d63f 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
@@ -29,10 +29,10 @@ import org.apache.inlong.manager.common.enums.GroupStatus;
import org.apache.inlong.manager.common.enums.SourceType;
import org.apache.inlong.manager.common.exceptions.BusinessException;
import org.apache.inlong.manager.common.pojo.group.InlongGroupApproveRequest;
+import org.apache.inlong.manager.common.pojo.group.InlongGroupBriefInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupCountResponse;
import org.apache.inlong.manager.common.pojo.group.InlongGroupExtInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
-import org.apache.inlong.manager.common.pojo.group.InlongGroupListResponse;
import org.apache.inlong.manager.common.pojo.group.InlongGroupPageRequest;
import org.apache.inlong.manager.common.pojo.group.InlongGroupRequest;
import org.apache.inlong.manager.common.pojo.group.InlongGroupTopicInfo;
@@ -167,7 +167,7 @@ public class InlongGroupServiceImpl implements
InlongGroupService {
}
@Override
- public PageInfo<InlongGroupListResponse> listByPage(InlongGroupPageRequest
request) {
+ public PageInfo<InlongGroupBriefInfo> listBrief(InlongGroupPageRequest
request) {
if (request.getPageSize() > MAX_PAGE_SIZE) {
LOGGER.warn("list group info, but page size is {}, change to {}",
request.getPageSize(), MAX_PAGE_SIZE);
request.setPageSize(MAX_PAGE_SIZE);
@@ -175,12 +175,12 @@ public class InlongGroupServiceImpl implements
InlongGroupService {
PageHelper.startPage(request.getPageNum(), request.getPageSize());
Page<InlongGroupEntity> entityPage = (Page<InlongGroupEntity>)
groupMapper.selectByCondition(request);
- List<InlongGroupListResponse> groupResponseList =
CommonBeanUtils.copyListProperties(entityPage,
- InlongGroupListResponse::new);
+ List<InlongGroupBriefInfo> briefInfos =
CommonBeanUtils.copyListProperties(entityPage,
+ InlongGroupBriefInfo::new);
- // need to list all related sources
- if (request.isListSources() &&
CollectionUtils.isNotEmpty(groupResponseList)) {
- Set<String> groupIds =
groupResponseList.stream().map(InlongGroupListResponse::getInlongGroupId)
+ // list all related sources
+ if (request.isListSources() && CollectionUtils.isNotEmpty(briefInfos))
{
+ Set<String> groupIds =
briefInfos.stream().map(InlongGroupBriefInfo::getInlongGroupId)
.collect(Collectors.toSet());
List<StreamSourceEntity> sourceEntities =
streamSourceMapper.selectByGroupIds(new ArrayList<>(groupIds));
Map<String, List<StreamSource>> sourceMap = Maps.newHashMap();
@@ -190,12 +190,12 @@ public class InlongGroupServiceImpl implements
InlongGroupService {
StreamSource source = operation.getFromEntity(sourceEntity);
sourceMap.computeIfAbsent(sourceEntity.getInlongGroupId(), k
-> Lists.newArrayList()).add(source);
});
- groupResponseList.forEach(group -> {
+ briefInfos.forEach(group -> {
List<StreamSource> sources =
sourceMap.getOrDefault(group.getInlongGroupId(), Lists.newArrayList());
group.setStreamSources(sources);
});
}
- PageInfo<InlongGroupListResponse> page = new
PageInfo<>(groupResponseList);
+ PageInfo<InlongGroupBriefInfo> page = new PageInfo<>(briefInfos);
page.setTotal(entityPage.getTotal());
LOGGER.debug("success to list inlong group for {}", request);
return page;
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkService.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkService.java
index aad07b29f..276061523 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkService.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkService.java
@@ -20,7 +20,7 @@ package org.apache.inlong.manager.service.sink;
import com.github.pagehelper.PageInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
import org.apache.inlong.manager.common.pojo.sink.SinkApproveDTO;
-import org.apache.inlong.manager.common.pojo.sink.SinkBriefResponse;
+import org.apache.inlong.manager.common.pojo.sink.SinkBriefInfo;
import org.apache.inlong.manager.common.pojo.sink.SinkPageRequest;
import org.apache.inlong.manager.common.pojo.sink.SinkRequest;
import org.apache.inlong.manager.common.pojo.sink.StreamSink;
@@ -67,7 +67,7 @@ public interface StreamSinkService {
* @param streamId Inlong stream id.
* @return Sink info list.
*/
- List<SinkBriefResponse> listBrief(String groupId, String streamId);
+ List<SinkBriefInfo> listBrief(String groupId, String streamId);
/**
* Get the StreamSink Map by the inlong group info and inlong stream info
list.
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkServiceImpl.java
index cd9c64337..6144f38d6 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/StreamSinkServiceImpl.java
@@ -32,7 +32,7 @@ import org.apache.inlong.manager.common.enums.SinkType;
import org.apache.inlong.manager.common.exceptions.BusinessException;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
import org.apache.inlong.manager.common.pojo.sink.SinkApproveDTO;
-import org.apache.inlong.manager.common.pojo.sink.SinkBriefResponse;
+import org.apache.inlong.manager.common.pojo.sink.SinkBriefInfo;
import org.apache.inlong.manager.common.pojo.sink.SinkField;
import org.apache.inlong.manager.common.pojo.sink.SinkPageRequest;
import org.apache.inlong.manager.common.pojo.sink.SinkRequest;
@@ -154,13 +154,11 @@ public class StreamSinkServiceImpl implements
StreamSinkService {
}
@Override
- public List<SinkBriefResponse> listBrief(String groupId, String streamId) {
+ public List<SinkBriefInfo> listBrief(String groupId, String streamId) {
Preconditions.checkNotNull(groupId,
ErrorCodeEnum.GROUP_ID_IS_EMPTY.getMessage());
Preconditions.checkNotNull(streamId,
ErrorCodeEnum.STREAM_ID_IS_EMPTY.getMessage());
- // Query all sink information and encapsulate it in the result set
- List<SinkBriefResponse> summaryList =
sinkMapper.selectSummary(groupId, streamId);
-
+ List<SinkBriefInfo> summaryList = sinkMapper.selectSummary(groupId,
streamId);
LOGGER.debug("success to list sink summary by groupId=" + groupId + ",
streamId=" + streamId);
return summaryList;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/AbstractSourceOperateListener.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/AbstractSourceOperateListener.java
index ed8b010cb..cd62aceec 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/AbstractSourceOperateListener.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/AbstractSourceOperateListener.java
@@ -71,7 +71,7 @@ public abstract class AbstractSourceOperateListener
implements DataSourceOperate
log.info("operate stream source for context={}", context);
InlongGroupInfo groupInfo = getGroupInfo(context.getProcessForm());
final String groupId = groupInfo.getInlongGroupId();
- List<InlongStreamBriefInfo> streamResponses =
streamService.getBriefList(groupId);
+ List<InlongStreamBriefInfo> streamResponses =
streamService.listBriefWithSink(groupId);
List<StreamSource> unOperatedSources = Lists.newArrayList();
streamResponses.forEach(stream ->
operateStreamSources(groupId, stream.getInlongStreamId(),
context.getOperator(), unOperatedSources));
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
index abb49f364..fbba322c2 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
@@ -25,9 +25,9 @@ import org.apache.inlong.manager.common.beans.Response;
import org.apache.inlong.manager.common.enums.OperationType;
import org.apache.inlong.manager.common.enums.UserTypeEnum;
import org.apache.inlong.manager.common.pojo.common.UpdateValidation;
+import org.apache.inlong.manager.common.pojo.group.InlongGroupBriefInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupCountResponse;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
-import org.apache.inlong.manager.common.pojo.group.InlongGroupListResponse;
import org.apache.inlong.manager.common.pojo.group.InlongGroupPageRequest;
import org.apache.inlong.manager.common.pojo.group.InlongGroupRequest;
import org.apache.inlong.manager.common.pojo.group.InlongGroupResetRequest;
@@ -75,10 +75,10 @@ public class InlongGroupController {
@RequestMapping(value = "/group/list", method = RequestMethod.POST)
@ApiOperation(value = "Get inlong group list by paginating")
- public Response<PageInfo<InlongGroupListResponse>>
listByCondition(@RequestBody InlongGroupPageRequest request) {
+ public Response<PageInfo<InlongGroupBriefInfo>> listBrief(@RequestBody
InlongGroupPageRequest request) {
request.setCurrentUser(LoginUserUtils.getLoginUserDetail().getUsername());
request.setIsAdminRole(LoginUserUtils.getLoginUserDetail().getRoles().contains(UserTypeEnum.ADMIN.name()));
- return Response.success(groupService.listByPage(request));
+ return Response.success(groupService.listBrief(request));
}
@RequestMapping(value = "/group/update", method = RequestMethod.POST)
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongStreamController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongStreamController.java
index 478a7c0f5..fca18cf89 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongStreamController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongStreamController.java
@@ -26,7 +26,6 @@ import org.apache.inlong.manager.common.beans.Response;
import org.apache.inlong.manager.common.enums.OperationType;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamBriefInfo;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamInfo;
-import org.apache.inlong.manager.common.pojo.stream.InlongStreamListResponse;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamPageRequest;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamRequest;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamResponse;
@@ -43,8 +42,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
-
/**
* Inlong stream control layer
*/
@@ -86,19 +83,19 @@ public class InlongStreamController {
}
@RequestMapping(value = "/stream/list", method = RequestMethod.POST)
- @ApiOperation(value = "Get inlong stream by paginating")
- public Response<PageInfo<InlongStreamListResponse>>
listByCondition(@RequestBody InlongStreamPageRequest request) {
+ @ApiOperation(value = "Get inlong stream brief info by paginating")
+ public Response<PageInfo<InlongStreamBriefInfo>>
listByCondition(@RequestBody InlongStreamPageRequest request) {
request.setCurrentUser(LoginUserUtils.getLoginUserDetail().getUsername());
request.setIsAdminRole(LoginUserUtils.getLoginUserDetail().getRoles().contains(UserRoleCode.ADMIN));
- return Response.success(streamService.listByCondition(request));
+ return Response.success(streamService.listBrief(request));
}
@RequestMapping(value = "/stream/listAll", method = RequestMethod.POST)
- @ApiOperation(value = "Get inlong stream with all info by paginating")
+ @ApiOperation(value = "Get inlong stream with all sources and sinks by
paginating")
public Response<PageInfo<InlongStreamInfo>>
listAllWithGroupId(@RequestBody InlongStreamPageRequest request) {
request.setCurrentUser(LoginUserUtils.getLoginUserDetail().getUsername());
request.setIsAdminRole(LoginUserUtils.getLoginUserDetail().getRoles().contains(UserRoleCode.ADMIN));
- return Response.success(streamService.listAllWithGroupId(request));
+ return Response.success(streamService.listAll(request));
}
@RequestMapping(value = "/stream/update", method = RequestMethod.POST)
@@ -170,11 +167,4 @@ public class InlongStreamController {
return Response.success(streamService.delete(groupId, streamId,
username));
}
- @RequestMapping(value = "/stream/getSummaryList/{groupId}", method =
RequestMethod.GET)
- @ApiOperation(value = "Get inlong stream summary list")
- @ApiImplicitParam(name = "groupId", value = "Inlong group id",
dataTypeClass = String.class, required = true)
- public Response<List<InlongStreamBriefInfo>> getSummaryList(@PathVariable
String groupId) {
- return Response.success(streamService.getBriefList(groupId));
- }
-
}
