Merge branch 'next' into wot-integration

[Sone.git] / src / main / java / net / pterodactylus / sone / data / Sone.java

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index f6d5181..5c0e486 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -24,7 +24,6 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -45,42 +44,39 @@ public class Sone {
        /** The logger. */
        private static final Logger logger = Logging.getLogger(Sone.class);
 
-       /** A GUID for this Sone. */
-       private final UUID id;
+       /** The ID of this Sone. */
+       private final String id;
 
        /** The name of this Sone. */
-       private String name;
+       private volatile String name;
 
        /** The URI under which the Sone is stored in Freenet. */
-       private FreenetURI requestUri;
+       private volatile FreenetURI requestUri;
 
        /** The URI used to insert a new version of this Sone. */
        /* This will be null for remote Sones! */
-       private FreenetURI insertUri;
+       private volatile FreenetURI insertUri;
 
        /** The time of the last inserted update. */
-       private long time;
+       private volatile long time;
 
        /** The profile of this Sone. */
-       private Profile profile;
+       private volatile Profile profile;
 
        /** All friend Sones. */
-       private final Set<Sone> friendSones = new HashSet<Sone>();
+       private final Set<Sone> friendSones = Collections.synchronizedSet(new HashSet<Sone>());
 
        /** All posts. */
-       private final Set<Post> posts = new HashSet<Post>();
+       private final Set<Post> posts = Collections.synchronizedSet(new HashSet<Post>());
 
        /** All replies. */
-       private final Set<Reply> replies = new HashSet<Reply>();
-
-       /** The IDs of all blocked Sones. */
-       private final Set<String> blockedSoneIds = new HashSet<String>();
+       private final Set<Reply> replies = Collections.synchronizedSet(new HashSet<Reply>());
 
        /** The IDs of all liked posts. */
-       private final Set<String> likedPostIds = new HashSet<String>();
+       private final Set<String> likedPostIds = Collections.synchronizedSet(new HashSet<String>());
 
        /** The IDs of all liked replies. */
-       private final Set<String> likedReplyIds = new HashSet<String>();
+       private final Set<String> likedReplyIds = Collections.synchronizedSet(new HashSet<String>());
 
        /** Modification count. */
        private volatile long modificationCounter = 0;
@@ -92,7 +88,7 @@ public class Sone {
         *            The ID of this Sone
         */
        public Sone(String id) {
-               this.id = UUID.fromString(id);
+               this.id = id;
        }
 
        //
@@ -105,7 +101,7 @@ public class Sone {
         * @return The ID of this Sone
         */
        public String getId() {
-               return id.toString();
+               return id;
        }
 
        /**
@@ -420,52 +416,6 @@ public class Sone {
        }
 
        /**
-        * Returns the IDs of all blocked Sones. These Sones will not propagated
-        * using the “known Sones” mechanism.
-        *
-        * @return The IDs of all blocked Sones
-        */
-       public Set<String> getBlockedSoneIds() {
-               return Collections.unmodifiableSet(blockedSoneIds);
-       }
-
-       /**
-        * Returns whether the given Sone ID is blocked.
-        *
-        * @param soneId
-        *            The Sone ID to check
-        * @return {@code true} if the given Sone ID is blocked, {@code false}
-        *         otherwise
-        */
-       public boolean isSoneBlocked(String soneId) {
-               return blockedSoneIds.contains(soneId);
-       }
-
-       /**
-        * Adds the given ID to the list of blocked IDs.
-        *
-        * @param soneId
-        *            The Sone ID to block
-        */
-       public synchronized void addBlockedSoneId(String soneId) {
-               if (blockedSoneIds.add(soneId)) {
-                       modificationCounter++;
-               }
-       }
-
-       /**
-        * Removes the given ID from the list of blocked IDs.
-        *
-        * @param soneId
-        *            The Sone ID to unblock
-        */
-       public synchronized void removeBlockedSoneId(String soneId) {
-               if (blockedSoneIds.remove(soneId)) {
-                       modificationCounter++;
-               }
-       }
-
-       /**
         * Returns the IDs of all liked posts.
         *
         * @return All liked posts’ IDs