optimize NotifySubscriberRequest (alibaba#7545)

dongYES · Jan 7, 2022 · cdd83e2 · cdd83e2
1 parent fb43bad
commit cdd83e2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/remote/request/NotifySubscriberRequest.java b/api/src/main/java/com/alibaba/nacos/api/naming/remote/request/NotifySubscriberRequest.java
@@ -22,7 +22,7 @@
 import static com.alibaba.nacos.api.common.Constants.Naming.NAMING_MODULE;
 
 /**
- * Notify subscriber response.
+ * Notify subscriber request.
  *
  * @author xiweng.yy
  */
@@ -44,22 +44,12 @@ public String getModule() {
         return NAMING_MODULE;
     }
 
-    private NotifySubscriberRequest(ServiceInfo serviceInfo, String message) {
+    private NotifySubscriberRequest(ServiceInfo serviceInfo) {
         this.serviceInfo = serviceInfo;
     }
 
-    public static NotifySubscriberRequest buildSuccessResponse(ServiceInfo serviceInfo) {
-        return new NotifySubscriberRequest(serviceInfo, "success");
-    }
-
-    /**
-     * Build fail response.
-     *
-     * @param message error message
-     * @return fail response
-     */
-    public static NotifySubscriberRequest buildFailResponse(String message) {
-        return new NotifySubscriberRequest();
+    public static NotifySubscriberRequest buildNotifySubscriberRequest(ServiceInfo serviceInfo) {
+        return new NotifySubscriberRequest(serviceInfo);
     }
 
     public ServiceInfo getServiceInfo() {

diff --git a/...c/test/java/com/alibaba/nacos/client/naming/remote/gprc/NamingPushRequestHandlerTest.java b/...c/test/java/com/alibaba/nacos/client/naming/remote/gprc/NamingPushRequestHandlerTest.java
@@ -39,7 +39,7 @@ public void testRequestReply() {
         ServiceInfoHolder holder = mock(ServiceInfoHolder.class);
         NamingPushRequestHandler handler = new NamingPushRequestHandler(holder);
         ServiceInfo info = new ServiceInfo("name", "cluster1");
-        Request req = NotifySubscriberRequest.buildSuccessResponse(info);
+        Request req = NotifySubscriberRequest.buildNotifySubscriberRequest(info);
         //when
         Response response = handler.requestReply(req);
         //then

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/push/v2/executor/PushExecutorRpcImpl.java b/naming/src/main/java/com/alibaba/nacos/naming/push/v2/executor/PushExecutorRpcImpl.java
@@ -42,12 +42,12 @@ public PushExecutorRpcImpl(RpcPushService pushService) {
 
     @Override
     public void doPush(String clientId, Subscriber subscriber, PushDataWrapper data) {
-        pushService.pushWithoutAck(clientId, NotifySubscriberRequest.buildSuccessResponse(getServiceInfo(data, subscriber)));
+        pushService.pushWithoutAck(clientId, NotifySubscriberRequest.buildNotifySubscriberRequest(getServiceInfo(data, subscriber)));
     }
 
     @Override
     public void doPushWithCallback(String clientId, Subscriber subscriber, PushDataWrapper data, PushCallBack callBack) {
-        pushService.pushWithCallback(clientId, NotifySubscriberRequest.buildSuccessResponse(getServiceInfo(data, subscriber)),
+        pushService.pushWithCallback(clientId, NotifySubscriberRequest.buildNotifySubscriberRequest(getServiceInfo(data, subscriber)),
                 callBack, GlobalExecutor.getCallbackExecutor());
     }