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 net.pterodactylus.fcp.ClientPut;
import net.pterodactylus.fcp.FcpMessage;
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;
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>
*/
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) {
this.threadPool = MoreExecutors.listeningDecorator(threadPool);
}
@Override
+ public ClientPutCommand onKeyGenerated(Consumer<String> keyGenerated) {
+ keyGenerateds.add(keyGenerated);
+ return this;
+ }
+
+ @Override
public ClientPutCommand named(String targetFilename) {
this.targetFilename.set(targetFilename);
return this;
}
private Executable<Optional<Key>> key(String uri) {
+ return () -> threadPool.submit(() -> execute(uri));
+ }
+
+ private Optional<Key> execute(String uri) throws InterruptedException, ExecutionException, IOException {
String identifier = new RandomIdentifierGenerator().generate();
ClientPut clientPut = createClientPutCommand(uri, identifier);
- return () -> threadPool.submit(() -> new ClientPutReplySequence().send(clientPut).get());
+ try (ClientPutDialog clientPutDialog = new ClientPutDialog()) {
+ return clientPutDialog.send(clientPut).get();
+ }
}
private ClientPut createClientPutCommand(String uri, String identifier) {
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());
}
}
@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);