X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FWebOfTrustConnector.java;h=2bd3d48af0a38a4283d8c6d5bbf075a26bc130da;hb=c3e470d2626bcbd932d4b01ce3f6c6b17ce184fd;hp=ca3a38c120e0c8c80672c8a2cb5f5dd9a5771407;hpb=76ed638264e531a26e35647d13702db865a52321;p=Sone.git
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 ca3a38c..2bd3d48 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â2015 David Roden
+ * Sone - WebOfTrustConnector.java - Copyright © 2010â2019 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,34 +17,23 @@
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;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.Level;
+import java.util.*;
import java.util.logging.Logger;
+import java.util.logging.*;
+import javax.annotation.*;
-import net.pterodactylus.sone.freenet.plugin.PluginConnector;
-import net.pterodactylus.sone.freenet.plugin.PluginException;
-import net.pterodactylus.sone.freenet.plugin.event.ReceivedReplyEvent;
+import net.pterodactylus.sone.freenet.plugin.*;
-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 com.google.inject.*;
+import freenet.support.*;
+import freenet.support.api.*;
-import freenet.support.SimpleFieldSet;
-import freenet.support.api.Bucket;
+import static java.lang.String.*;
+import static java.util.logging.Logger.*;
+import static net.pterodactylus.sone.utils.NumberParsers.*;
/**
* Connector for the Web of Trust plugin.
- *
- * @author David âBombeâ Roden
*/
@Singleton
public class WebOfTrustConnector {
@@ -55,15 +44,9 @@ public class WebOfTrustConnector {
/** The name of the WoT plugin. */
private static final String WOT_PLUGIN_NAME = "plugins.WebOfTrust.WebOfTrust";
- /** Counter for connection identifiers. */
- private final AtomicLong counter = new AtomicLong();
-
/** The plugin connector. */
private final PluginConnector pluginConnector;
- /** Map for replies. */
- private final Map replies = new MapMaker().makeMap();
-
/**
* Creates a new Web of Trust connector that uses the given plugin
* connector.
@@ -95,10 +78,10 @@ public class WebOfTrustConnector {
* if the own identities can not be loaded
*/
public Set loadAllOwnIdentities() throws WebOfTrustException {
- Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetOwnIdentities").get());
+ PluginReply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetOwnIdentities").get());
SimpleFieldSet fields = reply.getFields();
int ownIdentityCounter = -1;
- Set ownIdentities = new HashSet();
+ Set ownIdentities = new HashSet<>();
while (true) {
String id = fields.get("Identity" + ++ownIdentityCounter);
if (id == null) {
@@ -126,7 +109,7 @@ public class WebOfTrustConnector {
* if an error occured talking to the Web of Trust plugin
*/
public Set loadTrustedIdentities(OwnIdentity ownIdentity) throws PluginException {
- return loadTrustedIdentities(ownIdentity, Optional.absent());
+ return loadTrustedIdentities(ownIdentity, null);
}
/**
@@ -141,10 +124,10 @@ public class WebOfTrustConnector {
* @throws PluginException
* if an error occured talking to the Web of Trust plugin
*/
- public Set loadTrustedIdentities(OwnIdentity ownIdentity, Optional 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());
+ public Set loadTrustedIdentities(OwnIdentity ownIdentity, @Nullable String context) throws PluginException {
+ PluginReply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetIdentitiesByScore").put("Truster", ownIdentity.getId()).put("Selection", "+").put("Context", (context == null) ? "" : context).put("WantTrustValues", "true").get());
SimpleFieldSet fields = reply.getFields();
- Set identities = new HashSet();
+ Set identities = new HashSet<>();
int identityCounter = -1;
while (true) {
String id = fields.get("Identity" + ++identityCounter);
@@ -194,22 +177,6 @@ public class WebOfTrustConnector {
}
/**
- * Returns the value of the property with the given name.
- *
- * @param identity
- * The identity whose properties to check
- * @param name
- * The name of the property to return
- * @return The value of the property, or {@code null} if there is no value
- * @throws PluginException
- * if an error occured talking to the Web of Trust plugin
- */
- public String getProperty(Identity identity, String name) throws PluginException {
- Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetProperty").put("Identity", identity.getId()).put("Property", name).get());
- return reply.getFields().get("Property");
- }
-
- /**
* Sets the property with the given name to the given value.
*
* @param ownIdentity
@@ -252,7 +219,7 @@ public class WebOfTrustConnector {
* if an error occured talking to the Web of Trust plugin
*/
public Trust getTrust(OwnIdentity ownIdentity, Identity identity) throws PluginException {
- Reply getTrustReply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetIdentity").put("Truster", ownIdentity.getId()).put("Identity", identity.getId()).get());
+ PluginReply getTrustReply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetIdentity").put("Truster", ownIdentity.getId()).put("Identity", identity.getId()).get());
String trust = getTrustReply.getFields().get("Trust");
String score = getTrustReply.getFields().get("Score");
String rank = getTrustReply.getFields().get("Rank");
@@ -266,6 +233,10 @@ public class WebOfTrustConnector {
}
try {
implicit = Integer.valueOf(score);
+ } catch (NumberFormatException nfe1) {
+ /* ignore. */
+ }
+ try {
distance = Integer.valueOf(rank);
} catch (NumberFormatException nfe1) {
/* ignore. */
@@ -331,7 +302,7 @@ public class WebOfTrustConnector {
* @return The parsed contexts
*/
private static Set parseContexts(String prefix, SimpleFieldSet fields) {
- Set contexts = new HashSet();
+ Set contexts = new HashSet<>();
int contextCounter = -1;
while (true) {
String context = fields.get(prefix + "Context" + ++contextCounter);
@@ -353,7 +324,7 @@ public class WebOfTrustConnector {
* @return The parsed properties
*/
private static Map parseProperties(String prefix, SimpleFieldSet fields) {
- Map properties = new HashMap();
+ Map properties = new HashMap<>();
int propertiesCounter = -1;
while (true) {
String propertyName = fields.get(prefix + "Property" + ++propertiesCounter + ".Name");
@@ -376,7 +347,7 @@ public class WebOfTrustConnector {
* @throws PluginException
* if the request could not be sent
*/
- private Reply performRequest(SimpleFieldSet fields) throws PluginException {
+ private PluginReply performRequest(SimpleFieldSet fields) throws PluginException {
return performRequest(fields, null);
}
@@ -392,118 +363,18 @@ public class WebOfTrustConnector {
* @throws PluginException
* if the request could not be sent
*/
- private Reply performRequest(SimpleFieldSet fields, Bucket data) throws PluginException {
- 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")));
- synchronized (reply) {
- try {
- pluginConnector.sendRequest(WOT_PLUGIN_NAME, identifier, fields, data);
- while (reply.getFields() == null) {
- try {
- reply.wait();
- } catch (InterruptedException ie1) {
- logger.log(Level.WARNING, String.format("Got interrupted while waiting for reply on %s.", fields.get("Message")), ie1);
- }
- }
- } finally {
- 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));
- if ((reply.getFields() == null) || "Error".equals(reply.getFields().get("Message"))) {
+ private PluginReply performRequest(SimpleFieldSet fields, Bucket data) throws PluginException {
+ logger.log(Level.FINE, format("Sending FCP Request: %s", fields.get("Message")));
+ PluginReply pluginReply = pluginConnector.sendRequest(WOT_PLUGIN_NAME, "", fields, data);
+ logger.log(Level.FINEST, format("Received FCP Response for %s: %s", fields.get("Message"), pluginReply.getFields().get("Message")));
+ if ("Error".equals(pluginReply.getFields().get("Message"))) {
throw new PluginException("Could not perform request for " + fields.get("Message"));
}
- return reply;
- }
-
- /**
- * Notifies the connector that a plugin reply was received.
- *
- * @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.
- *
- * @author David âBombeâ Roden
- */
- private static class Reply {
-
- /** The fields of the reply. */
- private SimpleFieldSet fields;
-
- /** The payload of the reply. */
- private Bucket data;
-
- /** Empty constructor. */
- public Reply() {
- /* do nothing. */
- }
-
- /**
- * Returns the fields of the reply.
- *
- * @return The fields of the reply
- */
- public SimpleFieldSet getFields() {
- return fields;
- }
-
- /**
- * Sets the fields of the reply.
- *
- * @param fields
- * The fields of the reply
- */
- public void setFields(SimpleFieldSet fields) {
- this.fields = fields;
- }
-
- /**
- * Returns the payload of the reply.
- *
- * @return The payload of the reply (may be {@code null})
- */
- @SuppressWarnings("unused")
- public Bucket getData() {
- return data;
- }
-
- /**
- * Sets the payload of the reply.
- *
- * @param data
- * The payload of the reply (may be {@code null})
- */
- public void setData(Bucket data) {
- this.data = data;
- }
-
+ return pluginReply;
}
/**
* Helper method to create {@link SimpleFieldSet}s with terser code.
- *
- * @author David âBombeâ Roden
*/
private static class SimpleFieldSetConstructor {
@@ -575,57 +446,4 @@ public class WebOfTrustConnector {
}
- /**
- * Container for identifying plugins. Plugins are identified by their plugin
- * name and their unique identifier.
- *
- * @author David Roden
- */
- 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);
- }
-
- }
-
}