Skip to content

Commit cb1b7b8

Browse files
authored
[ISSUE #4937]fix gradle dependecy and add runtime v2
1 parent 1cb3b02 commit cb1b7b8

File tree

205 files changed

+839
-5522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+839
-5522
lines changed

Diff for: .idea/icon.png

-14.5 KB
Binary file not shown.

Diff for: build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ subprojects {
577577
dependency "org.mybatis.spring.boot:mybatis-spring-boot-starter:2.3.1"
578578
dependency "com.alibaba:druid-spring-boot-starter:1.2.22"
579579
dependency "org.springframework.boot:spring-boot-starter-jetty:2.7.10"
580-
580+
dependency "com.baomidou:mybatis-plus:3.5.6"
581581
dependency "com.mysql:mysql-connector-j:8.0.33"
582582

583583
}

Diff for: eventmesh-admin-server/build.gradle

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ dependencies {
33
implementation project(":eventmesh-common")
44
implementation project(":eventmesh-registry:eventmesh-registry-api")
55
implementation project(":eventmesh-registry:eventmesh-registry-nacos")
6+
implementation project(':eventmesh-openconnect:eventmesh-openconnect-offsetmgmt-plugin:eventmesh-openconnect-offsetmgmt-api')
67
implementation "com.alibaba.nacos:nacos-client"
78
implementation ("org.springframework.boot:spring-boot-starter-web") {
89
exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
@@ -11,9 +12,12 @@ dependencies {
1112
implementation "io.grpc:grpc-core"
1213
implementation "io.grpc:grpc-protobuf"
1314
implementation "io.grpc:grpc-stub"
15+
implementation "io.grpc:grpc-netty-shaded"
1416

17+
// https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter
18+
implementation group: 'com.baomidou', name: 'mybatis-plus-boot-starter', version: '3.5.5'
19+
implementation "org.reflections:reflections:0.10.2"
1520

16-
implementation "org.mybatis.spring.boot:mybatis-spring-boot-starter"
1721
// https://mvnrepository.com/artifact/com.alibaba/druid-spring-boot-starter
1822
implementation "com.alibaba:druid-spring-boot-starter"
1923
runtimeOnly 'com.mysql:mysql-connector-j'

Diff for: eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/config/DingDingConnectServerConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.eventmesh.connector.dingtalk.config;
1919

20-
import org.apache.eventmesh.openconnect.api.config.Config;
20+
import org.apache.eventmesh.common.config.connector.Config;
2121

2222
import lombok.Data;
2323
import lombok.EqualsAndHashCode;

Diff for: eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/config/DingDingSinkConfig.java

-30
This file was deleted.

Diff for: eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/config/SinkConnectorConfig.java

-36
This file was deleted.

Diff for: eventmesh-connectors/eventmesh-connector-dingtalk/src/main/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnector.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717

1818
package org.apache.eventmesh.connector.dingtalk.sink.connector;
1919

20+
import org.apache.eventmesh.common.config.connector.Config;
21+
import org.apache.eventmesh.common.config.connector.dingtalk.DingDingSinkConfig;
2022
import org.apache.eventmesh.common.utils.JsonUtils;
2123
import org.apache.eventmesh.connector.dingtalk.common.constants.ConnectRecordExtensionKeys;
2224
import org.apache.eventmesh.connector.dingtalk.config.DingDingMessageTemplateType;
23-
import org.apache.eventmesh.connector.dingtalk.sink.config.DingDingSinkConfig;
24-
import org.apache.eventmesh.openconnect.api.config.Config;
2525
import org.apache.eventmesh.openconnect.api.connector.ConnectorContext;
2626
import org.apache.eventmesh.openconnect.api.connector.SinkConnectorContext;
2727
import org.apache.eventmesh.openconnect.api.sink.Sink;

Diff for: eventmesh-connectors/eventmesh-connector-dingtalk/src/test/java/org/apache/eventmesh/connector/dingtalk/sink/connector/DingDingSinkConnectorTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import static org.mockito.Mockito.times;
2222
import static org.mockito.Mockito.verify;
2323

24+
import org.apache.eventmesh.common.config.connector.dingtalk.DingDingSinkConfig;
25+
import org.apache.eventmesh.common.remote.offset.RecordOffset;
26+
import org.apache.eventmesh.common.remote.offset.RecordPartition;
2427
import org.apache.eventmesh.connector.dingtalk.common.constants.ConnectRecordExtensionKeys;
2528
import org.apache.eventmesh.connector.dingtalk.config.DingDingMessageTemplateType;
26-
import org.apache.eventmesh.connector.dingtalk.sink.config.DingDingSinkConfig;
2729
import org.apache.eventmesh.openconnect.offsetmgmt.api.data.ConnectRecord;
28-
import org.apache.eventmesh.openconnect.offsetmgmt.api.data.RecordOffset;
29-
import org.apache.eventmesh.openconnect.offsetmgmt.api.data.RecordPartition;
3030
import org.apache.eventmesh.openconnect.util.ConfigUtil;
3131

3232
import java.lang.reflect.Field;

Diff for: eventmesh-connectors/eventmesh-connector-file/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717

1818
dependencies {
19+
implementation project(":eventmesh-common")
1920
api project(":eventmesh-openconnect:eventmesh-openconnect-java")
2021
testImplementation('org.junit.jupiter:junit-jupiter')
2122
testImplementation('org.mockito:mockito-junit-jupiter')

Diff for: eventmesh-connectors/eventmesh-connector-file/src/main/java/org/apache/eventmesh/connector/file/config/FileServerConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.eventmesh.connector.file.config;
1919

20-
import org.apache.eventmesh.openconnect.api.config.Config;
20+
import org.apache.eventmesh.common.config.connector.Config;
2121

2222
import lombok.Data;
2323
import lombok.EqualsAndHashCode;

Diff for: eventmesh-connectors/eventmesh-connector-file/src/main/java/org/apache/eventmesh/connector/file/sink/config/FileSinkConfig.java

-35
This file was deleted.

Diff for: eventmesh-connectors/eventmesh-connector-file/src/main/java/org/apache/eventmesh/connector/file/sink/config/SinkConnectorConfig.java

-28
This file was deleted.

Diff for: eventmesh-connectors/eventmesh-connector-file/src/main/java/org/apache/eventmesh/connector/file/sink/connector/FileSinkConnector.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package org.apache.eventmesh.connector.file.sink.connector;
1919

20-
import org.apache.eventmesh.connector.file.sink.config.FileSinkConfig;
21-
import org.apache.eventmesh.openconnect.api.config.Config;
20+
import org.apache.eventmesh.common.config.connector.Config;
21+
import org.apache.eventmesh.common.config.connector.file.FileSinkConfig;
2222
import org.apache.eventmesh.openconnect.api.connector.ConnectorContext;
2323
import org.apache.eventmesh.openconnect.api.connector.SinkConnectorContext;
2424
import org.apache.eventmesh.openconnect.api.sink.Sink;

Diff for: eventmesh-connectors/eventmesh-connector-file/src/main/java/org/apache/eventmesh/connector/file/source/config/FileSourceConfig.java

-30
This file was deleted.

Diff for: eventmesh-connectors/eventmesh-connector-file/src/main/java/org/apache/eventmesh/connector/file/source/config/SourceConnectorConfig.java

-28
This file was deleted.

Diff for: eventmesh-connectors/eventmesh-connector-file/src/main/java/org/apache/eventmesh/connector/file/source/connector/FileSourceConnector.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@
1717

1818
package org.apache.eventmesh.connector.file.source.connector;
1919

20-
import org.apache.eventmesh.connector.file.source.config.FileSourceConfig;
21-
import org.apache.eventmesh.openconnect.api.config.Config;
20+
import org.apache.eventmesh.common.config.connector.Config;
21+
import org.apache.eventmesh.common.config.connector.file.FileSourceConfig;
22+
import org.apache.eventmesh.common.remote.offset.RecordPartition;
2223
import org.apache.eventmesh.openconnect.api.connector.ConnectorContext;
2324
import org.apache.eventmesh.openconnect.api.connector.SourceConnectorContext;
2425
import org.apache.eventmesh.openconnect.api.source.Source;
2526
import org.apache.eventmesh.openconnect.offsetmgmt.api.data.ConnectRecord;
26-
import org.apache.eventmesh.openconnect.offsetmgmt.api.data.RecordPartition;
27+
import org.apache.eventmesh.common.remote.offset.file.FileRecordPartition;
2728

2829
import java.io.BufferedReader;
2930
import java.io.File;
@@ -34,9 +35,7 @@
3435
import java.nio.file.Path;
3536
import java.nio.file.Paths;
3637
import java.util.ArrayList;
37-
import java.util.HashMap;
3838
import java.util.List;
39-
import java.util.Map;
4039

4140
import lombok.extern.slf4j.Slf4j;
4241

@@ -118,9 +117,10 @@ public List<ConnectRecord> poll() {
118117
}
119118

120119
public static RecordPartition convertToRecordPartition(String fileName) {
121-
Map<String, String> map = new HashMap<>();
122-
map.put("fileName", fileName);
123-
return new RecordPartition(map);
120+
FileRecordPartition fileRecordPartition = new FileRecordPartition();
121+
fileRecordPartition.setFileName(fileName);
122+
fileRecordPartition.setClazz(fileRecordPartition.getRecordPartitionClass());
123+
return fileRecordPartition;
124124
}
125125

126126
private static String getFileName(String filePath) throws NullPointerException {

Diff for: eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/config/HttpServerConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.apache.eventmesh.connector.http.config;
1919

20-
import org.apache.eventmesh.openconnect.api.config.Config;
20+
import org.apache.eventmesh.common.config.connector.Config;
2121

2222
import lombok.Data;
2323
import lombok.EqualsAndHashCode;

Diff for: eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/source/config/HttpSourceConfig.java

-30
This file was deleted.

0 commit comments

Comments
 (0)