🎨 Replace DefaultIdentity with Kotlin version

[Sone.git] / src / main / java / net / pterodactylus / sone / freenet / wot / WebOfTrustConnector.java

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 1d30efb..a67ba82 100644 (file)
--- 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–2016 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;
@@ -96,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) {
@@ -124,7 +126,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, Optional.<String>absent());
+               return loadTrustedIdentities(ownIdentity, null);
        }
 
        /**
@@ -139,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);
@@ -329,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);
@@ -351,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");