[ISSUE #4420] Add Feishu Sink connector #4522

SunnyBoy-WYH · 2023-10-30T14:15:15Z

Fixes #4420.

Motivation

[ISSUE #4420] Add Feishu Sink connector

Modifications

add sink connector for feishu：

support open_id/chatId etc
feishu doc:https://open.feishu.cn/document/server-docs/im-v1/message/create?appId=cli_a5a556ae023a100d
like promthaus connector, i import guava-retry tool and keep 2.0.0 version

Documentation

Does this pull request introduce a new feature? (yes / no)
If yes, how is the feature documented? (not applicable / docs / JavaDocs / not documented)
If a feature is not applicable for documentation, explain why?
If a feature is not documented yet in this PR, please create a followup issue for adding the documentation

...r-feishu/src/main/java/org/apache/eventmesh/connector/feishu/server/FeishuConnectServer.java

...or-feishu/src/main/java/org/apache/eventmesh/connector/feishu/config/FeishuServerConfig.java

...r-feishu/src/test/java/org/apache/eventmesh/connector/s3/source/FeishuSinkConnectorTest.java

xwm1992 · 2023-11-13T09:58:04Z

@SunnyBoy-WYH ping, please take a look for the reveiw and fix the ci check error, thanks.

SunnyBoy-WYH · 2023-11-13T11:19:21Z

@SunnyBoy-WYH ping, please take a look for the reveiw and fix the ci check error, thanks.

ok，i will solve it later. thanks

...or-feishu/src/main/java/org/apache/eventmesh/connector/feishu/config/FeishuServerConfig.java

pandaapo

It seems that you haven't fixed the previous CI error.

SunnyBoy-WYH · 2023-11-13T16:05:15Z

It seems that you haven't fixed the previous CI error.

please approve the ci pipeline.

# Conflicts: # eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java

pandaapo · 2023-11-15T02:48:23Z

CI errors:

[ant:checkstyle] [WARN] /home/runner/work/eventmesh/eventmesh/eventmesh-connectors/eventmesh-connector-feishu/src/main/java/org/apache/eventmesh/connector/feishu/sink/connector/FeishuSinkConnector.java:105:108: '.' should be on a new line. [SeparatorWrapDot]

[ant:checkstyle] [WARN] /home/runner/work/eventmesh/eventmesh/eventmesh-connectors/eventmesh-connector-feishu/src/main/java/org/apache/eventmesh/connector/feishu/sink/connector/FeishuSinkConnector.java:106:51: ',' is not followed by whitespace. [WhitespaceAfter]
[ant:checkstyle] [WARN] /home/runner/work/eventmesh/eventmesh/eventmesh-connectors/eventmesh-connector-feishu/src/main/java/org/apache/eventmesh/connector/feishu/sink/connector/FeishuSinkConnector.java:141:63: WhitespaceAround: '{' is not preceded with whitespace. [WhitespaceAround]
[ant:checkstyle] [WARN] /home/runner/work/eventmesh/eventmesh/eventmesh-connectors/eventmesh-connector-feishu/src/main/java/org/apache/eventmesh/connector/feishu/sink/config/FeishuSinkConfig.java:19:1: 'import' should be separated from previous line. [EmptyLineSeparator]
> Task :eventmesh-connectors:eventmesh-connector-feishu:checkstyleMain FAILED

You can refer to https://eventmesh.apache.org/community/contribute/contribute#code-style to help you perform a checkstyle check locally.

# Conflicts: # settings.gradle

codecov · 2023-11-18T09:31:46Z

Codecov Report

Attention: 29 lines in your changes are missing coverage. Please review.

Comparison is base (fc900e5) 16.80% compared to head (0cf93d9) 16.87%.
Report is 2 commits behind head on master.

Files	Patch %	Lines
...tor/feishu/sink/connector/FeishuSinkConnector.java	56.81%	17 Missing and 2 partials ⚠️
...h/connector/feishu/server/FeishuConnectServer.java	0.00%	5 Missing ⚠️
...nector/feishu/sink/config/SinkConnectorConfig.java	33.33%	4 Missing ⚠️
...connector/feishu/sink/config/FeishuSinkConfig.java	66.66%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##             master    #4522      +/-   ##
============================================
+ Coverage     16.80%   16.87%   +0.06%     
- Complexity     1626     1638      +12     
============================================
  Files           749      753       +4     
  Lines         28683    28740      +57     
  Branches       2487     2489       +2     
============================================
+ Hits           4821     4850      +29     
- Misses        23408    23434      +26     
- Partials        454      456       +2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

SunnyBoy-WYH · 2023-11-18T09:48:45Z

CI errors:

[ant:checkstyle] [WARN] /home/runner/work/eventmesh/eventmesh/eventmesh-connectors/eventmesh-connector-feishu/src/main/java/org/apache/eventmesh/connector/feishu/sink/connector/FeishuSinkConnector.java:105:108: '.' should be on a new line. [SeparatorWrapDot]

[ant:checkstyle] [WARN] /home/runner/work/eventmesh/eventmesh/eventmesh-connectors/eventmesh-connector-feishu/src/main/java/org/apache/eventmesh/connector/feishu/sink/connector/FeishuSinkConnector.java:106:51: ',' is not followed by whitespace. [WhitespaceAfter]
[ant:checkstyle] [WARN] /home/runner/work/eventmesh/eventmesh/eventmesh-connectors/eventmesh-connector-feishu/src/main/java/org/apache/eventmesh/connector/feishu/sink/connector/FeishuSinkConnector.java:141:63: WhitespaceAround: '{' is not preceded with whitespace. [WhitespaceAround]
[ant:checkstyle] [WARN] /home/runner/work/eventmesh/eventmesh/eventmesh-connectors/eventmesh-connector-feishu/src/main/java/org/apache/eventmesh/connector/feishu/sink/config/FeishuSinkConfig.java:19:1: 'import' should be separated from previous line. [EmptyLineSeparator]
> Task :eventmesh-connectors:eventmesh-connector-feishu:checkstyleMain FAILED

You can refer to https://eventmesh.apache.org/community/contribute/contribute#code-style to help you perform a checkstyle check locally.

Done

pandaapo · 2023-11-18T10:00:13Z

...r-feishu/src/test/java/org/apache/eventmesh/connector/s3/source/FeishuSinkConnectorTest.java

+import org.junit.jupiter.api.Test;
+
+@Disabled
+public class FeishuSinkConnectorTest {


Could you modify the code using Mockito stubbing or other mocking techniques to remove the annotation and make the test class runnable?

能否使用Mockito的打桩或者其他模拟的方式修改下代码，使该测试类可以移除掉该注解，并能实际运行？

pandaapo · 2023-11-18T11:56:25Z

...r-feishu/src/test/java/org/apache/eventmesh/connector/s3/source/FeishuSinkConnectorTest.java

+    }
+
+    @Spy
+    private FeishuSinkConnector feishuSinkConnector;


The @Spy annotation is not very meaningful here, because you are not stubbing the object at all. You are basically constructing it manually.

这个@Spy注解意义不大，因为您没有对该对象进行任何打桩，基本上是手动构建的。

pandaapo · 2023-11-18T12:00:49Z

...r-feishu/src/test/java/org/apache/eventmesh/connector/s3/source/FeishuSinkConnectorTest.java

+
+    @Test
+    public void testFeishuSinkConnector() {
+        assertDoesNotThrow(() -> {


Now that you are using Mockito for mocking, you can change the verification method of assertDoesNotThrow() to verify the number of calls to the feishuClient that you are mocking. Otherwise, the introduction of Mockito is meaningless.

现在您已经使用Mockito进行模拟了，就可以将assertDoesNotThrow()的验证方式改成验证您所模拟的feishuClient的调用次数。否则引入的Mockito就没有意义了。

pandaapo · 2023-11-18T13:14:24Z

...r-feishu/src/test/java/org/apache/eventmesh/connector/s3/source/FeishuSinkConnectorTest.java

+        final int times = 3;
+        List<ConnectRecord> connectRecords = new ArrayList<>();
+        for (int i = 0; i < times; i++) {
+            feishuSinkConnector.start();


One startup is enough. Additionally, it would be better to call stop () at the end of the test, although it is currently an empty method.

启动一次就够了。另外，测试结束时最好调用下stop()，虽然目前是个空方法。

hhuang1231 · 2023-12-01T07:21:57Z

eventmesh-connectors/eventmesh-connector-feishu/src/main/resources/sink-config.yml

+connectorConfig:
+  connectorName: feishuSink
+  reciveId: reciveIdValue
+  reciveType: open_id


The reciveId and recoverType fields in the sink-config.yml are different from the field names in SinkConnectorConfig, which will cause the configuration to fail to be imported correctly.

@SunnyBoy-WYH 配置文件中reciveId和reciveType字段与SinkConnectorConfig中字段名不同，这将导致配置无法正确导入。

Are you willing to fix this bug? @hhuang1231 .
Additionally, this bug makes me worried about the correctness and effectiveness of this Connector in the absence of this bug.

您是否愿意修改这个bug？@hhuang1231 。另外，该bug也让我有点担心，当没有该bug时，该Connector的正确性和有效性。

@pandaapo ok, I'll try to perfect it and make it work.

# Conflicts: # eventmesh-examples/src/main/resources/application.properties

[ISSUE apache#4420] Add Feishu Sink connector

fae2324

pandaapo reviewed Oct 30, 2023

View reviewed changes

...r-feishu/src/main/java/org/apache/eventmesh/connector/feishu/server/FeishuConnectServer.java Outdated Show resolved Hide resolved

...or-feishu/src/main/java/org/apache/eventmesh/connector/feishu/config/FeishuServerConfig.java Outdated Show resolved Hide resolved

pandaapo reviewed Oct 30, 2023

View reviewed changes

...r-feishu/src/test/java/org/apache/eventmesh/connector/s3/source/FeishuSinkConnectorTest.java Show resolved Hide resolved

[ISSUE apache#4420] Add Feishu Sink connector

aff39ba

pandaapo reviewed Nov 13, 2023

View reviewed changes

...or-feishu/src/main/java/org/apache/eventmesh/connector/feishu/config/FeishuServerConfig.java Outdated Show resolved Hide resolved

pandaapo reviewed Nov 13, 2023

View reviewed changes

[ISSUE apache#4420] Add Feishu Sink connector

1f25a26

SunnyBoy-WYH added 2 commits November 14, 2023 23:07

[ISSUE apache#4420] Add Feishu Sink connector

edc38d5

Merge branch 'master' into feishu-connector

d85deec

# Conflicts: # eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java

SunnyBoy-WYH added 3 commits November 16, 2023 22:55

Merge branch 'master' into feishu-connector

dc1af2f

# Conflicts: # settings.gradle

[ISSUE apache#4420] Add Feishu Sink connector,code style

3123e6b

[ISSUE apache#4420] Add Feishu Sink connector,check style

4562695

pandaapo reviewed Nov 18, 2023

View reviewed changes

[ISSUE apache#4420] Add Feishu Sink connector,mock test

45bb953

pandaapo reviewed Nov 18, 2023

View reviewed changes

[ISSUE apache#4420] Add Feishu Sink connector,mock test

24abe12

pandaapo reviewed Nov 18, 2023

View reviewed changes

[ISSUE apache#4420] Add Feishu Sink connector,mock test

0cf93d9

pandaapo approved these changes Nov 18, 2023

View reviewed changes

Pil0tXia approved these changes Nov 18, 2023

View reviewed changes

xwm1992 approved these changes Nov 19, 2023

View reviewed changes

xwm1992 merged commit 5a8cd37 into apache:master Nov 19, 2023
13 checks passed

hhuang1231 reviewed Dec 1, 2023

View reviewed changes

hhuang1231 mentioned this pull request Dec 4, 2023

[Enhancement] Improve eventmesh-connector-lark #4598

Closed

3 tasks

pandaapo mentioned this pull request Dec 4, 2023

[ISSUE #4598] Improve eventmesh-connector-lark #4599

Merged

hhuang1231 added a commit to hhuang1231/eventmesh that referenced this pull request Dec 8, 2023

Merge branch 'master' into apache#4522-feishu-connector

fadb477

# Conflicts: # eventmesh-examples/src/main/resources/application.properties

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ISSUE #4420] Add Feishu Sink connector #4522

[ISSUE #4420] Add Feishu Sink connector #4522

SunnyBoy-WYH commented Oct 30, 2023 •

edited by pandaapo

xwm1992 commented Nov 13, 2023

SunnyBoy-WYH commented Nov 13, 2023

pandaapo left a comment

SunnyBoy-WYH commented Nov 13, 2023

pandaapo commented Nov 15, 2023

codecov bot commented Nov 18, 2023 •

edited

SunnyBoy-WYH commented Nov 18, 2023

pandaapo Nov 18, 2023

pandaapo Nov 18, 2023 •

edited

pandaapo Nov 18, 2023

pandaapo Nov 18, 2023

hhuang1231 Dec 1, 2023

pandaapo Dec 2, 2023

hhuang1231 Dec 2, 2023

[ISSUE #4420] Add Feishu Sink connector #4522

[ISSUE #4420] Add Feishu Sink connector #4522

Conversation

SunnyBoy-WYH commented Oct 30, 2023 • edited by pandaapo

Motivation

Modifications

Documentation

xwm1992 commented Nov 13, 2023

SunnyBoy-WYH commented Nov 13, 2023

pandaapo left a comment

Choose a reason for hiding this comment

SunnyBoy-WYH commented Nov 13, 2023

pandaapo commented Nov 15, 2023

codecov bot commented Nov 18, 2023 • edited

Codecov Report

SunnyBoy-WYH commented Nov 18, 2023

pandaapo Nov 18, 2023

Choose a reason for hiding this comment

pandaapo Nov 18, 2023 • edited

Choose a reason for hiding this comment

pandaapo Nov 18, 2023

Choose a reason for hiding this comment

pandaapo Nov 18, 2023

Choose a reason for hiding this comment

hhuang1231 Dec 1, 2023

Choose a reason for hiding this comment

pandaapo Dec 2, 2023

Choose a reason for hiding this comment

hhuang1231 Dec 2, 2023

Choose a reason for hiding this comment

SunnyBoy-WYH commented Oct 30, 2023 •

edited by pandaapo

codecov bot commented Nov 18, 2023 •

edited

pandaapo Nov 18, 2023 •

edited