X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FWebOfTrustConnector.java;h=4996c46dfbb3301fc3d13d04f699e340e4932f6f;hb=f90d92147c4cff4abe4ae904c6e89d7382b5921e;hp=07628e3e7b84f486cb247ac4b70dd6ad0c4e2d44;hpb=6f019de1d4d9742981d851ac3c9097cca8bff58e;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 07628e3..4996c46 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
@@ -31,9 +31,11 @@ import net.pterodactylus.sone.freenet.plugin.event.ReceivedReplyEvent;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.number.Numbers;
+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;
@@ -43,6 +45,7 @@ import freenet.support.api.Bucket;
*
* @author David âBombeâ Roden
*/
+@Singleton
public class WebOfTrustConnector {
/** The logger. */
@@ -137,8 +140,8 @@ public class WebOfTrustConnector {
* @throws PluginException
* if an error occured talking to the Web of Trust plugin
*/
- public Set 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 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());
SimpleFieldSet fields = reply.getFields();
Set identities = new HashSet();
int identityCounter = -1;
@@ -566,8 +569,7 @@ 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);
}
}