Refactor FCP dialog

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

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java
index 1b322f3..982fd76 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java
@@ -10,10 +10,10 @@ import java.util.Optional;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import net.pterodactylus.fcp.ClientPut;
 import net.pterodactylus.fcp.FcpMessage;
@@ -41,6 +41,7 @@ class ClientPutCommandImpl implements ClientPutCommand {
 
        private final ListeningExecutorService threadPool;
        private final ConnectionSupplier connectionSupplier;
+       private final Supplier<String> identifierGenerator;
        private final AtomicReference<String> redirectUri = new AtomicReference<>();
        private final AtomicReference<File> file = new AtomicReference<>();
        private final AtomicReference<InputStream> payload = new AtomicReference<>();
@@ -48,9 +49,10 @@ class ClientPutCommandImpl implements ClientPutCommand {
        private final AtomicReference<String> targetFilename = new AtomicReference<>();
        private final List<Consumer<String>> keyGenerateds = new CopyOnWriteArrayList<>();
 
-       public ClientPutCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier) {
+       public ClientPutCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier, Supplier<String> identifierGenerator) {
                this.threadPool = MoreExecutors.listeningDecorator(threadPool);
                this.connectionSupplier = connectionSupplier;
+               this.identifierGenerator = identifierGenerator;
        }
 
        @Override
@@ -66,24 +68,24 @@ class ClientPutCommandImpl implements ClientPutCommand {
        }
 
        @Override
-       public WithUri<Executable<Optional<Key>>> redirectTo(String uri) {
+       public WithUri redirectTo(String uri) {
                this.redirectUri.set(Objects.requireNonNull(uri, "uri must not be null"));
                return this::key;
        }
 
        @Override
-       public WithUri<Executable<Optional<Key>>> from(File file) {
+       public WithUri from(File file) {
                this.file.set(Objects.requireNonNull(file, "file must not be null"));
                return this::key;
        }
 
        @Override
-       public WithLength<WithUri<Executable<Optional<Key>>>> from(InputStream inputStream) {
+       public WithLength from(InputStream inputStream) {
                payload.set(Objects.requireNonNull(inputStream, "inputStream must not be null"));
                return this::length;
        }
 
-       private WithUri<Executable<Optional<Key>>> length(long length) {
+       private WithUri length(long length) {
                this.length.set(length);
                return this::key;
        }
@@ -93,8 +95,7 @@ class ClientPutCommandImpl implements ClientPutCommand {
        }
 
        private Optional<Key> execute(String uri) throws InterruptedException, ExecutionException, IOException {
-               String identifier = new RandomIdentifierGenerator().generate();
-               ClientPut clientPut = createClientPutCommand(uri, identifier);
+               ClientPut clientPut = createClientPutCommand(uri, identifierGenerator.get());
                try (ClientPutDialog clientPutDialog = new ClientPutDialog()) {
                        return clientPutDialog.send(clientPut).get();
                }
@@ -138,21 +139,9 @@ class ClientPutCommandImpl implements ClientPutCommand {
 
                private final AtomicReference<FcpMessage> originalClientPut = new AtomicReference<>();
                private final AtomicReference<String> directory = new AtomicReference<>();
-               private final AtomicReference<Key> finalKey = new AtomicReference<>();
-               private final AtomicBoolean putFinished = new AtomicBoolean();
 
                public ClientPutDialog() throws IOException {
-                       super(ClientPutCommandImpl.this.threadPool, ClientPutCommandImpl.this.connectionSupplier.get());
-               }
-
-               @Override
-               protected boolean isFinished() {
-                       return putFinished.get();
-               }
-
-               @Override
-               protected Optional<Key> getResult() {
-                       return Optional.ofNullable(finalKey.get());
+                       super(ClientPutCommandImpl.this.threadPool, ClientPutCommandImpl.this.connectionSupplier.get(), Optional.<Key>empty());
                }
 
                @Override
@@ -174,13 +163,12 @@ class ClientPutCommandImpl implements ClientPutCommand {
 
                @Override
                protected void consumePutSuccessful(PutSuccessful putSuccessful) {
-                       finalKey.set(new Key(putSuccessful.getURI()));
-                       putFinished.set(true);
+                       setResult(Optional.of(new Key(putSuccessful.getURI())));
                }
 
                @Override
                protected void consumePutFailed(PutFailed putFailed) {
-                       putFinished.set(true);
+                       finish();
                }
 
                @Override
@@ -189,7 +177,7 @@ class ClientPutCommandImpl implements ClientPutCommand {
                                setIdentifier(directory.get());
                                sendMessage(new TestDDARequest(directory.get(), true, false));
                        } else {
-                               putFinished.set(true);
+                               finish();
                        }
                }