X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FWebOfTrustConnector.java;h=a67ba828641026d86e76719ba0cf570478d78ff7;hb=8c46c562753c6cff5510f2d628b5adc4f315ffa2;hp=3b30a4eeddc5ad96a5c3b0e31b2857df85c824ae;hpb=0e8f7804ce344bdd69f5ecc7febe25a60a53561d;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 3b30a4e..a67ba82 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–2013 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
@@ -28,6 +28,8 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+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;
@@ -43,14 +45,12 @@ 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 = getLogger("Sone.WoT.Connector");
+	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";
@@ -98,7 +98,7 @@ public class WebOfTrustConnector {
 		Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetOwnIdentities").get());
 		SimpleFieldSet fields = reply.getFields();
 		int ownIdentityCounter = -1;
-		Set<OwnIdentity> ownIdentities = new HashSet<OwnIdentity>();
+		Set<OwnIdentity> ownIdentities = new HashSet<>();
 		while (true) {
 			String id = fields.get("Identity" + ++ownIdentityCounter);
 			if (id == null) {
@@ -141,10 +141,10 @@ public class WebOfTrustConnector {
 	 * @throws PluginException
 	 *             if an error occured talking to the Web of Trust plugin
 	 */
-	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());
+	public Set<Identity> loadTrustedIdentities(OwnIdentity ownIdentity, @Nullable 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());
 		SimpleFieldSet fields = reply.getFields();
-		Set<Identity> identities = new HashSet<Identity>();
+		Set<Identity> identities = new HashSet<>();
 		int identityCounter = -1;
 		while (true) {
 			String id = fields.get("Identity" + ++identityCounter);
@@ -331,7 +331,7 @@ public class WebOfTrustConnector {
 	 * @return The parsed contexts
 	 */
 	private static Set<String> parseContexts(String prefix, SimpleFieldSet fields) {
-		Set<String> contexts = new HashSet<String>();
+		Set<String> contexts = new HashSet<>();
 		int contextCounter = -1;
 		while (true) {
 			String context = fields.get(prefix + "Context" + ++contextCounter);
@@ -353,7 +353,7 @@ public class WebOfTrustConnector {
 	 * @return The parsed properties
 	 */
 	private static Map<String, String> parseProperties(String prefix, SimpleFieldSet fields) {
-		Map<String, String> properties = new HashMap<String, String>();
+		Map<String, String> properties = new HashMap<>();
 		int propertiesCounter = -1;
 		while (true) {
 			String propertyName = fields.get(prefix + "Property" + ++propertiesCounter + ".Name");
@@ -443,8 +443,6 @@ public class WebOfTrustConnector {
 
 	/**
 	 * Container for the data of the reply from a plugin.
-	 *
-	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
 	private static class Reply {
 
@@ -502,8 +500,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 {
 
@@ -578,8 +574,6 @@ public class WebOfTrustConnector {
 	/**
 	 * Container for identifying plugins. Plugins are identified by their plugin
 	 * name and their unique identifier.
-	 *
-	 * @author <a href="mailto:d.roden@xplosion.de">David Roden</a>
 	 */
 	private static class PluginIdentifier {