Remove connector-api in connector-plugin

apache · Jul 19, 2021 · bf6de22 · bf6de22
1 parent 15c51f7
commit bf6de22
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 12 deletions.
diff --git a/eventmesh-connector-plugin/build.gradle b/eventmesh-connector-plugin/build.gradle
@@ -26,6 +26,7 @@ task copyConnectorPlugin(dependsOn: ['jar']) {
             from project.jar.getArchivePath()
             exclude {
                 "eventmesh-connector-plugin-${version}.jar"
+                "eventmesh-connector-api-${version}.jar"
             }
         }
         copy {

diff --git a/eventmesh-connector-api/build.gradle → ...ugin/eventmesh-connector-api/build.gradle b/eventmesh-connector-api/build.gradle → ...ugin/eventmesh-connector-api/build.gradle
@@ -20,6 +20,6 @@ List open_message = [
 ]
 
 dependencies {
-    implementation open_message,project(":eventmesh-common"), project(":eventmesh-spi")
+    api open_message, project(":eventmesh-common"), project(":eventmesh-spi")
     testImplementation open_message,project(":eventmesh-common"), project(":eventmesh-spi")
 }
diff --git a/eventmesh-connector-api/gradle.properties → ...eventmesh-connector-api/gradle.properties b/eventmesh-connector-api/gradle.properties → ...eventmesh-connector-api/gradle.properties
diff --git a/...apache/eventmesh/api/AbstractContext.java → ...apache/eventmesh/api/AbstractContext.java b/...apache/eventmesh/api/AbstractContext.java → ...apache/eventmesh/api/AbstractContext.java
diff --git a/...apache/eventmesh/api/EventMeshAction.java → ...apache/eventmesh/api/EventMeshAction.java b/...apache/eventmesh/api/EventMeshAction.java → ...apache/eventmesh/api/EventMeshAction.java
diff --git a/...esh/api/EventMeshAsyncConsumeContext.java → ...esh/api/EventMeshAsyncConsumeContext.java b/...esh/api/EventMeshAsyncConsumeContext.java → ...esh/api/EventMeshAsyncConsumeContext.java
diff --git a/.../org/apache/eventmesh/api/RRCallback.java → .../org/apache/eventmesh/api/RRCallback.java b/.../org/apache/eventmesh/api/RRCallback.java → .../org/apache/eventmesh/api/RRCallback.java
diff --git a/...mesh/api/consumer/MeshMQPushConsumer.java → ...mesh/api/consumer/MeshMQPushConsumer.java b/...mesh/api/consumer/MeshMQPushConsumer.java → ...mesh/api/consumer/MeshMQPushConsumer.java
diff --git a/...h/api/factory/ConnectorPluginFactory.java → ...h/api/factory/ConnectorPluginFactory.java b/...h/api/factory/ConnectorPluginFactory.java → ...h/api/factory/ConnectorPluginFactory.java
diff --git a/...ventmesh/api/producer/MeshMQProducer.java → ...ventmesh/api/producer/MeshMQProducer.java b/...ventmesh/api/producer/MeshMQProducer.java → ...ventmesh/api/producer/MeshMQProducer.java
diff --git a/eventmesh-connector-plugin/eventmesh-connector-rocketmq/build.gradle b/eventmesh-connector-plugin/eventmesh-connector-rocketmq/build.gradle
@@ -55,6 +55,6 @@ List open_message = [
 ]
 
 dependencies {
-    implementation rocketmq, metrics,open_message,project(":eventmesh-connector-api"),project(":eventmesh-common")
-    testImplementation rocketmq, metrics,open_message,project(":eventmesh-connector-api"),project(":eventmesh-common")
+    api rocketmq, metrics, open_message, project(":eventmesh-connector-plugin:eventmesh-connector-api")
+    testImplementation rocketmq, metrics, open_message, project(":eventmesh-connector-plugin:eventmesh-connector-api")
 }
diff --git a/eventmesh-runtime/build.gradle b/eventmesh-runtime/build.gradle
@@ -31,6 +31,6 @@ List open_message = [
 
 
 dependencies {
-    implementation  metrics, open_message,project(":eventmesh-connector-api"),project(":eventmesh-common"),project(":eventmesh-spi")
-    testImplementation metrics,open_message,project(":eventmesh-common"),project(":eventmesh-connector-api"),project(":eventmesh-spi")
+    implementation metrics, open_message, project(":eventmesh-connector-plugin:eventmesh-connector-api")
+    testImplementation metrics, open_message, project(":eventmesh-connector-plugin:eventmesh-connector-api")
 }
diff --git a/.../main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/HandleMsgContext.java b/.../main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/HandleMsgContext.java
@@ -28,7 +28,6 @@
 import org.apache.eventmesh.api.AbstractContext;
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.protocol.SubscriptionItem;
-import org.apache.eventmesh.common.protocol.SubscriptionMode;
 import org.apache.eventmesh.runtime.boot.EventMeshHTTPServer;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.consumergroup.ConsumerGroupConf;

diff --git a/.../apache/eventmesh/runtime/core/protocol/tcp/client/session/push/DownStreamMsgContext.java b/.../apache/eventmesh/runtime/core/protocol/tcp/client/session/push/DownStreamMsgContext.java
@@ -29,7 +29,6 @@
 import org.apache.eventmesh.api.AbstractContext;
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.protocol.SubscriptionItem;
-import org.apache.eventmesh.common.protocol.SubscriptionMode;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.plugin.MQConsumerWrapper;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.Session;

diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/CCSubClient.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/demo/CCSubClient.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package demo;
+package org.apache.eventmesh.runtime.demo;
 
 import io.netty.channel.ChannelHandlerContext;
 

diff --git a/eventmesh-test/build.gradle b/eventmesh-test/build.gradle
@@ -25,8 +25,12 @@ List spring_framework = [
 dependencies {
 //    compile log4j2, sl4j
 //    testCompile log4j2, sl4j
-    implementation project(":eventmesh-sdk-java"), project(":eventmesh-connector-api"), project(":eventmesh-common"), spring_framework
-    testImplementation project(":eventmesh-sdk-java"), project(":eventmesh-connector-api"), project(":eventmesh-common"), spring_framework
+    implementation project(":eventmesh-sdk-java")
+    implementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
+    implementation spring_framework
+    testImplementation project(":eventmesh-sdk-java")
+    testImplementation project(":eventmesh-connector-plugin:eventmesh-connector-api")
+    testImplementation spring_framework
 }
 
 configurations.all {

diff --git a/settings.gradle b/settings.gradle
@@ -20,10 +20,9 @@ String jdkVersion = "${jdk}"
 include 'eventmesh-runtime'
 include 'eventmesh-sdk-java'
 include 'eventmesh-common'
-include 'eventmesh-connector-api'
 include 'eventmesh-starter'
 include 'eventmesh-test'
 include 'eventmesh-spi'
-include 'eventmesh-connector-plugin'
+include 'eventmesh-connector-plugin:eventmesh-connector-api'
 include 'eventmesh-connector-plugin:eventmesh-connector-rocketmq'