X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FNodeManager.java;h=c251232d246364ea618a34009f8bdb15ee4546fd;hb=f2aa4d06e218670fe40b602ea068db3c50446358;hp=b9404c738bc417c8364277f589031b0d105512be;hpb=7a6a3c1c08be242d176b141f261e25b16fee84aa;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/core/NodeManager.java b/src/net/pterodactylus/jsite/core/NodeManager.java
index b9404c7..c251232 100644
--- a/src/net/pterodactylus/jsite/core/NodeManager.java
+++ b/src/net/pterodactylus/jsite/core/NodeManager.java
@@ -40,15 +40,17 @@ import java.util.logging.Logger;
 
 import net.pterodactylus.fcp.highlevel.HighLevelClient;
 import net.pterodactylus.fcp.highlevel.HighLevelClientListener;
+import net.pterodactylus.fcp.highlevel.HighLevelException;
 import net.pterodactylus.fcp.highlevel.KeyGenerationResult;
+import net.pterodactylus.jsite.util.IdGenerator;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
+import net.pterodactylus.util.number.Hex;
 
 /**
  * TODO
  * 
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
- * @version $Id$
  */
 public class NodeManager implements Iterable<Node>, PropertyChangeListener, HighLevelClientListener {
 
@@ -70,6 +72,9 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
 	/** All nodes. */
 	private List<Node> nodes = Collections.synchronizedList(new ArrayList<Node>());
 
+	/** Map from node ID to node. */
+	private Map<String, Node> idNodes = Collections.synchronizedMap(new HashMap<String, Node>());
+
 	/** All FCP connections. */
 	private Map<Node, HighLevelClient> nodeClients = Collections.synchronizedMap(new HashMap<Node, HighLevelClient>());
 
@@ -120,7 +125,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
 	 *            The node that was added.
 	 */
 	private void fireNodeAdded(Node node) {
-		for (NodeListener nodeListener: nodeListeners) {
+		for (NodeListener nodeListener : nodeListeners) {
 			nodeListener.nodeAdded(node);
 		}
 	}
@@ -132,7 +137,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
 	 *            The node that was removed
 	 */
 	private void fireNodeRemoved(Node node) {
-		for (NodeListener nodeListener: nodeListeners) {
+		for (NodeListener nodeListener : nodeListeners) {
 			nodeListener.nodeRemoved(node);
 		}
 	}
@@ -144,7 +149,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
 	 *            The node that is now connected
 	 */
 	private void fireNodeConnected(Node node) {
-		for (NodeListener nodeListener: nodeListeners) {
+		for (NodeListener nodeListener : nodeListeners) {
 			nodeListener.nodeConnected(node);
 		}
 	}
@@ -158,7 +163,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
 	 *            The cause of the failure
 	 */
 	private void fireNodeConnectionFailed(Node node, Throwable cause) {
-		for (NodeListener nodeListener: nodeListeners) {
+		for (NodeListener nodeListener : nodeListeners) {
 			nodeListener.nodeConnectionFailed(node, cause);
 		}
 	}
@@ -173,7 +178,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
 	 *            if there was no exception
 	 */
 	private void fireNodeDisconnected(Node node, Throwable throwable) {
-		for (NodeListener nodeListener: nodeListeners) {
+		for (NodeListener nodeListener : nodeListeners) {
 			nodeListener.nodeDisconnected(node, throwable);
 		}
 	}
@@ -238,6 +243,10 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
 		List<Node> loadedNodes = new ArrayList<Node>();
 		while (nodeProperties.containsKey("nodes." + ++nodeIndex + ".name")) {
 			String nodePrefix = "nodes." + nodeIndex;
+			String nodeId = nodeProperties.getProperty(nodePrefix + ".id");
+			if (nodeId == null) {
+				nodeId = Hex.toHex(IdGenerator.generateId());
+			}
 			String nodeName = nodeProperties.getProperty(nodePrefix + ".name");
 			if (!Verifier.verifyNodeName(nodeName)) {
 				logger.log(Level.WARNING, "invalid node name “" + nodeName + "”, skipping…");
@@ -262,6 +271,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
 				continue;
 			}
 			Node newNode = new Node();
+			newNode.setId(nodeId);
 			newNode.setName(nodeName);
 			newNode.setHostname(nodeHostname);
 			newNode.setPort(nodePort);
@@ -270,7 +280,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
 		logger.fine("loaded " + loadedNodes.size() + " nodes from config");
 		synchronized (syncObject) {
 			nodes.clear();
-			for (Node node: loadedNodes) {
+			for (Node node : loadedNodes) {
 				addNode(node);
 			}
 		}
@@ -291,8 +301,9 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
 		}
 		Properties nodeProperties = new Properties();
 		int nodeIndex = -1;
-		for (Node node: nodes) {
+		for (Node node : nodes) {
 			String nodePrefix = "nodes." + ++nodeIndex;
+			nodeProperties.setProperty(nodePrefix + ".id", node.getId());
 			nodeProperties.setProperty(nodePrefix + ".name", node.getName());
 			nodeProperties.setProperty(nodePrefix + ".hostname", node.getHostname());
 			nodeProperties.setProperty(nodePrefix + ".port", String.valueOf(node.getPort()));
@@ -324,6 +335,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
 		node.addPropertyChangeListener(this);
 		HighLevelClient highLevelClient = new HighLevelClient(clientName);
 		nodes.add(node);
+		idNodes.put(node.getId(), node);
 		clientNodes.put(highLevelClient, node);
 		nodeClients.put(node, highLevelClient);
 		highLevelClient.addHighLevelClientListener(this);
@@ -346,6 +358,8 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
 			if (nodeClients.containsKey(node)) {
 				disconnect(node);
 			}
+			nodes.remove(node);
+			idNodes.remove(node.getId());
 			node.removePropertyChangeListener(this);
 			fireNodeRemoved(node);
 		}
@@ -423,16 +437,28 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
 	}
 
 	/**
+	 * Returns the node identified by the given ID.
+	 * 
+	 * @param id
+	 *            The ID of the node
+	 * @return The node with the given ID, or <code>null</code> if no such
+	 *         node was found
+	 */
+	Node getNode(String id) {
+		return idNodes.get(id);
+	}
+
+	/**
 	 * Generates a new SSK key pair.
 	 * 
 	 * @return An array with the private key at index <code>0</code> and the
 	 *         public key at index <code>1</code>
 	 * @throws IOException
 	 *             if an I/O error occurs communicating with the node
-	 * @throws NoNodeException
-	 *             if no node is configured
+	 * @throws JSiteException
+	 *             if there is a problem with the node
 	 */
-	public String[] generateKeyPair() throws IOException, NoNodeException {
+	public String[] generateKeyPair() throws IOException, JSiteException {
 		if (nodes.isEmpty()) {
 			throw new NoNodeException("no node configured");
 		}
@@ -441,6 +467,8 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
 		try {
 			KeyGenerationResult keyGenerationResult = highLevelClient.generateKey().getResult();
 			return new String[] { keyGenerationResult.getInsertURI(), keyGenerationResult.getRequestURI() };
+		} catch (HighLevelException hle1) {
+			throw new BackendException(hle1);
 		} catch (InterruptedException e) {
 			/* ignore. */
 		}