X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityLoader.java;h=b446e71cabc9d20d9aff62e5009c07bf75254f01;hb=6a5b585e731597b33beed8f58a0e79b9f0c37f96;hp=550079b0c604479954771b26deb4fbeed0d7f3df;hpb=4c4b77eff97fd247c6b1c8bbb30aeb6ea3d2c172;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityLoader.java b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityLoader.java
index 550079b..b446e71 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityLoader.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityLoader.java
@@ -1,5 +1,5 @@
 /*
- * Sone - IdentityLoader.java - Copyright © 2013 David Roden
+ * Sone - IdentityLoader.java - Copyright © 2013–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,57 +17,63 @@
 
 package net.pterodactylus.sone.freenet.wot;
 
-import static com.google.common.collect.HashMultimap.create;
+import java.util.*;
+import java.util.logging.*;
+import javax.annotation.*;
 
-import java.util.Collection;
-import java.util.Set;
+import com.google.common.base.*;
+import com.google.inject.*;
+import net.pterodactylus.sone.freenet.plugin.*;
 
-import net.pterodactylus.sone.freenet.plugin.PluginException;
-
-import com.google.common.base.Optional;
-import com.google.common.collect.Multimap;
+import static java.util.concurrent.TimeUnit.*;
 
 /**
  * Loads {@link OwnIdentity}s and the {@link Identity}s they trust.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class IdentityLoader {
 
+	private final Logger logger = Logger.getLogger(IdentityLoader.class.getName());
 	private final WebOfTrustConnector webOfTrustConnector;
-	private final Optional<String> context;
+	@Nullable
+	private final Context context;
 
 	public IdentityLoader(WebOfTrustConnector webOfTrustConnector) {
-		this(webOfTrustConnector, Optional.<String>absent());
+		this(webOfTrustConnector, null);
 	}
 
-	public IdentityLoader(WebOfTrustConnector webOfTrustConnector, Optional<String> context) {
+	@Inject
+	public IdentityLoader(WebOfTrustConnector webOfTrustConnector, @Nullable Context context) {
 		this.webOfTrustConnector = webOfTrustConnector;
 		this.context = context;
 	}
 
-	public Multimap<OwnIdentity, Identity> loadIdentities() throws WebOfTrustException {
+	public Map<OwnIdentity, Collection<Identity>> loadIdentities() throws WebOfTrustException {
+		Stopwatch stopwatch = Stopwatch.createStarted();
 		Collection<OwnIdentity> currentOwnIdentities = webOfTrustConnector.loadAllOwnIdentities();
+		logger.fine("Loaded " + currentOwnIdentities.size() + " own identities in " + (stopwatch.elapsed(MILLISECONDS) / 1000.0) + "s.");
 		return loadTrustedIdentitiesForOwnIdentities(currentOwnIdentities);
 	}
 
-	private Multimap<OwnIdentity, Identity> loadTrustedIdentitiesForOwnIdentities(Collection<OwnIdentity> ownIdentities) throws PluginException {
-		Multimap<OwnIdentity, Identity> currentIdentities = create();
+	private Map<OwnIdentity, Collection<Identity>> loadTrustedIdentitiesForOwnIdentities(Collection<OwnIdentity> ownIdentities) throws PluginException {
+		Map<OwnIdentity, Collection<Identity>> currentIdentities = new HashMap<>();
 
 		for (OwnIdentity ownIdentity : ownIdentities) {
 			if (identityDoesNotHaveTheCorrectContext(ownIdentity)) {
+				currentIdentities.put(ownIdentity, Collections.<Identity>emptySet());
 				continue;
 			}
 
-			Set<Identity> trustedIdentities = webOfTrustConnector.loadTrustedIdentities(ownIdentity, context.orNull());
-			currentIdentities.putAll(ownIdentity, trustedIdentities);
+			Stopwatch stopwatch = Stopwatch.createStarted();
+			Set<Identity> trustedIdentities = webOfTrustConnector.loadTrustedIdentities(ownIdentity, (context == null) ? null : context.getContext());
+			logger.fine("Loaded " + trustedIdentities.size() + " identities for " + ownIdentity.getNickname() + " in " + (stopwatch.elapsed(MILLISECONDS) / 1000.0) + "s.");
+			currentIdentities.put(ownIdentity, trustedIdentities);
 		}
 
 		return currentIdentities;
 	}
 
 	private boolean identityDoesNotHaveTheCorrectContext(OwnIdentity ownIdentity) {
-		return context.isPresent() && !ownIdentity.hasContext(context.get());
+		return (context != null) && !ownIdentity.hasContext(context.getContext());
 	}
 
 }