X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FWebOfTrustConnector.java;h=1d30efb5cc5f8682992910bc67e4eba917f257f6;hp=c4e8d8928fbb34c397bb89f901fc0ed1a28a4498;hb=62573c314957b1851f4fbe693b8746686caa940a;hpb=b64f7d11fca2a616c8ceaf146a79fc3782877afd

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
index c4e8d89..1d30efb 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
@@ -1,5 +1,5 @@
 /*
- * Sone - WebOfTrustConnector.java - Copyright © 2010–2012 David Roden
+ * Sone - WebOfTrustConnector.java - Copyright © 2010–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,9 @@
 
 package net.pterodactylus.sone.freenet.wot;
 
+import static java.util.logging.Logger.getLogger;
+import static net.pterodactylus.sone.utils.NumberParsers.parseInt;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -25,23 +28,27 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.pterodactylus.sone.freenet.plugin.ConnectorListener;
 import net.pterodactylus.sone.freenet.plugin.PluginConnector;
 import net.pterodactylus.sone.freenet.plugin.PluginException;
-import net.pterodactylus.util.logging.Logging;
-import net.pterodactylus.util.number.Numbers;
+import net.pterodactylus.sone.freenet.plugin.event.ReceivedReplyEvent;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.MapMaker;
+import com.google.common.eventbus.Subscribe;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
 import freenet.support.SimpleFieldSet;
 import freenet.support.api.Bucket;
 
 /**
  * Connector for the Web of Trust plugin.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
+@Singleton
 public class WebOfTrustConnector {
 
 	/** The logger. */
-	private static final Logger logger = Logging.getLogger(WebOfTrustConnector.class);
+	private static final Logger logger = getLogger(WebOfTrustConnector.class.getName());
 
 	/** The name of the WoT plugin. */
 	private static final String WOT_PLUGIN_NAME = "plugins.WebOfTrust.WebOfTrust";
