Move EventHttpHandler annotation

Pil0tXia · Jul 24, 2023 · 3fa6abb · 3fa6abb
1 parent b9150ce
commit 3fa6abb
Show file tree

Hide file tree

Showing 26 changed files with 28 additions and 25 deletions.
diff --git a/eventmesh-admin/eventmesh-admin-core/build.gradle b/eventmesh-admin/eventmesh-admin-core/build.gradle
@@ -42,4 +42,7 @@ dependencies {
     testImplementation "org.powermock:powermock-module-junit4"
     testImplementation "org.powermock:powermock-api-mockito2"
     testImplementation "commons-io:commons-io"
+
+    testCompileOnly "org.projectlombok:lombok"
+    testAnnotationProcessor "org.projectlombok:lombok"
 }
diff --git a/...mesh/runtime/common/EventHttpHandler.java → ...h/admin/core/common/EventHttpHandler.java b/...mesh/runtime/common/EventHttpHandler.java → ...h/admin/core/common/EventHttpHandler.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.eventmesh.runtime.common;
+package org.apache.eventmesh.admin.core.common;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

diff --git a/...min-core/src/main/java/org/apache/eventmesh/admin/core/controller/HttpHandlerManager.java b/...min-core/src/main/java/org/apache/eventmesh/admin/core/controller/HttpHandlerManager.java
@@ -17,7 +17,7 @@
 
 package org.apache.eventmesh.admin.core.controller;
 
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...dmin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ConfigurationHandler.java b/...dmin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ConfigurationHandler.java
@@ -23,7 +23,7 @@
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.admin.core.response.Error;
 import org.apache.eventmesh.admin.core.response.GetConfigurationResponse;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.configuration.EventMeshGrpcConfiguration;
 import org.apache.eventmesh.runtime.configuration.EventMeshHTTPConfiguration;
 import org.apache.eventmesh.runtime.configuration.EventMeshTCPConfiguration;

diff --git a/...ore/src/main/java/org/apache/eventmesh/admin/core/handler/DeleteWebHookConfigHandler.java b/...ore/src/main/java/org/apache/eventmesh/admin/core/handler/DeleteWebHookConfigHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.webhook.api.WebHookConfig;
 import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
 

diff --git a/...ntmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/EventHandler.java b/...ntmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/EventHandler.java
@@ -23,7 +23,7 @@
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.admin.core.response.Error;
 import org.apache.eventmesh.admin.core.utils.HttpExchangeUtils;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.plugin.MQAdminWrapper;
 

diff --git a/...h-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/GrpcClientHandler.java b/...h-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/GrpcClientHandler.java
@@ -26,7 +26,7 @@
 import org.apache.eventmesh.admin.core.response.GetClientResponse;
 import org.apache.eventmesh.admin.core.utils.HttpExchangeUtils;
 import org.apache.eventmesh.runtime.boot.EventMeshGrpcServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.grpc.consumer.ConsumerManager;
 import org.apache.eventmesh.runtime.core.protocol.grpc.consumer.consumergroup.ConsumerGroupClient;

diff --git a/...h-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/HTTPClientHandler.java b/...h-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/HTTPClientHandler.java
@@ -26,7 +26,7 @@
 import org.apache.eventmesh.common.enums.HttpMethod;
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.runtime.boot.EventMeshHTTPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.http.processor.inf.Client;
 

diff --git a/...ore/src/main/java/org/apache/eventmesh/admin/core/handler/InsertWebHookConfigHandler.java b/...ore/src/main/java/org/apache/eventmesh/admin/core/handler/InsertWebHookConfigHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.common.utils.NetUtils;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.webhook.api.WebHookConfig;
 import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
 

diff --git a/...mesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/MetricsHandler.java b/...mesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/MetricsHandler.java
@@ -27,7 +27,7 @@
 import org.apache.eventmesh.metrics.api.model.TcpSummaryMetrics;
 import org.apache.eventmesh.runtime.boot.EventMeshHTTPServer;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 
 import java.io.IOException;

diff --git a/...src/main/java/org/apache/eventmesh/admin/core/handler/QueryRecommendEventMeshHandler.java b/...src/main/java/org/apache/eventmesh/admin/core/handler/QueryRecommendEventMeshHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.recommend.EventMeshRecommendImpl;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.recommend.EventMeshRecommendStrategy;

