This is an automated email from the ASF dual-hosted git repository.
mikexue 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 56f893cc4 [ISSUE #5031] Http Connector Adaptation Work
56f893cc4 is described below
commit 56f893cc4510fbb176ba3e1a1834566699533285
Author: Zaki <[email protected]>
AuthorDate: Fri Jul 19 09:58:58 2024 +0800
[ISSUE #5031] Http Connector Adaptation Work
---
.../eventmesh/connector/http/server/HttpConnectServer.java | 2 +-
.../eventmesh/connector/http/sink/HttpSinkConnector.java | 8 +++++++-
.../http/source/{connector => }/HttpSourceConnector.java | 10 ++++++++--
.../http/{source/connector => sink}/HttpSinkConnectorTest.java | 3 +--
.../http/source/{connector => }/HttpSourceConnectorTest.java | 2 +-
5 files changed, 18 insertions(+), 7 deletions(-)
diff --git
a/eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/server/HttpConnectServer.java
b/eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/server/HttpConnectServer.java
index 8d753d281..dbe0838bc 100644
---
a/eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/server/HttpConnectServer.java
+++
b/eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/server/HttpConnectServer.java
@@ -19,7 +19,7 @@ package org.apache.eventmesh.connector.http.server;
import org.apache.eventmesh.connector.http.config.HttpServerConfig;
import org.apache.eventmesh.connector.http.sink.HttpSinkConnector;
-import
org.apache.eventmesh.connector.http.source.connector.HttpSourceConnector;
+import org.apache.eventmesh.connector.http.source.HttpSourceConnector;
import org.apache.eventmesh.openconnect.Application;
import org.apache.eventmesh.openconnect.util.ConfigUtil;
diff --git
a/eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/HttpSinkConnector.java
b/eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/HttpSinkConnector.java
index e63015989..6d38b4530 100644
---
a/eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/HttpSinkConnector.java
+++
b/eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/HttpSinkConnector.java
@@ -24,6 +24,7 @@ import
org.apache.eventmesh.connector.http.sink.handle.CommonHttpSinkHandler;
import org.apache.eventmesh.connector.http.sink.handle.HttpSinkHandler;
import org.apache.eventmesh.connector.http.sink.handle.RetryHttpSinkHandler;
import org.apache.eventmesh.connector.http.sink.handle.WebhookHttpSinkHandler;
+import org.apache.eventmesh.openconnect.api.ConnectorCreateService;
import org.apache.eventmesh.openconnect.api.connector.ConnectorContext;
import org.apache.eventmesh.openconnect.api.connector.SinkConnectorContext;
import org.apache.eventmesh.openconnect.api.sink.Sink;
@@ -37,7 +38,7 @@ import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
@Slf4j
-public class HttpSinkConnector implements Sink {
+public class HttpSinkConnector implements Sink, ConnectorCreateService<Sink> {
private HttpSinkConfig httpSinkConfig;
@@ -49,6 +50,11 @@ public class HttpSinkConnector implements Sink {
return HttpSinkConfig.class;
}
+ @Override
+ public Sink create() {
+ return new HttpSinkConnector();
+ }
+
@Override
public void init(Config config) throws Exception {
this.httpSinkConfig = (HttpSinkConfig) config;
diff --git
a/eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/source/connector/HttpSourceConnector.java
b/eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/source/HttpSourceConnector.java
similarity index 95%
rename from
eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/source/connector/HttpSourceConnector.java
rename to
eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/source/HttpSourceConnector.java
index c59915b20..4155aff91 100644
---
a/eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/source/connector/HttpSourceConnector.java
+++
b/eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/source/HttpSourceConnector.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.connector.http.source.connector;
+package org.apache.eventmesh.connector.http.source;
import org.apache.eventmesh.common.config.connector.Config;
import org.apache.eventmesh.common.config.connector.http.HttpSourceConfig;
@@ -23,6 +23,7 @@ import
org.apache.eventmesh.common.exception.EventMeshException;
import
org.apache.eventmesh.connector.http.common.SynchronizedCircularFifoQueue;
import org.apache.eventmesh.connector.http.source.protocol.Protocol;
import org.apache.eventmesh.connector.http.source.protocol.ProtocolFactory;
+import org.apache.eventmesh.openconnect.api.ConnectorCreateService;
import org.apache.eventmesh.openconnect.api.connector.ConnectorContext;
import org.apache.eventmesh.openconnect.api.connector.SourceConnectorContext;
import org.apache.eventmesh.openconnect.api.source.Source;
@@ -43,7 +44,7 @@ import io.vertx.ext.web.handler.LoggerHandler;
import lombok.extern.slf4j.Slf4j;
@Slf4j
-public class HttpSourceConnector implements Source {
+public class HttpSourceConnector implements Source,
ConnectorCreateService<Source> {
private HttpSourceConfig sourceConfig;
@@ -73,6 +74,11 @@ public class HttpSourceConnector implements Source {
return HttpSourceConfig.class;
}
+ @Override
+ public Source create() {
+ return new HttpSourceConnector();
+ }
+
@Override
public void init(Config config) {
this.sourceConfig = (HttpSourceConfig) config;
diff --git
a/eventmesh-connectors/eventmesh-connector-http/src/test/java/org/apache/eventmesh/connector/http/source/connector/HttpSinkConnectorTest.java
b/eventmesh-connectors/eventmesh-connector-http/src/test/java/org/apache/eventmesh/connector/http/sink/HttpSinkConnectorTest.java
similarity index 97%
rename from
eventmesh-connectors/eventmesh-connector-http/src/test/java/org/apache/eventmesh/connector/http/source/connector/HttpSinkConnectorTest.java
rename to
eventmesh-connectors/eventmesh-connector-http/src/test/java/org/apache/eventmesh/connector/http/sink/HttpSinkConnectorTest.java
index 778d963b5..3e724627c 100644
---
a/eventmesh-connectors/eventmesh-connector-http/src/test/java/org/apache/eventmesh/connector/http/source/connector/HttpSinkConnectorTest.java
+++
b/eventmesh-connectors/eventmesh-connector-http/src/test/java/org/apache/eventmesh/connector/http/sink/HttpSinkConnectorTest.java
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.connector.http.source.connector;
+package org.apache.eventmesh.connector.http.sink;
import static org.mockserver.model.HttpRequest.request;
-import org.apache.eventmesh.connector.http.sink.HttpSinkConnector;
import org.apache.eventmesh.connector.http.sink.config.HttpSinkConfig;
import org.apache.eventmesh.connector.http.sink.config.HttpWebhookConfig;
import org.apache.eventmesh.openconnect.offsetmgmt.api.data.ConnectRecord;
diff --git
a/eventmesh-connectors/eventmesh-connector-http/src/test/java/org/apache/eventmesh/connector/http/source/connector/HttpSourceConnectorTest.java
b/eventmesh-connectors/eventmesh-connector-http/src/test/java/org/apache/eventmesh/connector/http/source/HttpSourceConnectorTest.java
similarity index 99%
rename from
eventmesh-connectors/eventmesh-connector-http/src/test/java/org/apache/eventmesh/connector/http/source/connector/HttpSourceConnectorTest.java
rename to
eventmesh-connectors/eventmesh-connector-http/src/test/java/org/apache/eventmesh/connector/http/source/HttpSourceConnectorTest.java
index 8e3735dd2..0dbac4765 100644
---
a/eventmesh-connectors/eventmesh-connector-http/src/test/java/org/apache/eventmesh/connector/http/source/connector/HttpSourceConnectorTest.java
+++
b/eventmesh-connectors/eventmesh-connector-http/src/test/java/org/apache/eventmesh/connector/http/source/HttpSourceConnectorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.connector.http.source.connector;
+package org.apache.eventmesh.connector.http.source;
import org.apache.eventmesh.common.config.connector.http.HttpSourceConfig;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
