more grpc

xwm1992 · Apr 25, 2024 · e28fb81 · e28fb81
1 parent 9ba58b0
commit e28fb81
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 20 deletions.
diff --git a/...r/src/main/java/com/apache/eventmesh/admin/server/web/handler/FetchJobRequestHandler.java b/...r/src/main/java/com/apache/eventmesh/admin/server/web/handler/FetchJobRequestHandler.java
@@ -1,14 +1,14 @@
 package com.apache.eventmesh.admin.server.web.handler;
 
 import org.apache.eventmesh.common.adminserver.request.FetchJobRequest;
-import org.apache.eventmesh.common.adminserver.response.JobResponse;
+import org.apache.eventmesh.common.adminserver.response.FetchJobResponse;
 import org.apache.eventmesh.common.protocol.grpc.adminserver.Metadata;
 
-public class FetchJobRequestHandler extends AbstractRequestHandler<FetchJobRequest, JobResponse> {
+public class FetchJobRequestHandler extends AbstractRequestHandler<FetchJobRequest, FetchJobResponse> {
 
     @Override
-    public JobResponse handler(FetchJobRequest request, Metadata metadata) {
-        JobResponse response = new JobResponse();
+    public FetchJobResponse handler(FetchJobRequest request, Metadata metadata) {
+        FetchJobResponse response = new FetchJobResponse();
         return response;
     }
 }
diff --git a/...mon/adminserver/response/JobResponse.java → ...dminserver/response/FetchJobResponse.java b/...mon/adminserver/response/JobResponse.java → ...dminserver/response/FetchJobResponse.java
@@ -2,7 +2,7 @@
 
 import org.apache.eventmesh.common.adminserver.job.JobTransportType;
 
-public class JobResponse extends BaseResponse{
+public class FetchJobResponse extends BaseResponse{
     private long id;
     private String name;
     private String desc;

diff --git a/...ain/java/org/apache/eventmesh/common/protocol/grpc/adminserver/EventMeshAdminService.java b/...ain/java/org/apache/eventmesh/common/protocol/grpc/adminserver/EventMeshAdminService.java
diff --git a/...main/proto/event_mesh_admin_service.proto → ...grpc/proto/event_mesh_admin_service.proto b/...main/proto/event_mesh_admin_service.proto → ...grpc/proto/event_mesh_admin_service.proto
@@ -12,14 +12,11 @@ message Metadata {
 
 message Payload {
     Metadata metadata = 2;
-    google.protobuf.Any body = 3;
-}
-
-service AdminBiStreamService {
-  rpc invokeBiStream(stream Payload) returns (stream Payload){}
+    bytes body = 3;
 }
 
 service AdminService {
+  rpc invokeBiStream(stream Payload) returns (stream Payload){}
   rpc invoke(Payload) returns (Payload){}
 }
 
diff --git a/...esh-runtime-v2/src/main/java/org/apache/eventmesh/runtime/connector/ConnectorRuntime.java b/...esh-runtime-v2/src/main/java/org/apache/eventmesh/runtime/connector/ConnectorRuntime.java
@@ -3,16 +3,12 @@
 import org.apache.eventmesh.common.ThreadPoolFactory;
 import org.apache.eventmesh.common.adminserver.HeartBeat;
 import org.apache.eventmesh.common.adminserver.request.JobRequest;
-import org.apache.eventmesh.common.adminserver.response.JobResponse;
 import org.apache.eventmesh.common.config.ConfigService;
 import org.apache.eventmesh.common.utils.IPUtils;
 import org.apache.eventmesh.common.utils.JsonUtils;
 import org.apache.eventmesh.openconnect.api.ConnectorCreateService;
-import org.apache.eventmesh.openconnect.api.config.Config;
 import org.apache.eventmesh.openconnect.api.config.SinkConfig;
 import org.apache.eventmesh.openconnect.api.config.SourceConfig;
-import org.apache.eventmesh.openconnect.api.connector.Connector;
-import org.apache.eventmesh.openconnect.api.connector.ConnectorContext;
 import org.apache.eventmesh.openconnect.api.connector.SinkConnectorContext;
 import org.apache.eventmesh.openconnect.api.connector.SourceConnectorContext;
 import org.apache.eventmesh.openconnect.api.factory.ConnectorPluginFactory;