From 044e6c8b7a4de1b845d4127e23c468faa6a02446 Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Fri, 17 Nov 2023 19:35:15 +0800
Subject: [PATCH] =?UTF-8?q?ClientCodec=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/org/redkale/net/client/ClientCodec.java    | 6 +++---
 src/main/java/org/redkale/net/client/ClientRequest.java  | 2 +-
 src/main/java/org/redkale/net/client/ClientResponse.java | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/redkale/net/client/ClientCodec.java b/src/main/java/org/redkale/net/client/ClientCodec.java
index a34b9c741..c958bed78 100644
--- a/src/main/java/org/redkale/net/client/ClientCodec.java
+++ b/src/main/java/org/redkale/net/client/ClientCodec.java
@@ -83,7 +83,7 @@ public abstract class ClientCodec<R extends ClientRequest, P extends ClientResul
                     messageListener.onMessage(connection, cr);
                     respPool.accept(cr);
                 } else {
-                    ClientFuture<R, P> respFuture = connection.pollRespFuture(cr.getRequestid());
+                    ClientFuture respFuture = connection.pollRespFuture(cr.getRequestid());
                     if (respFuture != null) {
                         if (respFuture.request != cr.request) {
                             connection.dispose(new RedkaleException("request pipeline error"));
@@ -116,7 +116,7 @@ public abstract class ClientCodec<R extends ClientRequest, P extends ClientResul
         }
     }
 
-    void responseComplete(boolean halfCompleted, ClientFuture<R, P> respFuture, P message, Throwable exc) {
+    void responseComplete(boolean halfCompleted, ClientFuture<R, Object> respFuture, P message, Throwable exc) {
         R request = respFuture.request;
         Traces.currentTraceid(request.getTraceid());
         AsyncIOThread readThread = connection.channel.getReadIOThread();
@@ -144,7 +144,7 @@ public abstract class ClientCodec<R extends ClientRequest, P extends ClientResul
             connection.preComplete(message, (R) request, exc);
 
             if (exc == null) {
-                final P rs = request.respTransfer == null ? message : (P) request.respTransfer.apply(message);
+                final Object rs = request.respTransfer == null ? message : request.respTransfer.apply(message);
                 if (workThread == null) {
                     readThread.runWork(() -> {
                         Traces.currentTraceid(request.traceid);
diff --git a/src/main/java/org/redkale/net/client/ClientRequest.java b/src/main/java/org/redkale/net/client/ClientRequest.java
index bd6d7c001..d237228d6 100644
--- a/src/main/java/org/redkale/net/client/ClientRequest.java
+++ b/src/main/java/org/redkale/net/client/ClientRequest.java
@@ -30,7 +30,7 @@ public abstract class ClientRequest {
 
     protected String traceid;
 
-    //只会在ClientCodec的读线程里调用
+    //只会在ClientCodec的读线程里调用, 将ClientResult转成最终结果对象
     Function respTransfer;
 
     public abstract void writeTo(ClientConnection conn, ByteArray array);
diff --git a/src/main/java/org/redkale/net/client/ClientResponse.java b/src/main/java/org/redkale/net/client/ClientResponse.java
index 780aa903e..e242e6d2c 100644
--- a/src/main/java/org/redkale/net/client/ClientResponse.java
+++ b/src/main/java/org/redkale/net/client/ClientResponse.java
@@ -6,6 +6,7 @@
 package org.redkale.net.client;
 
 import java.io.Serializable;
+import org.redkale.annotation.Nullable;
 
 /**
  *
@@ -21,6 +22,7 @@ import java.io.Serializable;
  */
 public class ClientResponse<R extends ClientRequest, P extends ClientResult> {
 
+    @Nullable
     protected R request; //服务端返回一个不存在的requestid，可能为null
 
     protected P message;