import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
+import java.util.function.Supplier;
import net.pterodactylus.fcp.ClientPut;
import net.pterodactylus.fcp.FcpMessage;
private final ListeningExecutorService threadPool;
private final ConnectionSupplier connectionSupplier;
+ private final Supplier<String> identifierGenerator;
private final AtomicReference<String> redirectUri = new AtomicReference<>();
private final AtomicReference<File> file = new AtomicReference<>();
private final AtomicReference<InputStream> payload = new AtomicReference<>();
private final AtomicReference<String> targetFilename = new AtomicReference<>();
private final List<Consumer<String>> keyGenerateds = new CopyOnWriteArrayList<>();
- public ClientPutCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier) {
+ public ClientPutCommandImpl(ExecutorService threadPool, ConnectionSupplier connectionSupplier, Supplier<String> identifierGenerator) {
this.threadPool = MoreExecutors.listeningDecorator(threadPool);
this.connectionSupplier = connectionSupplier;
+ this.identifierGenerator = identifierGenerator;
}
@Override
}
@Override
- public WithUri<Executable<Optional<Key>>> redirectTo(String uri) {
+ public WithUri redirectTo(String uri) {
this.redirectUri.set(Objects.requireNonNull(uri, "uri must not be null"));
return this::key;
}
@Override
- public WithUri<Executable<Optional<Key>>> from(File file) {
+ public WithUri from(File file) {
this.file.set(Objects.requireNonNull(file, "file must not be null"));
return this::key;
}
@Override
- public WithLength<WithUri<Executable<Optional<Key>>>> from(InputStream inputStream) {
+ public WithLength from(InputStream inputStream) {
payload.set(Objects.requireNonNull(inputStream, "inputStream must not be null"));
return this::length;
}
- private WithUri<Executable<Optional<Key>>> length(long length) {
+ private WithUri length(long length) {
this.length.set(length);
return this::key;
}
}
private Optional<Key> execute(String uri) throws InterruptedException, ExecutionException, IOException {
- String identifier = new RandomIdentifierGenerator().generate();
- ClientPut clientPut = createClientPutCommand(uri, identifier);
+ ClientPut clientPut = createClientPutCommand(uri, identifierGenerator.get());
try (ClientPutDialog clientPutDialog = new ClientPutDialog()) {
return clientPutDialog.send(clientPut).get();
}