This is an automated email from the ASF dual-hosted git repository.
mxsm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new a170a7967 [ISSUE #4590]WeCom/DingTalk connector extension supports
spring environment variables. (#4591)
a170a7967 is described below
commit a170a7967ce09ad058f990fccaf8307aefb88fc1
Author: yanrongzhen <[email protected]>
AuthorDate: Thu Dec 7 16:58:56 2023 +0800
[ISSUE #4590]WeCom/DingTalk connector extension supports spring environment
variables. (#4591)
---
.../common/constants/ConnectRecordExtensionKeys.java | 2 +-
.../dingtalk/config/DingDingMessageTemplateType.java | 19 +++++++++++++------
.../sink/connector/DingDingSinkConnector.java | 4 ++--
.../sink/connector/DingDingSinkConnectorTest.java | 4 ++--
.../wecom/config/WeComMessageTemplateType.java | 19 +++++++++++++------
.../wecom/constants/ConnectRecordExtensionKeys.java | 2 +-
.../wecom/sink/connector/WeComSinkConnector.java | 4 ++--
.../wecom/connector/WeComSinkConnectorTest.java | 4 ++--
.../src/main/resources/application.properties | 3 ++-
9 files changed, 38 insertions(+), 23 deletions(-)
diff --git
a/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/common/constants/ConnectRecordExtensionKeys.java
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/common/constants/ConnectRecordExtensionKeys.java
index 733de2c43..bb6292134 100644
---
a/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/common/constants/ConnectRecordExtensionKeys.java
+++
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/common/constants/ConnectRecordExtensionKeys.java
@@ -22,7 +22,7 @@ package
org.apache.eventmesh.connector.dingtalk.common.constants;
*/
public interface ConnectRecordExtensionKeys {
- String DINGTALK_TEMPLATE_TYPE_KEY = "dingtalktemplatetype";
+ String DINGTALK_TEMPLATE_TYPE = "dingtalktemplatetype";
String DINGTALK_MARKDOWN_MESSAGE_TITLE = "dingtalkmarkdownmessagetitle";
}
diff --git
a/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/config/DingDingMessageTemplateType.java
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/config/DingDingMessageTemplateType.java
index 3477c9435..5c2606686 100644
---
a/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/config/DingDingMessageTemplateType.java
+++
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/config/DingDingMessageTemplateType.java
@@ -21,23 +21,30 @@ import java.util.Arrays;
public enum DingDingMessageTemplateType {
- PLAIN_TEXT("sampleText"),
- MARKDOWN("sampleMarkdown");
+ PLAIN_TEXT("text", "sampleText"),
+ MARKDOWN("markdown", "sampleMarkdown");
+
+ private final String templateType;
private final String templateKey;
- DingDingMessageTemplateType(String templateKey) {
+ DingDingMessageTemplateType(String templateType, String templateKey) {
+ this.templateType = templateType;
this.templateKey = templateKey;
}
+ public String getTemplateType() {
+ return templateType;
+ }
+
public String getTemplateKey() {
return templateKey;
}
- public static DingDingMessageTemplateType of(String templateKey) {
+ public static DingDingMessageTemplateType of(String templateType) {
return Arrays.stream(values())
- .filter(v -> v.getTemplateKey().equals(templateKey))
+ .filter(v -> v.getTemplateType().equals(templateType))
.findFirst()
- .orElseThrow(() -> new IllegalArgumentException("TemplateKey: " +
templateKey + " not found."));
+ .orElseThrow(() -> new IllegalArgumentException("TemplateType: " +
templateType + " not found."));
}
}
diff --git
a/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnector.java
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnector.java
index 864ac3ae6..ff41855e3 100644
---
a/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnector.java
+++
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnector.java
@@ -126,9 +126,9 @@ public class DingDingSinkConnector implements Sink {
new OrgGroupSendHeaders();
orgGroupSendHeaders.xAcsDingtalkAccessToken = accessToken;
- String templateTypeKey =
record.getExtension(ConnectRecordExtensionKeys.DINGTALK_TEMPLATE_TYPE_KEY);
+ String templateTypeKey =
record.getExtension(ConnectRecordExtensionKeys.DINGTALK_TEMPLATE_TYPE);
if (null == templateTypeKey || "null".equals(templateTypeKey))
{
- templateTypeKey =
DingDingMessageTemplateType.PLAIN_TEXT.getTemplateKey();
+ templateTypeKey =
DingDingMessageTemplateType.PLAIN_TEXT.getTemplateType();
}
DingDingMessageTemplateType templateType =
DingDingMessageTemplateType.of(templateTypeKey);
diff --git
a/eventmesh-connectors/eventmesh-connector-dingtalk/src/test/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnectorTest.java
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/test/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnectorTest.java
index d24c51ffa..38a136748 100644
---
a/eventmesh-connectors/eventmesh-connector-dingtalk/src/test/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnectorTest.java
+++
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/test/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnectorTest.java
@@ -94,8 +94,8 @@ public class DingDingSinkConnectorTest {
RecordOffset offset = new RecordOffset();
ConnectRecord connectRecord = new ConnectRecord(partition, offset,
System.currentTimeMillis(), "Hello,
EventMesh!".getBytes(StandardCharsets.UTF_8));
-
connectRecord.addExtension(ConnectRecordExtensionKeys.DINGTALK_TEMPLATE_TYPE_KEY,
- DingDingMessageTemplateType.PLAIN_TEXT.getTemplateKey());
+
connectRecord.addExtension(ConnectRecordExtensionKeys.DINGTALK_TEMPLATE_TYPE,
+ DingDingMessageTemplateType.PLAIN_TEXT.getTemplateType());
records.add(connectRecord);
}
connector.put(records);
diff --git
a/eventmesh-connectors/eventmesh-connector-wecom/src/main/java/org/apache/eventmesh/connector/wecom/config/WeComMessageTemplateType.java
b/eventmesh-connectors/eventmesh-connector-wecom/src/main/java/org/apache/eventmesh/connector/wecom/config/WeComMessageTemplateType.java
index 459d07894..a16602273 100644
---
a/eventmesh-connectors/eventmesh-connector-wecom/src/main/java/org/apache/eventmesh/connector/wecom/config/WeComMessageTemplateType.java
+++
b/eventmesh-connectors/eventmesh-connector-wecom/src/main/java/org/apache/eventmesh/connector/wecom/config/WeComMessageTemplateType.java
@@ -21,23 +21,30 @@ import java.util.Arrays;
public enum WeComMessageTemplateType {
- PLAIN_TEXT("text"),
- MARKDOWN("markdown");
+ PLAIN_TEXT("text", "text"),
+ MARKDOWN("markdown", "markdown");
+
+ private final String templateType;
private final String templateKey;
- WeComMessageTemplateType(String templateKey) {
+ WeComMessageTemplateType(String templateType, String templateKey) {
+ this.templateType = templateType;
this.templateKey = templateKey;
}
+ public String getTemplateType() {
+ return templateType;
+ }
+
public String getTemplateKey() {
return templateKey;
}
- public static WeComMessageTemplateType of(String templateKey) {
+ public static WeComMessageTemplateType of(String templateType) {
return Arrays.stream(values())
- .filter(v -> v.getTemplateKey().equals(templateKey))
+ .filter(v -> v.getTemplateType().equals(templateType))
.findFirst()
- .orElseThrow(() -> new IllegalArgumentException("TemplateKey: " +
templateKey + " not found."));
+ .orElseThrow(() -> new IllegalArgumentException("TemplateType: " +
templateType + " not found."));
}
}
diff --git
a/eventmesh-connectors/eventmesh-connector-wecom/src/main/java/org/apache/eventmesh/connector/wecom/constants/ConnectRecordExtensionKeys.java
b/eventmesh-connectors/eventmesh-connector-wecom/src/main/java/org/apache/eventmesh/connector/wecom/constants/ConnectRecordExtensionKeys.java
index 7958a7375..3c1a9dfa8 100644
---
a/eventmesh-connectors/eventmesh-connector-wecom/src/main/java/org/apache/eventmesh/connector/wecom/constants/ConnectRecordExtensionKeys.java
+++
b/eventmesh-connectors/eventmesh-connector-wecom/src/main/java/org/apache/eventmesh/connector/wecom/constants/ConnectRecordExtensionKeys.java
@@ -22,6 +22,6 @@ package org.apache.eventmesh.connector.wecom.constants;
*/
public interface ConnectRecordExtensionKeys {
- String WECOM_MESSAGE_TEMPLATE_TYPE_KEY = "weCom:MessageTemplateTypeKey";
+ String WECOM_MESSAGE_TEMPLATE_TYPE = "wecomtemplatetype";
}
diff --git
a/eventmesh-connectors/eventmesh-connector-wecom/src/main/java/org/apache/eventmesh/connector/wecom/sink/connector/WeComSinkConnector.java
b/eventmesh-connectors/eventmesh-connector-wecom/src/main/java/org/apache/eventmesh/connector/wecom/sink/connector/WeComSinkConnector.java
index bf884916d..499104e11 100644
---
a/eventmesh-connectors/eventmesh-connector-wecom/src/main/java/org/apache/eventmesh/connector/wecom/sink/connector/WeComSinkConnector.java
+++
b/eventmesh-connectors/eventmesh-connector-wecom/src/main/java/org/apache/eventmesh/connector/wecom/sink/connector/WeComSinkConnector.java
@@ -127,8 +127,8 @@ public class WeComSinkConnector implements Sink {
HttpPost httpPost = new HttpPost(target);
httpPost.addHeader("Content-Type",
EventMeshDataContentType.JSON.getCode());
WeComMessageTemplateType templateType = WeComMessageTemplateType.of(
-
Optional.ofNullable(record.getExtension(ConnectRecordExtensionKeys.WECOM_MESSAGE_TEMPLATE_TYPE_KEY))
- .orElse(WeComMessageTemplateType.PLAIN_TEXT.getTemplateKey()));
+
Optional.ofNullable(record.getExtension(ConnectRecordExtensionKeys.WECOM_MESSAGE_TEMPLATE_TYPE))
+
.orElse(WeComMessageTemplateType.PLAIN_TEXT.getTemplateType()));
Map<String, Object> contentMap = new HashMap<>();
if (WeComMessageTemplateType.PLAIN_TEXT == templateType) {
contentMap.put("content", new String((byte[]) record.getData()));
diff --git
a/eventmesh-connectors/eventmesh-connector-wecom/src/test/java/org/apache/eventmesh/connector/wecom/connector/WeComSinkConnectorTest.java
b/eventmesh-connectors/eventmesh-connector-wecom/src/test/java/org/apache/eventmesh/connector/wecom/connector/WeComSinkConnectorTest.java
index de363346b..4cf9f3523 100644
---
a/eventmesh-connectors/eventmesh-connector-wecom/src/test/java/org/apache/eventmesh/connector/wecom/connector/WeComSinkConnectorTest.java
+++
b/eventmesh-connectors/eventmesh-connector-wecom/src/test/java/org/apache/eventmesh/connector/wecom/connector/WeComSinkConnectorTest.java
@@ -93,8 +93,8 @@ public class WeComSinkConnectorTest {
RecordOffset offset = new RecordOffset();
ConnectRecord connectRecord = new ConnectRecord(partition,
offset,
System.currentTimeMillis(), "Hello,
EventMesh!".getBytes(StandardCharsets.UTF_8));
-
connectRecord.addExtension(ConnectRecordExtensionKeys.WECOM_MESSAGE_TEMPLATE_TYPE_KEY,
- WeComMessageTemplateType.PLAIN_TEXT.getTemplateKey());
+
connectRecord.addExtension(ConnectRecordExtensionKeys.WECOM_MESSAGE_TEMPLATE_TYPE,
+ WeComMessageTemplateType.PLAIN_TEXT.getTemplateType());
records.add(connectRecord);
}
connector.put(records);
diff --git a/eventmesh-examples/src/main/resources/application.properties
b/eventmesh-examples/src/main/resources/application.properties
index 6c7b727d2..726d05d19 100644
--- a/eventmesh-examples/src/main/resources/application.properties
+++ b/eventmesh-examples/src/main/resources/application.properties
@@ -24,4 +24,5 @@ eventmesh.selector.type=nacos
eventmesh.selector.nacos.address=127.0.0.1:8848
eventmesh.catalog.name=EVENTMESH-catalog
eventmesh.workflow.name=EVENTMESH-workflow
-eventmesh.connector.dingtalkTemplateType=sampleText
\ No newline at end of file
+eventmesh.connector.dingtalkTemplateType=text
+eventmesh.connector.wecomTemplateType=text
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
