serverscanning/capnproto-java-rpc
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tidy up access to hooks

Browse source
This commit is contained in:
Vaci Koblizek 2020-10-23 19:25:50 +01:00
parent dc4f8d07b4
commit 4f8c5faef4
4 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
runtime/src/main/java/org/capnproto/CallContext.java
View file

@ -33,7 +33,7 @@ public class CallContext<Params, Results> {
} }
public final <SubParams, Results> CompletableFuture<java.lang.Void> tailCall(Request<SubParams, Results> tailRequest) { public final <SubParams, Results> CompletableFuture<java.lang.Void> tailCall(Request<SubParams, Results> tailRequest) {
return this.hook.tailCall(tailRequest.getHook()); return this.hook.tailCall(tailRequest.hook);
} }
public final void allowCancellation() { public final void allowCancellation() {

2
runtime/src/main/java/org/capnproto/Capability.java
View file

@ -119,7 +119,7 @@ public final class Capability {
protected <T> StreamingRequest<T> newStreamingCall(FromPointerBuilder<T> paramsBuilder, protected <T> StreamingRequest<T> newStreamingCall(FromPointerBuilder<T> paramsBuilder,
long interfaceId, short methodId) { long interfaceId, short methodId) {
var request = hook.newCall(interfaceId, methodId); var request = hook.newCall(interfaceId, methodId);
return new StreamingRequest<> (paramsBuilder, request.params, request.hook); return new StreamingRequest<> (paramsBuilder, request.getParams(), request.hook);
} }
} }

9
runtime/src/main/java/org/capnproto/Request.java
View file

@ -4,8 +4,8 @@ import java.util.concurrent.CompletableFuture;
public class Request<Params, Results> { public class Request<Params, Results> {
Params params; protected Params params;
PipelineFactory<Results> pipelineFactory; private PipelineFactory<Results> pipelineFactory;
RequestHook hook; RequestHook hook;
public Request(Params params, public Request(Params params,
@ -20,10 +20,6 @@ public class Request<Params, Results> {
return params; return params;
} }
public RequestHook getHook() {
return this.hook;
}
public Results send() { public Results send() {
var typelessPromise = this.hook.send(); var typelessPromise = this.hook.send();
this.hook = null; // prevent reuse this.hook = null; // prevent reuse
@ -31,6 +27,7 @@ public class Request<Params, Results> {
} }
static <P, R> Request<P, R> newBrokenRequest(Throwable exc) { static <P, R> Request<P, R> newBrokenRequest(Throwable exc) {
final MessageBuilder message = new MessageBuilder(); final MessageBuilder message = new MessageBuilder();
var hook = new RequestHook() { var hook = new RequestHook() {

4
runtime/src/main/java/org/capnproto/Response.java
View file

@ -15,10 +15,6 @@ public class Response<Results> {
return this.results; return this.results;
} }
public ResponseHook getHook() {
return this.hook;
}
static <R> Response<R> fromTypeless(FromPointerReader<R> resultsFactory, static <R> Response<R> fromTypeless(FromPointerReader<R> resultsFactory,
Response<AnyPointer.Reader> typeless) { Response<AnyPointer.Reader> typeless) {
return new Response<>(typeless.getResults().getAs(resultsFactory), typeless.hook); return new Response<>(typeless.getResults().getAs(resultsFactory), typeless.hook);