Refactor FCP dialog

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

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/GenerateKeypairCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/GenerateKeypairCommandImpl.java
index d5f30d6..5a96450 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/quelaton/GenerateKeypairCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/GenerateKeypairCommandImpl.java
@@ -1,9 +1,8 @@
 package net.pterodactylus.fcp.quelaton;
 
 import java.io.IOException;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicReference;
 
 import net.pterodactylus.fcp.FcpKeyPair;
 import net.pterodactylus.fcp.GenerateSSK;
@@ -30,30 +29,24 @@ class GenerateKeypairCommandImpl implements GenerateKeypairCommand {
 
        @Override
        public ListenableFuture<FcpKeyPair> execute() {
-               return threadPool.submit(() -> new FcpKeyPairReplySequence().send(new GenerateSSK()).get());
+               return threadPool.submit(this::executeDialog);
        }
 
-       private class FcpKeyPairReplySequence extends FcpReplySequence<FcpKeyPair> {
-
-               private AtomicReference<FcpKeyPair> keyPair = new AtomicReference<>();
-
-               public FcpKeyPairReplySequence() throws IOException {
-                       super(GenerateKeypairCommandImpl.this.threadPool, GenerateKeypairCommandImpl.this.connectionSupplier.get());
+       private FcpKeyPair executeDialog() throws InterruptedException, ExecutionException, IOException {
+               try (FcpKeyPairDialog fcpKeyPairDialog = new FcpKeyPairDialog()) {
+                       return fcpKeyPairDialog.send(new GenerateSSK()).get();
                }
+       }
 
-               @Override
-               protected boolean isFinished() {
-                       return keyPair.get() != null;
-               }
+       private class FcpKeyPairDialog extends FcpDialog<FcpKeyPair> {
 
-               @Override
-               protected FcpKeyPair getResult() {
-                       return keyPair.get();
+               public FcpKeyPairDialog() throws IOException {
+                       super(GenerateKeypairCommandImpl.this.threadPool, GenerateKeypairCommandImpl.this.connectionSupplier.get(), null);
                }
 
                @Override
                protected void consumeSSKKeypair(SSKKeypair sskKeypair) {
-                       keyPair.set(new FcpKeyPair(sskKeypair.getRequestURI(), sskKeypair.getInsertURI()));
+                       setResult(new FcpKeyPair(sskKeypair.getRequestURI(), sskKeypair.getInsertURI()));
                }
 
        }