Use a single identifier generator in all commands

[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 8a2ebfe..6eeddd9 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java
@@ -4,12 +4,17 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
+import java.util.List;
 import java.util.Objects;
 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;
@@ -21,6 +26,7 @@ import net.pterodactylus.fcp.TestDDAComplete;
 import net.pterodactylus.fcp.TestDDAReply;
 import net.pterodactylus.fcp.TestDDARequest;
 import net.pterodactylus.fcp.TestDDAResponse;
+import net.pterodactylus.fcp.URIGenerated;
 import net.pterodactylus.fcp.UploadFrom;
 
 import com.google.common.util.concurrent.ListenableFuture;
@@ -28,7 +34,7 @@ import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 
 /**
- * Default {@link ClientPutCommand} implemented based on {@link FcpReplySequence}.
+ * Default {@link ClientPutCommand} implemented based on {@link FcpDialog}.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
@@ -36,15 +42,24 @@ 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<>();
        private final AtomicLong length = new AtomicLong();
        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
+       public ClientPutCommand onKeyGenerated(Consumer<String> keyGenerated) {
+               keyGenerateds.add(keyGenerated);
+               return this;
        }
 
        @Override
@@ -54,32 +69,37 @@ class ClientPutCommandImpl implements ClientPutCommand {
        }
 
        @Override
-       public WithUri<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<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<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<Optional<Key>> length(long length) {
+       private WithUri length(long length) {
                this.length.set(length);
                return this::key;
        }
 
-       private ListenableFuture<Optional<Key>> key(String uri) {
-               String identifier = new RandomIdentifierGenerator().generate();
-               ClientPut clientPut = createClientPutCommand(uri, identifier);
-               return threadPool.submit(() -> new ClientPutReplySequence().send(clientPut).get());
+       private Executable<Optional<Key>> key(String uri) {
+               return () -> threadPool.submit(() -> execute(uri));
+       }
+
+       private Optional<Key> execute(String uri) throws InterruptedException, ExecutionException, IOException {
+               ClientPut clientPut = createClientPutCommand(uri, identifierGenerator.get());
+               try (ClientPutDialog clientPutDialog = new ClientPutDialog()) {
+                       return clientPutDialog.send(clientPut).get();
+               }
        }
 
        private ClientPut createClientPutCommand(String uri, String identifier) {
@@ -116,14 +136,14 @@ class ClientPutCommandImpl implements ClientPutCommand {
                return clientPut;
        }
 
-       private class ClientPutReplySequence extends FcpReplySequence<Optional<Key>> {
+       private class ClientPutDialog extends FcpDialog<Optional<Key>> {
 
                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 ClientPutReplySequence() throws IOException {
+               public ClientPutDialog() throws IOException {
                        super(ClientPutCommandImpl.this.threadPool, ClientPutCommandImpl.this.connectionSupplier.get());
                }
 
@@ -148,6 +168,13 @@ class ClientPutCommandImpl implements ClientPutCommand {
                }
 
                @Override
+               protected void consumeURIGenerated(URIGenerated uriGenerated) {
+                       for (Consumer<String> keyGenerated : keyGenerateds) {
+                               keyGenerated.accept(uriGenerated.getURI());
+                       }
+               }
+
+               @Override
                protected void consumePutSuccessful(PutSuccessful putSuccessful) {
                        finalKey.set(new Key(putSuccessful.getURI()));
                        putFinished.set(true);
@@ -184,11 +211,6 @@ class ClientPutCommandImpl implements ClientPutCommand {
                        sendMessage(originalClientPut.get());
                }
 
-               @Override
-               protected void consumeConnectionClosed(Throwable throwable) {
-                       putFinished.set(true);
-               }
-
        }
 
 }