X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FWebOfTrustConnector.java;h=de3f23a9c6223a7c87c23030178990f4737acd08;hb=d14188d87056cfd63490ef9f16f4aae0c1864864;hp=4996c46dfbb3301fc3d13d04f699e340e4932f6f;hpb=5bcdc1b924c598b1e59551d44e2302ef29258dad;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 4996c46..de3f23a 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â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;
@@ -28,8 +31,6 @@ import java.util.logging.Logger;
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.util.logging.Logging;
-import net.pterodactylus.util.number.Numbers;
import com.google.common.base.Optional;
import com.google.common.collect.MapMaker;
@@ -42,14 +43,12 @@ import freenet.support.api.Bucket;
/**
* Connector for the Web of Trust plugin.
- *
- * @author David âBombeâ Roden
*/
@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";
@@ -97,7 +96,7 @@ public class WebOfTrustConnector {
Reply 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) {
@@ -125,7 +124,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, null);
+ return loadTrustedIdentities(ownIdentity, Optional.absent());
}
/**
@@ -143,7 +142,7 @@ public class WebOfTrustConnector {
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();
+ Set identities = new HashSet<>();
int identityCounter = -1;
while (true) {
String id = fields.get("Identity" + ++identityCounter);
@@ -155,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);
}
@@ -330,7 +329,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);
@@ -352,7 +351,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");
@@ -442,8 +441,6 @@ public class WebOfTrustConnector {
/**
* Container for the data of the reply from a plugin.
- *
- * @author David âBombeâ Roden
*/
private static class Reply {
@@ -501,8 +498,6 @@ public class WebOfTrustConnector {
/**
* Helper method to create {@link SimpleFieldSet}s with terser code.
- *
- * @author David âBombeâ Roden
*/
private static class SimpleFieldSetConstructor {
@@ -577,8 +572,6 @@ 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 {