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.atomic.AtomicReference;
+import java.util.function.Supplier;
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 com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
private final ListeningExecutorService threadPool;
private final ConnectionSupplier connectionSupplier;
+ private final Supplier<String> identifierGenerator;
private boolean ignoreDataStore;
private boolean dataStoreOnly;
private boolean realTime;
private boolean global;
- public ClientGetCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier) {
+ public ClientGetCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier, Supplier<String> identifierGenerator) {
this.threadPool = MoreExecutors.listeningDecorator(threadPool);
this.connectionSupplier = connectionSupplier;
+ this.identifierGenerator = identifierGenerator;
}
@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);
- return threadPool.submit(() -> new ClientGetReplySequence().send(clientGet).get());
+ try (ClientGetDialog clientGetDialog = new ClientGetDialog()) {
+ return clientGetDialog.send(clientGet).get();
+ }
}
private ClientGet createClientGetCommand(String uri) {
- String identifier = new RandomIdentifierGenerator().generate();
+ String identifier = identifierGenerator.get();
ClientGet clientGet = new ClientGet(uri, identifier, ReturnType.direct);
if (ignoreDataStore) {
clientGet.setIgnoreDataStore(true);
return clientGet;
}
- private class ClientGetReplySequence extends FcpReplySequence<Optional<Data>> {
+ private class ClientGetDialog extends FcpDialog<Optional<Data>> {
- private final AtomicReference<String> identifier = new AtomicReference<>();
private final AtomicBoolean finished = new AtomicBoolean();
private final AtomicBoolean failed = new AtomicBoolean();
private long dataLength;
private InputStream payload;
- public ClientGetReplySequence() throws IOException {
+ public ClientGetDialog() throws IOException {
super(ClientGetCommandImpl.this.threadPool, ClientGetCommandImpl.this.connectionSupplier.get());
}
@Override
protected void consumeAllData(AllData allData) {
- if (allData.getIdentifier().equals(identifier.get())) {
- synchronized (this) {
- contentType = allData.getContentType();
- dataLength = allData.getDataLength();
- try {
- payload = new TempInputStream(allData.getPayloadInputStream(), dataLength);
- finished.set(true);
- } catch (IOException e) {
- // TODO – logging
- failed.set(true);
- }
+ synchronized (this) {
+ contentType = allData.getContentType();
+ dataLength = allData.getDataLength();
+ try {
+ payload = new TempInputStream(allData.getPayloadInputStream(), dataLength);
+ finished.set(true);
+ } catch (IOException e) {
+ // TODO – logging
+ failed.set(true);
}
}
}
@Override
protected void consumeGetFailed(GetFailed getFailed) {
- if (getFailed.getIdentifier().equals(identifier.get())) {
- failed.set(true);
- }
- }
-
- @Override
- public ListenableFuture<Optional<Data>> send(FcpMessage fcpMessage) throws IOException {
- identifier.set(fcpMessage.getField("Identifier"));
- return super.send(fcpMessage);
+ failed.set(true);
}
}