You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by sh...@apache.org on 2022/12/23 09:09:50 UTC
[rocketmq-eventbridge] 02/02: upgradeOpenConnector0.1.4
This is an automated email from the ASF dual-hosted git repository.
shenlin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
commit b78aff6a5f785f32947e8c229b46c38be5c5d773
Author: Artisan <Am...@gmail.com>
AuthorDate: Fri Dec 23 12:49:42 2022 +0800
upgradeOpenConnector0.1.4
---
supports/connect-cloudevent-transform/pom.xml | 4 ++--
.../transform/eventbridge/CloudEventTransform.java | 20 ++++------------
.../rocketmq/connect/CloudEventTransformTest.java | 2 +-
supports/connect-eventbridge-transform/pom.xml | 4 ++--
.../eventbridge/EventBridgeTransform.java | 27 +++++++---------------
.../rocketmq/connect/EventBridgeTransformTest.java | 2 +-
supports/connect-filter-transform/pom.xml | 4 ++--
.../eventbridge/EventBridgeFilterTransform.java | 12 +++-------
.../EventBridgeFilterTransformTest.java | 2 +-
9 files changed, 25 insertions(+), 52 deletions(-)
diff --git a/supports/connect-cloudevent-transform/pom.xml b/supports/connect-cloudevent-transform/pom.xml
index 1568dac..9e47a7f 100644
--- a/supports/connect-cloudevent-transform/pom.xml
+++ b/supports/connect-cloudevent-transform/pom.xml
@@ -21,7 +21,7 @@
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
- <openmessaging-connector.version>0.1.2-SNAPSHOT</openmessaging-connector.version>
+ <openmessaging-connector.version>0.1.4</openmessaging-connector.version>
<cloudevents.version>2.3.0</cloudevents.version>
</properties>
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-eventbridge-common</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
</dependencies>
<build>
diff --git a/supports/connect-cloudevent-transform/src/main/java/org/apache/rocketmq/connect/transform/eventbridge/CloudEventTransform.java b/supports/connect-cloudevent-transform/src/main/java/org/apache/rocketmq/connect/transform/eventbridge/CloudEventTransform.java
index 673f697..0e43b2a 100644
--- a/supports/connect-cloudevent-transform/src/main/java/org/apache/rocketmq/connect/transform/eventbridge/CloudEventTransform.java
+++ b/supports/connect-cloudevent-transform/src/main/java/org/apache/rocketmq/connect/transform/eventbridge/CloudEventTransform.java
@@ -16,21 +16,16 @@
*/
package org.apache.rocketmq.connect.transform.eventbridge;
-import java.time.Instant;
-import java.util.UUID;
-
import com.google.common.base.Strings;
import com.google.gson.Gson;
import io.cloudevents.SpecVersion;
import io.cloudevents.core.v1.CloudEventV1;
import io.openmessaging.KeyValue;
-import io.openmessaging.connector.api.component.ComponentContext;
import io.openmessaging.connector.api.data.ConnectRecord;
-import org.apache.rocketmq.eventbridge.tools.transform.Data;
-import org.apache.rocketmq.eventbridge.tools.transform.ObjectData;
-import org.apache.rocketmq.eventbridge.tools.transform.StringData;
-import org.apache.rocketmq.eventbridge.tools.transform.Transform;
-import org.apache.rocketmq.eventbridge.tools.transform.TransformParam;
+import org.apache.rocketmq.eventbridge.tools.transform.*;
+
+import java.time.Instant;
+import java.util.UUID;
public class CloudEventTransform implements io.openmessaging.connector.api.component.Transform {
@@ -172,7 +167,7 @@ public class CloudEventTransform implements io.openmessaging.connector.api.compo
}
@Override
- public void init(KeyValue config) {
+ public void start(KeyValue config) {
this.idTransform = buildTransform(config, CloudEventV1.ID);
this.sourceTransform = buildTransform(config, CloudEventV1.SOURCE);
this.specversionTransform = buildTransform(config, CloudEventV1.SPECVERSION);
@@ -191,11 +186,6 @@ public class CloudEventTransform implements io.openmessaging.connector.api.compo
return EventBridgeTransformBuilder.buildTransform(transformParam);
}
- @Override
- public void start(ComponentContext componentContext) {
-
- }
-
@Override
public void stop() {
diff --git a/supports/connect-cloudevent-transform/src/test/java/org/apache/rocketmq/connect/CloudEventTransformTest.java b/supports/connect-cloudevent-transform/src/test/java/org/apache/rocketmq/connect/CloudEventTransformTest.java
index a9ed3c4..261604e 100644
--- a/supports/connect-cloudevent-transform/src/test/java/org/apache/rocketmq/connect/CloudEventTransformTest.java
+++ b/supports/connect-cloudevent-transform/src/test/java/org/apache/rocketmq/connect/CloudEventTransformTest.java
@@ -37,7 +37,7 @@ public class CloudEventTransformTest {
keyValue.put("subject", "{\"value\":\"$.data.subject\",\"form\":\"JSONPATH\"}");
keyValue.put("type", "{\"value\":\"$.type\",\"form\":\"JSONPATH\"}");
CloudEventTransform cloudEventTransform = new CloudEventTransform();
- cloudEventTransform.init(keyValue);
+ cloudEventTransform.start(keyValue);
ConnectRecord record = new ConnectRecord(null, null, System.currentTimeMillis());
record.addExtension("type", "type");
diff --git a/supports/connect-eventbridge-transform/pom.xml b/supports/connect-eventbridge-transform/pom.xml
index 575ba40..aa72f4d 100644
--- a/supports/connect-eventbridge-transform/pom.xml
+++ b/supports/connect-eventbridge-transform/pom.xml
@@ -21,7 +21,7 @@
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
- <openmessaging-connector.version>0.1.2-SNAPSHOT</openmessaging-connector.version>
+ <openmessaging-connector.version>0.1.4</openmessaging-connector.version>
<gson.version>2.8.9</gson.version>
</properties>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-eventbridge-common</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
diff --git a/supports/connect-eventbridge-transform/src/main/java/org/apache/rocketmq/connect/transform/eventbridge/EventBridgeTransform.java b/supports/connect-eventbridge-transform/src/main/java/org/apache/rocketmq/connect/transform/eventbridge/EventBridgeTransform.java
index f3b2d9c..bc98d4b 100644
--- a/supports/connect-eventbridge-transform/src/main/java/org/apache/rocketmq/connect/transform/eventbridge/EventBridgeTransform.java
+++ b/supports/connect-eventbridge-transform/src/main/java/org/apache/rocketmq/connect/transform/eventbridge/EventBridgeTransform.java
@@ -16,20 +16,14 @@
*/
package org.apache.rocketmq.connect.transform.eventbridge;
-import java.util.Map;
-
import com.google.common.collect.Maps;
import com.google.gson.Gson;
import io.openmessaging.KeyValue;
-import io.openmessaging.connector.api.component.ComponentContext;
import io.openmessaging.connector.api.data.ConnectRecord;
import io.openmessaging.connector.api.data.SchemaBuilder;
-import org.apache.rocketmq.eventbridge.tools.transform.Data;
-import org.apache.rocketmq.eventbridge.tools.transform.ObjectData;
-import org.apache.rocketmq.eventbridge.tools.transform.StringData;
-import org.apache.rocketmq.eventbridge.tools.transform.Transform;
-import org.apache.rocketmq.eventbridge.tools.transform.TransformBuilder;
-import org.apache.rocketmq.eventbridge.tools.transform.TransformParam;
+import org.apache.rocketmq.eventbridge.tools.transform.*;
+
+import java.util.Map;
public class EventBridgeTransform implements io.openmessaging.connector.api.component.Transform {
@@ -60,17 +54,12 @@ public class EventBridgeTransform implements io.openmessaging.connector.api.comp
}
@Override
- public void init(KeyValue config) {
+ public void start(KeyValue config) {
config.keySet()
- .forEach(key -> {
- TransformParam transformParam = new Gson().fromJson(config.getString(key), TransformParam.class);
- paramTransform.put(key, EventBridgeTransformBuilder.buildTransform(transformParam));
- });
- }
-
- @Override
- public void start(ComponentContext componentContext) {
-
+ .forEach(key -> {
+ TransformParam transformParam = new Gson().fromJson(config.getString(key), TransformParam.class);
+ paramTransform.put(key, EventBridgeTransformBuilder.buildTransform(transformParam));
+ });
}
@Override
diff --git a/supports/connect-eventbridge-transform/src/test/java/org/apache/rocketmq/connect/EventBridgeTransformTest.java b/supports/connect-eventbridge-transform/src/test/java/org/apache/rocketmq/connect/EventBridgeTransformTest.java
index 8395709..31c2e96 100644
--- a/supports/connect-eventbridge-transform/src/test/java/org/apache/rocketmq/connect/EventBridgeTransformTest.java
+++ b/supports/connect-eventbridge-transform/src/test/java/org/apache/rocketmq/connect/EventBridgeTransformTest.java
@@ -38,7 +38,7 @@ public class EventBridgeTransformTest {
"{\"template\":\"{\\\"text\\\":{\\\"content\\\":\\\"${content}\\\"},\\\"msgtype\\\":\\\"text\\\"}\","
+ "\"form\":\"TEMPLATE\",\"value\":\"{\\\"content\\\":\\\"$.data.body\\\"}\"}");
EventBridgeTransform eventBridgeTransform = new EventBridgeTransform();
- eventBridgeTransform.init(keyValue);
+ eventBridgeTransform.start(keyValue);
ConnectRecord record = new ConnectRecord(null, null, System.currentTimeMillis());
record.addExtension("type", "type");
diff --git a/supports/connect-filter-transform/pom.xml b/supports/connect-filter-transform/pom.xml
index 173486c..35e0769 100644
--- a/supports/connect-filter-transform/pom.xml
+++ b/supports/connect-filter-transform/pom.xml
@@ -21,7 +21,7 @@
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
- <openmessaging-connector.version>0.1.2-SNAPSHOT</openmessaging-connector.version>
+ <openmessaging-connector.version>0.1.4</openmessaging-connector.version>
<apache.commons-text.version>1.10.0</apache.commons-text.version>
<gson.version>2.8.9</gson.version>
<cloudevents.version>2.3.0</cloudevents.version>
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-eventbridge-common</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
diff --git a/supports/connect-filter-transform/src/main/java/org/apache/rocketmq/connect/transform/eventbridge/EventBridgeFilterTransform.java b/supports/connect-filter-transform/src/main/java/org/apache/rocketmq/connect/transform/eventbridge/EventBridgeFilterTransform.java
index 6b67db9..b34ca98 100644
--- a/supports/connect-filter-transform/src/main/java/org/apache/rocketmq/connect/transform/eventbridge/EventBridgeFilterTransform.java
+++ b/supports/connect-filter-transform/src/main/java/org/apache/rocketmq/connect/transform/eventbridge/EventBridgeFilterTransform.java
@@ -16,18 +16,17 @@
*/
package org.apache.rocketmq.connect.transform.eventbridge;
-import java.util.Map;
-
import com.google.common.collect.Maps;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import io.cloudevents.SpecVersion;
import io.openmessaging.KeyValue;
-import io.openmessaging.connector.api.component.ComponentContext;
import io.openmessaging.connector.api.data.ConnectRecord;
import org.apache.rocketmq.eventbridge.tools.pattern.PatternEvaluator;
import org.apache.rocketmq.eventbridge.tools.pattern.PatternEvaluatorBuilder;
+import java.util.Map;
+
public class EventBridgeFilterTransform implements io.openmessaging.connector.api.component.Transform {
private PatternEvaluator evaluator;
@@ -71,15 +70,10 @@ public class EventBridgeFilterTransform implements io.openmessaging.connector.ap
}
@Override
- public void init(KeyValue config) {
+ public void start(KeyValue config) {
this.evaluator = PatternEvaluatorBuilder.build(config.getString("filterPattern"));
}
- @Override
- public void start(ComponentContext componentContext) {
-
- }
-
@Override
public void stop() {
diff --git a/supports/connect-filter-transform/src/test/java/org/apache/rocketmq/connect/transform/eventbridge/EventBridgeFilterTransformTest.java b/supports/connect-filter-transform/src/test/java/org/apache/rocketmq/connect/transform/eventbridge/EventBridgeFilterTransformTest.java
index 40cca1d..7698cf8 100644
--- a/supports/connect-filter-transform/src/test/java/org/apache/rocketmq/connect/transform/eventbridge/EventBridgeFilterTransformTest.java
+++ b/supports/connect-filter-transform/src/test/java/org/apache/rocketmq/connect/transform/eventbridge/EventBridgeFilterTransformTest.java
@@ -30,7 +30,7 @@ public class EventBridgeFilterTransformTest {
EventBridgeFilterTransform transform = new EventBridgeFilterTransform();
KeyValue keyValue = new DefaultKeyValue();
keyValue.put("filterPattern", "{\"source\":[\"acs.mns\"]}");
- transform.init(keyValue);
+ transform.start(keyValue);
ConnectRecord record = new ConnectRecord(null, null, System.currentTimeMillis());
record.addExtension("source", "acs.demo");