diff --git a/src/main/java/org/redkale/net/client/Client.java b/src/main/java/org/redkale/net/client/Client.java index 0af4b16fc..cb1bdf581 100644 --- a/src/main/java/org/redkale/net/client/Client.java +++ b/src/main/java/org/redkale/net/client/Client.java @@ -225,7 +225,7 @@ public abstract class Client, R extends ClientR return connect().thenCompose(conn -> writeChannel(conn, request)); } - public final CompletableFuture sendAsync(R request, BiFunction respTransfer) { + public final CompletableFuture sendAsync(R request, Function respTransfer) { if (request.workThread == null) { request.workThread = WorkThread.currWorkThread(); } @@ -239,7 +239,7 @@ public abstract class Client, R extends ClientR return connect(addr).thenCompose(conn -> writeChannel(conn, request)); } - public final CompletableFuture sendAsync(SocketAddress addr, R request, BiFunction respTransfer) { + public final CompletableFuture sendAsync(SocketAddress addr, R request, Function respTransfer) { if (request.workThread == null) { request.workThread = WorkThread.currWorkThread(); } @@ -250,7 +250,7 @@ public abstract class Client, R extends ClientR return conn.writeChannel(request); } - protected CompletableFuture writeChannel(ClientConnection conn, R request, BiFunction respTransfer) { + protected CompletableFuture writeChannel(ClientConnection conn, R request, Function respTransfer) { return conn.writeChannel(request, respTransfer); } diff --git a/src/main/java/org/redkale/net/client/ClientCodec.java b/src/main/java/org/redkale/net/client/ClientCodec.java index 1fdfba0f0..333bf2af1 100644 --- a/src/main/java/org/redkale/net/client/ClientCodec.java +++ b/src/main/java/org/redkale/net/client/ClientCodec.java @@ -135,7 +135,7 @@ public abstract class ClientCodec implements Complet }); } } else { - final Object rs = request.respTransfer == null ? message : request.respTransfer.apply(connection, message); + final Object rs = request.respTransfer == null ? message : request.respTransfer.apply(message); if (workThread.inIO() && workThread.getState() == Thread.State.RUNNABLE) { workThread.execute(() -> { Traces.currTraceid(request.traceid); diff --git a/src/main/java/org/redkale/net/client/ClientConnection.java b/src/main/java/org/redkale/net/client/ClientConnection.java index 164bb4f1e..bb2225979 100644 --- a/src/main/java/org/redkale/net/client/ClientConnection.java +++ b/src/main/java/org/redkale/net/client/ClientConnection.java @@ -106,7 +106,7 @@ public abstract class ClientConnection implements Co } //respTransfer只会在ClientCodec的读线程里调用 - protected final CompletableFuture writeChannel(R request, BiFunction, P, T> respTransfer) { + protected final CompletableFuture writeChannel(R request, Function respTransfer) { request.respTransfer = respTransfer; ClientFuture respFuture = createClientFuture(request); int rts = this.channel.getReadTimeoutSeconds(); diff --git a/src/main/java/org/redkale/net/client/ClientRequest.java b/src/main/java/org/redkale/net/client/ClientRequest.java index 760030b67..5dd40a0ae 100644 --- a/src/main/java/org/redkale/net/client/ClientRequest.java +++ b/src/main/java/org/redkale/net/client/ClientRequest.java @@ -6,7 +6,7 @@ package org.redkale.net.client; import java.io.Serializable; -import java.util.function.BiFunction; +import java.util.function.Function; import org.redkale.net.WorkThread; import org.redkale.util.*; @@ -28,7 +28,7 @@ public abstract class ClientRequest { protected String traceid; //只会在ClientCodec的读线程里调用 - BiFunction respTransfer; + Function respTransfer; public abstract void writeTo(ClientConnection conn, ByteArray array);