Refactor FCP dialog

[jFCPlib.git] / src / main / java / net / pterodactylus / fcp / quelaton / GetNodeCommandImpl.java

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/GetNodeCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/GetNodeCommandImpl.java
index 2447179..d6999f2 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/quelaton/GetNodeCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/GetNodeCommandImpl.java
@@ -4,7 +4,7 @@ import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 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;
@@ -14,7 +14,7 @@ import com.google.common.util.concurrent.ListeningExecutorService;
 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>
  */
@@ -22,13 +22,15 @@ public class GetNodeCommandImpl implements GetNodeCommand {
 
        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
@@ -51,38 +53,26 @@ public class GetNodeCommandImpl implements GetNodeCommand {
 
        @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 {
-                       super(threadPool, connectionSupplier.get());
-               }
-
-               @Override
-               protected boolean isFinished() {
-                       return nodeData.get() != null;
-               }
-
-               @Override
-               protected NodeData getResult() {
-                       return nodeData.get();
+               public GetNodeDialog() throws IOException {
+                       super(threadPool, connectionSupplier.get(), null);
                }
 
                @Override
                protected void consumeNodeData(NodeData nodeData) {
-                       this.nodeData.set(nodeData);
+                       setResult(nodeData);
                }
 
        }