diff --git a/runtime/src/main/java/org/capnproto/CallContext.java b/runtime/src/main/java/org/capnproto/CallContext.java index 55b58cd..af044c1 100644 --- a/runtime/src/main/java/org/capnproto/CallContext.java +++ b/runtime/src/main/java/org/capnproto/CallContext.java @@ -33,7 +33,7 @@ public class CallContext { } public final CompletableFuture tailCall(Request tailRequest) { - return this.hook.tailCall(tailRequest.getHook()); + return this.hook.tailCall(tailRequest.hook); } public final void allowCancellation() { diff --git a/runtime/src/main/java/org/capnproto/Capability.java b/runtime/src/main/java/org/capnproto/Capability.java index a1e6e01..e0b4f22 100644 --- a/runtime/src/main/java/org/capnproto/Capability.java +++ b/runtime/src/main/java/org/capnproto/Capability.java @@ -119,7 +119,7 @@ public final class Capability { protected StreamingRequest newStreamingCall(FromPointerBuilder paramsBuilder, long interfaceId, short methodId) { var request = hook.newCall(interfaceId, methodId); - return new StreamingRequest<> (paramsBuilder, request.params, request.hook); + return new StreamingRequest<> (paramsBuilder, request.getParams(), request.hook); } } diff --git a/runtime/src/main/java/org/capnproto/Request.java b/runtime/src/main/java/org/capnproto/Request.java index b5ac341..6d501a5 100644 --- a/runtime/src/main/java/org/capnproto/Request.java +++ b/runtime/src/main/java/org/capnproto/Request.java @@ -4,8 +4,8 @@ import java.util.concurrent.CompletableFuture; public class Request { - Params params; - PipelineFactory pipelineFactory; + protected Params params; + private PipelineFactory pipelineFactory; RequestHook hook; public Request(Params params, @@ -20,10 +20,6 @@ public class Request { return params; } - public RequestHook getHook() { - return this.hook; - } - public Results send() { var typelessPromise = this.hook.send(); this.hook = null; // prevent reuse @@ -31,6 +27,7 @@ public class Request { } static Request newBrokenRequest(Throwable exc) { + final MessageBuilder message = new MessageBuilder(); var hook = new RequestHook() { diff --git a/runtime/src/main/java/org/capnproto/Response.java b/runtime/src/main/java/org/capnproto/Response.java index 90cc483..c08944f 100644 --- a/runtime/src/main/java/org/capnproto/Response.java +++ b/runtime/src/main/java/org/capnproto/Response.java @@ -15,10 +15,6 @@ public class Response { return this.results; } - public ResponseHook getHook() { - return this.hook; - } - static Response fromTypeless(FromPointerReader resultsFactory, Response typeless) { return new Response<>(typeless.getResults().getAs(resultsFactory), typeless.hook);