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

Make Response typed

Browse source
This commit is contained in:
Vaci Koblizek 2020-10-08 15:35:15 +01:00
parent 59977b53fe
commit 2ffdecbe41
5 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -306,7 +306,7 @@ public final class Capability {
final CompletableFuture<?> cancelAllowed; final CompletableFuture<?> cancelAllowed;
MessageBuilder request; MessageBuilder request;
Response response; Response<AnyPointer.Reader> response;
AnyPointer.Builder responseBuilder; AnyPointer.Builder responseBuilder;
ClientHook clientRef; ClientHook clientRef;
@ -333,7 +333,10 @@ public final class Capability {
if (this.response == null) { if (this.response == null) {
var localResponse = new LocalResponse(); var localResponse = new LocalResponse();
this.responseBuilder = localResponse.message.getRoot(AnyPointer.factory); this.responseBuilder = localResponse.message.getRoot(AnyPointer.factory);
this.response = new Response(this.responseBuilder.asReader(), localResponse); this.response = new Response<>(
AnyPointer.factory,
this.responseBuilder.asReader(),
localResponse);
} }
return this.responseBuilder; return this.responseBuilder;
} }

7
runtime/src/main/java/org/capnproto/RemotePromise.java
View file

@ -4,15 +4,16 @@ import java.util.concurrent.CompletableFuture;
class RemotePromise<Results> { class RemotePromise<Results> {
final CompletableFuture<Response> response; final CompletableFuture<Response<Results>> response;
final PipelineHook pipeline; final PipelineHook pipeline;
RemotePromise(CompletableFuture<Response> response, PipelineHook pipeline) { RemotePromise(CompletableFuture<Response<Results>> response,
PipelineHook pipeline) {
this.response = response; this.response = response;
this.pipeline = pipeline; this.pipeline = pipeline;
} }
public CompletableFuture<Response> getResponse() { public CompletableFuture<Response<Results>> getResponse() {
return response; return response;
} }

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

@ -22,11 +22,17 @@ public class Request<Params, Results> {
return params.getAs(paramsBuilder); return params.getAs(paramsBuilder);
} }
CompletableFuture<Results> send() { RemotePromise<Results> send() {
var typelessPromise = hook.send(); var typelessPromise = hook.send();
hook = null; // prevent reuse hook = null; // prevent reuse
return typelessPromise.getResponse().thenApply( var typedPromise = typelessPromise.getResponse().thenApply(response -> {
response -> response.getAs(resultsReader)); return new Response<Results>(
resultsReader,
response.get(),
response.hook);
});
return new RemotePromise<Results>(typedPromise, typelessPromise.pipeline);
} }
static <T, U> Request<T, U> newBrokenRequest(Throwable exc) { static <T, U> Request<T, U> newBrokenRequest(Throwable exc) {

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

@ -2,7 +2,7 @@ package org.capnproto;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
interface RequestHook { public interface RequestHook {
RemotePromise<AnyPointer.Reader> send(); RemotePromise<AnyPointer.Reader> send();
CompletableFuture<?> sendStreaming(); CompletableFuture<?> sendStreaming();
Object getBrand(); Object getBrand();

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

@ -1,16 +1,20 @@
package org.capnproto; package org.capnproto;
class Response { class Response<Results> {
final FromPointerReader<Results> factory;
final ResponseHook hook; final ResponseHook hook;
final AnyPointer.Reader results; final AnyPointer.Reader results;
public Response(AnyPointer.Reader reader, ResponseHook hook) { public Response(FromPointerReader<Results> factory,
AnyPointer.Reader reader,
ResponseHook hook) {
this.factory = factory;
this.hook = hook; this.hook = hook;
this.results = reader; this.results = reader;
} }
public final <T> T getAs(FromPointerReader<T> factory) { public final Results get() {
return this.results.getAs(factory); return this.results.getAs(factory);
} }
} }