X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fquelaton%2FClientPutCommandImpl.java;h=d401f8d792c08523fbf623035f1dad0ba2fd5bc2;hb=dbd390e996a8b0d94d5e57906b996a95f4a22f4e;hp=2796156d65a071e0a78923a5b317edd5bd910751;hpb=c60508a35e188f72fd6165711c1cb4e32190a4f4;p=jFCPlib.git

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java
index 2796156..d401f8d 100644
--- a/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java
@@ -54,31 +54,31 @@ class ClientPutCommandImpl implements ClientPutCommand {
 	}
 
 	@Override
-	public Keyed<Optional<Key>> redirectTo(Key key) {
-		this.redirectUri.set(Objects.requireNonNull(key, "key must not be null").getKey());
+	public WithUri<Optional<Key>> redirectTo(String uri) {
+		this.redirectUri.set(Objects.requireNonNull(uri, "uri must not be null"));
 		return this::key;
 	}
 
 	@Override
-	public Keyed<Optional<Key>> from(File file) {
+	public WithUri<Optional<Key>> from(File file) {
 		this.file.set(Objects.requireNonNull(file, "file must not be null"));
 		return this::key;
 	}
 
 	@Override
-	public Lengthed<Keyed<Optional<Key>>> from(InputStream inputStream) {
+	public Lengthed<WithUri<Optional<Key>>> from(InputStream inputStream) {
 		payload.set(Objects.requireNonNull(inputStream, "inputStream must not be null"));
 		return this::length;
 	}
 
-	private Keyed<Optional<Key>> length(long length) {
+	private WithUri<Optional<Key>> length(long length) {
 		this.length.set(length);
 		return this::key;
 	}
 
-	private ListenableFuture<Optional<Key>> key(Key key) {
+	private ListenableFuture<Optional<Key>> key(String uri) {
 		String identifier = new RandomIdentifierGenerator().generate();
-		ClientPut clientPut = createClientPutCommand(key.getKey(), identifier);
+		ClientPut clientPut = createClientPutCommand(uri, identifier);
 		return threadPool.submit(() -> new ClientPutReplySequence().send(clientPut).get());
 	}
 
@@ -182,7 +182,6 @@ class ClientPutCommandImpl implements ClientPutCommand {
 					String readContent = Files.readAllLines(new File(testDDAReply.getReadFilename()).toPath()).get(0);
 					sendMessage(new TestDDAResponse(directory.get(), readContent));
 				} catch (IOException e) {
-					e.printStackTrace();
 					sendMessage(new TestDDAResponse(directory.get(), "failed-to-read"));
 				}
 			}