diff --git a/runtime/src/main/java/org/capnproto/Request.java b/runtime/src/main/java/org/capnproto/Request.java index 854c008..29988a1 100644 --- a/runtime/src/main/java/org/capnproto/Request.java +++ b/runtime/src/main/java/org/capnproto/Request.java @@ -6,6 +6,8 @@ public interface Request { FromPointerBuilder getParamsFactory(); + Request getTypelessRequest(); + default Params getParams() { return this.getTypelessRequest().getParams().getAs(this.getParamsFactory()); } @@ -14,7 +16,6 @@ public interface Request { return this.getTypelessRequest().getHook(); } - Request getTypelessRequest(); default RemotePromise sendInternal() { return this.getTypelessRequest().sendInternal(); @@ -23,7 +24,7 @@ public interface Request { static Request newBrokenRequest(FromPointerBuilder paramsFactory, Throwable exc) { - final MessageBuilder message = new MessageBuilder(); + var message = new MessageBuilder(); var hook = new RequestHook() { @Override @@ -36,14 +37,8 @@ public interface Request { public CompletableFuture sendStreaming() { return CompletableFuture.failedFuture(exc); } - - @Override - public Object getBrand() { - return null; - } }; - var root = message.getRoot(AnyPointer.factory); return new Request<>() { @Override public FromPointerBuilder getParamsFactory() { diff --git a/runtime/src/main/java/org/capnproto/RequestHook.java b/runtime/src/main/java/org/capnproto/RequestHook.java index 8bdf9c4..7e90f3e 100644 --- a/runtime/src/main/java/org/capnproto/RequestHook.java +++ b/runtime/src/main/java/org/capnproto/RequestHook.java @@ -3,7 +3,12 @@ package org.capnproto; import java.util.concurrent.CompletionStage; public interface RequestHook { + RemotePromise send(); + CompletionStage sendStreaming(); - Object getBrand(); + + default Object getBrand() { + return null; + } }