X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fquelaton%2FClientPutCommandImpl.java;h=df345f349fc491381f55cb81164e3ee2f6f7574d;hb=5d5612c9bfcc8c30abca5556f94cbd01c8a1f4be;hp=f0a670616f244fa3c82a41129b2f3a305d4dd29a;hpb=12eb8641be8a71957856ec76c9522d80394e5cd6;p=jFCPlib.git

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java
index f0a6706..df345f3 100644
--- a/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java
@@ -6,6 +6,7 @@ import java.io.InputStream;
 import java.nio.file.Files;
 import java.util.Objects;
 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.AtomicLong;
@@ -54,32 +55,38 @@ class ClientPutCommandImpl implements ClientPutCommand {
 	}
 
 	@Override
-	public Keyed<Optional<Key>> redirectTo(Key key) {
-		this.redirectUri.set(Objects.requireNonNull(key, "key must not be null").getKey());
+	public WithUri<Executable<Optional<Key>>> redirectTo(String uri) {
+		this.redirectUri.set(Objects.requireNonNull(uri, "uri must not be null"));
 		return this::key;
 	}
 
 	@Override
-	public Keyed<Optional<Key>> from(File file) {
+	public WithUri<Executable<Optional<Key>>> from(File file) {
 		this.file.set(Objects.requireNonNull(file, "file must not be null"));
 		return this::key;
 	}
 
 	@Override
-	public Lengthed<Keyed<Optional<Key>>> from(InputStream inputStream) {
+	public WithLength<WithUri<Executable<Optional<Key>>>> from(InputStream inputStream) {
 		payload.set(Objects.requireNonNull(inputStream, "inputStream must not be null"));
 		return this::length;
 	}
 
-	private Keyed<Optional<Key>> length(long length) {
+	private WithUri<Executable<Optional<Key>>> length(long length) {
 		this.length.set(length);
 		return this::key;
 	}
 
-	private ListenableFuture<Optional<Key>> key(Key key) {
+	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(key.getKey(), identifier);
-		return threadPool.submit(() -> new ClientPutReplySequence().send(clientPut).get());
+		ClientPut clientPut = createClientPutCommand(uri, identifier);
+		try (ClientPutReplySequence clientPutReplySequence = new ClientPutReplySequence()) {
+			return clientPutReplySequence.send(clientPut).get();
+		}
 	}
 
 	private ClientPut createClientPutCommand(String uri, String identifier) {
@@ -119,7 +126,6 @@ class ClientPutCommandImpl implements ClientPutCommand {
 	private class ClientPutReplySequence extends FcpReplySequence<Optional<Key>> {
 
 		private final AtomicReference<FcpMessage> originalClientPut = new AtomicReference<>();
-		private final AtomicReference<String> identifier = new AtomicReference<>();
 		private final AtomicReference<String> directory = new AtomicReference<>();
 		private final AtomicReference<Key> finalKey = new AtomicReference<>();
 		private final AtomicBoolean putFinished = new AtomicBoolean();
@@ -141,7 +147,6 @@ class ClientPutCommandImpl implements ClientPutCommand {
 		@Override
 		public ListenableFuture<Optional<Key>> send(FcpMessage fcpMessage) throws IOException {
 			originalClientPut.set(fcpMessage);
-			identifier.set(fcpMessage.getField("Identifier"));
 			String filename = fcpMessage.getField("Filename");
 			if (filename != null) {
 				directory.set(new File(filename).getParent());
@@ -151,49 +156,39 @@ class ClientPutCommandImpl implements ClientPutCommand {
 
 		@Override
 		protected void consumePutSuccessful(PutSuccessful putSuccessful) {
-			if (putSuccessful.getIdentifier().equals(identifier.get())) {
-				finalKey.set(new Key(putSuccessful.getURI()));
-				putFinished.set(true);
-			}
+			finalKey.set(new Key(putSuccessful.getURI()));
+			putFinished.set(true);
 		}
 
 		@Override
 		protected void consumePutFailed(PutFailed putFailed) {
-			if (putFailed.getIdentifier().equals(identifier.get())) {
-				putFinished.set(true);
-			}
+			putFinished.set(true);
 		}
 
 		@Override
 		protected void consumeProtocolError(ProtocolError protocolError) {
-			if (protocolError.getIdentifier().equals(identifier.get()) && (protocolError.getCode() == 25)) {
+			if (protocolError.getCode() == 25) {
+				setIdentifier(directory.get());
 				sendMessage(new TestDDARequest(directory.get(), true, false));
+			} else {
+				putFinished.set(true);
 			}
 		}
 
 		@Override
 		protected void consumeTestDDAReply(TestDDAReply testDDAReply) {
-			if (testDDAReply.getDirectory().equals(directory.get())) {
-				try {
-					String readContent = Files.readAllLines(new File(testDDAReply.getReadFilename()).toPath()).get(0);
-					sendMessage(new TestDDAResponse(directory.get(), readContent));
-				} catch (IOException e) {
-					e.printStackTrace();
-					sendMessage(new TestDDAResponse(directory.get(), "failed-to-read"));
-				}
+			try {
+				String readContent = Files.readAllLines(new File(testDDAReply.getReadFilename()).toPath()).get(0);
+				sendMessage(new TestDDAResponse(directory.get(), readContent));
+			} catch (IOException e) {
+				sendMessage(new TestDDAResponse(directory.get(), "failed-to-read"));
 			}
 		}
 
 		@Override
 		protected void consumeTestDDAComplete(TestDDAComplete testDDAComplete) {
-			if (testDDAComplete.getDirectory().equals(directory.get())) {
-				sendMessage(originalClientPut.get());
-			}
-		}
-
-		@Override
-		protected void consumeConnectionClosed(Throwable throwable) {
-			putFinished.set(true);
+			setIdentifier(originalClientPut.get().getField("Identifier"));
+			sendMessage(originalClientPut.get());
 		}
 
 	}