X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fquelaton%2FFcpReplySequence.java;h=afaac4c614d280807f033007e4c28a4cf65ad049;hb=7c28553f5be04a7db175af2612df65afe54d29ce;hp=25db84713e8689caa87fa28e38fa329672cf5447;hpb=28e284e354ca3825675010f36c2b16b11c5f70ef;p=jFCPlib.git

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/FcpReplySequence.java b/src/main/java/net/pterodactylus/fcp/quelaton/FcpReplySequence.java
index 25db847..afaac4c 100644
--- a/src/main/java/net/pterodactylus/fcp/quelaton/FcpReplySequence.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/FcpReplySequence.java
@@ -1,11 +1,15 @@
 package net.pterodactylus.fcp.quelaton;
 
 import java.io.IOException;
+import java.util.Objects;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
 import net.pterodactylus.fcp.AllData;
+import net.pterodactylus.fcp.BaseMessage;
 import net.pterodactylus.fcp.CloseConnectionDuplicateClientName;
 import net.pterodactylus.fcp.ConfigData;
 import net.pterodactylus.fcp.DataFound;
@@ -46,6 +50,10 @@ import net.pterodactylus.fcp.URIGenerated;
 import net.pterodactylus.fcp.UnknownNodeIdentifier;
 import net.pterodactylus.fcp.UnknownPeerNoteType;
 
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+
 /**
  * An FCP reply sequence enables you to conveniently wait for a specific set of FCP replies.
  *
@@ -54,27 +62,36 @@ import net.pterodactylus.fcp.UnknownPeerNoteType;
 public abstract class FcpReplySequence<R> implements AutoCloseable, FcpListener {
 
 	private final Object syncObject = new Object();
-	private final ExecutorService executorService;
+	private final ListeningExecutorService executorService;
 	private final FcpConnection fcpConnection;
+	private final Queue<FcpMessage> messages = new ConcurrentLinkedQueue<>();
+	private final AtomicReference<String> identifier = new AtomicReference<>();
 
 	public FcpReplySequence(ExecutorService executorService, FcpConnection fcpConnection) {
-		this.executorService = executorService;
+		this.executorService = MoreExecutors.listeningDecorator(executorService);
 		this.fcpConnection = fcpConnection;
 	}
 
+	protected void setIdentifier(String identifier) {
+		this.identifier.set(identifier);
+	}
+
 	protected abstract boolean isFinished();
 
-	public Future<R> send(FcpMessage fcpMessage) throws IOException {
-		try {
+	public ListenableFuture<R> send(FcpMessage fcpMessage) throws IOException {
+		setIdentifier(fcpMessage.getField("Identifier"));
 		fcpConnection.addFcpListener(this);
-
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-		fcpConnection.sendMessage(fcpMessage);
+		messages.add(fcpMessage);
 		return executorService.submit(() -> {
 			synchronized (syncObject) {
-				while (!isFinished()) {
+				while (!isFinished() || !messages.isEmpty()) {
+					while (messages.peek() != null) {
+						FcpMessage message = messages.poll();
+						fcpConnection.sendMessage(message);
+					}
+					if (isFinished()) {
+						continue;
+					}
 					syncObject.wait();
 				}
 			}
@@ -82,6 +99,17 @@ public abstract class FcpReplySequence<R> implements AutoCloseable, FcpListener
 		});
 	}
 
+	protected void sendMessage(FcpMessage fcpMessage) {
+		messages.add(fcpMessage);
+		notifySyncObject();
+	}
+
+	private void notifySyncObject() {
+		synchronized (syncObject) {
+			syncObject.notifyAll();
+		}
+	}
+
 	protected R getResult() {
 		return null;
 	}
@@ -91,25 +119,28 @@ public abstract class FcpReplySequence<R> implements AutoCloseable, FcpListener
 		fcpConnection.removeFcpListener(this);
 	}
 
-	private <M> void consume(Consumer<M> consumer,  M message) {
-		consumer.accept(message);
-		synchronized (syncObject) {
-			syncObject.notifyAll();
+	private <M extends BaseMessage> void consume(Consumer<M> consumer, M message) {
+		consume(consumer, message, "Identifier");
+	}
+
+	private <M extends BaseMessage> void consume(Consumer<M> consumer, M message,
+			String identifier) {
+		if (Objects.equals(message.getField(identifier), this.identifier.get())) {
+			consumer.accept(message);
+			notifySyncObject();
 		}
 	}
 
 	private void consumeUnknown(FcpMessage fcpMessage) {
-		consumeUnknownMessage(fcpMessage);
-		synchronized (syncObject) {
-			syncObject.notifyAll();
+		if (Objects.equals(fcpMessage.getField("Identifier"), identifier.get())) {
+			consumeUnknownMessage(fcpMessage);
+			notifySyncObject();
 		}
 	}
 
 	private void consumeClose(Throwable throwable) {
 		consumeConnectionClosed(throwable);
-		synchronized (syncObject) {
-			syncObject.notifyAll();
-		}
+		notifySyncObject();
 	}
 
 	@Override
@@ -178,14 +209,14 @@ public abstract class FcpReplySequence<R> implements AutoCloseable, FcpListener
 
 	@Override
 	public final void receivedTestDDAReply(FcpConnection fcpConnection, TestDDAReply testDDAReply) {
-		consume(this::consumeTestDDAReply, testDDAReply);
+		consume(this::consumeTestDDAReply, testDDAReply, "Directory");
 	}
 
 	protected void consumeTestDDAReply(TestDDAReply testDDAReply) { }
 
 	@Override
 	public final void receivedTestDDAComplete(FcpConnection fcpConnection, TestDDAComplete testDDAComplete) {
-		consume(this::consumeTestDDAComplete, testDDAComplete);
+		consume(this::consumeTestDDAComplete, testDDAComplete, "Directory");
 	}
 
 	protected void consumeTestDDAComplete(TestDDAComplete testDDAComplete) { }