Rename Kafka connector name

apache · Jul 27, 2021 · 14262af · 14262af
1 parent 1400e59
commit 14262af
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/eventmesh-connector-plugin/build.gradle b/eventmesh-connector-plugin/build.gradle
@@ -31,7 +31,7 @@ task copyConnectorPlugin(dependsOn: ['jar']) {
         }
         copy {
             into '../dist/plugin/connector'
-            from "../eventmesh-connector-plugin/dist/apps/eventmesh-connector-rocketmq-${version}.jar"
+            from '../eventmesh-connector-plugin/dist/apps'
         }
     }
 }
diff --git a/...or/kafka/consumer/OMSConsumerAdaptor.java → ...ka/consumer/KafkaMeshConsumerAdaptor.java b/...or/kafka/consumer/OMSConsumerAdaptor.java → ...ka/consumer/KafkaMeshConsumerAdaptor.java
@@ -41,9 +41,9 @@
 /**
  * The adaptor to adapt Kafka consumer to OMS producer.
  */
-public class OMSConsumerAdaptor implements MeshMQPushConsumer {
+public class KafkaMeshConsumerAdaptor implements MeshMQPushConsumer {
 
-    private final Logger logger = LoggerFactory.getLogger(OMSConsumerAdaptor.class);
+    private final Logger logger = LoggerFactory.getLogger(KafkaMeshConsumerAdaptor.class);
 
     private KafkaMQConsumerImpl kafkaConsumer;
 

diff --git a/...or/kafka/producer/OMSProducerAdaptor.java → ...ka/producer/KafkaMeshProducerAdaptor.java b/...or/kafka/producer/OMSProducerAdaptor.java → ...ka/producer/KafkaMeshProducerAdaptor.java
@@ -38,9 +38,9 @@
 /**
  * The adaptor to adapt Kafka producer to OMS producer.
  */
-public class OMSProducerAdaptor implements MeshMQProducer {
+public class KafkaMeshProducerAdaptor implements MeshMQProducer {
 
-    private final Logger logger = LoggerFactory.getLogger(OMSProducerAdaptor.class);
+    private final Logger logger = LoggerFactory.getLogger(KafkaMeshProducerAdaptor.class);
 
     private KafkaMQProducerImpl kafkaMQProducer;
 

diff --git a/...rc/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.MeshMQPushConsumer b/...rc/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.consumer.MeshMQPushConsumer
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-kafka=org.apache.eventmesh.connector.kafka.consumer.OMSConsumerAdaptor
+kafka=org.apache.eventmesh.connector.kafka.consumer.KafkaMeshConsumerAdaptor
diff --git a/...ka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.MeshMQProducer b/...ka/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.producer.MeshMQProducer
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-kafka=org.apache.eventmesh.connector.kafka.producer.OMSProducerAdaptor
+kafka=org.apache.eventmesh.connector.kafka.producer.KafkaMeshProducerAdaptor
diff --git a/...c/test/java/org/apache/eventmesh/connector/kafka/consumer/KafkaMQConsumerImplExample.java b/...c/test/java/org/apache/eventmesh/connector/kafka/consumer/KafkaMQConsumerImplExample.java
@@ -21,6 +21,8 @@
 import org.apache.eventmesh.connector.kafka.common.Constants;
 import org.apache.eventmesh.connector.kafka.config.ConfigurationWrapper;
 import org.apache.eventmesh.connector.kafka.producer.KafkaMQProducerImplExample;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Properties;
@@ -29,6 +31,8 @@ public class KafkaMQConsumerImplExample {
 
     private static KafkaMQConsumerImpl kafkaMQConsumer;
 
+    private static final Logger logger = LoggerFactory.getLogger(KafkaMQConsumerImplExample.class);
+
     static {
         kafkaMQConsumer = new KafkaMQConsumerImpl(new Properties());
         String filePath = KafkaMQProducerImplExample.class.getClassLoader().getResource(Constants.KAFKA_CONF_FILE).getPath();
@@ -40,7 +44,7 @@ public class KafkaMQConsumerImplExample {
 
     public static void main(String[] args) {
         kafkaMQConsumer.subscribe("eventmesh-test-topic",
-                (message, context) -> System.out.println(new String(message.getBody(), StandardCharsets.UTF_8)));
+                (message, context) -> logger.info(new String(message.getBody(), StandardCharsets.UTF_8)));
         kafkaMQConsumer.start();
     }
 }
diff --git a/...a/src/test/java/org/apache/eventmesh/connector/kafka/producer/OMSProducerAdaptorTest.java b/...a/src/test/java/org/apache/eventmesh/connector/kafka/producer/OMSProducerAdaptorTest.java
@@ -22,11 +22,11 @@
 
 public class OMSProducerAdaptorTest {
 
-    private OMSProducerAdaptor omsProducerAdaptor;
+    private KafkaMeshProducerAdaptor kafkaMeshProducerAdaptor;
 
     @Before
     public void before() {
-        omsProducerAdaptor = new OMSProducerAdaptor();
+        kafkaMeshProducerAdaptor = new KafkaMeshProducerAdaptor();
     }
 
     @Test

diff --git a/eventmesh-runtime/conf/eventmesh.properties b/eventmesh-runtime/conf/eventmesh.properties
@@ -54,4 +54,4 @@ eventMesh.server.registry.fetchRegistryAddrIntervalInMills=20000
 #eventMesh.server.defibus.client.comsumeTimeoutInMin=5
 
 #connector plugin
-eventMesh.connector.plugin.type=rocketmq
+eventMesh.connector.plugin.type=kafka