diff --git a/.../src/main/java/org/apache/eventmesh/admin/core/handler/QueryWebHookConfigByIdHandler.java b/.../src/main/java/org/apache/eventmesh/admin/core/handler/QueryWebHookConfigByIdHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.common.utils.NetUtils;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.webhook.api.WebHookConfig;
 import org.apache.eventmesh.webhook.api.WebHookConfigOperation;

diff --git a/...java/org/apache/eventmesh/admin/core/handler/QueryWebHookConfigByManufacturerHandler.java b/...java/org/apache/eventmesh/admin/core/handler/QueryWebHookConfigByManufacturerHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.common.utils.NetUtils;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.webhook.api.WebHookConfig;
 import org.apache.eventmesh.webhook.api.WebHookConfigOperation;

diff --git a/.../src/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientByIpPortHandler.java b/.../src/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientByIpPortHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;

diff --git a/...re/src/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientByPathHandler.java b/...re/src/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientByPathHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.Constants;
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;

diff --git a/...c/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientBySubSystemHandler.java b/...c/main/java/org/apache/eventmesh/admin/core/handler/RedirectClientBySubSystemHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;

diff --git a/...esh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RegistryHandler.java b/...esh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/RegistryHandler.java
@@ -24,7 +24,7 @@
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.admin.core.response.Error;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.registry.Registry;
 

diff --git a/...in-core/src/main/java/org/apache/eventmesh/admin/core/handler/RejectAllClientHandler.java b/...in-core/src/main/java/org/apache/eventmesh/admin/core/handler/RejectAllClientHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.Session;

diff --git a/...re/src/main/java/org/apache/eventmesh/admin/core/handler/RejectClientByIpPortHandler.java b/...re/src/main/java/org/apache/eventmesh/admin/core/handler/RejectClientByIpPortHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;

diff --git a/...src/main/java/org/apache/eventmesh/admin/core/handler/RejectClientBySubSystemHandler.java b/...src/main/java/org/apache/eventmesh/admin/core/handler/RejectClientBySubSystemHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;

diff --git a/...core/src/main/java/org/apache/eventmesh/admin/core/handler/ShowClientBySystemHandler.java b/...core/src/main/java/org/apache/eventmesh/admin/core/handler/ShowClientBySystemHandler.java
@@ -22,7 +22,7 @@
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.Session;

diff --git a/...h-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ShowClientHandler.java b/...h-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/ShowClientHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.Session;
 

diff --git a/...src/main/java/org/apache/eventmesh/admin/core/handler/ShowListenClientByTopicHandler.java b/...src/main/java/org/apache/eventmesh/admin/core/handler/ShowListenClientByTopicHandler.java
@@ -22,7 +22,7 @@
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientGroupWrapper;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;

diff --git a/...sh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/TCPClientHandler.java b/...sh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/TCPClientHandler.java
@@ -27,7 +27,7 @@
 import org.apache.eventmesh.admin.core.response.Error;
 import org.apache.eventmesh.admin.core.response.GetClientResponse;
 import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
 import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;

diff --git a/...ntmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/TopicHandler.java b/...ntmesh-admin-core/src/main/java/org/apache/eventmesh/admin/core/handler/TopicHandler.java
@@ -26,7 +26,7 @@
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
 import org.apache.eventmesh.admin.core.response.Error;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.runtime.constants.EventMeshConstants;
 import org.apache.eventmesh.runtime.core.plugin.MQAdminWrapper;
 

diff --git a/...ore/src/main/java/org/apache/eventmesh/admin/core/handler/UpdateWebHookConfigHandler.java b/...ore/src/main/java/org/apache/eventmesh/admin/core/handler/UpdateWebHookConfigHandler.java
@@ -21,7 +21,7 @@
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.common.utils.NetUtils;
 import org.apache.eventmesh.admin.core.controller.HttpHandlerManager;
-import org.apache.eventmesh.runtime.common.EventHttpHandler;
+import org.apache.eventmesh.admin.core.common.EventHttpHandler;
 import org.apache.eventmesh.webhook.api.WebHookConfig;
 import org.apache.eventmesh.webhook.api.WebHookConfigOperation;