Refactor FCP dialog

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

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java
index 5dfef6f..9dca0dc 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java
@@ -6,8 +6,8 @@ import java.net.URL;
 import java.util.Optional;
 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.AddPeer;
 import net.pterodactylus.fcp.NodeRef;
@@ -19,7 +19,7 @@ import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 
 /**
- * Default {@link AddPeerCommand} implementation based on {@link FcpReplySequence}.
+ * Default {@link AddPeerCommand} implementation based on {@link FcpDialog}.
  *
  * @author <a href="mailto:bombe@freenetproject.org">David ‘Bombe’ Roden</a>
  */
@@ -27,11 +27,13 @@ public class AddPeerCommandImpl implements AddPeerCommand {
 
        private final ListeningExecutorService threadPool;
        private final ConnectionSupplier connectionSupplier;
+       private final Supplier<String> identifierSupplier;
        private final AtomicReference<File> file = new AtomicReference<>();
        private final AtomicReference<URL> url = new AtomicReference<>();
        private final AtomicReference<NodeRef> nodeRef = new AtomicReference<>();
 
-       public AddPeerCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier) {
+       public AddPeerCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier, Supplier<String> identifierSupplier) {
+               this.identifierSupplier = identifierSupplier;
                this.threadPool = MoreExecutors.listeningDecorator(threadPool);
                this.connectionSupplier = connectionSupplier;
        }
@@ -55,51 +57,37 @@ public class AddPeerCommandImpl implements AddPeerCommand {
        }
 
        private ListenableFuture<Optional<Peer>> execute() {
-               return threadPool.submit(this::executeSequence);
+               return threadPool.submit(this::executeDialog);
        }
 
-       private Optional<Peer> executeSequence() throws IOException, ExecutionException, InterruptedException {
-               AddPeer addPeer = null;
+       private Optional<Peer> executeDialog() throws IOException, ExecutionException, InterruptedException {
+               AddPeer addPeer;
                if (file.get() != null) {
-                       addPeer = new AddPeer(new RandomIdentifierGenerator().generate(), file.get().getPath());
+                       addPeer = new AddPeer(identifierSupplier.get(), file.get().getPath());
                } else if (url.get() != null) {
-                       addPeer = new AddPeer(new RandomIdentifierGenerator().generate(), url.get());
+                       addPeer = new AddPeer(identifierSupplier.get(), url.get());
                } else {
-                       addPeer = new AddPeer(new RandomIdentifierGenerator().generate(), nodeRef.get());
+                       addPeer = new AddPeer(identifierSupplier.get(), nodeRef.get());
                }
-               try (AddPeerSequence addPeerSequence = new AddPeerSequence()) {
-                       return addPeerSequence.send(addPeer).get();
+               try (AddPeerDialog addPeerDialog = new AddPeerDialog()) {
+                       return addPeerDialog.send(addPeer).get();
                }
        }
 
-       private class AddPeerSequence extends FcpReplySequence<Optional<Peer>> {
+       private class AddPeerDialog extends FcpDialog<Optional<Peer>> {
 
-               private final AtomicBoolean finished = new AtomicBoolean();
-               private final AtomicReference<Peer> peer = new AtomicReference<>();
-
-               public AddPeerSequence() throws IOException {
-                       super(threadPool, connectionSupplier.get());
-               }
-
-               @Override
-               protected boolean isFinished() {
-                       return finished.get();
-               }
-
-               @Override
-               protected Optional<Peer> getResult() {
-                       return Optional.ofNullable(peer.get());
+               public AddPeerDialog() throws IOException {
+                       super(threadPool, connectionSupplier.get(), Optional.empty());
                }
 
                @Override
                protected void consumePeer(Peer peer) {
-                       this.peer.set(peer);
-                       finished.set(true);
+                       setResult(Optional.ofNullable(peer));
                }
 
                @Override
                protected void consumeProtocolError(ProtocolError protocolError) {
-                       finished.set(true);
+                       finish();
                }
 
        }