X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityManager.java;h=810e0540a2d477d43703d4cc3cd626611ed031d6;hb=88469a40e677180866ae22f991dd547d0a367522;hp=ef8b3b6f5536b795e1f93d175e60efad4a586e7d;hpb=f787966bd8ba2d1a50690339b0e14424d8591f8c;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java index ef8b3b6..810e054 100644 --- a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java +++ b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java @@ -1,5 +1,5 @@ /* - * Sone - IdentityManager.java - Copyright © 2010 David Roden + * Sone - IdentityManager.java - Copyright © 2010–2013 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,84 +17,67 @@ package net.pterodactylus.sone.freenet.wot; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; +import static com.google.common.base.Optional.fromNullable; +import static com.google.common.collect.HashMultimap.create; + +import java.util.HashSet; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import net.pterodactylus.sone.freenet.plugin.PluginException; import net.pterodactylus.util.logging.Logging; import net.pterodactylus.util.service.AbstractService; +import com.google.common.collect.Multimap; +import com.google.common.collect.Sets; +import com.google.common.eventbus.EventBus; +import com.google.inject.Inject; + /** * The identity manager takes care of loading and storing identities, their * contexts, and properties. It does so in a way that does not expose errors via * exceptions but it only logs them and tries to return sensible defaults. *

* It is also responsible for polling identities from the Web of Trust plugin - * and notifying registered {@link IdentityListener}s when {@link Identity}s and + * and sending events to the {@link EventBus} when {@link Identity}s and * {@link OwnIdentity}s are discovered or disappearing. * * @author David ‘Bombe’ Roden */ public class IdentityManager extends AbstractService { - /** Object used for synchronization. */ - private final Object syncObject = new Object() { - /* inner class for better lock names. */ - }; - /** The logger. */ private static final Logger logger = Logging.getLogger(IdentityManager.class); - /** The event manager. */ - private final IdentityListenerManager identityListenerManager = new IdentityListenerManager(); + /** The event bus. */ + private final EventBus eventBus; + + private final IdentityLoader identityLoader; /** The Web of Trust connector. */ private final WebOfTrustConnector webOfTrustConnector; - /** The context to filter for. */ - private volatile String context; - /** The currently known own identities. */ - /* synchronize access on syncObject. */ - private Map currentOwnIdentities = new HashMap(); + private final Set currentOwnIdentities = Sets.newHashSet(); /** * Creates a new identity manager. * + * @param eventBus + * The event bus * @param webOfTrustConnector * The Web of Trust connector + * @param context + * The context to focus on (may be {@code null} to ignore + * contexts) */ - public IdentityManager(WebOfTrustConnector webOfTrustConnector) { + @Inject + public IdentityManager(EventBus eventBus, WebOfTrustConnector webOfTrustConnector, Context context) { super("Sone Identity Manager", false); + this.eventBus = eventBus; this.webOfTrustConnector = webOfTrustConnector; - } - - // - // LISTENER MANAGEMENT - // - - /** - * Adds a listener for identity events. - * - * @param identityListener - * The listener to add - */ - public void addIdentityListener(IdentityListener identityListener) { - identityListenerManager.addListener(identityListener); - } - - /** - * Removes a listener for identity events. - * - * @param identityListener - * The listener to remove - */ - public void removeIdentityListener(IdentityListener identityListener) { - identityListenerManager.removeListener(identityListener); + this.identityLoader = new IdentityLoader(webOfTrustConnector, fromNullable(context.getContext())); } // @@ -102,16 +85,6 @@ public class IdentityManager extends AbstractService { // /** - * Sets the context to filter own identities and trusted identities for. - * - * @param context - * The context to filter for, or {@code null} to not filter - */ - public void setContext(String context) { - this.context = context; - } - - /** * Returns whether the Web of Trust plugin could be reached during the last * try. * @@ -129,119 +102,13 @@ public class IdentityManager extends AbstractService { } /** - * Returns the own identity with the given ID. - * - * @param id - * The ID of the own identity - * @return The own identity, or {@code null} if there is no such identity - */ - public OwnIdentity getOwnIdentity(String id) { - Set allOwnIdentities = getAllOwnIdentities(); - for (OwnIdentity ownIdentity : allOwnIdentities) { - if (ownIdentity.getId().equals(id)) { - return ownIdentity; - } - } - return null; - } - - /** * Returns all own identities. * * @return All own identities */ public Set getAllOwnIdentities() { - try { - Set ownIdentities = webOfTrustConnector.loadAllOwnIdentities(); - Map newOwnIdentities = new HashMap(); - for (OwnIdentity ownIdentity : ownIdentities) { - newOwnIdentities.put(ownIdentity.getId(), ownIdentity); - } - checkOwnIdentities(newOwnIdentities); - return ownIdentities; - } catch (PluginException pe1) { - logger.log(Level.WARNING, "Could not load all own identities!", pe1); - return Collections.emptySet(); - } - } - - // - // ACTIONS - // - - /** - * Adds a context to the given own identity. - * - * @param ownIdentity - * The own identity - * @param context - * The context to add - */ - public void addContext(OwnIdentity ownIdentity, String context) { - if (ownIdentity.hasContext(context)) { - return; - } - try { - webOfTrustConnector.addContext(ownIdentity, context); - ownIdentity.addContext(context); - } catch (PluginException pe1) { - logger.log(Level.WARNING, "Could not add context " + context + " to OwnIdentity " + ownIdentity + ".", pe1); - } - } - - /** - * Removes a context from the given own identity. - * - * @param ownIdentity - * The own identity - * @param context - * The context to remove - */ - public void removeContext(OwnIdentity ownIdentity, String context) { - if (!ownIdentity.hasContext(context)) { - return; - } - try { - webOfTrustConnector.removeContext(ownIdentity, context); - ownIdentity.removeContext(context); - } catch (PluginException pe1) { - logger.log(Level.WARNING, "Could not remove context " + context + " from OwnIdentity " + ownIdentity + ".", pe1); - } - } - - /** - * Sets the property with the given name to the given value. - * - * @param ownIdentity - * The own identity - * @param name - * The name of the property - * @param value - * The value of the property - */ - public void setProperty(OwnIdentity ownIdentity, String name, String value) { - try { - webOfTrustConnector.setProperty(ownIdentity, name, value); - ownIdentity.setProperty(name, value); - } catch (PluginException pe1) { - logger.log(Level.WARNING, "Could not set property “" + name + "” to “" + value + "” for OwnIdentity: " + ownIdentity, pe1); - } - } - - /** - * Removes the property with the given name. - * - * @param ownIdentity - * The own identity - * @param name - * The name of the property to remove - */ - public void removeProperty(OwnIdentity ownIdentity, String name) { - try { - webOfTrustConnector.removeProperty(ownIdentity, name); - ownIdentity.removeProperty(name); - } catch (PluginException pe1) { - logger.log(Level.WARNING, "Could not remove property “" + name + "” from OwnIdentity: " + ownIdentity, pe1); + synchronized (currentOwnIdentities) { + return new HashSet(currentOwnIdentities); } } @@ -254,86 +121,23 @@ public class IdentityManager extends AbstractService { */ @Override protected void serviceRun() { - Map oldIdentities = Collections.emptyMap(); - while (!shouldStop()) { - Map currentIdentities = new HashMap(); - Map currentOwnIdentities = new HashMap(); + Multimap oldIdentities = create(); - /* get all identities with the wanted context from WoT. */ - Set ownIdentities; + while (!shouldStop()) { try { - ownIdentities = webOfTrustConnector.loadAllOwnIdentities(); - for (OwnIdentity ownIdentity : ownIdentities) { - if ((context != null) && !ownIdentity.hasContext(context)) { - continue; - } - currentOwnIdentities.put(ownIdentity.getId(), ownIdentity); - for (Identity identity : webOfTrustConnector.loadTrustedIdentities(ownIdentity, context)) { - currentIdentities.put(identity.getId(), identity); - } - } + Multimap currentIdentities = identityLoader.loadIdentities(); - checkOwnIdentities(currentOwnIdentities); + IdentityChangeEventSender identityChangeEventSender = new IdentityChangeEventSender(eventBus, oldIdentities); + identityChangeEventSender.detectChanges(currentIdentities); - /* find removed identities. */ - for (Identity oldIdentity : oldIdentities.values()) { - if (!currentIdentities.containsKey(oldIdentity.getId())) { - identityListenerManager.fireIdentityRemoved(oldIdentity); - } - } - - /* find new identities. */ - for (Identity currentIdentity : currentIdentities.values()) { - if (!oldIdentities.containsKey(currentIdentity.getId())) { - identityListenerManager.fireIdentityAdded(currentIdentity); - } - } - - /* check for changes in the contexts. */ - for (Identity oldIdentity : oldIdentities.values()) { - if (!currentIdentities.containsKey(oldIdentity.getId())) { - continue; - } - Identity newIdentity = currentIdentities.get(oldIdentity.getId()); - Set oldContexts = oldIdentity.getContexts(); - Set newContexts = newIdentity.getContexts(); - if (oldContexts.size() != newContexts.size()) { - identityListenerManager.fireIdentityUpdated(newIdentity); - continue; - } - for (String oldContext : oldContexts) { - if (!newContexts.contains(oldContext)) { - identityListenerManager.fireIdentityUpdated(newIdentity); - break; - } - } - } - - /* check for changes in the properties. */ - for (Identity oldIdentity : oldIdentities.values()) { - if (!currentIdentities.containsKey(oldIdentity.getId())) { - continue; - } - Identity newIdentity = currentIdentities.get(oldIdentity.getId()); - Map oldProperties = oldIdentity.getProperties(); - Map newProperties = newIdentity.getProperties(); - if (oldProperties.size() != newProperties.size()) { - identityListenerManager.fireIdentityUpdated(newIdentity); - continue; - } - for (Entry oldProperty : oldProperties.entrySet()) { - if (!newProperties.containsKey(oldProperty.getKey()) || !newProperties.get(oldProperty.getKey()).equals(oldProperty.getValue())) { - identityListenerManager.fireIdentityUpdated(newIdentity); - break; - } - } - } - - /* remember the current set of identities. */ oldIdentities = currentIdentities; - } catch (PluginException pe1) { - logger.log(Level.WARNING, "WoT has disappeared!", pe1); + synchronized (currentOwnIdentities) { + currentOwnIdentities.clear(); + currentOwnIdentities.addAll(currentIdentities.keySet()); + } + } catch (WebOfTrustException wote1) { + logger.log(Level.WARNING, "WoT has disappeared!", wote1); } /* wait a minute before checking again. */ @@ -341,37 +145,4 @@ public class IdentityManager extends AbstractService { } } - // - // PRIVATE METHODS - // - - /** - * Checks the given new list of own identities for added or removed own - * identities, as compared to {@link #currentOwnIdentities}. - * - * @param newOwnIdentities - * The new own identities - */ - private void checkOwnIdentities(Map newOwnIdentities) { - synchronized (syncObject) { - - /* find removed own identities: */ - for (OwnIdentity oldOwnIdentity : currentOwnIdentities.values()) { - if (!newOwnIdentities.containsKey(oldOwnIdentity.getId())) { - identityListenerManager.fireOwnIdentityRemoved(oldOwnIdentity); - } - } - - /* find added own identities. */ - for (OwnIdentity currentOwnIdentity : newOwnIdentities.values()) { - if (!currentOwnIdentities.containsKey(currentOwnIdentity.getId())) { - identityListenerManager.fireOwnIdentityAdded(currentOwnIdentity); - } - } - - currentOwnIdentities.clear(); - currentOwnIdentities.putAll(newOwnIdentities); - } - } - }