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

remove unused getVatIdFactory()

Browse source
This commit is contained in:
Vaci Koblizek 2020-11-19 15:26:21 +00:00
parent 5e797d36a3
commit 68edac583b
4 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
runtime-rpc/src/main/java/org/capnproto/RpcSystem.java
View file

@ -15,7 +15,7 @@ public class RpcSystem<VatId extends StructReader> {
private final Map<VatNetwork.Connection<VatId>, RpcState<VatId>> connections = new ConcurrentHashMap<>(); private final Map<VatNetwork.Connection<VatId>, RpcState<VatId>> connections = new ConcurrentHashMap<>();
public RpcSystem(VatNetwork<VatId> network) { public RpcSystem(VatNetwork<VatId> network) {
this(network, (BootstrapFactory)null); this(network, (BootstrapFactory<VatId>)null);
} }
public RpcSystem(VatNetwork<VatId> network, public RpcSystem(VatNetwork<VatId> network,
@ -26,12 +26,6 @@ public class RpcSystem<VatId extends StructReader> {
public RpcSystem(VatNetwork<VatId> network, public RpcSystem(VatNetwork<VatId> network,
Capability.Client bootstrapInterface) { Capability.Client bootstrapInterface) {
this(network, new BootstrapFactory<VatId>() { this(network, new BootstrapFactory<VatId>() {
@Override
public FromPointerReader<VatId> getVatIdFactory() {
return this.getVatIdFactory();
}
@Override @Override
public Capability.Client createFor(VatId clientId) { public Capability.Client createFor(VatId clientId) {
return bootstrapInterface; return bootstrapInterface;
@ -47,7 +41,7 @@ public class RpcSystem<VatId extends StructReader> {
} }
public Capability.Client bootstrap(VatId vatId) { public Capability.Client bootstrap(VatId vatId) {
var connection = this.getNetwork().connect(vatId); var connection = this.network.connect(vatId);
if (connection != null) { if (connection != null) {
var state = getConnectionState(connection); var state = getConnectionState(connection);
var hook = state.restore(); var hook = state.restore();
@ -66,15 +60,14 @@ public class RpcSystem<VatId extends StructReader> {
} }
RpcState<VatId> getConnectionState(VatNetwork.Connection<VatId> connection) { RpcState<VatId> getConnectionState(VatNetwork.Connection<VatId> connection) {
var state = this.connections.computeIfAbsent(connection, conn -> { return this.connections.computeIfAbsent(connection, conn -> {
var onDisconnect = new CompletableFuture<RpcState.DisconnectInfo>(); var onDisconnect = new CompletableFuture<RpcState.DisconnectInfo>();
onDisconnect.thenCompose(info -> { onDisconnect.thenCompose(info -> {
this.connections.remove(connection); this.connections.remove(connection);
return info.shutdownPromise.thenRun(() -> connection.close()); return info.shutdownPromise.thenRun(connection::close);
}); });
return new RpcState<>(this.bootstrapFactory, conn, onDisconnect); return new RpcState<>(this.bootstrapFactory, conn, onDisconnect);
}); });
return state;
} }
public void accept(VatNetwork.Connection<VatId> connection) { public void accept(VatNetwork.Connection<VatId> connection) {

5
runtime-rpc/src/test/java/org/capnproto/RpcStateTest.java
View file

@ -83,11 +83,6 @@ public class RpcStateTest {
this.connection = new TestConnection(); this.connection = new TestConnection();
this.bootstrapInterface = new Capability.Client(Capability.newNullCap()); this.bootstrapInterface = new Capability.Client(Capability.newNullCap());
var bootstrapFactory = new BootstrapFactory<RpcTwoPartyProtocol.VatId.Reader>() { var bootstrapFactory = new BootstrapFactory<RpcTwoPartyProtocol.VatId.Reader>() {
@Override
public FromPointerReader<RpcTwoPartyProtocol.VatId.Reader> getVatIdFactory() {
return RpcTwoPartyProtocol.VatId.factory;
}
@Override @Override
public Capability.Client createFor(RpcTwoPartyProtocol.VatId.Reader clientId) { public Capability.Client createFor(RpcTwoPartyProtocol.VatId.Reader clientId) {
return bootstrapInterface; return bootstrapInterface;

5
runtime-rpc/src/test/java/org/capnproto/RpcTest.java
View file

@ -281,11 +281,6 @@ public class RpcTest {
} }
static BootstrapFactory<Test.TestSturdyRef.Reader> bootstrapFactory = new BootstrapFactory<>() { static BootstrapFactory<Test.TestSturdyRef.Reader> bootstrapFactory = new BootstrapFactory<>() {
@Override
public FromPointerReader<Test.TestSturdyRef.Reader> getVatIdFactory() {
return Test.TestSturdyRef.factory;
}
@Override @Override
public Capability.Client createFor(Test.TestSturdyRef.Reader refId) { public Capability.Client createFor(Test.TestSturdyRef.Reader refId) {
var callCount = new Counter(); var callCount = new Counter();

3
runtime/src/main/java/org/capnproto/BootstrapFactory.java
View file

@ -1,8 +1,5 @@
package org.capnproto; package org.capnproto;
public interface BootstrapFactory<VatId> { public interface BootstrapFactory<VatId> {
FromPointerReader<VatId> getVatIdFactory();
Capability.Client createFor(VatId clientId); Capability.Client createFor(VatId clientId);
} }