X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fquelaton%2FDefaultFcpClient.java;h=8d2afc0a5a06f22aa4bfbf56e11f108100d94e90;hb=d558b6c8d41b6b25adf49eadda1dae32af2c5933;hp=1d7c02c2365065a7909e63498ec7c6806643a2ce;hpb=e7fe15a311e143a2154bfc62ed21cdf591b9a27f;p=jFCPlib.git

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/DefaultFcpClient.java b/src/main/java/net/pterodactylus/fcp/quelaton/DefaultFcpClient.java
index 1d7c02c..8d2afc0 100644
--- a/src/main/java/net/pterodactylus/fcp/quelaton/DefaultFcpClient.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/DefaultFcpClient.java
@@ -3,14 +3,10 @@ package net.pterodactylus.fcp.quelaton;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
-import net.pterodactylus.fcp.ClientHello;
-import net.pterodactylus.fcp.CloseConnectionDuplicateClientName;
 import net.pterodactylus.fcp.FcpConnection;
-import net.pterodactylus.fcp.NodeHello;
 
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -46,17 +42,16 @@ public class DefaultFcpClient implements FcpClient {
 	}
 
 	private FcpConnection createConnection() throws IOException {
-		FcpConnection connection = new FcpConnection(hostname, port);
-		connection.connect();
-		FcpReplySequence<?> nodeHelloSequence = new ClientHelloReplySequence(connection);
-		ClientHello clientHello = new ClientHello(clientName.get(), "2.0");
 		try {
-			nodeHelloSequence.send(clientHello).get();
+			return new ClientHelloImpl(threadPool, hostname, port).withName(clientName.get()).execute().get();
 		} catch (InterruptedException | ExecutionException e) {
-			connection.close();
-			throw new IOException(String.format("Could not connect to %s:%d.", hostname, port), e);
+			throw new IOException(e);
 		}
-		return connection;
+	}
+
+	@Override
+	public GetNodeCommand getNode() {
+		return new GetNodeCommandImpl(threadPool, this::connect);
 	}
 
 	@Override
@@ -79,34 +74,5 @@ public class DefaultFcpClient implements FcpClient {
 		return new ListPeersCommandImpl(threadPool, this::connect);
 	}
 
-	private class ClientHelloReplySequence extends FcpReplySequence<Void> {
-
-		private final AtomicReference<NodeHello> receivedNodeHello;
-		private final AtomicBoolean receivedClosed;
-
-		public ClientHelloReplySequence(FcpConnection connection) {
-			super(DefaultFcpClient.this.threadPool, connection);
-			receivedNodeHello = new AtomicReference<>();
-			receivedClosed = new AtomicBoolean();
-		}
-
-		@Override
-		protected boolean isFinished() {
-			return receivedNodeHello.get() != null || receivedClosed.get();
-		}
-
-		@Override
-		protected void consumeNodeHello(NodeHello nodeHello) {
-			receivedNodeHello.set(nodeHello);
-		}
-
-		@Override
-		protected void consumeCloseConnectionDuplicateClientName(
-			CloseConnectionDuplicateClientName closeConnectionDuplicateClientName) {
-			receivedClosed.set(true);
-		}
-
-	}
-
 }