[incubator-inlong] branch master updated: [INLONG-4687][Manager] Add middlewareType field back to adapt the old behavior (#4689)

[healchow]

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

healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 1ae83c3d8 [INLONG-4687][Manager] Add middlewareType field back to 
adapt the old behavior (#4689)
1ae83c3d8 is described below

commit 1ae83c3d89a7fda126fcc54034fb8acec81d3557
Author: kipshi <48468934+kip...@users.noreply.github.com>
AuthorDate: Fri Jun 17 15:37:17 2022 +0800

    [INLONG-4687][Manager] Add middlewareType field back to adapt the old 
behavior (#4689)
---
 .../main/java/org/apache/inlong/manager/common/enums/GroupStatus.java | 3 ++-
 .../org/apache/inlong/manager/common/pojo/group/InlongGroupInfo.java  | 4 ++++
 .../apache/inlong/manager/common/pojo/group/InlongGroupRequest.java   | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git 
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupStatus.java
 
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupStatus.java
index da790561d..d42ed9bde 100644
--- 
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupStatus.java
+++ 
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupStatus.java
@@ -125,7 +125,8 @@ public enum GroupStatus {
      * allows change the MQ type of inlong group.
      */
     public static boolean notAllowedUpdateMQ(GroupStatus status) {
-        return status == GroupStatus.DRAFT || status == 
GroupStatus.TO_BE_SUBMIT;
+        return status != GroupStatus.DRAFT && status != 
GroupStatus.TO_BE_SUBMIT
+                && status != GroupStatus.APPROVE_REJECTED && status != 
GroupStatus.CONFIG_FAILED;
     }
 
     /**
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 6ea1436cf..2bb4f4468 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
@@ -56,6 +56,10 @@ public abstract class InlongGroupInfo {
     @ApiModelProperty(value = "Inlong group description")
     private String description;
 
+    @Deprecated
+    @ApiModelProperty(value = "MQ type, replaced by mqType")
+    private String middlewareType;
+
     @ApiModelProperty(value = "MQ type, high throughput: TUBE, high 
consistency: PULSAR")
     private String mqType;
 
diff --git 
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupRequest.java
 
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupRequest.java
index 1abe3ae8a..aee78b58b 100644
--- 
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupRequest.java
+++ 
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupRequest.java
@@ -58,6 +58,10 @@ public class InlongGroupRequest {
     @ApiModelProperty(value = "Inlong group description")
     private String description;
 
+    @Deprecated
+    @ApiModelProperty(value = "MQ type, replaced by mqType")
+    private String middlewareType;
+
     @NotBlank
     @ApiModelProperty(value = "MQ type, high throughput: TUBE, high 
consistency: PULSAR")
     private String mqType;