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/03/12 14:07:19 UTC
[incubator-inlong] branch master updated: [INLONG-3090][Manager] Add TDMQ_PULSAR type in manager (#3091)
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 baa8802 [INLONG-3090][Manager] Add TDMQ_PULSAR type in manager (#3091)
baa8802 is described below
commit baa8802d3250bb8711bac9da136f76af7b14863a
Author: kipshi <48...@users.noreply.github.com>
AuthorDate: Sat Mar 12 22:07:11 2022 +0800
[INLONG-3090][Manager] Add TDMQ_PULSAR type in manager (#3091)
---
.../manager/client/api/TdmqPulsarBaseConf.java} | 20 +++++++-------------
.../manager/client/api/util/InlongGroupTransfer.java | 3 ++-
.../apache/inlong/manager/common/enums/MqType.java | 1 +
.../common/pojo/group/InlongGroupMqExtBase.java | 3 ++-
4 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/MqType.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/TdmqPulsarBaseConf.java
similarity index 66%
copy from inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/MqType.java
copy to inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/TdmqPulsarBaseConf.java
index f94a9dd..3074794 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/MqType.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/TdmqPulsarBaseConf.java
@@ -15,19 +15,13 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.common.enums;
+package org.apache.inlong.manager.client.api;
-public enum MqType {
- PULSAR,
- TUBE,
- NONE;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.inlong.manager.common.enums.MqType;
- public static MqType forType(String type) {
- for (MqType mqType : values()) {
- if (mqType.name().equals(type)) {
- return mqType;
- }
- }
- throw new IllegalArgumentException(String.format("Unsupport queue=%s for Inlong", type));
- }
+public class TdmqPulsarBaseConf extends PulsarBaseConf {
+
+ @ApiModelProperty("Message queue type")
+ private MqType type = MqType.TDMQ_PULSAR;
}
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongGroupTransfer.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongGroupTransfer.java
index a79c36e..67aca2c 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongGroupTransfer.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/util/InlongGroupTransfer.java
@@ -74,6 +74,7 @@ public class InlongGroupTransfer {
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 class InlongGroupTransfer {
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/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/MqType.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/MqType.java
index f94a9dd..e1d27c1 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/MqType.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/MqType.java
@@ -20,6 +20,7 @@ package org.apache.inlong.manager.common.enums;
public enum MqType {
PULSAR,
TUBE,
+ TDMQ_PULSAR,
NONE;
public static MqType forType(String type) {
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupMqExtBase.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupMqExtBase.java
index f64036c..8fdd587 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupMqExtBase.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/group/InlongGroupMqExtBase.java
@@ -32,7 +32,8 @@ import org.apache.inlong.manager.common.enums.Constant;
@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 {