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/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new c1e3bc349 [INLONG-4208][Manager] Merge UpdateGroupProcessForm into
GroupResourceProcessForm (#4209)
c1e3bc349 is described below
commit c1e3bc349913ee3deef476c5491f2ac4c19410cd
Author: kipshi <[email protected]>
AuthorDate: Mon May 16 12:55:19 2022 +0800
[INLONG-4208][Manager] Merge UpdateGroupProcessForm into
GroupResourceProcessForm (#4209)
---
.../common/pojo/workflow/form/BaseProcessForm.java | 1 -
.../workflow/form/GroupResourceProcessForm.java | 10 ++-
.../pojo/workflow/form/UpdateGroupProcessForm.java | 73 ----------------------
.../plugin/eventselect/DeleteProcessSelector.java | 11 ++--
.../plugin/eventselect/RestartProcessSelector.java | 9 +--
.../plugin/eventselect/SuspendProcessSelector.java | 11 ++--
.../plugin/listener/DeleteSortListener.java | 10 +--
.../plugin/listener/RestartSortListener.java | 10 +--
.../plugin/listener/SuspendSortListener.java | 10 +--
.../plugin/listener/DeleteSortListenerTest.java | 8 +--
.../plugin/listener/RestartSortListenerTest.java | 8 +--
.../plugin/listener/SuspendSortListenerTest.java | 8 +--
.../core/impl/InlongGroupProcessOperation.java | 16 ++---
.../CreateSinkResourceForStreamListener.java | 2 +-
.../service/resource/SinkResourceListener.java | 2 +-
.../service/sort/CreateSortConfigListener.java | 10 +--
.../service/sort/ZookeeperDisabledSelector.java | 9 ---
.../listener/AbstractSourceOperateListener.java | 9 +--
.../source/listener/SourceDeleteEventSelector.java | 8 +--
.../listener/SourceRestartEventSelector.java | 8 +--
.../source/listener/SourceStopEventSelector.java | 8 +--
.../group/DeleteGroupWorkflowDefinition.java | 4 +-
.../group/RestartGroupWorkflowDefinition.java | 4 +-
.../group/SuspendGroupWorkflowDefinition.java | 4 +-
.../listener/GroupUpdateCompleteListener.java | 4 +-
.../group/listener/GroupUpdateFailedListener.java | 4 +-
.../group/listener/GroupUpdateListener.java | 4 +-
.../inlong/manager/service/mocks/MockPlugin.java | 14 ++---
.../manager/service/sort/DisableZkForSortTest.java | 5 +-
.../source/listener/DataSourceListenerTest.java | 8 +--
.../service/workflow/WorkflowServiceImplTest.java | 7 +--
31 files changed, 106 insertions(+), 193 deletions(-)
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/form/BaseProcessForm.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/form/BaseProcessForm.java
index fdb814812..8bc424c74 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/form/BaseProcessForm.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/form/BaseProcessForm.java
@@ -31,7 +31,6 @@ import lombok.Data;
@JsonSubTypes.Type(value = NewGroupProcessForm.class, name =
NewGroupProcessForm.FORM_NAME),
@JsonSubTypes.Type(value = NewConsumptionProcessForm.class, name =
NewConsumptionProcessForm.FORM_NAME),
@JsonSubTypes.Type(value = GroupResourceProcessForm.class, name =
GroupResourceProcessForm.FORM_NAME),
- @JsonSubTypes.Type(value = UpdateGroupProcessForm.class, name =
UpdateGroupProcessForm.FORM_NAME),
@JsonSubTypes.Type(value = LightGroupResourceProcessForm.class, name =
LightGroupResourceProcessForm.FORM_NAME),
})
public abstract class BaseProcessForm implements ProcessForm {
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/form/GroupResourceProcessForm.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/form/GroupResourceProcessForm.java
index 043cd2e94..ef90b0aba 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/form/GroupResourceProcessForm.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/form/GroupResourceProcessForm.java
@@ -20,6 +20,9 @@ package org.apache.inlong.manager.common.pojo.workflow.form;
import com.google.common.collect.Maps;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.inlong.manager.common.enums.GroupOperateType;
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.InlongStreamInfo;
@@ -38,14 +41,16 @@ public class GroupResourceProcessForm extends
BaseProcessForm {
private InlongGroupInfo groupInfo;
+ @Getter
+ @Setter
+ private GroupOperateType groupOperateType = GroupOperateType.INIT;
+
@Deprecated
private String streamId;
@Deprecated
private List<InlongStreamInfo> streamInfos;
- private List<InlongStreamInfo> streamInfoList;
-
public InlongGroupInfo getGroupInfo() {
return groupInfo;
}
@@ -82,6 +87,7 @@ public class GroupResourceProcessForm extends BaseProcessForm
{
public Map<String, Object> showInList() {
Map<String, Object> show = Maps.newHashMap();
show.put("inlongGroupId", groupInfo.getInlongGroupId());
+ show.put("groupOperateType", this.groupOperateType);
return show;
}
}
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/form/UpdateGroupProcessForm.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/form/UpdateGroupProcessForm.java
deleted file mode 100644
index f236cfacd..000000000
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/workflow/form/UpdateGroupProcessForm.java
+++ /dev/null
@@ -1,73 +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.workflow.form;
-
-import com.google.common.collect.Maps;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.inlong.manager.common.enums.GroupOperateType;
-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.InlongStreamInfo;
-import org.apache.inlong.manager.common.util.Preconditions;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class UpdateGroupProcessForm extends BaseProcessForm {
-
- public static final String FORM_NAME = "UpdateGroupProcessForm";
- @ApiModelProperty(value = "Inlong group info", required = true)
- private InlongGroupInfo groupInfo;
- @Getter
- @Setter
- @ApiModelProperty(value = "OperateType to define the update operation",
required = true)
- private GroupOperateType groupOperateType;
-
- private List<InlongStreamInfo> streamInfos;
-
- @Override
- public void validate() throws FormValidateException {
- Preconditions.checkNotNull(groupInfo, "inlong group info is empty");
- Preconditions.checkNotNull(groupOperateType, "operate type is empty");
- }
-
- @Override
- public String getFormName() {
- return FORM_NAME;
- }
-
- @Override
- public String getInlongGroupId() {
- return groupInfo.getInlongGroupId();
- }
-
- @Override
- public Map<String, Object> showInList() {
- Map<String, Object> show = Maps.newHashMap();
- show.put("inlongGroupId", groupInfo.getInlongGroupId());
- show.put("operateType",
groupOperateType.name().toLowerCase(Locale.ROOT));
- return show;
- }
-}
diff --git
a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/eventselect/DeleteProcessSelector.java
b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/eventselect/DeleteProcessSelector.java
index 088e63a75..d7a532cd8 100644
---
a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/eventselect/DeleteProcessSelector.java
+++
b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/eventselect/DeleteProcessSelector.java
@@ -20,8 +20,8 @@ package org.apache.inlong.manager.plugin.eventselect;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.enums.GroupOperateType;
+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.pojo.workflow.form.UpdateGroupProcessForm;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.EventSelector;
@@ -36,13 +36,14 @@ public class DeleteProcessSelector implements EventSelector
{
public boolean accept(WorkflowContext context) {
ProcessForm processForm = context.getProcessForm();
String groupId = processForm.getInlongGroupId();
- if (!(processForm instanceof UpdateGroupProcessForm)) {
- log.info("not add deleteProcess listener as the form was not
UpdateGroup for groupId [{}]", groupId);
+ if (!(processForm instanceof GroupResourceProcessForm)) {
+ log.info("not add deleteProcess listener as the form was not
GroupResourceProcessForm for groupId [{}]",
+ groupId);
return false;
}
- UpdateGroupProcessForm updateProcessForm = (UpdateGroupProcessForm)
processForm;
- boolean flag = updateProcessForm.getGroupOperateType() ==
GroupOperateType.DELETE;
+ GroupResourceProcessForm groupResourceProcessForm =
(GroupResourceProcessForm) processForm;
+ boolean flag = groupResourceProcessForm.getGroupOperateType() ==
GroupOperateType.DELETE;
if (!flag) {
log.info("not add deleteProcess listener as the operate was not
DELETE for groupId [{}]", groupId);
return false;
diff --git
a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/eventselect/RestartProcessSelector.java
b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/eventselect/RestartProcessSelector.java
index 2dfc25ae3..ebc727ca0 100644
---
a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/eventselect/RestartProcessSelector.java
+++
b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/eventselect/RestartProcessSelector.java
@@ -20,8 +20,8 @@ package org.apache.inlong.manager.plugin.eventselect;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.enums.GroupOperateType;
+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.pojo.workflow.form.UpdateGroupProcessForm;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.EventSelector;
@@ -36,12 +36,13 @@ public class RestartProcessSelector implements
EventSelector {
public boolean accept(WorkflowContext workflowContext) {
ProcessForm processForm = workflowContext.getProcessForm();
String groupId = processForm.getInlongGroupId();
- if (!(processForm instanceof UpdateGroupProcessForm)) {
- log.info("not add restartProcess listener as the form was not
UpdateGroup for groupId [{}]", groupId);
+ if (!(processForm instanceof GroupResourceProcessForm)) {
+ log.info("not add restartProcess listener as the form was not
GroupResourceProcessForm for groupId [{}]",
+ groupId);
return false;
}
- UpdateGroupProcessForm updateProcessForm = (UpdateGroupProcessForm)
processForm;
+ GroupResourceProcessForm updateProcessForm =
(GroupResourceProcessForm) processForm;
boolean flag = updateProcessForm.getGroupOperateType() ==
GroupOperateType.RESTART;
if (!flag) {
log.info("not add restartProcess listener as the operate was not
RESTART for groupId [{}]", groupId);
diff --git
a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/eventselect/SuspendProcessSelector.java
b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/eventselect/SuspendProcessSelector.java
index 58b07ec3e..271b7496e 100644
---
a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/eventselect/SuspendProcessSelector.java
+++
b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/eventselect/SuspendProcessSelector.java
@@ -20,8 +20,8 @@ package org.apache.inlong.manager.plugin.eventselect;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.enums.GroupOperateType;
+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.pojo.workflow.form.UpdateGroupProcessForm;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.EventSelector;
@@ -36,13 +36,14 @@ public class SuspendProcessSelector implements
EventSelector {
public boolean accept(WorkflowContext workflowContext) {
ProcessForm processForm = workflowContext.getProcessForm();
String groupId = processForm.getInlongGroupId();
- if (!(processForm instanceof UpdateGroupProcessForm)) {
- log.info("not add suspendProcess listener as the form was not
UpdateGroup for groupId [{}]", groupId);
+ if (!(processForm instanceof GroupResourceProcessForm)) {
+ log.info("not add suspendProcess listener as the form was not
GroupResourceProcessForm for groupId [{}]",
+ groupId);
return false;
}
- UpdateGroupProcessForm updateProcessForm = (UpdateGroupProcessForm)
processForm;
- boolean flag = updateProcessForm.getGroupOperateType() ==
GroupOperateType.SUSPEND;
+ GroupResourceProcessForm groupResourceProcessForm =
(GroupResourceProcessForm) processForm;
+ boolean flag = groupResourceProcessForm.getGroupOperateType() ==
GroupOperateType.SUSPEND;
if (!flag) {
log.info("not add suspendProcess listener as the operate was not
SUSPEND for groupId [{}]", groupId);
return false;
diff --git
a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/listener/DeleteSortListener.java
b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/listener/DeleteSortListener.java
index bb6581291..e16256823 100644
---
a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/listener/DeleteSortListener.java
+++
b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/listener/DeleteSortListener.java
@@ -22,8 +22,8 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
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.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.common.pojo.workflow.form.ProcessForm;
-import
org.apache.inlong.manager.common.pojo.workflow.form.UpdateGroupProcessForm;
import org.apache.inlong.manager.common.settings.InlongGroupSettings;
import org.apache.inlong.manager.common.util.JsonUtils;
import org.apache.inlong.manager.plugin.flink.FlinkOperation;
@@ -55,14 +55,14 @@ public class DeleteSortListener implements
SortOperateListener {
public ListenerResult listen(WorkflowContext context) throws Exception {
ProcessForm processForm = context.getProcessForm();
String groupId = processForm.getInlongGroupId();
- if (!(processForm instanceof UpdateGroupProcessForm)) {
- String message = String.format("process form was not UpdateGroup
for groupId [%s]", groupId);
+ if (!(processForm instanceof GroupResourceProcessForm)) {
+ String message = String.format("process form was not
GroupResourceProcessForm for groupId [%s]", groupId);
log.error(message);
return ListenerResult.fail(message);
}
- UpdateGroupProcessForm updateGroupForm = (UpdateGroupProcessForm)
processForm;
- InlongGroupInfo inlongGroupInfo = updateGroupForm.getGroupInfo();
+ GroupResourceProcessForm groupResourceProcessForm =
(GroupResourceProcessForm) processForm;
+ InlongGroupInfo inlongGroupInfo =
groupResourceProcessForm.getGroupInfo();
List<InlongGroupExtInfo> extList = inlongGroupInfo.getExtList();
log.info("inlong group ext info: {}", extList);
diff --git
a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/listener/RestartSortListener.java
b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/listener/RestartSortListener.java
index 9e0a96d05..511fd2f0e 100644
---
a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/listener/RestartSortListener.java
+++
b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/listener/RestartSortListener.java
@@ -23,8 +23,8 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
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.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.common.pojo.workflow.form.ProcessForm;
-import
org.apache.inlong.manager.common.pojo.workflow.form.UpdateGroupProcessForm;
import org.apache.inlong.manager.common.settings.InlongGroupSettings;
import org.apache.inlong.manager.common.util.JsonUtils;
import org.apache.inlong.manager.plugin.flink.enums.Constants;
@@ -59,14 +59,14 @@ public class RestartSortListener implements
SortOperateListener {
public ListenerResult listen(WorkflowContext context) throws Exception {
ProcessForm processForm = context.getProcessForm();
String groupId = processForm.getInlongGroupId();
- if (!(processForm instanceof UpdateGroupProcessForm)) {
- String message = String.format("process form was not UpdateGroup
for groupId [%s]", groupId);
+ if (!(processForm instanceof GroupResourceProcessForm)) {
+ String message = String.format("process form was not
GroupResourceProcessForm for groupId [%s]", groupId);
log.error(message);
return ListenerResult.fail(message);
}
- UpdateGroupProcessForm updateGroupForm = (UpdateGroupProcessForm)
processForm;
- InlongGroupInfo inlongGroupInfo = updateGroupForm.getGroupInfo();
+ GroupResourceProcessForm groupResourceProcessForm =
(GroupResourceProcessForm) processForm;
+ InlongGroupInfo inlongGroupInfo =
groupResourceProcessForm.getGroupInfo();
List<InlongGroupExtInfo> extList = inlongGroupInfo.getExtList();
log.info("inlong group ext info: {}", extList);
diff --git
a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/listener/SuspendSortListener.java
b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/listener/SuspendSortListener.java
index 29853dea2..f4f9d44c6 100644
---
a/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/listener/SuspendSortListener.java
+++
b/inlong-manager/manager-plugins/src/main/java/org/apache/inlong/manager/plugin/listener/SuspendSortListener.java
@@ -22,8 +22,8 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
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.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.common.pojo.workflow.form.ProcessForm;
-import
org.apache.inlong.manager.common.pojo.workflow.form.UpdateGroupProcessForm;
import org.apache.inlong.manager.common.settings.InlongGroupSettings;
import org.apache.inlong.manager.common.util.JsonUtils;
import org.apache.inlong.manager.plugin.flink.FlinkOperation;
@@ -55,14 +55,14 @@ public class SuspendSortListener implements
SortOperateListener {
public ListenerResult listen(WorkflowContext context) throws Exception {
ProcessForm processForm = context.getProcessForm();
String groupId = processForm.getInlongGroupId();
- if (!(processForm instanceof UpdateGroupProcessForm)) {
- String message = String.format("process form was not UpdateGroup
for groupId [%s]", groupId);
+ if (!(processForm instanceof GroupResourceProcessForm)) {
+ String message = String.format("process form was not
GroupResourceProcessForm for groupId [%s]", groupId);
log.error(message);
return ListenerResult.fail(message);
}
- UpdateGroupProcessForm updateGroupForm = (UpdateGroupProcessForm)
processForm;
- InlongGroupInfo inlongGroupInfo = updateGroupForm.getGroupInfo();
+ GroupResourceProcessForm groupResourceProcessForm =
(GroupResourceProcessForm) processForm;
+ InlongGroupInfo inlongGroupInfo =
groupResourceProcessForm.getGroupInfo();
List<InlongGroupExtInfo> extList = inlongGroupInfo.getExtList();
log.info("inlong group ext info: {}", extList);
diff --git
a/inlong-manager/manager-plugins/src/test/java/org/apache/inlong/manager/plugin/listener/DeleteSortListenerTest.java
b/inlong-manager/manager-plugins/src/test/java/org/apache/inlong/manager/plugin/listener/DeleteSortListenerTest.java
index 32e34ae8c..bf55b9c13 100644
---
a/inlong-manager/manager-plugins/src/test/java/org/apache/inlong/manager/plugin/listener/DeleteSortListenerTest.java
+++
b/inlong-manager/manager-plugins/src/test/java/org/apache/inlong/manager/plugin/listener/DeleteSortListenerTest.java
@@ -20,7 +20,7 @@ package org.apache.inlong.manager.plugin.listener;
import com.fasterxml.jackson.databind.ObjectMapper;
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.workflow.form.UpdateGroupProcessForm;
+import
org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.common.settings.InlongGroupSettings;
import org.apache.inlong.manager.plugin.flink.enums.Constants;
import org.apache.inlong.manager.workflow.WorkflowContext;
@@ -39,11 +39,11 @@ public class DeleteSortListenerTest {
@Test
public void testListener() throws Exception {
WorkflowContext context = new WorkflowContext();
- UpdateGroupProcessForm updateGroupProcessForm = new
UpdateGroupProcessForm();
- context.setProcessForm(updateGroupProcessForm);
+ GroupResourceProcessForm groupResourceProcessForm = new
GroupResourceProcessForm();
+ context.setProcessForm(groupResourceProcessForm);
InlongGroupInfo inlongGroupInfo = new InlongGroupInfo();
inlongGroupInfo.setInlongGroupId("1");
- updateGroupProcessForm.setGroupInfo(inlongGroupInfo);
+ groupResourceProcessForm.setGroupInfo(inlongGroupInfo);
InlongGroupExtInfo inlongGroupExtInfo1 = new InlongGroupExtInfo();
inlongGroupExtInfo1.setKeyName(InlongGroupSettings.SORT_URL);
diff --git
a/inlong-manager/manager-plugins/src/test/java/org/apache/inlong/manager/plugin/listener/RestartSortListenerTest.java
b/inlong-manager/manager-plugins/src/test/java/org/apache/inlong/manager/plugin/listener/RestartSortListenerTest.java
index 8c4e3cd74..f7da701fa 100644
---
a/inlong-manager/manager-plugins/src/test/java/org/apache/inlong/manager/plugin/listener/RestartSortListenerTest.java
+++
b/inlong-manager/manager-plugins/src/test/java/org/apache/inlong/manager/plugin/listener/RestartSortListenerTest.java
@@ -20,7 +20,7 @@ package org.apache.inlong.manager.plugin.listener;
import com.fasterxml.jackson.databind.ObjectMapper;
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.workflow.form.UpdateGroupProcessForm;
+import
org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.common.settings.InlongGroupSettings;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.junit.Test;
@@ -38,11 +38,11 @@ public class RestartSortListenerTest {
@Test
public void testListener() throws Exception {
WorkflowContext context = new WorkflowContext();
- UpdateGroupProcessForm updateGroupProcessForm = new
UpdateGroupProcessForm();
- context.setProcessForm(updateGroupProcessForm);
+ GroupResourceProcessForm groupResourceProcessForm = new
GroupResourceProcessForm();
+ context.setProcessForm(groupResourceProcessForm);
InlongGroupInfo inlongGroupInfo = new InlongGroupInfo();
inlongGroupInfo.setInlongGroupId("1");
- updateGroupProcessForm.setGroupInfo(inlongGroupInfo);
+ groupResourceProcessForm.setGroupInfo(inlongGroupInfo);
InlongGroupExtInfo inlongGroupExtInfo1 = new InlongGroupExtInfo();
inlongGroupExtInfo1.setKeyName(InlongGroupSettings.SORT_URL);
diff --git
a/inlong-manager/manager-plugins/src/test/java/org/apache/inlong/manager/plugin/listener/SuspendSortListenerTest.java
b/inlong-manager/manager-plugins/src/test/java/org/apache/inlong/manager/plugin/listener/SuspendSortListenerTest.java
index 9351e6f3c..65401604a 100644
---
a/inlong-manager/manager-plugins/src/test/java/org/apache/inlong/manager/plugin/listener/SuspendSortListenerTest.java
+++
b/inlong-manager/manager-plugins/src/test/java/org/apache/inlong/manager/plugin/listener/SuspendSortListenerTest.java
@@ -20,7 +20,7 @@ package org.apache.inlong.manager.plugin.listener;
import com.fasterxml.jackson.databind.ObjectMapper;
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.workflow.form.UpdateGroupProcessForm;
+import
org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.common.settings.InlongGroupSettings;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.junit.Test;
@@ -38,11 +38,11 @@ public class SuspendSortListenerTest {
@Test
public void testListener() throws Exception {
WorkflowContext context = new WorkflowContext();
- UpdateGroupProcessForm updateGroupProcessForm = new
UpdateGroupProcessForm();
- context.setProcessForm(updateGroupProcessForm);
+ GroupResourceProcessForm groupResourceProcessForm = new
GroupResourceProcessForm();
+ context.setProcessForm(groupResourceProcessForm);
InlongGroupInfo inlongGroupInfo = new InlongGroupInfo();
inlongGroupInfo.setInlongGroupId("1");
- updateGroupProcessForm.setGroupInfo(inlongGroupInfo);
+ groupResourceProcessForm.setGroupInfo(inlongGroupInfo);
InlongGroupExtInfo inlongGroupExtInfo1 = new InlongGroupExtInfo();
inlongGroupExtInfo1.setKeyName(InlongGroupSettings.SORT_URL);
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/InlongGroupProcessOperation.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/InlongGroupProcessOperation.java
index 712a73ea8..a7431369b 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/InlongGroupProcessOperation.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/InlongGroupProcessOperation.java
@@ -27,9 +27,9 @@ 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.workflow.WorkflowResult;
+import
org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
import
org.apache.inlong.manager.common.pojo.workflow.form.LightGroupResourceProcessForm;
import org.apache.inlong.manager.common.pojo.workflow.form.NewGroupProcessForm;
-import
org.apache.inlong.manager.common.pojo.workflow.form.UpdateGroupProcessForm;
import org.apache.inlong.manager.service.core.InlongGroupService;
import org.apache.inlong.manager.service.core.InlongStreamService;
import org.apache.inlong.manager.service.workflow.ProcessName;
@@ -99,7 +99,7 @@ public class InlongGroupProcessOperation {
GroupMode mode = GroupMode.parseGroupMode(groupInfo);
switch (mode) {
case NORMAL:
- UpdateGroupProcessForm form =
genUpdateGroupProcessForm(groupInfo, GroupOperateType.SUSPEND);
+ GroupResourceProcessForm form = genGroupProcessForm(groupInfo,
GroupOperateType.SUSPEND);
executorService.execute(() ->
workflowService.start(ProcessName.SUSPEND_GROUP_PROCESS, operator, form));
break;
case LIGHT:
@@ -128,7 +128,7 @@ public class InlongGroupProcessOperation {
WorkflowResult result;
switch (mode) {
case NORMAL:
- UpdateGroupProcessForm form =
genUpdateGroupProcessForm(groupInfo, GroupOperateType.SUSPEND);
+ GroupResourceProcessForm form = genGroupProcessForm(groupInfo,
GroupOperateType.SUSPEND);
result =
workflowService.start(ProcessName.SUSPEND_GROUP_PROCESS, operator, form);
break;
case LIGHT:
@@ -154,7 +154,7 @@ public class InlongGroupProcessOperation {
GroupMode mode = GroupMode.parseGroupMode(groupInfo);
switch (mode) {
case NORMAL:
- UpdateGroupProcessForm form =
genUpdateGroupProcessForm(groupInfo, GroupOperateType.RESTART);
+ GroupResourceProcessForm form = genGroupProcessForm(groupInfo,
GroupOperateType.RESTART);
executorService.execute(() ->
workflowService.start(ProcessName.RESTART_GROUP_PROCESS, operator, form));
break;
case LIGHT:
@@ -182,7 +182,7 @@ public class InlongGroupProcessOperation {
WorkflowResult result;
switch (mode) {
case NORMAL:
- UpdateGroupProcessForm form =
genUpdateGroupProcessForm(groupInfo, GroupOperateType.RESTART);
+ GroupResourceProcessForm form = genGroupProcessForm(groupInfo,
GroupOperateType.RESTART);
result =
workflowService.start(ProcessName.RESTART_GROUP_PROCESS, operator, form);
break;
case LIGHT:
@@ -231,7 +231,7 @@ public class InlongGroupProcessOperation {
GroupMode mode = GroupMode.parseGroupMode(groupInfo);
switch (mode) {
case NORMAL:
- UpdateGroupProcessForm form =
genUpdateGroupProcessForm(groupInfo, GroupOperateType.DELETE);
+ GroupResourceProcessForm form = genGroupProcessForm(groupInfo,
GroupOperateType.DELETE);
workflowService.start(ProcessName.DELETE_GROUP_PROCESS,
operator, form);
break;
case LIGHT:
@@ -256,8 +256,8 @@ public class InlongGroupProcessOperation {
return form;
}
- private UpdateGroupProcessForm genUpdateGroupProcessForm(InlongGroupInfo
groupInfo, GroupOperateType operateType) {
- UpdateGroupProcessForm form = new UpdateGroupProcessForm();
+ private GroupResourceProcessForm genGroupProcessForm(InlongGroupInfo
groupInfo, GroupOperateType operateType) {
+ GroupResourceProcessForm form = new GroupResourceProcessForm();
String groupId = groupInfo.getInlongGroupId();
if (GroupOperateType.RESTART == operateType) {
List<InlongStreamInfo> streamList = streamService.list(groupId);
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/CreateSinkResourceForStreamListener.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/CreateSinkResourceForStreamListener.java
index cf7f631ca..296c9b732 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/CreateSinkResourceForStreamListener.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/CreateSinkResourceForStreamListener.java
@@ -62,7 +62,7 @@ public class CreateSinkResourceForStreamListener implements
SinkOperateListener
log.info("begin create hive table for groupId={}, streamId={}",
groupId, streamId);
List<String> streamIdList = new ArrayList<>();
- List<InlongStreamInfo> streamList = form.getStreamInfoList();
+ List<InlongStreamInfo> streamList = form.getStreamInfos();
if (CollectionUtils.isNotEmpty(streamList)) {
streamIdList =
streamList.stream().map(InlongStreamInfo::getInlongStreamId).collect(Collectors.toList());
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/SinkResourceListener.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/SinkResourceListener.java
index f5af67491..029958a92 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/SinkResourceListener.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/SinkResourceListener.java
@@ -60,7 +60,7 @@ public class SinkResourceListener implements
SinkOperateListener {
log.info("begin to create sink resources for groupId={}", groupId);
List<String> streamIdList = new ArrayList<>();
- List<InlongStreamInfo> streamList = form.getStreamInfoList();
+ List<InlongStreamInfo> streamList = form.getStreamInfos();
if (CollectionUtils.isNotEmpty(streamList)) {
streamIdList =
streamList.stream().map(InlongStreamInfo::getInlongStreamId).collect(Collectors.toList());
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/CreateSortConfigListener.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/CreateSortConfigListener.java
index 33f2d76db..94a5aa280 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/CreateSortConfigListener.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/CreateSortConfigListener.java
@@ -29,7 +29,6 @@ import
org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
import org.apache.inlong.manager.common.pojo.sink.SinkResponse;
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.pojo.workflow.form.UpdateGroupProcessForm;
import org.apache.inlong.manager.common.settings.InlongGroupSettings;
import org.apache.inlong.manager.service.sink.StreamSinkService;
import org.apache.inlong.manager.service.sort.util.DataFlowUtils;
@@ -70,9 +69,9 @@ public class CreateSortConfigListener implements
SortOperateListener {
public ListenerResult listen(WorkflowContext context) throws
WorkflowListenerException {
LOGGER.info("Create sort config for context={}", context);
ProcessForm form = context.getProcessForm();
- if (form instanceof UpdateGroupProcessForm) {
- UpdateGroupProcessForm updateGroupProcessForm =
(UpdateGroupProcessForm) form;
- GroupOperateType groupOperateType =
updateGroupProcessForm.getGroupOperateType();
+ if (form instanceof GroupResourceProcessForm) {
+ GroupResourceProcessForm groupResourceProcessForm =
(GroupResourceProcessForm) form;
+ GroupOperateType groupOperateType =
groupResourceProcessForm.getGroupOperateType();
if (groupOperateType == GroupOperateType.SUSPEND ||
groupOperateType == GroupOperateType.DELETE) {
return ListenerResult.success();
}
@@ -124,9 +123,6 @@ public class CreateSortConfigListener implements
SortOperateListener {
if (processForm instanceof GroupResourceProcessForm) {
GroupResourceProcessForm groupResourceProcessForm =
(GroupResourceProcessForm) processForm;
return groupResourceProcessForm.getGroupInfo();
- } else if (processForm instanceof UpdateGroupProcessForm) {
- UpdateGroupProcessForm updateGroupProcessForm =
(UpdateGroupProcessForm) processForm;
- return updateGroupProcessForm.getGroupInfo();
} else {
LOGGER.error("Illegal ProcessForm {} to get inlong group info",
processForm.getFormName());
throw new WorkflowListenerException(
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/ZookeeperDisabledSelector.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/ZookeeperDisabledSelector.java
index 13793db51..1657a6d8b 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/ZookeeperDisabledSelector.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/ZookeeperDisabledSelector.java
@@ -22,7 +22,6 @@ import org.apache.inlong.manager.common.enums.MQType;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
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.pojo.workflow.form.UpdateGroupProcessForm;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.EventSelector;
import org.springframework.stereotype.Component;
@@ -42,14 +41,6 @@ public class ZookeeperDisabledSelector implements
EventSelector {
GroupResourceProcessForm groupResourceForm =
(GroupResourceProcessForm) processForm;
InlongGroupInfo groupInfo = groupResourceForm.getGroupInfo();
- boolean enable = groupInfo.getZookeeperEnabled() == 0
- && MQType.forType(groupInfo.getMiddlewareType()) !=
MQType.NONE;
- log.info("zookeeper disabled was [{}] for groupId [{}]", enable,
groupId);
- return enable;
- } else if (processForm instanceof UpdateGroupProcessForm) {
- UpdateGroupProcessForm updateGroupProcessForm =
(UpdateGroupProcessForm) processForm;
- InlongGroupInfo groupInfo = updateGroupProcessForm.getGroupInfo();
-
boolean enable = groupInfo.getZookeeperEnabled() == 0
&& MQType.forType(groupInfo.getMiddlewareType()) !=
MQType.NONE;
log.info("zookeeper disabled was [{}] for groupId [{}]", enable,
groupId);
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 71a613e16..43ab41992 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
@@ -35,7 +35,6 @@ import
org.apache.inlong.manager.common.pojo.source.kafka.KafkaSourceResponse;
import org.apache.inlong.manager.common.pojo.stream.StreamBriefResponse;
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.pojo.workflow.form.UpdateGroupProcessForm;
import org.apache.inlong.manager.common.util.CommonBeanUtils;
import org.apache.inlong.manager.service.core.InlongStreamService;
import org.apache.inlong.manager.service.source.StreamSourceService;
@@ -157,10 +156,7 @@ public abstract class AbstractSourceOperateListener
implements DataSourceOperate
private GroupOperateType getOperateType(ProcessForm processForm) {
if (processForm instanceof GroupResourceProcessForm) {
- return GroupOperateType.INIT;
- } else if (processForm instanceof UpdateGroupProcessForm) {
- UpdateGroupProcessForm updateGroupProcessForm =
(UpdateGroupProcessForm) processForm;
- return updateGroupProcessForm.getGroupOperateType();
+ return ((GroupResourceProcessForm)
processForm).getGroupOperateType();
} else {
log.error("Illegal ProcessForm {} to get inlong group info",
processForm.getFormName());
throw new RuntimeException(String.format("Unsupported ProcessForm
{%s} in CreateSortConfigListener",
@@ -172,9 +168,6 @@ public abstract class AbstractSourceOperateListener
implements DataSourceOperate
if (processForm instanceof GroupResourceProcessForm) {
GroupResourceProcessForm groupResourceProcessForm =
(GroupResourceProcessForm) processForm;
return groupResourceProcessForm.getGroupInfo();
- } else if (processForm instanceof UpdateGroupProcessForm) {
- UpdateGroupProcessForm updateGroupProcessForm =
(UpdateGroupProcessForm) processForm;
- return updateGroupProcessForm.getGroupInfo();
} else {
log.error("Illegal ProcessForm {} to get inlong group info",
processForm.getFormName());
throw new RuntimeException(String.format("Unsupported ProcessForm
{%s} in CreateSortConfigListener",
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/SourceDeleteEventSelector.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/SourceDeleteEventSelector.java
index d38c43170..da6e965d0 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/SourceDeleteEventSelector.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/SourceDeleteEventSelector.java
@@ -18,8 +18,8 @@
package org.apache.inlong.manager.service.source.listener;
import org.apache.inlong.manager.common.enums.GroupOperateType;
+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.pojo.workflow.form.UpdateGroupProcessForm;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.EventSelector;
@@ -31,10 +31,10 @@ public class SourceDeleteEventSelector implements
EventSelector {
@Override
public boolean accept(WorkflowContext context) {
ProcessForm processForm = context.getProcessForm();
- if (!(processForm instanceof UpdateGroupProcessForm)) {
+ if (!(processForm instanceof GroupResourceProcessForm)) {
return false;
}
- UpdateGroupProcessForm updateGroupProcessForm =
(UpdateGroupProcessForm) processForm;
- return updateGroupProcessForm.getGroupOperateType() ==
GroupOperateType.DELETE;
+ GroupResourceProcessForm groupResourceProcessForm =
(GroupResourceProcessForm) processForm;
+ return groupResourceProcessForm.getGroupOperateType() ==
GroupOperateType.DELETE;
}
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/SourceRestartEventSelector.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/SourceRestartEventSelector.java
index 554c85546..1d5a63dc6 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/SourceRestartEventSelector.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/SourceRestartEventSelector.java
@@ -18,8 +18,8 @@
package org.apache.inlong.manager.service.source.listener;
import org.apache.inlong.manager.common.enums.GroupOperateType;
+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.pojo.workflow.form.UpdateGroupProcessForm;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.EventSelector;
@@ -31,10 +31,10 @@ public class SourceRestartEventSelector implements
EventSelector {
@Override
public boolean accept(WorkflowContext context) {
ProcessForm processForm = context.getProcessForm();
- if (!(processForm instanceof UpdateGroupProcessForm)) {
+ if (!(processForm instanceof GroupResourceProcessForm)) {
return false;
}
- UpdateGroupProcessForm updateGroupProcessForm =
(UpdateGroupProcessForm) processForm;
- return updateGroupProcessForm.getGroupOperateType() ==
GroupOperateType.RESTART;
+ GroupResourceProcessForm groupResourceProcessForm =
(GroupResourceProcessForm) processForm;
+ return groupResourceProcessForm.getGroupOperateType() ==
GroupOperateType.RESTART;
}
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/SourceStopEventSelector.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/SourceStopEventSelector.java
index 7b647d4b4..f86be95da 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/SourceStopEventSelector.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/listener/SourceStopEventSelector.java
@@ -18,8 +18,8 @@
package org.apache.inlong.manager.service.source.listener;
import org.apache.inlong.manager.common.enums.GroupOperateType;
+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.pojo.workflow.form.UpdateGroupProcessForm;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.EventSelector;
@@ -31,10 +31,10 @@ public class SourceStopEventSelector implements
EventSelector {
@Override
public boolean accept(WorkflowContext context) {
ProcessForm processForm = context.getProcessForm();
- if (!(processForm instanceof UpdateGroupProcessForm)) {
+ if (!(processForm instanceof GroupResourceProcessForm)) {
return false;
}
- UpdateGroupProcessForm updateGroupProcessForm =
(UpdateGroupProcessForm) processForm;
- return updateGroupProcessForm.getGroupOperateType() ==
GroupOperateType.SUSPEND;
+ GroupResourceProcessForm groupResourceProcessForm =
(GroupResourceProcessForm) processForm;
+ return groupResourceProcessForm.getGroupOperateType() ==
GroupOperateType.SUSPEND;
}
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/DeleteGroupWorkflowDefinition.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/DeleteGroupWorkflowDefinition.java
index b51c4132f..d677cf1b9 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/DeleteGroupWorkflowDefinition.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/DeleteGroupWorkflowDefinition.java
@@ -18,7 +18,7 @@
package org.apache.inlong.manager.service.workflow.group;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.inlong.manager.common.pojo.workflow.form.UpdateGroupProcessForm;
+import
org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.service.workflow.ProcessName;
import org.apache.inlong.manager.service.workflow.ServiceTaskListenerFactory;
import org.apache.inlong.manager.service.workflow.WorkflowDefinition;
@@ -59,7 +59,7 @@ public class DeleteGroupWorkflowDefinition implements
WorkflowDefinition {
process.setType("Group Resource Delete");
process.setName(getProcessName().name());
process.setDisplayName(getProcessName().getDisplayName());
- process.setFormClass(UpdateGroupProcessForm.class);
+ process.setFormClass(GroupResourceProcessForm.class);
process.setVersion(1);
process.setHidden(1);
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/RestartGroupWorkflowDefinition.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/RestartGroupWorkflowDefinition.java
index 3caf7432c..ea96a7fe8 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/RestartGroupWorkflowDefinition.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/RestartGroupWorkflowDefinition.java
@@ -18,7 +18,7 @@
package org.apache.inlong.manager.service.workflow.group;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.inlong.manager.common.pojo.workflow.form.UpdateGroupProcessForm;
+import
org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.service.workflow.ProcessName;
import org.apache.inlong.manager.service.workflow.ServiceTaskListenerFactory;
import org.apache.inlong.manager.service.workflow.WorkflowDefinition;
@@ -62,7 +62,7 @@ public class RestartGroupWorkflowDefinition implements
WorkflowDefinition {
process.setType("Group Resource Restart");
process.setName(getProcessName().name());
process.setDisplayName(getProcessName().getDisplayName());
- process.setFormClass(UpdateGroupProcessForm.class);
+ process.setFormClass(GroupResourceProcessForm.class);
process.setVersion(1);
process.setHidden(1);
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/SuspendGroupWorkflowDefinition.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/SuspendGroupWorkflowDefinition.java
index 4afef40eb..e5bebe7e5 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/SuspendGroupWorkflowDefinition.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/SuspendGroupWorkflowDefinition.java
@@ -18,7 +18,7 @@
package org.apache.inlong.manager.service.workflow.group;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.inlong.manager.common.pojo.workflow.form.UpdateGroupProcessForm;
+import
org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.service.workflow.ProcessName;
import org.apache.inlong.manager.service.workflow.ServiceTaskListenerFactory;
import org.apache.inlong.manager.service.workflow.WorkflowDefinition;
@@ -62,7 +62,7 @@ public class SuspendGroupWorkflowDefinition implements
WorkflowDefinition {
process.setType("Group Resource Suspend");
process.setName(getProcessName().name());
process.setDisplayName(getProcessName().getDisplayName());
- process.setFormClass(UpdateGroupProcessForm.class);
+ process.setFormClass(GroupResourceProcessForm.class);
process.setVersion(1);
process.setHidden(1);
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/listener/GroupUpdateCompleteListener.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/listener/GroupUpdateCompleteListener.java
index 1409e8cb2..80334064b 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/listener/GroupUpdateCompleteListener.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/listener/GroupUpdateCompleteListener.java
@@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.enums.GroupOperateType;
import org.apache.inlong.manager.common.enums.GroupStatus;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
-import
org.apache.inlong.manager.common.pojo.workflow.form.UpdateGroupProcessForm;
+import
org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.service.core.InlongGroupService;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.ListenerResult;
@@ -47,7 +47,7 @@ public class GroupUpdateCompleteListener implements
ProcessEventListener {
@Override
public ListenerResult listen(WorkflowContext context) throws Exception {
- UpdateGroupProcessForm form = (UpdateGroupProcessForm)
context.getProcessForm();
+ GroupResourceProcessForm form = (GroupResourceProcessForm)
context.getProcessForm();
String username = context.getApplicant();
GroupOperateType groupOperateType = form.getGroupOperateType();
InlongGroupInfo groupInfo = form.getGroupInfo();
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/listener/GroupUpdateFailedListener.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/listener/GroupUpdateFailedListener.java
index a99594362..a7a4eee82 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/listener/GroupUpdateFailedListener.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/listener/GroupUpdateFailedListener.java
@@ -20,7 +20,7 @@ package
org.apache.inlong.manager.service.workflow.group.listener;
import lombok.extern.slf4j.Slf4j;
import org.apache.inlong.manager.common.enums.GroupStatus;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
-import
org.apache.inlong.manager.common.pojo.workflow.form.UpdateGroupProcessForm;
+import
org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.service.core.InlongGroupService;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.ListenerResult;
@@ -46,7 +46,7 @@ public class GroupUpdateFailedListener implements
ProcessEventListener {
@Override
public ListenerResult listen(WorkflowContext context) throws Exception {
- UpdateGroupProcessForm form = (UpdateGroupProcessForm)
context.getProcessForm();
+ GroupResourceProcessForm form = (GroupResourceProcessForm)
context.getProcessForm();
String username = context.getApplicant();
InlongGroupInfo groupInfo = form.getGroupInfo();
// Update inlong group status and other info
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/listener/GroupUpdateListener.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/listener/GroupUpdateListener.java
index 7f578bb5f..e00dd0ea5 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/listener/GroupUpdateListener.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/workflow/group/listener/GroupUpdateListener.java
@@ -22,7 +22,7 @@ import
org.apache.inlong.manager.common.enums.GroupOperateType;
import org.apache.inlong.manager.common.enums.GroupStatus;
import org.apache.inlong.manager.common.exceptions.BusinessException;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
-import
org.apache.inlong.manager.common.pojo.workflow.form.UpdateGroupProcessForm;
+import
org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.service.core.InlongGroupService;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.workflow.event.ListenerResult;
@@ -47,7 +47,7 @@ public class GroupUpdateListener implements
ProcessEventListener {
@Override
public ListenerResult listen(WorkflowContext context) throws Exception {
- UpdateGroupProcessForm form = (UpdateGroupProcessForm)
context.getProcessForm();
+ GroupResourceProcessForm form = (GroupResourceProcessForm)
context.getProcessForm();
InlongGroupInfo groupInfo =
groupService.get(context.getProcessForm().getInlongGroupId());
GroupOperateType groupOperateType = form.getGroupOperateType();
String username = context.getApplicant();
diff --git
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockPlugin.java
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockPlugin.java
index a3531dcd7..e8dc341c1 100644
---
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockPlugin.java
+++
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockPlugin.java
@@ -18,7 +18,7 @@
package org.apache.inlong.manager.service.mocks;
import org.apache.inlong.manager.common.enums.GroupOperateType;
-import
org.apache.inlong.manager.common.pojo.workflow.form.UpdateGroupProcessForm;
+import
org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.workflow.WorkflowContext;
import org.apache.inlong.manager.common.pojo.workflow.form.ProcessForm;
import org.apache.inlong.manager.workflow.event.EventSelector;
@@ -38,10 +38,10 @@ public class MockPlugin implements ProcessPlugin {
@Override
public boolean accept(WorkflowContext context) {
ProcessForm processForm = context.getProcessForm();
- if (!(processForm instanceof UpdateGroupProcessForm)) {
+ if (!(processForm instanceof GroupResourceProcessForm)) {
return false;
}
- UpdateGroupProcessForm form = (UpdateGroupProcessForm) processForm;
+ GroupResourceProcessForm form = (GroupResourceProcessForm)
processForm;
return form.getGroupOperateType() == GroupOperateType.SUSPEND;
}
};
@@ -50,10 +50,10 @@ public class MockPlugin implements ProcessPlugin {
@Override
public boolean accept(WorkflowContext context) {
ProcessForm processForm = context.getProcessForm();
- if (!(processForm instanceof UpdateGroupProcessForm)) {
+ if (!(processForm instanceof GroupResourceProcessForm)) {
return false;
}
- UpdateGroupProcessForm form = (UpdateGroupProcessForm) processForm;
+ GroupResourceProcessForm form = (GroupResourceProcessForm)
processForm;
return form.getGroupOperateType() == GroupOperateType.RESTART;
}
};
@@ -62,10 +62,10 @@ public class MockPlugin implements ProcessPlugin {
@Override
public boolean accept(WorkflowContext context) {
ProcessForm processForm = context.getProcessForm();
- if (!(processForm instanceof UpdateGroupProcessForm)) {
+ if (!(processForm instanceof GroupResourceProcessForm)) {
return false;
}
- UpdateGroupProcessForm form = (UpdateGroupProcessForm) processForm;
+ GroupResourceProcessForm form = (GroupResourceProcessForm)
processForm;
return form.getGroupOperateType() == GroupOperateType.DELETE;
}
};
diff --git
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java
index 750c74236..243b02fd0 100644
---
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java
+++
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/sort/DisableZkForSortTest.java
@@ -30,7 +30,6 @@ import
org.apache.inlong.manager.common.pojo.workflow.ProcessResponse;
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.ProcessForm;
-import
org.apache.inlong.manager.common.pojo.workflow.form.UpdateGroupProcessForm;
import org.apache.inlong.manager.service.core.InlongStreamService;
import org.apache.inlong.manager.service.mocks.MockPlugin;
import org.apache.inlong.manager.service.sink.StreamSinkService;
@@ -157,7 +156,7 @@ public class DisableZkForSortTest extends
WorkflowServiceImplTest {
InlongStreamInfo streamInfo = createStreamInfo(groupInfo);
createHiveSink(streamInfo);
createKafkaSource(streamInfo);
- UpdateGroupProcessForm form = new UpdateGroupProcessForm();
+ GroupResourceProcessForm form = new GroupResourceProcessForm();
form.setGroupInfo(groupInfo);
form.setGroupOperateType(GroupOperateType.SUSPEND);
taskListenerFactory.acceptPlugin(new MockPlugin());
@@ -174,7 +173,7 @@ public class DisableZkForSortTest extends
WorkflowServiceImplTest {
List<TaskEventListener> listeners =
Lists.newArrayList(task.getNameToListenerMap().values());
Assert.assertTrue(listeners.get(1) instanceof
CreateSortConfigListener);
ProcessForm currentProcessForm = context.getProcessForm();
- InlongGroupInfo curGroupRequest = ((UpdateGroupProcessForm)
currentProcessForm).getGroupInfo();
+ InlongGroupInfo curGroupRequest = ((GroupResourceProcessForm)
currentProcessForm).getGroupInfo();
Assert.assertEquals(1, curGroupRequest.getExtList().size());
}
diff --git
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/source/listener/DataSourceListenerTest.java
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/source/listener/DataSourceListenerTest.java
index 8a6daeaea..11743e42a 100644
---
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/source/listener/DataSourceListenerTest.java
+++
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/source/listener/DataSourceListenerTest.java
@@ -27,7 +27,7 @@ import
org.apache.inlong.manager.common.pojo.source.binlog.BinlogSourceRequest;
import org.apache.inlong.manager.common.pojo.stream.InlongStreamInfo;
import org.apache.inlong.manager.common.pojo.workflow.ProcessResponse;
import org.apache.inlong.manager.common.pojo.workflow.WorkflowResult;
-import
org.apache.inlong.manager.common.pojo.workflow.form.UpdateGroupProcessForm;
+import
org.apache.inlong.manager.common.pojo.workflow.form.GroupResourceProcessForm;
import org.apache.inlong.manager.service.source.StreamSourceService;
import org.apache.inlong.manager.service.workflow.ProcessName;
import org.apache.inlong.manager.service.workflow.WorkflowServiceImplTest;
@@ -46,7 +46,7 @@ import org.springframework.beans.factory.annotation.Autowired;
*/
public class DataSourceListenerTest extends WorkflowServiceImplTest {
- public UpdateGroupProcessForm form;
+ public GroupResourceProcessForm form;
public InlongGroupInfo groupInfo;
@@ -78,7 +78,7 @@ public class DataSourceListenerTest extends
WorkflowServiceImplTest {
streamSourceService.updateStatus(groupInfo.getInlongGroupId(), null,
SourceStatus.SOURCE_NORMAL.getCode(), OPERATOR);
- form = new UpdateGroupProcessForm();
+ form = new GroupResourceProcessForm();
form.setGroupInfo(groupInfo);
form.setGroupOperateType(GroupOperateType.SUSPEND);
WorkflowContext context = workflowEngine.processService()
@@ -109,7 +109,7 @@ public class DataSourceListenerTest extends
WorkflowServiceImplTest {
streamSourceService.updateStatus(groupInfo.getInlongGroupId(), null,
SourceStatus.SOURCE_NORMAL.getCode(), OPERATOR);
- form = new UpdateGroupProcessForm();
+ form = new GroupResourceProcessForm();
form.setGroupInfo(groupInfo);
form.setGroupOperateType(GroupOperateType.RESTART);
WorkflowContext context = workflowEngine.processService()
diff --git
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImplTest.java
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImplTest.java
index 8c027b086..2ecdc217f 100644
---
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImplTest.java
+++
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/workflow/WorkflowServiceImplTest.java
@@ -32,7 +32,6 @@ import
org.apache.inlong.manager.common.pojo.workflow.ProcessResponse;
import org.apache.inlong.manager.common.pojo.workflow.TaskExecuteLogQuery;
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.UpdateGroupProcessForm;
import org.apache.inlong.manager.dao.entity.WorkflowProcessEntity;
import org.apache.inlong.manager.dao.entity.WorkflowTaskEntity;
import org.apache.inlong.manager.dao.mapper.WorkflowProcessEntityMapper;
@@ -289,7 +288,7 @@ public class WorkflowServiceImplTest extends
ServiceBaseTest {
groupService.updateStatus(GROUP_ID,
GroupStatus.CONFIG_SUCCESSFUL.getCode(), OPERATOR);
groupService.update(groupInfo.genRequest(), OPERATOR);
- UpdateGroupProcessForm form = new UpdateGroupProcessForm();
+ GroupResourceProcessForm form = new GroupResourceProcessForm();
form.setGroupInfo(groupInfo);
form.setGroupOperateType(GroupOperateType.SUSPEND);
taskListenerFactory.acceptPlugin(new MockPlugin());
@@ -321,7 +320,7 @@ public class WorkflowServiceImplTest extends
ServiceBaseTest {
groupService.updateStatus(groupInfo.getInlongGroupId(),
GroupStatus.SUSPENDED.getCode(), OPERATOR);
groupService.update(groupInfo.genRequest(), OPERATOR);
- UpdateGroupProcessForm form = new UpdateGroupProcessForm();
+ GroupResourceProcessForm form = new GroupResourceProcessForm();
form.setGroupInfo(groupInfo);
form.setGroupOperateType(GroupOperateType.RESTART);
taskListenerFactory.acceptPlugin(new MockPlugin());
@@ -356,7 +355,7 @@ public class WorkflowServiceImplTest extends
ServiceBaseTest {
groupService.updateStatus(groupInfo.getInlongGroupId(),
GroupStatus.SUSPENDED.getCode(), OPERATOR);
groupService.update(groupInfo.genRequest(), OPERATOR);
- UpdateGroupProcessForm form = new UpdateGroupProcessForm();
+ GroupResourceProcessForm form = new GroupResourceProcessForm();
form.setGroupInfo(groupInfo);
form.setGroupOperateType(GroupOperateType.DELETE);
taskListenerFactory.acceptPlugin(new MockPlugin());
