This is an automated email from the ASF dual-hosted git repository.
lrhkobe 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 007553a65 refactor moudle dingding to dingtalk (#4574)
007553a65 is described below
commit 007553a65804a53155be6254bbb5673f5b6d0bcb
Author: Eason Chen <[email protected]>
AuthorDate: Thu Nov 23 15:30:17 2023 +0800
refactor moudle dingding to dingtalk (#4574)
* remove duplicated moudle
* refacotr moudle dingding to dingtalk
---------
Co-authored-by: easoncchen(陈广胜) <[email protected]>
---
eventmesh-connectors/README.md | 4 ++--
.../build.gradle | 0
.../dingtalk}/common/constants/ConnectRecordExtensionKeys.java | 2 +-
.../connector/dingtalk}/config/DingDingConnectServerConfig.java | 2 +-
.../connector/dingtalk}/config/DingDingMessageTemplateType.java | 2 +-
.../connector/dingtalk}/server/DingDingConnectServer.java | 6 +++---
.../connector/dingtalk}/sink/config/DingDingSinkConfig.java | 2 +-
.../connector/dingtalk}/sink/config/SinkConnectorConfig.java | 2 +-
.../connector/dingtalk}/sink/connector/DingDingSinkConnector.java | 8 ++++----
.../src/main/resources/server-config.yml | 0
.../src/main/resources/sink-config.yml | 0
.../dingtalk}/sink/connector/DingDingSinkConnectorTest.java | 8 ++++----
.../src/test/resources/server-config.yml | 0
.../src/test/resources/sink-config.yml | 0
settings.gradle | 2 +-
15 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/eventmesh-connectors/README.md b/eventmesh-connectors/README.md
index 8b14734f5..25abaef68 100644
--- a/eventmesh-connectors/README.md
+++ b/eventmesh-connectors/README.md
@@ -27,11 +27,11 @@ Add a new connector by implementing the source/sink
interface using :
| ClickHouse | Source | ⬜ |
| ClickHouse | Sink | ⬜ |
| DingDing | Source | ⬜ |
-| [DingDing](eventmesh-connector-dingding) | Sink | ✅ |
+| [Dingtalk](eventmesh-connector-dingtalk) | Sink | ✅ |
| Email | Source | ⬜ |
| Email | Sink | ⬜ |
| FeiShu | Source | ⬜ |
-| FeiShu | Sink | ⬜ |
+| [FeiShu](eventmesh-connector-feishu) | Sink | ✅ |
| [File](eventmesh-connector-file) | Source | ✅ |
| [File](eventmesh-connector-file) | Sink | ✅ |
| Github | Source | ⬜ |
diff --git a/eventmesh-connectors/eventmesh-connector-dingding/build.gradle
b/eventmesh-connectors/eventmesh-connector-dingtalk/build.gradle
similarity index 100%
rename from eventmesh-connectors/eventmesh-connector-dingding/build.gradle
rename to eventmesh-connectors/eventmesh-connector-dingtalk/build.gradle
diff --git
a/eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/common/constants/ConnectRecordExtensionKeys.java
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/common/constants/ConnectRecordExtensionKeys.java
similarity index 94%
rename from
eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/common/constants/ConnectRecordExtensionKeys.java
rename to
eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/common/constants/ConnectRecordExtensionKeys.java
index 425a130dc..16efd5219 100644
---
a/eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/common/constants/ConnectRecordExtensionKeys.java
+++
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/common/constants/ConnectRecordExtensionKeys.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.connector.dingding.common.constants;
+package org.apache.eventmesh.connector.dingtalk.common.constants;
/**
* Constants of record extension key.
diff --git
a/eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/config/DingDingConnectServerConfig.java
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/config/DingDingConnectServerConfig.java
similarity index 94%
rename from
eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/config/DingDingConnectServerConfig.java
rename to
eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/config/DingDingConnectServerConfig.java
index 2475ccd85..ec744922c 100644
---
a/eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/config/DingDingConnectServerConfig.java
+++
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/config/DingDingConnectServerConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.connector.dingding.config;
+package org.apache.eventmesh.connector.dingtalk.config;
import org.apache.eventmesh.openconnect.api.config.Config;
diff --git
a/eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/config/DingDingMessageTemplateType.java
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/config/DingDingMessageTemplateType.java
similarity index 96%
rename from
eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/config/DingDingMessageTemplateType.java
rename to
eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/config/DingDingMessageTemplateType.java
index 5cb2e077a..3477c9435 100644
---
a/eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/config/DingDingMessageTemplateType.java
+++
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/config/DingDingMessageTemplateType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.connector.dingding.config;
+package org.apache.eventmesh.connector.dingtalk.config;
import java.util.Arrays;
diff --git
a/eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/server/DingDingConnectServer.java
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/server/DingDingConnectServer.java
similarity index 88%
rename from
eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/server/DingDingConnectServer.java
rename to
eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/server/DingDingConnectServer.java
index abd0ab844..a7ea6fad0 100644
---
a/eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/server/DingDingConnectServer.java
+++
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/server/DingDingConnectServer.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.connector.dingding.server;
+package org.apache.eventmesh.connector.dingtalk.server;
import org.apache.eventmesh.common.Constants;
-import
org.apache.eventmesh.connector.dingding.config.DingDingConnectServerConfig;
-import
org.apache.eventmesh.connector.dingding.sink.connector.DingDingSinkConnector;
+import
org.apache.eventmesh.connector.dingtalk.config.DingDingConnectServerConfig;
+import
org.apache.eventmesh.connector.dingtalk.sink.connector.DingDingSinkConnector;
import org.apache.eventmesh.openconnect.Application;
import org.apache.eventmesh.openconnect.util.ConfigUtil;
diff --git
a/eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/sink/config/DingDingSinkConfig.java
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/config/DingDingSinkConfig.java
similarity index 94%
rename from
eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/sink/config/DingDingSinkConfig.java
rename to
eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/config/DingDingSinkConfig.java
index 242d31b57..aa4245219 100644
---
a/eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/sink/config/DingDingSinkConfig.java
+++
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/config/DingDingSinkConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.connector.dingding.sink.config;
+package org.apache.eventmesh.connector.dingtalk.sink.config;
import org.apache.eventmesh.openconnect.api.config.SinkConfig;
diff --git
a/eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/sink/config/SinkConnectorConfig.java
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/config/SinkConnectorConfig.java
similarity index 94%
rename from
eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/sink/config/SinkConnectorConfig.java
rename to
eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/config/SinkConnectorConfig.java
index 3ae669abf..2211fd1ad 100644
---
a/eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/sink/config/SinkConnectorConfig.java
+++
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/config/SinkConnectorConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.connector.dingding.sink.config;
+package org.apache.eventmesh.connector.dingtalk.sink.config;
import lombok.Data;
diff --git
a/eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/sink/connector/DingDingSinkConnector.java
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnector.java
similarity index 96%
rename from
eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/sink/connector/DingDingSinkConnector.java
rename to
eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnector.java
index 252108bcc..592d1ad1b 100644
---
a/eventmesh-connectors/eventmesh-connector-dingding/src/main/java/org/apache/eventmesh/connector/dingding/sink/connector/DingDingSinkConnector.java
+++
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnector.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.eventmesh.connector.dingding.sink.connector;
+package org.apache.eventmesh.connector.dingtalk.sink.connector;
import org.apache.eventmesh.common.utils.JsonUtils;
-import
org.apache.eventmesh.connector.dingding.common.constants.ConnectRecordExtensionKeys;
-import
org.apache.eventmesh.connector.dingding.config.DingDingMessageTemplateType;
-import org.apache.eventmesh.connector.dingding.sink.config.DingDingSinkConfig;
+import
org.apache.eventmesh.connector.dingtalk.common.constants.ConnectRecordExtensionKeys;
+import
org.apache.eventmesh.connector.dingtalk.config.DingDingMessageTemplateType;
+import org.apache.eventmesh.connector.dingtalk.sink.config.DingDingSinkConfig;
import org.apache.eventmesh.openconnect.api.config.Config;
import org.apache.eventmesh.openconnect.api.connector.ConnectorContext;
import org.apache.eventmesh.openconnect.api.connector.SinkConnectorContext;
diff --git
a/eventmesh-connectors/eventmesh-connector-dingding/src/main/resources/server-config.yml
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/resources/server-config.yml
similarity index 100%
rename from
eventmesh-connectors/eventmesh-connector-dingding/src/main/resources/server-config.yml
rename to
eventmesh-connectors/eventmesh-connector-dingtalk/src/main/resources/server-config.yml
diff --git
a/eventmesh-connectors/eventmesh-connector-dingding/src/main/resources/sink-config.yml
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/main/resources/sink-config.yml
similarity index 100%
rename from
eventmesh-connectors/eventmesh-connector-dingding/src/main/resources/sink-config.yml
rename to
eventmesh-connectors/eventmesh-connector-dingtalk/src/main/resources/sink-config.yml
diff --git
a/eventmesh-connectors/eventmesh-connector-dingding/src/test/java/org/apache/eventmesh/connector/dingding/sink/connector/DingDingSinkConnectorTest.java
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/test/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnectorTest.java
similarity index 94%
rename from
eventmesh-connectors/eventmesh-connector-dingding/src/test/java/org/apache/eventmesh/connector/dingding/sink/connector/DingDingSinkConnectorTest.java
rename to
eventmesh-connectors/eventmesh-connector-dingtalk/src/test/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnectorTest.java
index 3de799d94..81e6fecf6 100644
---
a/eventmesh-connectors/eventmesh-connector-dingding/src/test/java/org/apache/eventmesh/connector/dingding/sink/connector/DingDingSinkConnectorTest.java
+++
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/test/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnectorTest.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.eventmesh.connector.dingding.sink.connector;
+package org.apache.eventmesh.connector.dingtalk.sink.connector;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import
org.apache.eventmesh.connector.dingding.common.constants.ConnectRecordExtensionKeys;
-import
org.apache.eventmesh.connector.dingding.config.DingDingMessageTemplateType;
-import org.apache.eventmesh.connector.dingding.sink.config.DingDingSinkConfig;
+import
org.apache.eventmesh.connector.dingtalk.common.constants.ConnectRecordExtensionKeys;
+import
org.apache.eventmesh.connector.dingtalk.config.DingDingMessageTemplateType;
+import org.apache.eventmesh.connector.dingtalk.sink.config.DingDingSinkConfig;
import org.apache.eventmesh.openconnect.offsetmgmt.api.data.ConnectRecord;
import org.apache.eventmesh.openconnect.offsetmgmt.api.data.RecordOffset;
import org.apache.eventmesh.openconnect.offsetmgmt.api.data.RecordPartition;
diff --git
a/eventmesh-connectors/eventmesh-connector-dingding/src/test/resources/server-config.yml
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/test/resources/server-config.yml
similarity index 100%
rename from
eventmesh-connectors/eventmesh-connector-dingding/src/test/resources/server-config.yml
rename to
eventmesh-connectors/eventmesh-connector-dingtalk/src/test/resources/server-config.yml
diff --git
a/eventmesh-connectors/eventmesh-connector-dingding/src/test/resources/sink-config.yml
b/eventmesh-connectors/eventmesh-connector-dingtalk/src/test/resources/sink-config.yml
similarity index 100%
rename from
eventmesh-connectors/eventmesh-connector-dingding/src/test/resources/sink-config.yml
rename to
eventmesh-connectors/eventmesh-connector-dingtalk/src/test/resources/sink-config.yml
diff --git a/settings.gradle b/settings.gradle
index 9555fc5db..b95ff0ddc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -44,7 +44,7 @@ include 'eventmesh-connectors:eventmesh-connector-jdbc'
include 'eventmesh-connectors:eventmesh-connector-file'
include 'eventmesh-connectors:eventmesh-connector-spring'
include 'eventmesh-connectors:eventmesh-connector-prometheus'
-include 'eventmesh-connectors:eventmesh-connector-dingding'
+include 'eventmesh-connectors:eventmesh-connector-dingtalk'
include 'eventmesh-connectors:eventmesh-connector-feishu'
include 'eventmesh-connectors:eventmesh-connector-wecom'
include 'eventmesh-connectors:eventmesh-connector-slack'
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
