X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fquelaton%2FDefaultFcpClient.java;h=3dd0b7692ef25d5c7ba6ea9b1d7dbc6397d899ec;hb=e591c6488b692e3dfcf2efd1905d399f39c6067f;hp=1f31d91a83a6ab2cc07c6cd0a452cd2fa421c34a;hpb=7b56cfbede438a0bfa113ca2fac36913047018bd;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 1f31d91..3dd0b76 100644
--- a/src/main/java/net/pterodactylus/fcp/quelaton/DefaultFcpClient.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/DefaultFcpClient.java
@@ -1,16 +1,14 @@
 package net.pterodactylus.fcp.quelaton;
 
 import java.io.IOException;
+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.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 net.pterodactylus.fcp.Peer;
 
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -37,26 +35,25 @@ public class DefaultFcpClient implements FcpClient {
 
 	private FcpConnection connect() throws IOException {
 		FcpConnection fcpConnection = this.fcpConnection.get();
-		if (fcpConnection != null) {
+		if ((fcpConnection != null) && !fcpConnection.isClosed()) {
 			return fcpConnection;
 		}
 		fcpConnection = createConnection();
-		this.fcpConnection.compareAndSet(null, fcpConnection);
+		this.fcpConnection.set(fcpConnection);
 		return fcpConnection;
 	}
 
 	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
@@ -74,33 +71,29 @@ public class DefaultFcpClient implements FcpClient {
 		return new ClientPutCommandImpl(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
+	public ListPeerCommand listPeer() {
+		return new ListPeerCommandImpl(threadPool, this::connect);
+	}
 
-		@Override
-		protected boolean isFinished() {
-			return receivedNodeHello.get() != null || receivedClosed.get();
-		}
+	@Override
+	public ListPeersCommand listPeers() {
+		return new ListPeersCommandImpl(threadPool, this::connect);
+	}
 
-		@Override
-		protected void consumeNodeHello(NodeHello nodeHello) {
-			receivedNodeHello.set(nodeHello);
-		}
+	@Override
+	public AddPeerCommand addPeer() {
+		return new AddPeerCommandImpl(threadPool, this::connect);
+	}
 
-		@Override
-		protected void consumeCloseConnectionDuplicateClientName(
-			CloseConnectionDuplicateClientName closeConnectionDuplicateClientName) {
-			receivedClosed.set(true);
-		}
+	@Override
+	public ModifyPeerCommand modifyPeer() {
+		return new ModifyPeerCommandImpl(threadPool, this::connect);
+	}
 
+	@Override
+	public ListPeerNotesCommand listPeerNotes() {
+		return new ListPeerNotesCommandImpl(threadPool, this::connect);
 	}
 
 }