X-Git-Url: https://git.pterodactylus.net/?p=jSite.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fapplication%2FFreenet7Interface.java;h=9263010ded5820e8ead2d91cf1d8bbee0f2396a1;hp=dae72fb38d017b2e73dd5770661adfc469b53aa3;hb=674b7e5c95467f6e31125fea6b00bf01b74cda36;hpb=3ef9769cede04873ed7ffaabdf495895bbf080bd

diff --git a/src/main/java/de/todesbaum/jsite/application/Freenet7Interface.java b/src/main/java/de/todesbaum/jsite/application/Freenet7Interface.java
index dae72fb..9263010 100644
--- a/src/main/java/de/todesbaum/jsite/application/Freenet7Interface.java
+++ b/src/main/java/de/todesbaum/jsite/application/Freenet7Interface.java
@@ -21,6 +21,7 @@ package de.todesbaum.jsite.application;
 import java.io.IOException;
 
 import de.todesbaum.util.freenet.fcp2.Client;
+import de.todesbaum.util.freenet.fcp2.Command;
 import de.todesbaum.util.freenet.fcp2.Connection;
 import de.todesbaum.util.freenet.fcp2.GenerateSSK;
 import de.todesbaum.util.freenet.fcp2.Message;
@@ -39,12 +40,26 @@ public class Freenet7Interface {
 	/** Counter. */
 	private static int counter = 0;
 
+	private final NodeSupplier nodeSupplier;
+	private final ConnectionSupplier connectionSupplier;
+	private final ClientSupplier clientSupplier;
+
 	/** The node to connect to. */
 	private Node node;
 
 	/** The connection to the node. */
 	private Connection connection;
 
+	public Freenet7Interface() {
+		this(new DefaultNodeSupplier(), new DefaultConnectionSupplier(), new DefaultClientSupplier());
+	}
+
+	Freenet7Interface(NodeSupplier nodeSupplier, ConnectionSupplier connectionSupplier, ClientSupplier clientSupplier) {
+		this.nodeSupplier = nodeSupplier;
+		this.connectionSupplier = connectionSupplier;
+		this.clientSupplier = clientSupplier;
+	}
+
 	/**
 	 * Sets hostname and port from the given node.
 	 *
@@ -53,8 +68,8 @@ public class Freenet7Interface {
 	 */
 	public void setNode(de.todesbaum.jsite.application.Node node) {
 		if (node != null) {
-			this.node = new Node(node.getHostname(), node.getPort());
-			connection = new Connection(node, "jSite-" + number + "-connection-" + counter++);
+			this.node = nodeSupplier.supply(node.getHostname(), node.getPort());
+			connection = connectionSupplier.supply(node, "jSite-" + number + "-connection-" + counter++);
 		} else {
 			this.node = null;
 			connection = null;
@@ -78,7 +93,7 @@ public class Freenet7Interface {
 	 * @return The connection to the node
 	 */
 	public Connection getConnection(String identifier) {
-		return new Connection(node, identifier);
+		return connectionSupplier.supply(node, identifier);
 	}
 
 	/**
@@ -111,7 +126,7 @@ public class Freenet7Interface {
 			throw new IOException("Node is offline.");
 		}
 		GenerateSSK generateSSK = new GenerateSSK();
-		Client client = new Client(connection, generateSSK);
+		Client client = clientSupplier.supply(connection, generateSSK);
 		Message keypairMessage = client.readMessage();
 		return new String[] { keypairMessage.get("InsertURI"), keypairMessage.get("RequestURI") };
 	}
@@ -126,4 +141,49 @@ public class Freenet7Interface {
 		return (node != null) && (connection != null);
 	}
 
+	public interface NodeSupplier {
+
+		Node supply(String hostname, int port);
+
+	}
+
+	public static class DefaultNodeSupplier implements NodeSupplier {
+
+		@Override
+		public Node supply(String hostname, int port) {
+			return new Node(hostname, port);
+		}
+
+	}
+
+	public interface ConnectionSupplier {
+
+		Connection supply(Node node, String identifier);
+
+	}
+
+	public static class DefaultConnectionSupplier implements ConnectionSupplier {
+
+		@Override
+		public Connection supply(Node node, String identifier) {
+			return new Connection(node, identifier);
+		}
+
+	}
+
+	public interface ClientSupplier {
+
+		Client supply(Connection connection, Command command) throws IOException;
+
+	}
+
+	public static class DefaultClientSupplier implements ClientSupplier {
+
+		@Override
+		public Client supply(Connection connection, Command command) throws IOException {
+			return new Client(connection, command);
+		}
+
+	}
+
 }