X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fquelaton%2FDefaultFcpClient.java;h=1d7c02c2365065a7909e63498ec7c6806643a2ce;hb=207d6e210e81e7dfa3fb7931aecbfe1d251f6c7c;hp=9cb098155e33c0c68bf4f1f619b3775d0ef9a8e6;hpb=aa659bcdaa77efb1e902a279a3505964d26e09ff;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 9cb0981..1d7c02c 100644
--- a/src/main/java/net/pterodactylus/fcp/quelaton/DefaultFcpClient.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/DefaultFcpClient.java
@@ -3,7 +3,6 @@ package net.pterodactylus.fcp.quelaton;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
@@ -11,10 +10,10 @@ import java.util.function.Supplier;
 import net.pterodactylus.fcp.ClientHello;
 import net.pterodactylus.fcp.CloseConnectionDuplicateClientName;
 import net.pterodactylus.fcp.FcpConnection;
-import net.pterodactylus.fcp.FcpKeyPair;
-import net.pterodactylus.fcp.GenerateSSK;
 import net.pterodactylus.fcp.NodeHello;
-import net.pterodactylus.fcp.SSKKeypair;
+
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
 
 /**
  * Default {@link FcpClient} implementation.
@@ -23,43 +22,34 @@ import net.pterodactylus.fcp.SSKKeypair;
  */
 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 void connect() throws IOException {
-		if (fcpConnection.get() != null) {
-			return;
+	private FcpConnection connect() throws IOException {
+		FcpConnection fcpConnection = this.fcpConnection.get();
+		if (fcpConnection != null) {
+			return fcpConnection;
 		}
-		fcpConnection.compareAndSet(null, createConnection());
+		fcpConnection = createConnection();
+		this.fcpConnection.compareAndSet(null, fcpConnection);
+		return fcpConnection;
 	}
 
 	private FcpConnection createConnection() throws IOException {
 		FcpConnection connection = new FcpConnection(hostname, port);
 		connection.connect();
-		AtomicReference<NodeHello> receivedNodeHello = new AtomicReference<>();
-		AtomicBoolean receivedClosed = new AtomicBoolean();
-		FcpReplySequence nodeHelloSequence = new FcpReplySequence(threadPool, connection);
-		nodeHelloSequence
-				.handle(NodeHello.class)
-				.with((nodeHello) -> receivedNodeHello.set(nodeHello));
-		nodeHelloSequence
-				.handle(CloseConnectionDuplicateClientName.class)
-				.with((closeConnection) -> receivedClosed.set(true));
-		nodeHelloSequence.waitFor(() -> receivedNodeHello.get() != null || receivedClosed.get());
-		ClientHello clientHello = new ClientHello(clientName.get(), expectedVersion.get());
+		FcpReplySequence<?> nodeHelloSequence = new ClientHelloReplySequence(connection);
+		ClientHello clientHello = new ClientHello(clientName.get(), "2.0");
 		try {
 			nodeHelloSequence.send(clientHello).get();
 		} catch (InterruptedException | ExecutionException e) {
@@ -71,42 +61,52 @@ public class DefaultFcpClient implements FcpClient {
 
 	@Override
 	public GenerateKeypairCommand generateKeypair() {
-		return new GenerateKeypairCommandImpl();
+		return new GenerateKeypairCommandImpl(threadPool, this::connect);
 	}
 
-	private class GenerateKeypairCommandImpl implements GenerateKeypairCommand {
+	@Override
+	public ClientGetCommand clientGet() {
+		return new ClientGetCommandImpl(threadPool, this::connect);
+	}
 
-		@Override
-		public Future<FcpKeyPair> execute() {
-			return threadPool.submit(() -> {
-				connect();
-				Sequence sequence = new Sequence();
-				FcpReplySequence replySequence = new FcpReplySequence(threadPool, fcpConnection.get());
-				replySequence.handle(SSKKeypair.class).with(sequence::handleSSKKeypair);
-				replySequence.waitFor(sequence::isFinished);
-				replySequence.send(new GenerateSSK()).get();
-				return sequence.getKeyPair();
-			});
-		}
+	@Override
+	public ClientPutCommand clientPut() {
+		return new ClientPutCommandImpl(threadPool, this::connect);
+	}
 
-		private class Sequence {
+	@Override
+	public ListPeersCommand listPeers() {
+		return new ListPeersCommandImpl(threadPool, this::connect);
+	}
 
-			private AtomicReference<FcpKeyPair> keyPair = new AtomicReference<>();
+	private class ClientHelloReplySequence extends FcpReplySequence<Void> {
 
-			public void handleSSKKeypair(SSKKeypair sskKeypair) {
-				keyPair.set(new FcpKeyPair(sskKeypair.getRequestURI(), sskKeypair.getInsertURI()));
-			}
+		private final AtomicReference<NodeHello> receivedNodeHello;
+		private final AtomicBoolean receivedClosed;
 
-			public boolean isFinished() {
-				return keyPair.get() != null;
-			}
+		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();
+		}
 
-			public FcpKeyPair getKeyPair() {
-				return keyPair.get();
-			}
+		@Override
+		protected void consumeNodeHello(NodeHello nodeHello) {
+			receivedNodeHello.set(nodeHello);
+		}
 
+		@Override
+		protected void consumeCloseConnectionDuplicateClientName(
+			CloseConnectionDuplicateClientName closeConnectionDuplicateClientName) {
+			receivedClosed.set(true);
 		}
 
 	}
 
 }
+