Merge branch 'next' into wot-integration

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

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java b/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java
index 2909936..d4288ea 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java
@@ -17,10 +17,6 @@
 
 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;
 
 /**
@@ -42,12 +38,6 @@ public class Identity {
        /** The request URI of the identity. */
        private final String requestUri;
 
-       /** The contexts of the identity. */
-       protected 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.
         *
@@ -99,7 +89,9 @@ public class Identity {
        }
 
        /**
-        * Returns the contexts of the 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.
         *
         * @return The contexts of the identity
         * @throws PluginException
@@ -107,26 +99,7 @@ public class Identity {
         *             plugin
         */
        public Set<String> getContexts() throws PluginException {
-               return getContexts(false);
-       }
-
-       /**
-        * Returns the contexts of the identity.
-        *
-        * @param forceReload
-        *            {@code true} to force a reload of the contexts
-        * @return The contexts of the identity
-        * @throws PluginException
-        *             if an error occured communicating with the Web of Trust
-        *             plugin
-        */
-       public Set<String> getContexts(boolean forceReload) throws PluginException {
-               if (contexts.isEmpty() || forceReload) {
-                       Set<String> contexts = webOfTrustConnector.loadIdentityContexts(this);
-                       this.contexts.clear();
-                       this.contexts.addAll(contexts);
-               }
-               return Collections.unmodifiableSet(contexts);
+               return webOfTrustConnector.loadIdentityContexts(this);
        }
 
        /**
@@ -136,18 +109,12 @@ public class Identity {
         *            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) {
-               return contexts.contains(context);
-       }
-
-       /**
-        * Returns the properties of the identity.
-        *
-        * @return The properties of the identity
-        */
-       public Map<String, String> getProperties() {
-               return Collections.unmodifiableMap(properties);
+       public boolean hasContext(String context) throws PluginException {
+               return getContexts().contains(context);
        }
 
        /**
@@ -157,33 +124,12 @@ public class Identity {
         *            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
         */
-       public String getProperty(String name) {
-               return properties.get(name);
-       }
-
-       /**
-        * 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
-        */
-       public void setProperty(String name, String value) {
-               properties.put(name, value);
-               /* TODO - set property. */
-       }
-
-       /**
-        * Removes the property with the given name.
-        *
-        * @param name
-        *            The name of the property to remove
-        */
-       public void removeProperty(String name) {
-               properties.remove(name);
-               /* TODO - remove property. */
+       public String getProperty(String name) throws PluginException {
+               return webOfTrustConnector.getProperty(this, name);
        }
 
        //