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

get rid of PipelineBase and PipelineImpl again

Browse source
This commit is contained in:
Vaci Koblizek 2020-10-30 18:27:21 +00:00
parent 8eacc8cada
commit d515500996
5 changed files with 26 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compiler/src/main/cpp/capnpc-java.c++
View file

@ -1665,7 +1665,7 @@ private:
KJ_MAP(n, nestedTypeDecls) { return kj::mv(n); },
//spaces(indent), " public interface Pipeline", readerTypeParams, " extends org.capnproto.RemotePromise<Reader", readerTypeParams, "> {\n",
spaces(indent), " public interface Pipeline", readerTypeParams, " extends org.capnproto.PipelineBase {\n",
spaces(indent), " public interface Pipeline", readerTypeParams, " extends org.capnproto.Pipeline {\n",
//spaces(indent), " private final org.capnproto.PipelineImpl typeless;\n",
//spaces(indent), " org.capnproto.AnyPointer.Pipeline getTypeless();\n",
//spaces(indent), " public Pipeline(",

30
runtime/src/main/java/org/capnproto/AnyPointer.java
View file

@ -35,9 +35,6 @@ public final class AnyPointer {
result.clear();
return result;
}
public Pipeline newPipeline(PipelineImpl typeless) {
return new AnyPointer.Pipeline(typeless.hook, typeless.ops);
}
}
public static final Factory factory = new Factory();
@ -145,20 +142,41 @@ public final class AnyPointer {
}
}
public static class Pipeline extends PipelineImpl implements PipelineBase {
public static class Pipeline implements org.capnproto.Pipeline {
protected final PipelineHook hook;
protected final PipelineOp[] ops;
public Pipeline(PipelineHook hook) {
this(hook, new PipelineOp[0]);
}
Pipeline(PipelineHook hook, PipelineOp[] ops) {
super(hook, ops);
this.hook = hook;
this.ops = ops;
}
@Override
public Pipeline typelessPipeline() {
return this;
}
Pipeline noop() {
return new Pipeline(this.hook, this.ops.clone());
}
public ClientHook asCap() {
return this.hook.getPipelinedCap(ops);
}
public Pipeline getPointerField(short pointerIndex) {
var newOps = new PipelineOp[this.ops.length + 1];
for (int ii = 0; ii < this.ops.length; ++ii) {
newOps[ii] = this.ops[ii];
}
newOps[this.ops.length] = PipelineOp.PointerField(pointerIndex);
return new Pipeline(this.hook, newOps);
}
}
public static final class Request
@ -186,7 +204,7 @@ public final class AnyPointer {
public RequestHook getHook() {
return this.requestHook;
}
@Override
public FromPointerBuilder<Builder> getParamsFactory() {
return AnyPointer.factory;

2
runtime/src/main/java/org/capnproto/PipelineBase.java → runtime/src/main/java/org/capnproto/Pipeline.java
View file

@ -1,5 +1,5 @@
package org.capnproto;
public interface PipelineBase {
public interface Pipeline {
AnyPointer.Pipeline typelessPipeline();
}

5
runtime/src/main/java/org/capnproto/PipelineFactory.java
View file

@ -1,5 +0,0 @@
package org.capnproto;
public interface PipelineFactory<Pipeline> {
Pipeline newPipeline(RemotePromise<AnyPointer.Reader> promise, PipelineImpl typeless);
}

32
runtime/src/main/java/org/capnproto/PipelineImpl.java
View file

@ -1,32 +0,0 @@
package org.capnproto;
public class PipelineImpl {
protected final PipelineHook hook;
protected final PipelineOp[] ops;
public PipelineImpl(PipelineHook hook) {
this(hook, new PipelineOp[0]);
}
public PipelineImpl(PipelineHook hook, PipelineOp[] ops) {
this.hook = hook;
this.ops = ops;
}
PipelineImpl noop() {
return new PipelineImpl(this.hook, this.ops.clone());
}
public ClientHook asCap() {
return this.hook.getPipelinedCap(ops);
}
public AnyPointer.Pipeline getPointerField(short pointerIndex) {
var newOps = new PipelineOp[this.ops.length+1];
for (int ii = 0; ii < this.ops.length; ++ii) {
newOps[ii] = this.ops[ii];
}
newOps[this.ops.length] = PipelineOp.PointerField(pointerIndex);
return new AnyPointer.Pipeline(this.hook, newOps);
}
}