Copy identity classes from refactoring branch.

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultIdentity.java b/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultIdentity.java
index 0cfb055..dc44aab 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultIdentity.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultIdentity.java
@@ -69,151 +69,103 @@ public class DefaultIdentity implements Identity {
        // ACCESSORS
        //
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public String getId() {
                return id;
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public String getNickname() {
                return nickname;
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public String getRequestUri() {
                return requestUri;
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public Set<String> getContexts() {
                return Collections.unmodifiableSet(contexts);
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public boolean hasContext(String context) {
                return contexts.contains(context);
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public void setContexts(Collection<String> contexts) {
                this.contexts.clear();
                this.contexts.addAll(contexts);
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
-       public void addContext(String context) {
+       public Identity addContext(String context) {
                contexts.add(context);
+               return this;
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
-       public void removeContext(String context) {
+       public Identity removeContext(String context) {
                contexts.remove(context);
+               return this;
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public Map<String, String> getProperties() {
                return Collections.unmodifiableMap(properties);
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public void setProperties(Map<String, String> properties) {
                this.properties.clear();
                this.properties.putAll(properties);
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public String getProperty(String name) {
                return properties.get(name);
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
-       public void setProperty(String name, String value) {
+       public Identity setProperty(String name, String value) {
                properties.put(name, value);
+               return this;
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
-       public void removeProperty(String name) {
+       public Identity removeProperty(String name) {
                properties.remove(name);
+               return this;
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public Trust getTrust(OwnIdentity ownIdentity) {
                return trustCache.get(ownIdentity);
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
-       public void setTrust(OwnIdentity ownIdentity, Trust trust) {
+       public Identity setTrust(OwnIdentity ownIdentity, Trust trust) {
                trustCache.put(ownIdentity, trust);
+               return this;
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
-       public void removeTrust(OwnIdentity ownIdentity) {
+       public Identity removeTrust(OwnIdentity ownIdentity) {
                trustCache.remove(ownIdentity);
+               return this;
        }
 
        //
        // OBJECT METHODS
        //
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public int hashCode() {
                return getId().hashCode();
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public boolean equals(Object object) {
                if (!(object instanceof Identity)) {
@@ -223,9 +175,6 @@ public class DefaultIdentity implements Identity {
                return identity.getId().equals(getId());
        }
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public String toString() {
                return getClass().getSimpleName() + "[id=" + id + ",nickname=" + nickname + ",contexts=" + contexts + ",properties=" + properties + "]";

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultOwnIdentity.java b/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultOwnIdentity.java
index 348cd8c..ce34b2a 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultOwnIdentity.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultOwnIdentity.java
@@ -45,31 +45,35 @@ public class DefaultOwnIdentity extends DefaultIdentity implements OwnIdentity {
                this.insertUri = insertUri;
        }
 
-       /**
-        * Copy constructor for an own identity.
-        *
-        * @param ownIdentity
-        *            The own identity to copy
-        */
-       public DefaultOwnIdentity(OwnIdentity ownIdentity) {
-               super(ownIdentity.getId(), ownIdentity.getNickname(), ownIdentity.getRequestUri());
-               this.insertUri = ownIdentity.getInsertUri();
-               setContexts(ownIdentity.getContexts());
-               setProperties(ownIdentity.getProperties());
-       }
-
        //
        // ACCESSORS
        //
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        public String getInsertUri() {
                return insertUri;
        }
 
+       @Override
+       public OwnIdentity addContext(String context) {
+               return (OwnIdentity) super.addContext(context);
+       }
+
+       @Override
+       public OwnIdentity removeContext(String context) {
+               return (OwnIdentity) super.removeContext(context);
+       }
+
+       @Override
+       public OwnIdentity setProperty(String name, String value) {
+               return (OwnIdentity) super.setProperty(name, value);
+       }
+
+       @Override
+       public OwnIdentity removeProperty(String name) {
+               return (OwnIdentity) super.removeProperty(name);
+       }
+
        //
        // OBJECT METHODS
        //

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 4554f40..d0cafc5 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java
@@ -22,8 +22,6 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
-
 import com.google.common.base.Function;
 
 /**
@@ -35,17 +33,17 @@ import com.google.common.base.Function;
  */
 public interface Identity {
 
-       final Function<Identity, Collection<String>> TO_CONTEXTS = new Function<Identity, Collection<String>>() {
+       public static final Function<Identity, Set<String>> TO_CONTEXTS = new Function<Identity, Set<String>>() {
                @Override
-               public Collection<String> apply(@Nullable Identity identity) {
-                       return (identity == null) ? Collections.<String>emptyList() : identity.getContexts();
+               public Set<String> apply(Identity identity) {
+                       return (identity == null) ? Collections.<String>emptySet() : identity.getContexts();
                }
        };
 
-       final Function<Identity, Map<String, String>> TO_PROPERTIES = new Function<Identity, Map<String, String>>() {
+       public static final Function<Identity, Map<String, String>> TO_PROPERTIES = new Function<Identity, Map<String, String>>() {
                @Override
-               public Map<String, String> apply(@Nullable Identity identity) {
-                       return (identity == null) ? Collections.<String, String>emptyMap() : identity.getProperties();
+               public Map<String, String> apply(Identity input) {
+                       return (input == null) ? Collections.<String, String>emptyMap() : input.getProperties();
                }
        };
 
@@ -93,7 +91,7 @@ public interface Identity {
         * @param context
         *            The context to add
         */
-       public void addContext(String context);
+       public Identity addContext(String context);
 
        /**
         * Sets all contexts of this identity.
@@ -109,7 +107,7 @@ public interface Identity {
         * @param context
         *            The context to remove
         */
-       public void removeContext(String context);
+       public Identity removeContext(String context);
 
        /**
         * Returns all properties of this identity.
@@ -135,7 +133,7 @@ public interface Identity {
         * @param value
         *            The value of the property
         */
-       public void setProperty(String name, String value);
+       public Identity setProperty(String name, String value);
 
        /**
         * Sets all properties of this identity.
@@ -151,7 +149,7 @@ public interface Identity {
         * @param name
         *            The name of the property to remove
         */
-       public void removeProperty(String name);
+       public Identity removeProperty(String name);
 
        /**
         * Retrieves the trust that this identity receives from the given own
@@ -174,7 +172,7 @@ public interface Identity {
         * @param trust
         *            The trust given by the given own identity
         */
-       public void setTrust(OwnIdentity ownIdentity, Trust trust);
+       public Identity setTrust(OwnIdentity ownIdentity, Trust trust);
 
        /**
         * Removes trust assignment from the given own identity for this identity.
@@ -183,6 +181,6 @@ public interface Identity {
         *            The own identity that removed the trust assignment for this
         *            identity
         */
-       public void removeTrust(OwnIdentity ownIdentity);
+       public Identity removeTrust(OwnIdentity ownIdentity);
 
 }

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/OwnIdentity.java b/src/main/java/net/pterodactylus/sone/freenet/wot/OwnIdentity.java
index 6fc7044..da6409b 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/OwnIdentity.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/OwnIdentity.java
@@ -32,4 +32,9 @@ public interface OwnIdentity extends Identity {
         */
        public String getInsertUri();
 
+       public OwnIdentity addContext(String context);
+       public OwnIdentity removeContext(String context);
+       public OwnIdentity setProperty(String name, String value);
+       public OwnIdentity removeProperty(String name);
+
 }