Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #5031] Http Connector Adaptation Work #5032

Merged
merged 1 commit into from
Jul 19, 2024
Merged

[ISSUE #5031] Http Connector Adaptation Work #5032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ctor-http/src/main/java/org/apache/eventmesh/connector/http/server/HttpConnectServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

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;

Expand Down
8 changes: 7 additions & 1 deletion ...nector-http/src/main/java/org/apache/eventmesh/connector/http/sink/HttpSinkConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
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;
Expand All @@ -37,7 +38,7 @@
import lombok.extern.slf4j.Slf4j;

@Slf4j
public class HttpSinkConnector implements Sink {
public class HttpSinkConnector implements Sink, ConnectorCreateService<Sink> {

private HttpSinkConfig httpSinkConfig;

Expand All @@ -49,6 +50,11 @@ public Class<? extends Config> configClass() {
return HttpSinkConfig.class;
}

@Override
public Sink create() {
return new HttpSinkConnector();
}

@Override
public void init(Config config) throws Exception {
this.httpSinkConfig = (HttpSinkConfig) config;
Expand Down
10 changes: 8 additions & 2 deletions ...source/connector/HttpSourceConnector.java → ...ctor/http/source/HttpSourceConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
* 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;
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;
Expand All @@ -43,7 +44,7 @@
import lombok.extern.slf4j.Slf4j;

@Slf4j
public class HttpSourceConnector implements Source {
public class HttpSourceConnector implements Source, ConnectorCreateService<Source> {

private HttpSourceConfig sourceConfig;

Expand Down Expand Up @@ -73,6 +74,11 @@ public Class<? extends Config> configClass() {
return HttpSourceConfig.class;
}

@Override
public Source create() {
return new HttpSourceConnector();
}

@Override
public void init(Config config) {
this.sourceConfig = (HttpSourceConfig) config;
Expand Down
3 changes: 1 addition & 2 deletions ...urce/connector/HttpSinkConnectorTest.java → ...ctor/http/sink/HttpSinkConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ce/connector/HttpSourceConnectorTest.java → .../http/source/HttpSourceConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading