Store contexts and properties in identities, allow modification only via IdentityManager.
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 1 Nov 2010 20:30:44 +0000 (21:30 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 1 Nov 2010 20:30:44 +0000 (21:30 +0100)
src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java
src/main/java/net/pterodactylus/sone/freenet/wot/OwnIdentity.java
src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java

index d4288ea..5816b47 100644 (file)
 
 package net.pterodactylus.sone.freenet.wot;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -26,9 +30,6 @@ import java.util.Set;
  */
 public class Identity {
 
-       /** The Web of Trust connector. */
-       protected final WebOfTrustConnector webOfTrustConnector;
-
        /** The ID of the identity. */
        private final String id;
 
@@ -38,11 +39,15 @@ public class Identity {
        /** The request URI of the identity. */
        private final String requestUri;
 
+       /** The contexts of the identity. */
+       private final Set<String> contexts = Collections.synchronizedSet(new HashSet<String>());
+
+       /** The properties of the identity. */
+       private final Map<String, String> properties = Collections.synchronizedMap(new HashMap<String, String>());
+
        /**
         * Creates a new identity.
         *
-        * @param webOfTrustConnector
-        *            The Web of Trust connector
         * @param id
         *            The ID of the identity
         * @param nickname
@@ -50,8 +55,7 @@ public class Identity {
         * @param requestUri
         *            The request URI of the identity
         */
-       public Identity(WebOfTrustConnector webOfTrustConnector, String id, String nickname, String requestUri) {
-               this.webOfTrustConnector = webOfTrustConnector;
+       public Identity(String id, String nickname, String requestUri) {
                this.id = id;
                this.nickname = nickname;
                this.requestUri = requestUri;
@@ -89,32 +93,103 @@ public class Identity {
        }
 
        /**
-        * Returns the contexts of the identity. If the contexts have not been
-        * loaded yet, they will be loaded. If loading the contexts fails, an empty
-        * set is returned.
+        * Returns all contexts of this identity.
+        *
+        * @return All contexts of this identity
+        */
+       public Set<String> getContexts() {
+               return Collections.unmodifiableSet(contexts);
+       }
+
+       /**
+        * Sets all contexts of this identity.
+        * <p>
+        * This method is only called by the {@link IdentityManager}.
         *
-        * @return The contexts of the identity
-        * @throws PluginException
-        *             if an error occured communicating with the Web of Trust
-        *             plugin
+        * @param contexts
+        *            All contexts of the identity
         */
-       public Set<String> getContexts() throws PluginException {
-               return webOfTrustConnector.loadIdentityContexts(this);
+       void setContexts(Set<String> contexts) {
+               this.contexts.clear();
+               this.contexts.addAll(contexts);
        }
 
        /**
-        * Returns whether the identity contains the given context.
+        * Returns whether this identity has the given context.
         *
         * @param context
         *            The context to check for
         * @return {@code true} if this identity has the given context,
         *         {@code false} otherwise
-        * @throws PluginException
-        *             if an error occured communicating with the Web of Trust
-        *             plugin
         */
-       public boolean hasContext(String context) throws PluginException {
-               return getContexts().contains(context);
+       public boolean hasContext(String context) {
+               return contexts.contains(context);
+       }
+
+       /**
+        * Adds the given context to this identity.
+        * <p>
+        * This method is only called by the {@link IdentityManager}.
+        *
+        * @param context
+        *            The context to add
+        */
+       void addContext(String context) {
+               contexts.add(context);
+       }
+
+       /**
+        * Removes the given context from this identity.
+        * <p>
+        * This method is only called by the {@link IdentityManager}.
+        *
+        * @param context
+        *            The context to remove
+        */
+       void removeContext(String context) {
+               contexts.remove(context);
+       }
+
+       /**
+        * Returns all properties of this identity.
+        *
+        * @return All properties of this identity
+        */
+       public Map<String, String> getProperties() {
+               synchronized (properties) {
+                       return Collections.unmodifiableMap(properties);
+               }
+       }
+
+       /**
+        * Sets all properties of this identity.
+        * <p>
+        * This method is only called by the {@link IdentityManager}.
+        *
+        * @param properties
+        *            The new properties of this identity
+        */
+       void setProperties(Map<String, String> properties) {
+               synchronized (this.properties) {
+                       this.properties.clear();
+                       this.properties.putAll(properties);
+               }
+       }
+
+       /**
+        * Sets the property with the given name to the given value.
+        * <p>
+        * This method is only called by the {@link IdentityManager}.
+        *
+        * @param name
+        *            The name of the property
+        * @param value
+        *            The value of the property
+        */
+       void setProperty(String name, String value) {
+               synchronized (properties) {
+                       properties.put(name, value);
+               }
        }
 
        /**
@@ -122,14 +197,26 @@ public class Identity {
         *
         * @param name
         *            The name of the property
-        * @return The value of the property, or {@code null} if there is no such
-        *         property
-        * @throws PluginException
-        *             if an error occured communicating with the Web of Trust
-        *             plugin
+        * @return The value of the property
         */
-       public String getProperty(String name) throws PluginException {
-               return webOfTrustConnector.getProperty(this, name);
+       public String getProperty(String name) {
+               synchronized (properties) {
+                       return properties.get(name);
+               }
+       }
+
+       /**
+        * Removes the property with the given name.
+        * <p>
+        * This method is only called by the {@link IdentityManager}.
+        *
+        * @param name
+        *            The name of the property to remove
+        */
+       void removeProperty(String name) {
+               synchronized (properties) {
+                       properties.remove(name);
+               }
        }
 
        //
@@ -156,4 +243,12 @@ public class Identity {
                return identity.id.equals(id);
        }
 
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       public String toString() {
+               return getClass().getSimpleName() + "[id=" + id + ",nickname=" + nickname + ",contexts=" + contexts + ",properties=" + properties + "]";
+       }
+
 }
index 3716229..d9ec160 100644 (file)
@@ -31,8 +31,6 @@ public class OwnIdentity extends Identity {
        /**
         * Creates a new own identity.
         *
-        * @param webOfTrustConnector
-        *            The Web of Trust connector
         * @param id
         *            The ID of the identity
         * @param nickname
@@ -42,8 +40,8 @@ public class OwnIdentity extends Identity {
         * @param insertUri
         *            The insert URI of the identity
         */
-       public OwnIdentity(WebOfTrustConnector webOfTrustConnector, String id, String nickname, String requestUri, String insertUri) {
-               super(webOfTrustConnector, id, nickname, requestUri);
+       public OwnIdentity(String id, String nickname, String requestUri, String insertUri) {
+               super(id, nickname, requestUri);
                this.insertUri = insertUri;
        }
 
@@ -60,70 +58,4 @@ public class OwnIdentity extends Identity {
                return insertUri;
        }
 
-       /**
-        * Adds the given context to this identity.
-        *
-        * @param context
-        *            The context to add
-        * @throws PluginException
-        *             if an error occured communicating with the Web of Trust
-        *             plugin
-        */
-       public void addContext(String context) throws PluginException {
-               webOfTrustConnector.addContext(this, context);
-       }
-
-       /**
-        * Removes the given context from this identity.
-        *
-        * @param context
-        *            The context to remove
-        * @throws PluginException
-        *             if an error occured communicating with the Web of Trust
-        *             plugin
-        */
-       public void removeContext(String context) throws PluginException {
-               webOfTrustConnector.removeContext(this, context);
-       }
-
-       /**
-        * Sets the property with the given name to the given value.
-        *
-        * @param name
-        *            The name of the property to set
-        * @param value
-        *            The new value of the property
-        * @throws PluginException
-        *             if an error occured communicating with the Web of Trust
-        *             plugin
-        */
-       public void setProperty(String name, String value) throws PluginException {
-               webOfTrustConnector.setProperty(this, name, value);
-       }
-
-       /**
-        * Removes the property with the given name.
-        *
-        * @param name
-        *            The name of the property to remove
-        * @throws PluginException
-        *             if an error occured communicating with the Web of Trust
-        *             plugin
-        */
-       public void removeProperty(String name) throws PluginException {
-               webOfTrustConnector.removeProperty(this, name);
-       }
-
-       //
-       // OBJECT METHODS
-       //
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       public String toString() {
-               return getClass().getSimpleName() + "[id=" + getId() + ",nickname=" + getNickname() + ",requestUri=" + getRequestUri() + ",insertUri=" + insertUri + "]";
-       }
-
 }
index fd42ce6..d7c8289 100644 (file)
@@ -87,37 +87,15 @@ public class WebOfTrustConnector implements ConnectorListener {
                        String requestUri = fields.get("RequestURI" + ownIdentityCounter);
                        String insertUri = fields.get("InsertURI" + ownIdentityCounter);
                        String nickname = fields.get("Nickname" + ownIdentityCounter);
-                       OwnIdentity ownIdentity = new OwnIdentity(this, id, nickname, requestUri, insertUri);
+                       OwnIdentity ownIdentity = new OwnIdentity(id, nickname, requestUri, insertUri);
+                       ownIdentity.setContexts(parseContexts("Contexts" + ownIdentityCounter, fields));
+                       ownIdentity.setProperties(parseProperties("Properties" + ownIdentityCounter, fields));
                        ownIdentities.add(ownIdentity);
                }
                return ownIdentities;
        }
 
        /**
-        * Loads the contexts of the given identity.
-        *
-        * @param identity
-        *            The identity to load the contexts for
-        * @return The contexts of the identity
-        * @throws PluginException
-        *             if an error occured talking to the Web of Trust plugin
-        */
-       public Set<String> loadIdentityContexts(Identity identity) throws PluginException {
-               Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetIdentity").put("TreeOwner", identity.getId()).put("Identity", identity.getId()).get(), "Identity");
-               SimpleFieldSet fields = reply.getFields();
-               int contextCounter = -1;
-               Set<String> contexts = new HashSet<String>();
-               while (true) {
-                       String context = fields.get("Context" + ++contextCounter);
-                       if (context == null) {
-                               break;
-                       }
-                       contexts.add(context);
-               }
-               return contexts;
-       }
-
-       /**
         * Loads all identities that the given identities trusts with a score of
         * more than 0.
         *
@@ -155,7 +133,10 @@ public class WebOfTrustConnector implements ConnectorListener {
                        }
                        String nickname = fields.get("Nickname" + identityCounter);
                        String requestUri = fields.get("RequestURI" + identityCounter);
-                       identities.add(new Identity(this, id, nickname, requestUri));
+                       Identity identity = new Identity(id, nickname, requestUri);
+                       identity.setContexts(parseContexts("Contexts" + identityCounter, fields));
+                       identity.setProperties(parseProperties("Properties" + identityCounter, fields));
+                       identities.add(identity);
                }
                return identities;
        }
@@ -200,7 +181,7 @@ public class WebOfTrustConnector implements ConnectorListener {
         *             if an error occured talking to the Web of Trust plugin
         */
        public String getProperty(Identity identity, String name) throws PluginException {
-               Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetProperty").put("Identity", identity.getId()).put("Property", name).get(), "PropertyValue", "Error");
+               Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetProperty").put("Identity", identity.getId()).put("Property", name).get(), "PropertyValue");
                return reply.getFields().get("Property");
        }
 
@@ -239,6 +220,51 @@ public class WebOfTrustConnector implements ConnectorListener {
        //
 
        /**
+        * Parses the contexts from the given fields.
+        *
+        * @param prefix
+        *            The prefix to use to access the contexts
+        * @param fields
+        *            The fields to parse the contexts from
+        * @return The parsed contexts
+        */
+       private Set<String> parseContexts(String prefix, SimpleFieldSet fields) {
+               Set<String> contexts = new HashSet<String>();
+               int contextCounter = -1;
+               while (true) {
+                       String context = fields.get(prefix + "Context" + ++contextCounter);
+                       if (context == null) {
+                               break;
+                       }
+                       contexts.add(context);
+               }
+               return contexts;
+       }
+
+       /**
+        * Parses the properties from the given fields.
+        *
+        * @param prefix
+        *            The prefix to use to access the properties
+        * @param fields
+        *            The fields to parse the properties from
+        * @return The parsed properties
+        */
+       private Map<String, String> parseProperties(String prefix, SimpleFieldSet fields) {
+               Map<String, String> properties = new HashMap<String, String>();
+               int propertiesCounter = -1;
+               while (true) {
+                       String propertyName = fields.get(prefix + "Property" + ++propertiesCounter + "Name");
+                       if (propertyName == null) {
+                               break;
+                       }
+                       String propertyValue = fields.get(prefix + "Property" + ++propertiesCounter + "Value");
+                       properties.put(propertyName, propertyValue);
+               }
+               return properties;
+       }
+
+       /**
         * Sends a request containing the given fields and waits for the target
         * message.
         *
@@ -274,6 +300,7 @@ public class WebOfTrustConnector implements ConnectorListener {
                for (String targetMessage : targetMessages) {
                        replies.put(targetMessage, reply);
                }
+               replies.put("Error", reply);
                synchronized (reply) {
                        pluginConnector.sendRequest(WOT_PLUGIN_NAME, PLUGIN_CONNECTION_IDENTIFIER, fields, data);
                        try {
@@ -285,6 +312,10 @@ public class WebOfTrustConnector implements ConnectorListener {
                for (String targetMessage : targetMessages) {
                        replies.remove(targetMessage);
                }
+               replies.remove("Error");
+               if ((reply.getFields() != null) && reply.getFields().get("Message").equals("Error")) {
+                       throw new PluginException("Could not perform request for " + targetMessages[0]);
+               }
                return reply;
        }