@@ -52,6 +59,9 @@ public class WebOfTrustConnector {
 	/** The plugin connector. */
 	private final PluginConnector pluginConnector;
 
+	/** Map for replies. */
+	private final Map<PluginIdentifier, Reply> replies = new MapMaker().makeMap();
+
 	/**
 	 * Creates a new Web of Trust connector that uses the given plugin
 	 * connector.
@@ -59,6 +69,7 @@ public class WebOfTrustConnector {
 	 * @param pluginConnector
 	 *            The plugin connector
 	 */
+	@Inject
 	public WebOfTrustConnector(PluginConnector pluginConnector) {
 		this.pluginConnector = pluginConnector;
 	}
@@ -113,7 +124,7 @@ public class WebOfTrustConnector {
 	 *             if an error occured talking to the Web of Trust plugin
 	 */
 	public Set<Identity> loadTrustedIdentities(OwnIdentity ownIdentity) throws PluginException {
-		return loadTrustedIdentities(ownIdentity, null);
+		return loadTrustedIdentities(ownIdentity, Optional.<String>absent());
 	}
 
 	/**
@@ -128,8 +139,8 @@ public class WebOfTrustConnector {
 	 * @throws PluginException
 	 *             if an error occured talking to the Web of Trust plugin
 	 */
-	public Set<Identity> loadTrustedIdentities(OwnIdentity ownIdentity, String context) throws PluginException {
-		Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetIdentitiesByScore").put("Truster", ownIdentity.getId()).put("Selection", "+").put("Context", (context == null) ? "" : context).put("WantTrustValues", "true").get());
+	public Set<Identity> loadTrustedIdentities(OwnIdentity ownIdentity, Optional<String> context) throws PluginException {
+		Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetIdentitiesByScore").put("Truster", ownIdentity.getId()).put("Selection", "+").put("Context", context.or("")).put("WantTrustValues", "true").get());
 		SimpleFieldSet fields = reply.getFields();
 		Set<Identity> identities = new HashSet<Identity>();
 		int identityCounter = -1;
@@ -143,9 +154,9 @@ public class WebOfTrustConnector {
 			DefaultIdentity identity = new DefaultIdentity(id, nickname, requestUri);
 			identity.setContexts(parseContexts("Contexts" + identityCounter + ".", fields));
 			identity.setProperties(parseProperties("Properties" + identityCounter + ".", fields));
-			Integer trust = Numbers.safeParseInteger(fields.get("Trust" + identityCounter), null);
-			int score = Numbers.safeParseInteger(fields.get("Score" + identityCounter), 0);
-			int rank = Numbers.safeParseInteger(fields.get("Rank" + identityCounter), 0);
+			Integer trust = parseInt(fields.get("Trust" + identityCounter), null);
+			int score = parseInt(fields.get("Score" + identityCounter), 0);
+			int rank = parseInt(fields.get("Rank" + identityCounter), 0);
 			identity.setTrust(ownIdentity, new Trust(trust, score, rank));
 			identities.add(identity);
 		}
@@ -380,24 +391,12 @@ public class WebOfTrustConnector {
 	 *             if the request could not be sent
 	 */
 	private Reply performRequest(SimpleFieldSet fields, Bucket data) throws PluginException {
-		final String identifier = "FCP-Command-" + System.currentTimeMillis() + "-" + counter.getAndIncrement();
-		final Reply reply = new Reply();
+		String identifier = "FCP-Command-" + System.currentTimeMillis() + "-" + counter.getAndIncrement();
+		Reply reply = new Reply();
+		PluginIdentifier pluginIdentifier = new PluginIdentifier(WOT_PLUGIN_NAME, identifier);
+		replies.put(pluginIdentifier, reply);
+
 		logger.log(Level.FINE, String.format("Sending FCP Request: %s", fields.get("Message")));
-		ConnectorListener connectorListener = new ConnectorListener() {
-
-			@Override
-			@SuppressWarnings("synthetic-access")
-			public void receivedReply(PluginConnector pluginConnector, SimpleFieldSet fields, Bucket data) {
-				String messageName = fields.get("Message");
-				logger.log(Level.FINEST, String.format("Received Reply from Plugin: %s", messageName));
-				synchronized (reply) {
-					reply.setFields(fields);
-					reply.setData(data);
-					reply.notify();
-				}
-			}
-		};
-		pluginConnector.addConnectorListener(WOT_PLUGIN_NAME, identifier, connectorListener);
 		synchronized (reply) {
 			try {
 				pluginConnector.sendRequest(WOT_PLUGIN_NAME, identifier, fields, data);
@@ -409,7 +408,7 @@ public class WebOfTrustConnector {
 					}
 				}
 			} finally {
-				pluginConnector.removeConnectorListener(WOT_PLUGIN_NAME, identifier, connectorListener);
+				replies.remove(pluginIdentifier);
 			}
 		}
 		logger.log(Level.FINEST, String.format("Received FCP Response for %s: %s", fields.get("Message"), (reply.getFields() != null) ? reply.getFields().get("Message") : null));
@@ -420,9 +419,28 @@ public class WebOfTrustConnector {
 	}
 
 	/**
-	 * Container for the data of the reply from a plugin.
+	 * Notifies the connector that a plugin reply was received.
 	 *
-	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+	 * @param receivedReplyEvent
+	 *            The event
+	 */
+	@Subscribe
+	public void receivedReply(ReceivedReplyEvent receivedReplyEvent) {
+		PluginIdentifier pluginIdentifier = new PluginIdentifier(receivedReplyEvent.pluginName(), receivedReplyEvent.identifier());
+		Reply reply = replies.remove(pluginIdentifier);
+		if (reply == null) {
+			return;
+		}
+		logger.log(Level.FINEST, String.format("Received Reply from Plugin: %s", receivedReplyEvent.fieldSet().get("Message")));
+		synchronized (reply) {
+			reply.setFields(receivedReplyEvent.fieldSet());
+			reply.setData(receivedReplyEvent.data());
+			reply.notify();
+		}
+	}
+
+	/**
+	 * Container for the data of the reply from a plugin.
 	 */
 	private static class Reply {
 
@@ -480,8 +498,6 @@ public class WebOfTrustConnector {
 
 	/**
 	 * Helper method to create {@link SimpleFieldSet}s with terser code.
-	 *
-	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
 	private static class SimpleFieldSetConstructor {
 
@@ -548,8 +564,58 @@ public class WebOfTrustConnector {
 		 * @return The created simple field set constructor
 		 */
 		public static SimpleFieldSetConstructor create(boolean shortLived) {
-			SimpleFieldSetConstructor simpleFieldSetConstructor = new SimpleFieldSetConstructor(shortLived);
-			return simpleFieldSetConstructor;
+			return new SimpleFieldSetConstructor(shortLived);
+		}
+
+	}
+
+	/**
+	 * Container for identifying plugins. Plugins are identified by their plugin
+	 * name and their unique identifier.
+	 */
+	private static class PluginIdentifier {
+
+		/** The plugin name. */
+		private final String pluginName;
+
+		/** The plugin identifier. */
+		private final String identifier;
+
+		/**
+		 * Creates a new plugin identifier.
+		 *
+		 * @param pluginName
+		 *            The name of the plugin
+		 * @param identifier
+		 *            The identifier of the plugin
+		 */
+		public PluginIdentifier(String pluginName, String identifier) {
+			this.pluginName = pluginName;
+			this.identifier = identifier;
+		}
+
+		//
+		// OBJECT METHODS
+		//
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public int hashCode() {
+			return pluginName.hashCode() ^ identifier.hashCode();
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public boolean equals(Object object) {
+			if (!(object instanceof PluginIdentifier)) {
+				return false;
+			}
+			PluginIdentifier pluginIdentifier = (PluginIdentifier) object;
+			return pluginName.equals(pluginIdentifier.pluginName) && identifier.equals(pluginIdentifier.identifier);
 		}
 
 	}