This is an automated email from the ASF dual-hosted git repository.
xiatian pushed a change to branch
dependabot/gradle/org.springframework.boot-spring-boot-starter-jetty-2.7.18
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
from b031f43ff feat: remove duplicate dep
add 2ba54c775 [ISSUE #5052] Enhancement for source\sink connector (#5066)
add 771a18940 [ISSUE #5067] Enhancement for eventmesh-admin-server (#5068)
add a6018dd28 [ISSUE #5069] Enhancement for http source/sink connector
(#5070)
add 691aab015 [ISSUE #5071] Enhancement for admin server and canal
source/sink connector (#5072)
add a941d0f3a [ISSUE #5073] Fix eventmesh-admin-server createTask response
error (#5074)
add 0ba3c5e5d [ISSUE #5075] update eventmesh-admin-server create task
response (#5076)
add 8cb8df531 [ISSUE #5077] HTTP Sink Connector supports result callback
(#5078)
add 9701f0266 [ISSUE #5079] Enhancement update for admin-server (#5080)
add 60fb430ad [ISSUE #5081] Enhancement update for connectors &
admin-server (#5082)
add 659d748c6 Bump org.redisson:redisson from 3.32.0 to 3.35.0 (#5090)
add c7679d62c [ISSUE #4992] unit tests for JsonPathUtils.java (#5083)
add fb0951217 Bump io.netty:netty-all from 4.1.111.Final to 4.1.112.Final
(#5064)
add ab0820870 Bump com.baomidou:mybatis-plus-boot-starter from 3.5.5 to
3.5.7 (#5060)
add 622af004c Bump protobufVersion from 3.25.3 to 3.25.4 (#5057)
add ab2a71934 Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.17.0
(#5087)
add c36475249 Bump com.alibaba.nacos:nacos-client from 2.3.3 to 2.4.1
(#5089)
add b28b321d0 Bump com.slack.api:bolt from 1.40.+ to 1.42.0 (#5084)
add 3b979bd6c Bump io.vertx:vertx-web-client from 4.5.8 to 4.5.9 (#5054)
add 6718e775c Bump com.github.fppt:jedis-mock from 1.1.2 to 1.1.3 (#5062)
add 8b56d8ef5 Merge branch 'master' into
dependabot/gradle/org.springframework.boot-spring-boot-starter-jetty-2.7.18
No new revisions were added by this update.
Summary of changes:
build.gradle | 8 +-
eventmesh-admin-server/bin/start-admin.sh | 51 +-
eventmesh-admin-server/build.gradle | 4 +-
eventmesh-admin-server/conf/application.yaml | 14 +-
eventmesh-admin-server/conf/eventmesh.sql | 147 ++--
.../conf/mapper/EventMeshDataSourceMapper.xml | 5 +-
.../conf/mapper/EventMeshJobInfoMapper.xml | 40 +-
.../conf/mapper/EventMeshTaskInfoMapper.xml | 13 +-
.../conf/mapper/EventMeshVerifyMapper.xml | 5 +-
.../admin/server/AdminServerProperties.java | 5 +
.../eventmesh/admin/server/web/HttpServer.java | 35 +-
.../eventmesh/admin/server/web/Response.java | 7 +
.../admin/server/web/db/DBThreadPool.java | 26 +-
.../server/web/db/entity/EventMeshDataSource.java | 2 +
.../server/web/db/entity/EventMeshJobInfo.java | 8 +-
.../server/web/db/entity/EventMeshTaskInfo.java | 10 +-
.../server/web/db/entity/EventMeshVerify.java | 3 +
.../web/db/mapper/EventMeshJobInfoExtMapper.java | 18 +-
...ceImpl.java => EventMeshVerifyServiceImpl.java} | 12 +-
.../web/handler/impl/FetchJobRequestHandler.java | 6 +-
...fyHandler.java => ReportJobRequestHandler.java} | 30 +-
.../web/handler/impl/ReportPositionHandler.java | 2 +
.../web/handler/impl/ReportVerifyHandler.java | 49 +-
.../eventmesh/admin/server/web/pojo/JobDetail.java | 8 +-
.../service/datasource/DataSourceBizService.java | 2 +
.../server/web/service/job/JobInfoBizService.java | 120 +++-
.../position/impl/HttpPositionHandler.java} | 44 +-
.../server/web/service/task/TaskBizService.java | 130 +++-
.../web/service/verify/VerifyBizService.java | 2 +
.../eventmesh/common/config/ConfigService.java | 11 +-
.../config/connector/http}/HttpRetryConfig.java | 6 +-
.../config/connector/http}/HttpSinkConfig.java | 2 +-
.../config/connector/http}/HttpWebhookConfig.java | 2 +-
.../connector/http}/SinkConnectorConfig.java | 11 +-
.../connector/http/SourceConnectorConfig.java | 7 +-
.../connector/rdb/canal/CanalSinkConfig.java | 25 +-
.../connector/rdb/canal/CanalSinkFullConfig.java | 2 +-
...nkConfig.java => CanalSinkIncrementConfig.java} | 3 +-
.../connector/rdb/canal/CanalSourceConfig.java | 58 +-
.../connector/rdb/canal/CanalSourceFullConfig.java | 2 +-
.../rdb/canal/CanalSourceIncrementConfig.java} | 15 +-
.../remote/{TaskState.java => JobState.java} | 15 +-
.../eventmesh/common/remote/TransportType.java | 7 +-
.../common/remote/datasource/DataSource.java | 25 +-
.../common/remote/datasource/DataSourceType.java | 9 +
.../request/CreateOrUpdateDataSourceReq.java | 6 +-
.../common/remote/request/CreateTaskRequest.java | 41 +-
...HeartBeatRequest.java => ReportJobRequest.java} | 13 +-
.../common/remote/request/ReportVerifyRequest.java | 2 +
.../common/remote/response/CreateTaskResponse.java | 12 +
.../apache/eventmesh/common/utils/JsonUtils.java | 15 +
...apache.eventmesh.common.remote.payload.IPayload | 2 +
.../eventmesh/common/utils/JsonPathUtilsTest.java | 171 +++++
.../connector/canal/CanalConnectRecord.java | 5 +-
.../interceptor/SqlBuilderLoadInterceptor.java | 16 +-
...Connector.java => CanalSinkCheckConnector.java} | 15 +-
.../canal/sink/connector/CanalSinkConnector.java | 739 +--------------------
.../sink/connector/CanalSinkFullConnector.java | 48 +-
...ector.java => CanalSinkIncrementConnector.java} | 108 ++-
.../connector/canal/source/EntryParser.java | 27 +-
.../canal/source/connector/CanalFullProducer.java | 8 +-
...nnector.java => CanalSourceCheckConnector.java} | 21 +-
.../source/connector/CanalSourceConnector.java | 320 +--------
.../source/connector/CanalSourceFullConnector.java | 31 +-
...tor.java => CanalSourceIncrementConnector.java} | 29 +-
.../source/position/CanalFullPositionMgr.java | 4 +-
.../source/connector/ChatGPTSourceConnector.java | 5 +
.../sink/connector/DingDingSinkConnector.java | 5 +
.../file/sink/connector/FileSinkConnector.java | 5 +
.../file/source/connector/FileSourceConnector.java | 5 +
.../eventmesh-connector-http/build.gradle | 2 +-
.../http/common/SynchronizedCircularFifoQueue.java | 3 +-
.../connector/http/sink/HttpSinkConnector.java | 19 +-
.../http/sink/data/HttpConnectRecord.java | 76 ++-
.../http/sink/data/HttpExportMetadata.java | 10 +-
.../connector/http/sink/data/HttpExportRecord.java | 6 +-
.../http/sink/data/HttpExportRecordPage.java | 5 +-
.../connector/http/sink/data/HttpRetryEvent.java | 80 +++
.../http/sink/data/MultiHttpRequestContext.java | 64 ++
.../http/sink/handle/CommonHttpSinkHandler.java | 191 ------
.../http/sink/handle/RetryHttpSinkHandler.java | 206 ------
.../http/sink/handler/AbstractHttpSinkHandler.java | 88 +++
.../sink/{handle => handler}/HttpSinkHandler.java | 14 +-
.../sink/handler/impl/CommonHttpSinkHandler.java | 279 ++++++++
.../handler/impl/HttpSinkHandlerRetryWrapper.java | 122 ++++
.../impl}/WebhookHttpSinkHandler.java | 94 +--
.../connector/http/source/HttpSourceConnector.java | 39 +-
.../connector/http/source/data/WebhookRequest.java | 4 +
.../http/source/protocol/impl/CommonProtocol.java | 46 +-
.../http/source/protocol/impl/GitHubProtocol.java | 2 +-
...ventmesh.openconnect.api.ConnectorCreateService | 5 +-
.../connector/http/sink/HttpSinkConnectorTest.java | 6 +-
.../connector/jdbc/sink/JdbcSinkConnector.java | 5 +
.../connector/jdbc/source/JdbcSourceConnector.java | 5 +
.../kafka/sink/connector/KafkaSinkConnector.java | 5 +
.../source/connector/KafkaSourceConnector.java | 5 +
.../sink/connector/KnativeSinkConnector.java | 5 +
.../source/connector/KnativeSourceConnector.java | 5 +
.../lark/sink/connector/LarkSinkConnector.java | 5 +
.../sink/connector/MongodbSinkConnector.java | 5 +
.../source/connector/MongodbSourceConnector.java | 5 +
.../sink/connector/OpenFunctionSinkConnector.java | 5 +
.../connector/OpenFunctionSourceConnector.java | 5 +
.../sink/connector/PravegaSinkConnector.java | 5 +
.../source/connector/PravegaSourceConnector.java | 5 +
.../connector/PrometheusSourceConnector.java | 5 +
.../pulsar/sink/connector/PulsarSinkConnector.java | 5 +
.../source/connector/PulsarSourceConnector.java | 5 +
.../sink/connector/RabbitMQSinkConnector.java | 5 +
.../source/connector/RabbitMQSourceConnector.java | 5 +
.../eventmesh-connector-redis/build.gradle | 2 +-
.../redis/sink/connector/RedisSinkConnector.java | 5 +
.../source/connector/RedisSourceConnector.java | 5 +
.../sink/connector/RocketMQSinkConnector.java | 5 +
.../source/connector/RocketMQSourceConnector.java | 5 +
.../s3/source/connector/S3SourceConnector.java | 5 +
.../eventmesh-connector-slack/build.gradle | 2 +-
.../slack/sink/connector/SlackSinkConnector.java | 5 +
.../spring/sink/connector/SpringSinkConnector.java | 5 +
.../spring/source/MessageSendingOperations.java | 2 +-
.../source/connector/SpringSourceConnector.java | 14 +-
.../wechat/sink/connector/WeChatSinkConnector.java | 5 +
.../wecom/sink/connector/WeComSinkConnector.java | 5 +
.../eventmesh/spring/pub/SpringPubController.java | 10 +-
eventmesh-meta/eventmesh-meta-raft/build.gradle | 2 +-
.../apache/eventmesh/openconnect/SourceWorker.java | 10 +-
.../openconnect/api/connector/Connector.java | 11 +-
.../api/connector/SinkConnectorContext.java | 7 +
.../api/connector/SourceConnectorContext.java | 6 +
.../offsetmgmt/admin/AdminOffsetService.java | 16 +-
.../api/callback/SendExceptionContext.java} | 6 +-
.../api/callback/SendMessageCallback.java | 4 +-
.../offsetmgmt}/api/callback/SendResult.java | 2 +-
.../offsetmgmt/api/data/ConnectRecord.java | 54 +-
.../offsetmgmt/api/data/DefaultKeyValue.java | 5 +
.../eventmesh-protocol-cloudevents/build.gradle | 2 +-
.../eventmesh-protocol-grpc/build.gradle | 2 +-
.../eventmesh-protocol-http/build.gradle | 2 +-
.../eventmesh-protocol-meshmessage/build.gradle | 2 +-
eventmesh-runtime-v2/build.gradle | 1 +
.../eventmesh/runtime/RuntimeInstanceConfig.java | 4 +-
.../eventmesh/runtime/boot/RuntimeInstance.java | 74 ++-
.../runtime/connector/ConnectorRuntime.java | 202 ++++--
.../runtime/connector/ConnectorRuntimeConfig.java | 2 +
.../src/main/resources/connector.yaml | 7 +-
.../src/main/resources/runtime.yaml | 2 +
eventmesh-sdks/eventmesh-sdk-java/build.gradle | 2 +-
.../eventmesh-storage-redis/build.gradle | 4 +-
148 files changed, 2499 insertions(+), 2115 deletions(-)
copy
eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/db/service/impl/{EventMeshJobInfoServiceImpl.java
=> EventMeshVerifyServiceImpl.java} (85%)
copy
eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/handler/impl/{ReportVerifyHandler.java
=> ReportJobRequestHandler.java} (54%)
copy
eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/{handler/impl/FetchPositionHandler.java
=> service/position/impl/HttpPositionHandler.java} (51%)
rename
{eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/config
=>
eventmesh-common/src/main/java/org/apache/eventmesh/common/config/connector/http}/HttpRetryConfig.java
(90%)
rename
{eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/config
=>
eventmesh-common/src/main/java/org/apache/eventmesh/common/config/connector/http}/HttpSinkConfig.java
(94%)
rename
{eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/config
=>
eventmesh-common/src/main/java/org/apache/eventmesh/common/config/connector/http}/HttpWebhookConfig.java
(95%)
rename
{eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/config
=>
eventmesh-common/src/main/java/org/apache/eventmesh/common/config/connector/http}/SinkConnectorConfig.java
(84%)
copy
eventmesh-common/src/main/java/org/apache/eventmesh/common/config/connector/rdb/canal/{CanalSinkConfig.java
=> CanalSinkIncrementConfig.java} (92%)
rename
eventmesh-common/src/main/java/org/apache/eventmesh/common/{remote/datasource/MySqlIncDataSourceSourceConf.java
=> config/connector/rdb/canal/CanalSourceIncrementConfig.java} (86%)
copy
eventmesh-common/src/main/java/org/apache/eventmesh/common/remote/{TaskState.java
=> JobState.java} (76%)
copy
eventmesh-common/src/main/java/org/apache/eventmesh/common/remote/request/{ReportHeartBeatRequest.java
=> ReportJobRequest.java} (85%)
create mode 100644
eventmesh-common/src/test/java/org/apache/eventmesh/common/utils/JsonPathUtilsTest.java
copy
eventmesh-connectors/eventmesh-connector-canal/src/main/java/org/apache/eventmesh/connector/canal/sink/connector/{CanalSinkFullConnector.java
=> CanalSinkCheckConnector.java} (97%)
copy
eventmesh-connectors/eventmesh-connector-canal/src/main/java/org/apache/eventmesh/connector/canal/sink/connector/{CanalSinkConnector.java
=> CanalSinkIncrementConnector.java} (87%)
copy
eventmesh-connectors/eventmesh-connector-canal/src/main/java/org/apache/eventmesh/connector/canal/source/connector/{CanalSourceFullConnector.java
=> CanalSourceCheckConnector.java} (91%)
copy
eventmesh-connectors/eventmesh-connector-canal/src/main/java/org/apache/eventmesh/connector/canal/source/connector/{CanalSourceConnector.java
=> CanalSourceIncrementConnector.java} (94%)
create mode 100644
eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/data/HttpRetryEvent.java
create mode 100644
eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/data/MultiHttpRequestContext.java
delete mode 100644
eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/handle/CommonHttpSinkHandler.java
delete mode 100644
eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/handle/RetryHttpSinkHandler.java
create mode 100644
eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/handler/AbstractHttpSinkHandler.java
rename
eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/{handle
=> handler}/HttpSinkHandler.java (82%)
create mode 100644
eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/handler/impl/CommonHttpSinkHandler.java
create mode 100644
eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/handler/impl/HttpSinkHandlerRetryWrapper.java
rename
eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/{handle
=> handler/impl}/WebhookHttpSinkHandler.java (82%)
copy eventmesh-admin-server/src/main/resources/META-INF/spring.factories =>
eventmesh-connectors/eventmesh-connector-http/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.openconnect.api.ConnectorCreateService
(84%)
rename
eventmesh-openconnect/{eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/api/callback/SendExcepionContext.java
=>
eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-api/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt/api/callback/SendExceptionContext.java}
(90%)
rename
eventmesh-openconnect/{eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect
=>
eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-api/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt}/api/callback/SendMessageCallback.java
(87%)
rename
eventmesh-openconnect/{eventmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect
=>
eventmesh-openconnect-offsetmgmt-plugin/eventmesh-openconnect-offsetmgmt-api/src/main/java/org/apache/eventmesh/openconnect/offsetmgmt}/api/callback/SendResult.java
(95%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]