[INLONG-3090][Manager] Add TDMQ_PULSAR type in manager (#3091)

apache · Mar 12, 2022 · baa8802 · baa8802
1 parent 0ec4e30
commit baa8802
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/...manager-client/src/main/java/org/apache/inlong/manager/client/api/TdmqPulsarBaseConf.java b/...manager-client/src/main/java/org/apache/inlong/manager/client/api/TdmqPulsarBaseConf.java
@@ -0,0 +1,27 @@
+/*
+ * 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.client.api;
+
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.inlong.manager.common.enums.MqType;
+
+public class TdmqPulsarBaseConf extends PulsarBaseConf {
+
+    @ApiModelProperty("Message queue type")
+    private MqType type = MqType.TDMQ_PULSAR;
+}
diff --git a/...r-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongGroupTransfer.java b/...r-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongGroupTransfer.java
@@ -74,6 +74,7 @@ public static MqBaseConf parseMqBaseConf(InlongGroupResponse inlongGroupResponse
             case NONE:
                 return MqBaseConf.BLANK_MQ_CONF;
             case PULSAR:
+            case TDMQ_PULSAR:
                 return parsePulsarConf(inlongGroupResponse);
             case TUBE:
                 return parseTubeConf(inlongGroupResponse);
@@ -204,7 +205,7 @@ public static InlongGroupInfo createGroupInfo(InlongGroupConf groupConf) {
         groupInfo.setInCharges(groupConf.getOperator());
         groupInfo.setExtList(Lists.newArrayList());
         groupInfo.setCreator(groupConf.getOperator());
-        if (mqType == MqType.PULSAR) {
+        if (mqType == MqType.PULSAR || mqType == MqType.TDMQ_PULSAR) {
             PulsarBaseConf pulsarBaseConf = (PulsarBaseConf) mqConf;
             groupInfo.setMqResourceObj(pulsarBaseConf.getNamespace());
             InlongGroupPulsarInfo pulsarInfo = createPulsarInfo(pulsarBaseConf);

diff --git a/...g-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/MqType.java b/...g-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/MqType.java
@@ -20,6 +20,7 @@
 public enum MqType {
     PULSAR,
     TUBE,
+    TDMQ_PULSAR,
     NONE;
 
     public static MqType forType(String type) {

diff --git a/...ommon/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupMqExtBase.java b/...ommon/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupMqExtBase.java
@@ -32,7 +32,8 @@
 @ApiModel("Extended inlong group info of different MQs")
 @JsonTypeInfo(use = Id.NAME, visible = true, property = "middlewareType", defaultImpl = InlongGroupMqExtBase.class)
 @JsonSubTypes({
-        @JsonSubTypes.Type(value = InlongGroupPulsarInfo.class, name = Constant.MIDDLEWARE_PULSAR)
+        @JsonSubTypes.Type(value = InlongGroupPulsarInfo.class, name = Constant.MIDDLEWARE_PULSAR),
+        @JsonSubTypes.Type(value = InlongGroupPulsarInfo.class, name = Constant.MIDDLEWARE_TDMQ_PULSAR)
 })
 public class InlongGroupMqExtBase {