🎨 Replace Identities helper with Kotlin version

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

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 75ec828..b446e71 100644 (file)
--- 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,47 +17,45 @@
 
 package net.pterodactylus.sone.freenet.wot;
 
-import static java.util.Collections.emptySet;
-import static net.pterodactylus.sone.freenet.wot.Context.extractContext;
+import java.util.*;
+import java.util.logging.*;
+import javax.annotation.*;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-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.inject.Inject;
+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<Context> context;
+       @Nullable
+       private final Context context;
 
        public IdentityLoader(WebOfTrustConnector webOfTrustConnector) {
-               this(webOfTrustConnector, Optional.<Context>absent());
+               this(webOfTrustConnector, null);
        }
 
        @Inject
-       public IdentityLoader(WebOfTrustConnector webOfTrustConnector, Optional<Context> context) {
+       public IdentityLoader(WebOfTrustConnector webOfTrustConnector, @Nullable Context context) {
                this.webOfTrustConnector = webOfTrustConnector;
                this.context = context;
        }
 
        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 Map<OwnIdentity, Collection<Identity>> loadTrustedIdentitiesForOwnIdentities(Collection<OwnIdentity> ownIdentities) throws PluginException {
-               Map<OwnIdentity, Collection<Identity>> currentIdentities = new HashMap<OwnIdentity, Collection<Identity>>();
+               Map<OwnIdentity, Collection<Identity>> currentIdentities = new HashMap<>();
 
                for (OwnIdentity ownIdentity : ownIdentities) {
                        if (identityDoesNotHaveTheCorrectContext(ownIdentity)) {
@@ -65,7 +63,9 @@ public class IdentityLoader {
                                continue;
                        }
 
-                       Set<Identity> trustedIdentities = webOfTrustConnector.loadTrustedIdentities(ownIdentity, context.transform(extractContext));
+                       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);
                }
 
@@ -73,7 +73,7 @@ public class IdentityLoader {
        }
 
        private boolean identityDoesNotHaveTheCorrectContext(OwnIdentity ownIdentity) {
-               return context.isPresent() && !ownIdentity.hasContext(context.transform(extractContext).get());
+               return (context != null) && !ownIdentity.hasContext(context.getContext());
        }
 
 }