From dbd390e996a8b0d94d5e57906b996a95f4a22f4e Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Fri, 10 Jul 2015 07:18:54 +0200 Subject: [PATCH] Rename Keyed interface to WithUri --- .../fcp/quelaton/ClientPutCommand.java | 6 +++--- .../fcp/quelaton/ClientPutCommandImpl.java | 12 +++++------ .../java/net/pterodactylus/fcp/quelaton/Keyed.java | 18 ---------------- .../net/pterodactylus/fcp/quelaton/WithUri.java | 16 +++++++++++++++ .../fcp/quelaton/DefaultFcpClientTest.java | 24 +++++++++++----------- 5 files changed, 37 insertions(+), 39 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/fcp/quelaton/Keyed.java create mode 100644 src/main/java/net/pterodactylus/fcp/quelaton/WithUri.java diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommand.java b/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommand.java index 231af10..bb6e099 100644 --- a/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommand.java +++ b/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommand.java @@ -14,8 +14,8 @@ import net.pterodactylus.fcp.Key; public interface ClientPutCommand { ClientPutCommand named(String targetFilename); - Keyed> redirectTo(String uri); - Keyed> from(File file); - Lengthed>> from(InputStream inputStream); + WithUri> redirectTo(String uri); + WithUri> from(File file); + Lengthed>> from(InputStream inputStream); } diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java index 39d525a..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> redirectTo(String uri) { + public WithUri> redirectTo(String uri) { this.redirectUri.set(Objects.requireNonNull(uri, "uri must not be null")); return this::key; } @Override - public Keyed> from(File file) { + public WithUri> from(File file) { this.file.set(Objects.requireNonNull(file, "file must not be null")); return this::key; } @Override - public Lengthed>> from(InputStream inputStream) { + public Lengthed>> from(InputStream inputStream) { payload.set(Objects.requireNonNull(inputStream, "inputStream must not be null")); return this::length; } - private Keyed> length(long length) { + private WithUri> length(long length) { this.length.set(length); return this::key; } - private ListenableFuture> key(Key key) { + private ListenableFuture> 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()); } diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/Keyed.java b/src/main/java/net/pterodactylus/fcp/quelaton/Keyed.java deleted file mode 100644 index ea10ab9..0000000 --- a/src/main/java/net/pterodactylus/fcp/quelaton/Keyed.java +++ /dev/null @@ -1,18 +0,0 @@ -package net.pterodactylus.fcp.quelaton; - -import net.pterodactylus.fcp.Key; - -import com.google.common.util.concurrent.ListenableFuture; - -/** - * The terminal operation of an FCP command, requiring a {@link Key}. - * - * @param - * The type of the command result - * @author David ‘Bombe’ Roden - */ -public interface Keyed { - - ListenableFuture key(Key key); - -} diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/WithUri.java b/src/main/java/net/pterodactylus/fcp/quelaton/WithUri.java new file mode 100644 index 0000000..76ffeaf --- /dev/null +++ b/src/main/java/net/pterodactylus/fcp/quelaton/WithUri.java @@ -0,0 +1,16 @@ +package net.pterodactylus.fcp.quelaton; + +import com.google.common.util.concurrent.ListenableFuture; + +/** + * The terminal operation of an FCP command, requiring a Freenet URI. + * + * @param + * The type of the command result + * @author David ‘Bombe’ Roden + */ +public interface WithUri { + + ListenableFuture uri(String uri); + +} diff --git a/src/test/java/net/pterodactylus/fcp/quelaton/DefaultFcpClientTest.java b/src/test/java/net/pterodactylus/fcp/quelaton/DefaultFcpClientTest.java index 6af103c..da3ba42 100644 --- a/src/test/java/net/pterodactylus/fcp/quelaton/DefaultFcpClientTest.java +++ b/src/test/java/net/pterodactylus/fcp/quelaton/DefaultFcpClientTest.java @@ -294,7 +294,7 @@ public class DefaultFcpClientTest { fcpClient.clientPut() .from(new ByteArrayInputStream("Hello\n".getBytes())) .length(6) - .key(new Key("KSK@foo.txt")); + .uri("KSK@foo.txt"); connectNode(); List lines = fcpServer.collectUntil(is("Hello")); assertThat(lines, matchesFcpMessage("ClientPut", "UploadFrom=direct", "DataLength=6", "URI=KSK@foo.txt")); @@ -306,7 +306,7 @@ public class DefaultFcpClientTest { Future> key = fcpClient.clientPut() .from(new ByteArrayInputStream("Hello\n".getBytes())) .length(6) - .key(new Key("KSK@foo.txt")); + .uri("KSK@foo.txt"); connectNode(); List lines = fcpServer.collectUntil(is("Hello")); String identifier = extractIdentifier(lines); @@ -330,7 +330,7 @@ public class DefaultFcpClientTest { Future> key = fcpClient.clientPut() .from(new ByteArrayInputStream("Hello\n".getBytes())) .length(6) - .key(new Key("KSK@foo.txt")); + .uri("KSK@foo.txt"); connectNode(); List lines = fcpServer.collectUntil(is("Hello")); String identifier = extractIdentifier(lines); @@ -355,7 +355,7 @@ public class DefaultFcpClientTest { .named("otherName.txt") .from(new ByteArrayInputStream("Hello\n".getBytes())) .length(6) - .key(new Key("KSK@foo.txt")); + .uri("KSK@foo.txt"); connectNode(); List lines = fcpServer.collectUntil(is("Hello")); assertThat(lines, matchesFcpMessage("ClientPut", "TargetFilename=otherName.txt", "UploadFrom=direct", @@ -365,7 +365,7 @@ public class DefaultFcpClientTest { @Test public void clientPutWithRedirectSendsCorrectCommand() throws IOException, ExecutionException, InterruptedException { - fcpClient.clientPut().redirectTo("KSK@bar.txt").key(new Key("KSK@foo.txt")); + fcpClient.clientPut().redirectTo("KSK@bar.txt").uri("KSK@foo.txt"); connectNode(); List lines = fcpServer.collectUntil(is("EndMessage")); assertThat(lines, @@ -374,7 +374,7 @@ public class DefaultFcpClientTest { @Test public void clientPutWithFileSendsCorrectCommand() throws InterruptedException, ExecutionException, IOException { - fcpClient.clientPut().from(new File("/tmp/data.txt")).key(new Key("KSK@foo.txt")); + fcpClient.clientPut().from(new File("/tmp/data.txt")).uri("KSK@foo.txt"); connectNode(); List lines = fcpServer.collectUntil(is("EndMessage")); assertThat(lines, @@ -385,7 +385,7 @@ public class DefaultFcpClientTest { public void clientPutWithFileCanCompleteTestDdaSequence() throws IOException, ExecutionException, InterruptedException { File tempFile = createTempFile(); - fcpClient.clientPut().from(new File(tempFile.getParent(), "test.dat")).key(new Key("KSK@foo.txt")); + fcpClient.clientPut().from(new File(tempFile.getParent(), "test.dat")).uri("KSK@foo.txt"); connectNode(); List lines = fcpServer.collectUntil(is("EndMessage")); String identifier = extractIdentifier(lines); @@ -438,7 +438,7 @@ public class DefaultFcpClientTest { @Test public void clientPutDoesNotReactToProtocolErrorForDifferentIdentifier() throws InterruptedException, ExecutionException, IOException { - Future> key = fcpClient.clientPut().from(new File("/tmp/data.txt")).key(new Key("KSK@foo.txt")); + Future> key = fcpClient.clientPut().from(new File("/tmp/data.txt")).uri("KSK@foo.txt"); connectNode(); List lines = fcpServer.collectUntil(is("EndMessage")); String identifier = extractIdentifier(lines); @@ -460,7 +460,7 @@ public class DefaultFcpClientTest { @Test public void clientPutAbortsOnProtocolErrorOtherThan25() throws InterruptedException, ExecutionException, IOException { - Future> key = fcpClient.clientPut().from(new File("/tmp/data.txt")).key(new Key("KSK@foo.txt")); + Future> key = fcpClient.clientPut().from(new File("/tmp/data.txt")).uri("KSK@foo.txt"); connectNode(); List lines = fcpServer.collectUntil(is("EndMessage")); String identifier = extractIdentifier(lines); @@ -477,7 +477,7 @@ public class DefaultFcpClientTest { public void clientPutDoesNotReplyToWrongTestDdaReply() throws IOException, ExecutionException, InterruptedException { File tempFile = createTempFile(); - fcpClient.clientPut().from(new File(tempFile.getParent(), "test.dat")).key(new Key("KSK@foo.txt")); + fcpClient.clientPut().from(new File(tempFile.getParent(), "test.dat")).uri("KSK@foo.txt"); connectNode(); List lines = fcpServer.collectUntil(is("EndMessage")); String identifier = extractIdentifier(lines); @@ -520,7 +520,7 @@ public class DefaultFcpClientTest { public void clientPutSendsResponseEvenIfFileCanNotBeRead() throws IOException, ExecutionException, InterruptedException { File tempFile = createTempFile(); - fcpClient.clientPut().from(new File(tempFile.getParent(), "test.dat")).key(new Key("KSK@foo.txt")); + fcpClient.clientPut().from(new File(tempFile.getParent(), "test.dat")).uri("KSK@foo.txt"); connectNode(); List lines = fcpServer.collectUntil(is("EndMessage")); String identifier = extractIdentifier(lines); @@ -557,7 +557,7 @@ public class DefaultFcpClientTest { public void clientPutDoesNotResendOriginalClientPutOnTestDDACompleteWithWrongDirectory() throws IOException, ExecutionException, InterruptedException { File tempFile = createTempFile(); - fcpClient.clientPut().from(new File(tempFile.getParent(), "test.dat")).key(new Key("KSK@foo.txt")); + fcpClient.clientPut().from(new File(tempFile.getParent(), "test.dat")).uri("KSK@foo.txt"); connectNode(); List lines = fcpServer.collectUntil(is("EndMessage")); String identifier = extractIdentifier(lines); -- 2.7.4