import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
import net.pterodactylus.fcp.GetNode;
import net.pterodactylus.fcp.NodeData;
import com.google.common.util.concurrent.MoreExecutors;
/**
- * Default {@link GetNodeCommandImpl} implementation based on {@link FcpReplySequence}.
+ * Default {@link GetNodeCommandImpl} implementation based on {@link FcpDialog}.
*
* @author <a href="mailto:bombe@freenetproject.org">David ‘Bombe’ Roden</a>
*/
private final ListeningExecutorService threadPool;
private final ConnectionSupplier connectionSupplier;
+ private final Supplier<String> identifierGenerator;
private final AtomicBoolean giveOpennetRef = new AtomicBoolean(false);
private final AtomicBoolean includePrivate = new AtomicBoolean(false);
private final AtomicBoolean includeVolatile = new AtomicBoolean(false);
- public GetNodeCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier) {
+ public GetNodeCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier, Supplier<String> identifierGenerator) {
this.threadPool = MoreExecutors.listeningDecorator(threadPool);
this.connectionSupplier = connectionSupplier;
+ this.identifierGenerator = identifierGenerator;
}
@Override
@Override
public ListenableFuture<NodeData> execute() {
- return threadPool.submit(this::executeSequence);
+ return threadPool.submit(this::executeDialog);
}
- private NodeData executeSequence() throws InterruptedException, ExecutionException, IOException {
- GetNode getNode = new GetNode(new RandomIdentifierGenerator().generate(), giveOpennetRef.get(),
+ private NodeData executeDialog() throws InterruptedException, ExecutionException, IOException {
+ GetNode getNode = new GetNode(identifierGenerator.get(), giveOpennetRef.get(),
includePrivate.get(), includeVolatile.get());
- try (GetNodeReplySequence getNodeReplySequence = new GetNodeReplySequence()) {
- return getNodeReplySequence.send(getNode).get();
+ try (GetNodeDialog getNodeDialog = new GetNodeDialog()) {
+ return getNodeDialog.send(getNode).get();
}
}
- private class GetNodeReplySequence extends FcpReplySequence<NodeData> {
+ private class GetNodeDialog extends FcpDialog<NodeData> {
private final AtomicReference<NodeData> nodeData = new AtomicReference<>();
- public GetNodeReplySequence() throws IOException {
+ public GetNodeDialog() throws IOException {
super(threadPool, connectionSupplier.get());
}