X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityLoader.java;fp=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityLoader.java;h=e19cbfce530ecf3fc26998fbd96e686194fbb789;hp=823653e1d50bf8e2ae4ffb92d52941353b281bcb;hb=52f608f5902d6d05dd39599cdb2ed28f2465b4be;hpb=b2a3147c056a532558c9bfe676431f4597b7f8eb 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 823653e..e19cbfc 100644 --- a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityLoader.java +++ b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityLoader.java @@ -17,19 +17,16 @@ package net.pterodactylus.sone.freenet.wot; -import static com.google.common.collect.HashMultimap.create; import static net.pterodactylus.sone.freenet.wot.Context.extractContext; import java.util.Collection; +import java.util.HashMap; +import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; - import net.pterodactylus.sone.freenet.plugin.PluginException; -import com.google.common.base.Function; import com.google.common.base.Optional; -import com.google.common.collect.Multimap; import com.google.inject.Inject; /** @@ -52,13 +49,13 @@ public class IdentityLoader { this.context = context; } - public Multimap loadIdentities() throws WebOfTrustException { + public Map> loadIdentities() throws WebOfTrustException { Collection currentOwnIdentities = webOfTrustConnector.loadAllOwnIdentities(); return loadTrustedIdentitiesForOwnIdentities(currentOwnIdentities); } - private Multimap loadTrustedIdentitiesForOwnIdentities(Collection ownIdentities) throws PluginException { - Multimap currentIdentities = create(); + private Map> loadTrustedIdentitiesForOwnIdentities(Collection ownIdentities) throws PluginException { + Map> currentIdentities = new HashMap>(); for (OwnIdentity ownIdentity : ownIdentities) { if (identityDoesNotHaveTheCorrectContext(ownIdentity)) { @@ -66,7 +63,7 @@ public class IdentityLoader { } Set trustedIdentities = webOfTrustConnector.loadTrustedIdentities(ownIdentity, context.transform(extractContext)); - currentIdentities.putAll(ownIdentity, trustedIdentities); + currentIdentities.put(ownIdentity, trustedIdentities); } return currentIdentities;