projects
/
jFCPlib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
021111b
)
Rename method to add peer from a file
author
David ‘Bombe’ Roden
<bombe@freenetproject.org>
Sat, 11 Jul 2015 17:03:37 +0000
(19:03 +0200)
committer
David ‘Bombe’ Roden
<bombe@freenetproject.org>
Sat, 11 Jul 2015 17:03:37 +0000
(19:03 +0200)
src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommand.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java
patch
|
blob
|
history
src/test/java/net/pterodactylus/fcp/quelaton/DefaultFcpClientTest.java
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommand.java
b/src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommand.java
index
8b7a7bb
..
5997af6
100644
(file)
--- a/
src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommand.java
+++ b/
src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommand.java
@@
-1,5
+1,6
@@
package net.pterodactylus.fcp.quelaton;
package net.pterodactylus.fcp.quelaton;
+import java.io.File;
import java.net.URL;
import java.util.Optional;
import java.net.URL;
import java.util.Optional;
@@
-10,8
+11,9
@@
import net.pterodactylus.fcp.Peer;
*
* @author <a href="mailto:bombe@freenetproject.org">David ‘Bombe’ Roden</a>
*/
*
* @author <a href="mailto:bombe@freenetproject.org">David ‘Bombe’ Roden</a>
*/
-public interface AddPeerCommand
extends WithFile<Executable<Optional<Peer>>>
{
+public interface AddPeerCommand {
+ Executable<Optional<Peer>> fromFile(File file);
Executable<Optional<Peer>> fromURL(URL url);
}
Executable<Optional<Peer>> fromURL(URL url);
}
diff --git
a/src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java
b/src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java
index
fbfb314
..
a4f4452
100644
(file)
--- a/
src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java
+++ b/
src/main/java/net/pterodactylus/fcp/quelaton/AddPeerCommandImpl.java
@@
-35,7
+35,7
@@
public class AddPeerCommandImpl implements AddPeerCommand {
}
@Override
}
@Override
- public Executable<Optional<Peer>>
with
File(File file) {
+ public Executable<Optional<Peer>>
from
File(File file) {
this.file.set(file);
return this::execute;
}
this.file.set(file);
return this::execute;
}
diff --git
a/src/test/java/net/pterodactylus/fcp/quelaton/DefaultFcpClientTest.java
b/src/test/java/net/pterodactylus/fcp/quelaton/DefaultFcpClientTest.java
index
574f4d7
..
840e601
100644
(file)
--- a/
src/test/java/net/pterodactylus/fcp/quelaton/DefaultFcpClientTest.java
+++ b/
src/test/java/net/pterodactylus/fcp/quelaton/DefaultFcpClientTest.java
@@
-1001,7
+1001,7
@@
public class DefaultFcpClientTest {
@Test
public void defaultFcpClientCanAddPeerFromFile() throws InterruptedException, ExecutionException, IOException {
@Test
public void defaultFcpClientCanAddPeerFromFile() throws InterruptedException, ExecutionException, IOException {
- Future<Optional<Peer>> peer = fcpClient.addPeer().
with
File(new File("/tmp/ref.txt")).execute();
+ Future<Optional<Peer>> peer = fcpClient.addPeer().
from
File(new File("/tmp/ref.txt")).execute();
connectNode();
List<String> lines = fcpServer.collectUntil(is("EndMessage"));
String identifier = extractIdentifier(lines);
connectNode();
List<String> lines = fcpServer.collectUntil(is("EndMessage"));
String identifier = extractIdentifier(lines);