X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityLoader.java;h=f16df1c5b4d2ebda0cbb574e8ac32128c0640fea;hb=b4d2d68b5ea4f4edc7337f380cfe078756678126;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..f16df1c 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,61 @@
package net.pterodactylus.sone.freenet.wot;
-import static com.google.common.collect.HashMultimap.create;
+import static java.util.Collections.emptySet;
+import static net.pterodactylus.sone.freenet.wot.Context.extractContext;
import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Set;
import net.pterodactylus.sone.freenet.plugin.PluginException;
import com.google.common.base.Optional;
-import com.google.common.collect.Multimap;
+import com.google.inject.Inject;
/**
* Loads {@link OwnIdentity}s and the {@link Identity}s they trust.
- *
- * @author David âBombeâ Roden
*/
public class IdentityLoader {
private final WebOfTrustConnector webOfTrustConnector;
- private final Optional context;
+ private final Optional context;
public IdentityLoader(WebOfTrustConnector webOfTrustConnector) {
- this(webOfTrustConnector, Optional.absent());
+ this(webOfTrustConnector, Optional.absent());
}
- public IdentityLoader(WebOfTrustConnector webOfTrustConnector, Optional context) {
+ @Inject
+ public IdentityLoader(WebOfTrustConnector webOfTrustConnector, Optional context) {
this.webOfTrustConnector = webOfTrustConnector;
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)) {
+ currentIdentities.put(ownIdentity, Collections.emptySet());
continue;
}
- Set trustedIdentities = webOfTrustConnector.loadTrustedIdentities(ownIdentity, context.orNull());
- currentIdentities.putAll(ownIdentity, trustedIdentities);
+ Set trustedIdentities = webOfTrustConnector.loadTrustedIdentities(ownIdentity, context.transform(extractContext));
+ currentIdentities.put(ownIdentity, trustedIdentities);
}
return currentIdentities;
}
private boolean identityDoesNotHaveTheCorrectContext(OwnIdentity ownIdentity) {
- return context.isPresent() && !ownIdentity.hasContext(context.get());
+ return context.isPresent() && !ownIdentity.hasContext(context.transform(extractContext).get());
}
}