X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fquelaton%2FListPeersCommandImpl.java;h=921c0faf9dcffeeaa594b596082e9ec6a00b2fd7;hb=e591c6488b692e3dfcf2efd1905d399f39c6067f;hp=97f38421f5a4eaa6c5ce854c4a5aa4a03cc067c1;hpb=207d6e210e81e7dfa3fb7931aecbfe1d251f6c7c;p=jFCPlib.git diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/ListPeersCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/ListPeersCommandImpl.java index 97f3842..921c0fa 100644 --- a/src/main/java/net/pterodactylus/fcp/quelaton/ListPeersCommandImpl.java +++ b/src/main/java/net/pterodactylus/fcp/quelaton/ListPeersCommandImpl.java @@ -3,19 +3,20 @@ package net.pterodactylus.fcp.quelaton; import java.io.IOException; import java.util.Collection; import java.util.HashSet; +import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicBoolean; import net.pterodactylus.fcp.EndListPeers; import net.pterodactylus.fcp.ListPeers; import net.pterodactylus.fcp.Peer; +import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; /** - * Default {@link ListPeersCommand} implementation based on {@link FcpReplySequence}. + * Default {@link ListPeersCommand} implementation based on {@link FcpDialog}. * * @author David ‘Bombe’ Roden */ @@ -44,18 +45,24 @@ public class ListPeersCommandImpl implements ListPeersCommand { } @Override - public Future> execute() { + public ListenableFuture> execute() { + return threadPool.submit(this::executeSequence); + } + + private Collection executeSequence() throws InterruptedException, ExecutionException, IOException { String identifier = new RandomIdentifierGenerator().generate(); ListPeers listPeers = new ListPeers(identifier, includeMetadata.get(), includeVolatile.get()); - return threadPool.submit(() -> new ListPeersReplySequence().send(listPeers).get()); + try (ListPeersDialog listPeersDialog = new ListPeersDialog()) { + return listPeersDialog.send(listPeers).get(); + } } - private class ListPeersReplySequence extends FcpReplySequence> { + private class ListPeersDialog extends FcpDialog> { private final Collection peers = new HashSet<>(); private final AtomicBoolean finished = new AtomicBoolean(false); - public ListPeersReplySequence() throws IOException { + public ListPeersDialog() throws IOException { super(threadPool, connectionSupplier.get()); }