You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/06/13 11:49:33 UTC
[incubator-inlong] branch master updated: [INLONG-4631][Manager] Replace InlongStreamTopicInfo and StreamBriefResponse with InlongStreamBriefInfo (#4645)
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/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new a4163e412 [INLONG-4631][Manager] Replace InlongStreamTopicInfo and StreamBriefResponse with InlongStreamBriefInfo (#4645)
a4163e412 is described below
commit a4163e41277165d9d5b0b3ebc91caecb2013ac2f
Author: ciscozhou <45...@users.noreply.github.com>
AuthorDate: Mon Jun 13 19:49:28 2022 +0800
[INLONG-4631][Manager] Replace InlongStreamTopicInfo and StreamBriefResponse with InlongStreamBriefInfo (#4645)
---
.../common/pojo/group/InlongGroupTopicInfo.java | 4 +-
.../common/pojo/stream/InlongStreamBriefInfo.java | 5 ++
.../common/pojo/stream/InlongStreamTopicInfo.java | 37 ---------------
.../common/pojo/stream/StreamBriefResponse.java | 54 ----------------------
.../pojo/workflow/form/NewGroupProcessForm.java | 4 +-
.../manager/service/core/InlongStreamService.java | 3 +-
.../service/core/impl/ConsumptionServiceImpl.java | 4 +-
.../service/core/impl/InlongStreamServiceImpl.java | 9 ++--
.../operation/InlongGroupProcessOperation.java | 4 +-
.../listener/AbstractSourceOperateListener.java | 4 +-
.../web/controller/InlongStreamController.java | 4 +-
11 files changed, 22 insertions(+), 110 deletions(-)
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupTopicInfo.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupTopicInfo.java
index f7bc07e86..b07585467 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupTopicInfo.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupTopicInfo.java
@@ -20,7 +20,7 @@ package org.apache.inlong.manager.common.pojo.group;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.apache.inlong.manager.common.pojo.stream.InlongStreamTopicInfo;
+import org.apache.inlong.manager.common.pojo.stream.InlongStreamBriefInfo;
import java.util.List;
@@ -42,7 +42,7 @@ public class InlongGroupTopicInfo {
@ApiModelProperty(value = "Topic list, Tube corresponds to inlong group, there is only 1 topic, "
+ "Pulsar corresponds to inlong stream, there are multiple topics")
- private List<InlongStreamTopicInfo> streamTopics;
+ private List<InlongStreamBriefInfo> streamTopics;
@ApiModelProperty(value = "Tube master URL")
private String tubeMasterUrl;
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 dad12640b..71f5037ab 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,8 +21,10 @@ 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 java.util.Date;
+import java.util.List;
/**
* Inlong stream brief info
@@ -49,4 +51,7 @@ public class InlongStreamBriefInfo {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
+ @ApiModelProperty(value = "Sink brief list")
+ private List<SinkBriefResponse> sinkList;
+
}
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamTopicInfo.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamTopicInfo.java
deleted file mode 100644
index 94c7bacfa..000000000
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/InlongStreamTopicInfo.java
+++ /dev/null
@@ -1,37 +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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * Inlong stream and topic info.
- */
-@Data
-@ApiModel("Inlong stream and topic info")
-public class InlongStreamTopicInfo {
-
- @ApiModelProperty(value = "InLong stream ID")
- private String inlongStreamId;
-
- @ApiModelProperty(value = "MQ resource, the inlong stream corresponds to the topic of Pulsar one-to-one")
- private String mqResource;
-
-}
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/StreamBriefResponse.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/StreamBriefResponse.java
deleted file mode 100644
index 3dd260f33..000000000
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/stream/StreamBriefResponse.java
+++ /dev/null
@@ -1,54 +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 org.apache.inlong.manager.common.pojo.sink.SinkBriefResponse;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * Summary response of the inlong stream
- */
-@Data
-@ApiModel("Brief response of the inlong stream")
-public class StreamBriefResponse {
-
- @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 = "Sink brief list")
- private List<SinkBriefResponse> sinkList;
-
- @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/workflow/form/NewGroupProcessForm.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/form/NewGroupProcessForm.java
index b6973940d..de4bf86aa 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/form/NewGroupProcessForm.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/form/NewGroupProcessForm.java
@@ -23,7 +23,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.inlong.manager.common.exceptions.FormValidateException;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
-import org.apache.inlong.manager.common.pojo.stream.StreamBriefResponse;
+import org.apache.inlong.manager.common.pojo.stream.InlongStreamBriefInfo;
import org.apache.inlong.manager.common.util.Preconditions;
import java.util.List;
@@ -42,7 +42,7 @@ public class NewGroupProcessForm extends BaseProcessForm {
private InlongGroupInfo groupInfo;
@ApiModelProperty(value = "All inlong stream info under the inlong group, including the sink info")
- private List<StreamBriefResponse> streamInfoList;
+ private List<InlongStreamBriefInfo> streamInfoList;
@Override
public void validate() throws FormValidateException {
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 24838b4f0..d87f3d43d 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
@@ -26,7 +26,6 @@ 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.StreamBriefResponse;
import java.util.List;
@@ -115,7 +114,7 @@ public interface InlongStreamService {
* @param groupId Inlong group id
* @return Summary list of inlong stream
*/
- List<StreamBriefResponse> getBriefList(String groupId);
+ List<InlongStreamBriefInfo> getBriefList(String groupId);
/**
* Save all information related to the inlong stream, its data source, and stream sink
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/ConsumptionServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/ConsumptionServiceImpl.java
index 3354ad125..f1b0c5d1b 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/ConsumptionServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/ConsumptionServiceImpl.java
@@ -38,7 +38,7 @@ import org.apache.inlong.manager.common.pojo.consumption.ConsumptionQuery;
import org.apache.inlong.manager.common.pojo.consumption.ConsumptionSummary;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupTopicInfo;
-import org.apache.inlong.manager.common.pojo.stream.InlongStreamTopicInfo;
+import org.apache.inlong.manager.common.pojo.stream.InlongStreamBriefInfo;
import org.apache.inlong.manager.common.pojo.user.UserRoleCode;
import org.apache.inlong.manager.common.settings.InlongGroupSettings;
import org.apache.inlong.manager.common.util.CommonBeanUtils;
@@ -402,7 +402,7 @@ public class ConsumptionServiceImpl implements ConsumptionService {
} else if (mqType == MQType.PULSAR || mqType == MQType.TDMQ_PULSAR) {
// Pulsar's topic is the inlong stream level.
// There will be multiple inlong streams under one inlong group, and there will be multiple topics
- List<InlongStreamTopicInfo> streamTopics = topicVO.getStreamTopics();
+ List<InlongStreamBriefInfo> streamTopics = topicVO.getStreamTopics();
if (streamTopics != null && streamTopics.size() > 0) {
Set<String> topicSet = new HashSet<>(Arrays.asList(info.getTopic().split(",")));
streamTopics.forEach(stream -> topicSet.remove(stream.getMqResource()));
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 fe925d376..7ba385da0 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
@@ -41,7 +41,6 @@ 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.StreamBriefResponse;
import org.apache.inlong.manager.common.pojo.stream.StreamField;
import org.apache.inlong.manager.common.util.CommonBeanUtils;
import org.apache.inlong.manager.common.util.Preconditions;
@@ -348,16 +347,16 @@ public class InlongStreamServiceImpl implements InlongStreamService {
}
@Override
- public List<StreamBriefResponse> getBriefList(String groupId) {
+ 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<StreamBriefResponse> briefInfoList = CommonBeanUtils
- .copyListProperties(entityList, StreamBriefResponse::new);
+ List<InlongStreamBriefInfo> briefInfoList = CommonBeanUtils
+ .copyListProperties(entityList, InlongStreamBriefInfo::new);
// Query stream sinks based on groupId and streamId
- for (StreamBriefResponse briefInfo : briefInfoList) {
+ for (InlongStreamBriefInfo briefInfo : briefInfoList) {
String streamId = briefInfo.getInlongStreamId();
List<SinkBriefResponse> sinkList = sinkService.listBrief(groupId, streamId);
briefInfo.setSinkList(sinkList);
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 edf576a10..3900b6c15 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
@@ -25,7 +25,7 @@ import org.apache.inlong.manager.common.enums.GroupStatus;
import org.apache.inlong.manager.common.exceptions.WorkflowListenerException;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamInfo;
-import org.apache.inlong.manager.common.pojo.stream.StreamBriefResponse;
+import org.apache.inlong.manager.common.pojo.stream.InlongStreamBriefInfo;
import org.apache.inlong.manager.common.pojo.workflow.WorkflowResult;
import org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.common.pojo.workflow.form.LightGroupResourceProcessForm;
@@ -251,7 +251,7 @@ public class InlongGroupProcessOperation {
NewGroupProcessForm form = new NewGroupProcessForm();
InlongGroupInfo groupInfo = groupService.get(groupId);
form.setGroupInfo(groupInfo);
- List<StreamBriefResponse> infoList = streamService.getBriefList(groupInfo.getInlongGroupId());
+ List<InlongStreamBriefInfo> infoList = streamService.getBriefList(groupInfo.getInlongGroupId());
form.setStreamInfoList(infoList);
return form;
}
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 968237649..d338f1baa 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
@@ -32,7 +32,7 @@ import org.apache.inlong.manager.common.pojo.source.kafka.KafkaSource;
import org.apache.inlong.manager.common.pojo.source.kafka.KafkaSourceRequest;
import org.apache.inlong.manager.common.pojo.source.mysql.MySQLBinlogSource;
import org.apache.inlong.manager.common.pojo.source.mysql.MySQLBinlogSourceRequest;
-import org.apache.inlong.manager.common.pojo.stream.StreamBriefResponse;
+import org.apache.inlong.manager.common.pojo.stream.InlongStreamBriefInfo;
import org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.common.pojo.workflow.form.ProcessForm;
import org.apache.inlong.manager.common.util.CommonBeanUtils;
@@ -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<StreamBriefResponse> streamResponses = streamService.getBriefList(groupId);
+ List<InlongStreamBriefInfo> streamResponses = streamService.getBriefList(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/InlongStreamController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongStreamController.java
index be69bfa05..38fbb26cd 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
@@ -30,7 +30,7 @@ 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;
-import org.apache.inlong.manager.common.pojo.stream.StreamBriefResponse;
+import org.apache.inlong.manager.common.pojo.stream.InlongStreamBriefInfo;
import org.apache.inlong.manager.common.pojo.user.UserRoleCode;
import org.apache.inlong.manager.common.util.LoginUserUtils;
import org.apache.inlong.manager.service.core.InlongStreamService;
@@ -190,7 +190,7 @@ public class InlongStreamController {
@RequestMapping(value = "/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<StreamBriefResponse>> getSummaryList(@PathVariable String groupId) {
+ public Response<List<InlongStreamBriefInfo>> getSummaryList(@PathVariable String groupId) {
return Response.success(streamService.getBriefList(groupId));
}