projects
/
jFCPlib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add second constructor to set identifier
[jFCPlib.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
fcp
/
quelaton
/
ClientGetCommandImpl.java
diff --git
a/src/main/java/net/pterodactylus/fcp/quelaton/ClientGetCommandImpl.java
b/src/main/java/net/pterodactylus/fcp/quelaton/ClientGetCommandImpl.java
index
8e24cbf
..
0c93fc3
100644
(file)
--- a/
src/main/java/net/pterodactylus/fcp/quelaton/ClientGetCommandImpl.java
+++ b/
src/main/java/net/pterodactylus/fcp/quelaton/ClientGetCommandImpl.java
@@
-3,19
+3,17
@@
package net.pterodactylus.fcp.quelaton;
import java.io.IOException;
import java.io.InputStream;
import java.util.Optional;
import java.io.IOException;
import java.io.InputStream;
import java.util.Optional;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
import net.pterodactylus.fcp.AllData;
import net.pterodactylus.fcp.ClientGet;
import net.pterodactylus.fcp.AllData;
import net.pterodactylus.fcp.ClientGet;
-import net.pterodactylus.fcp.FcpMessage;
import net.pterodactylus.fcp.FcpUtils.TempInputStream;
import net.pterodactylus.fcp.GetFailed;
import net.pterodactylus.fcp.Priority;
import net.pterodactylus.fcp.ReturnType;
import net.pterodactylus.fcp.FcpUtils.TempInputStream;
import net.pterodactylus.fcp.GetFailed;
import net.pterodactylus.fcp.Priority;
import net.pterodactylus.fcp.ReturnType;
-import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
@@
-78,9
+76,15
@@
class ClientGetCommandImpl implements ClientGetCommand {
}
@Override
}
@Override
- public ListenableFuture<Optional<Data>> uri(String uri) {
+ public Executable<Optional<Data>> uri(String uri) {
+ return () -> threadPool.submit(() -> execute(uri));
+ }
+
+ private Optional<Data> execute(String uri) throws InterruptedException, ExecutionException, IOException {
ClientGet clientGet = createClientGetCommand(uri);
ClientGet clientGet = createClientGetCommand(uri);
- return threadPool.submit(() -> new ClientGetReplySequence().send(clientGet).get());
+ try (ClientGetDialog clientGetDialog = new ClientGetDialog()) {
+ return clientGetDialog.send(clientGet).get();
+ }
}
private ClientGet createClientGetCommand(String uri) {
}
private ClientGet createClientGetCommand(String uri) {
@@
-107,7
+111,7
@@
class ClientGetCommandImpl implements ClientGetCommand {
return clientGet;
}
return clientGet;
}
- private class ClientGet
ReplySequence extends FcpReplySequence
<Optional<Data>> {
+ private class ClientGet
Dialog extends FcpDialog
<Optional<Data>> {
private final AtomicBoolean finished = new AtomicBoolean();
private final AtomicBoolean failed = new AtomicBoolean();
private final AtomicBoolean finished = new AtomicBoolean();
private final AtomicBoolean failed = new AtomicBoolean();
@@
-116,7
+120,7
@@
class ClientGetCommandImpl implements ClientGetCommand {
private long dataLength;
private InputStream payload;
private long dataLength;
private InputStream payload;
- public ClientGet
ReplySequence
() throws IOException {
+ public ClientGet
Dialog
() throws IOException {
super(ClientGetCommandImpl.this.threadPool, ClientGetCommandImpl.this.connectionSupplier.get());
}
super(ClientGetCommandImpl.this.threadPool, ClientGetCommandImpl.this.connectionSupplier.get());
}