refactor: registerRequestHandler don't need requestClass.

opc-source · Jul 19, 2022 · f03fba6 · f03fba6
1 parent a713758
commit f03fba6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 14 deletions.
diff --git a/example/example-client/src/main/java/io/opc/rpc/example/TestClient.java b/example/example-client/src/main/java/io/opc/rpc/example/TestClient.java
@@ -56,7 +56,7 @@ private static OpcRpcClient getOpcRpcClient(Properties properties) {
 
         PayloadClassHelper.register(ClientTestClientRequest.class, ClientTestServerResponse.class);
         PayloadClassHelper.register(ServerTestServerRequest.class, ServerTestClientResponse.class);
-        rpcClient.registerServerRequestHandler(ServerTestServerRequest.class, new ServerTestRequestHandler());
+        rpcClient.registerServerRequestHandler(new ServerTestRequestHandler());
 
         //noinspection AlibabaAvoidManuallyCreateThread
         new Thread(() -> {

diff --git a/example/example-server/src/main/java/io/opc/rpc/example/TestServer.java b/example/example-server/src/main/java/io/opc/rpc/example/TestServer.java
@@ -78,7 +78,7 @@ private static OpcRpcServer getOpcRpcServer(Properties properties2) {
         final OpcRpcServer rpcServer = OpcRpcFactory.createOpcServer(properties2);
 
         PayloadClassHelper.register(ClientTestClientRequest.class, ClientTestServerResponse.class);
-        rpcServer.registerClientRequestHandler(ClientTestClientRequest.class, new ClientTestRequestHandler());
+        rpcServer.registerClientRequestHandler(new ClientTestRequestHandler());
         PayloadClassHelper.register(ServerTestServerRequest.class, ServerTestClientResponse.class);
 
         return rpcServer;

diff --git a/rpc-api/src/main/java/io/opc/rpc/api/OpcRpcClient.java b/rpc-api/src/main/java/io/opc/rpc/api/OpcRpcClient.java
@@ -29,11 +29,9 @@ public interface OpcRpcClient extends AutoCloseable {
     /**
      * register a ServerRequestHandler who handle ServerRequest.
      *
-     * @param requestClass requestClass
      * @param requestHandler RequestHandler
      */
-    void registerServerRequestHandler(Class<? extends ServerRequest> requestClass,
-            RequestHandler<? extends ServerRequest, ? extends ClientResponse> requestHandler);
+    void registerServerRequestHandler(RequestHandler<? extends ServerRequest, ? extends ClientResponse> requestHandler);
 
     /**
      * async send Request. async listening a Response with RequestCallback.

diff --git a/rpc-api/src/main/java/io/opc/rpc/api/OpcRpcServer.java b/rpc-api/src/main/java/io/opc/rpc/api/OpcRpcServer.java
@@ -32,10 +32,8 @@ public interface OpcRpcServer extends AutoCloseable {
     /**
      * register a ClientRequestHandler who handle ClientRequest.
      *
-     * @param requestClass requestClass
      * @param requestHandler RequestHandler
      */
-    void registerClientRequestHandler(Class<? extends ClientRequest> requestClass,
-            RequestHandler<? extends ClientRequest, ? extends ServerResponse> requestHandler);
+    void registerClientRequestHandler(RequestHandler<? extends ClientRequest, ? extends ServerResponse> requestHandler);
 
 }
diff --git a/rpc-client/src/main/java/io/opc/rpc/client/BaseOpcRpcClient.java b/rpc-client/src/main/java/io/opc/rpc/client/BaseOpcRpcClient.java
@@ -36,7 +36,6 @@
 import io.opc.rpc.core.handle.BaseRequestHandler;
 import io.opc.rpc.core.handle.ClientDetectionRequestHandler;
 import io.opc.rpc.core.handle.RequestHandlerSupport;
-import io.opc.rpc.core.request.ClientDetectionServerRequest;
 import io.opc.rpc.core.request.ConnectionInitClientRequest;
 import io.opc.rpc.core.request.ConnectionResetServerRequest;
 import io.opc.rpc.core.request.ConnectionSetupClientRequest;
@@ -159,7 +158,7 @@ public void init(@Nonnull Properties properties) {
         }, this.keepActive * 2, 1000L, TimeUnit.MILLISECONDS);
 
         // register ClientDetectionRequestHandler for ClientDetectionServerRequest, tobe a good practice of RequestHandler
-        this.registerServerRequestHandler(ClientDetectionServerRequest.class, new ClientDetectionRequestHandler());
+        this.registerServerRequestHandler(new ClientDetectionRequestHandler());
 
         // subclass init
         this.doInit(properties);
@@ -292,8 +291,7 @@ private void shutdownChanel(ManagedChannel channel) {
     protected abstract void doInit(Properties properties);
 
     @Override
-    public void registerServerRequestHandler(Class<? extends ServerRequest> requestClass,
-            RequestHandler<? extends ServerRequest, ? extends ClientResponse> requestHandler) {
+    public void registerServerRequestHandler(RequestHandler<? extends ServerRequest, ? extends ClientResponse> requestHandler) {
 
         //noinspection StatementWithEmptyBody
         if (requestHandler instanceof BaseRequestHandler) {

diff --git a/rpc-server/src/main/java/io/opc/rpc/server/BaseOpcRpcServer.java b/rpc-server/src/main/java/io/opc/rpc/server/BaseOpcRpcServer.java
@@ -185,8 +185,7 @@ protected void notifyAllConnectionResetServer() {
     }
 
     @Override
-    public void registerClientRequestHandler(Class<? extends ClientRequest> requestClass,
-            RequestHandler<? extends ClientRequest, ? extends ServerResponse> requestHandler) {
+    public void registerClientRequestHandler(RequestHandler<? extends ClientRequest, ? extends ServerResponse> requestHandler) {
         //noinspection StatementWithEmptyBody
         if (requestHandler instanceof BaseRequestHandler) {
             // noop, because already be registered on construct