X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fquelaton%2FDefaultFcpClient.java;h=3dd0b7692ef25d5c7ba6ea9b1d7dbc6397d899ec;hb=e591c6488b692e3dfcf2efd1905d399f39c6067f;hp=30dac917bf451624dd386ab1d29b9216090e6956;hpb=9970ce4a2868da05e778ec998afb0a899a133959;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 30dac91..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,17 @@
 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;
 
 /**
  * Default {@link FcpClient} implementation.
@@ -19,62 +20,40 @@ import net.pterodactylus.fcp.NodeHello;
  */
 public class DefaultFcpClient implements FcpClient {
 
-	private final ExecutorService threadPool;
+	private final ListeningExecutorService threadPool;
 	private final String hostname;
 	private final int port;
 	private final AtomicReference<FcpConnection> fcpConnection = new AtomicReference<>();
 	private final Supplier<String> clientName;
-	private final Supplier<String> expectedVersion;
 
-	public DefaultFcpClient(ExecutorService threadPool, String hostname, int port, Supplier<String> clientName,
-			Supplier<String> expectedVersion) {
-		this.threadPool = threadPool;
+	public DefaultFcpClient(ExecutorService threadPool, String hostname, int port, Supplier<String> clientName) {
+		this.threadPool = MoreExecutors.listeningDecorator(threadPool);
 		this.hostname = hostname;
 		this.port = port;
 		this.clientName = clientName;
-		this.expectedVersion = expectedVersion;
 	}
 
 	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 FcpReplySequence<Void>(threadPool, connection) {
-			private final AtomicReference<NodeHello> receivedNodeHello = new AtomicReference<>();
-			private final AtomicBoolean 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);
-			}
-		};
-		ClientHello clientHello = new ClientHello(clientName.get(), expectedVersion.get());
 		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
@@ -87,5 +66,35 @@ public class DefaultFcpClient implements FcpClient {
 		return new ClientGetCommandImpl(threadPool, this::connect);
 	}
 
+	@Override
+	public ClientPutCommand clientPut() {
+		return new ClientPutCommandImpl(threadPool, this::connect);
+	}
+
+	@Override
+	public ListPeerCommand listPeer() {
+		return new ListPeerCommandImpl(threadPool, this::connect);
+	}
+
+	@Override
+	public ListPeersCommand listPeers() {
+		return new ListPeersCommandImpl(threadPool, this::connect);
+	}
+
+	@Override
+	public AddPeerCommand addPeer() {
+		return new AddPeerCommandImpl(threadPool, this::connect);
+	}
+
+	@Override
+	public ModifyPeerCommand modifyPeer() {
+		return new ModifyPeerCommandImpl(threadPool, this::connect);
+	}
+
+	@Override
+	public ListPeerNotesCommand listPeerNotes() {
+		return new ListPeerNotesCommandImpl(threadPool, this::connect);
+	}
+
 }