X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2Fimpl%2FSoneImpl.java;h=eb8bbe5c720c98649f3f6ed769b6195741bf6894;hb=d15563b5b582b71366a52a361537c06cd52ae55b;hp=9b46988e50b3519e2eeaec832b0a239234677024;hpb=fd9d1edd9eef0dff1e9dd17a6bc55cb9e4da8f9f;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java b/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java
index 9b46988..eb8bbe5 100644
--- a/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java
@@ -25,6 +25,7 @@ import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -47,6 +48,7 @@ import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 
 import freenet.keys.FreenetURI;
 
+import com.google.common.collect.FluentIterable;
 import com.google.common.hash.Hasher;
 import com.google.common.hash.Hashing;
 
@@ -87,16 +89,16 @@ public class SoneImpl implements LocalSone {
 	private volatile Profile profile = new Profile(this);
 
 	/** The client used by the Sone. */
-	private volatile Client client;
+	private final Client client;
 
 	/** Whether this Sone is known. */
 	private volatile boolean known;
 
 	/** All posts. */
-	private final Set<Post> posts = new CopyOnWriteArraySet<Post>();
+	private final Collection<Post> posts = new HashSet<Post>();
 
 	/** All replies. */
-	private final Set<PostReply> replies = new CopyOnWriteArraySet<PostReply>();
+	private final Set<PostReply> replies = new HashSet<PostReply>();
 
 	/** The IDs of all liked posts. */
 	private final Set<String> likedPostIds = new CopyOnWriteArraySet<String>();
@@ -119,12 +121,15 @@ public class SoneImpl implements LocalSone {
 	 * @param local
 	 * 		{@code true} if the Sone is a local Sone, {@code false} otherwise
 	 */
-	public SoneImpl(Database database, Identity identity, boolean local, long time) {
+	public SoneImpl(Database database, Identity identity, boolean local, long time, Client client, Collection<Post> posts, Collection<PostReply> postReplies) {
 		this.database = database;
 		this.id = identity.getId();
 		this.identity = identity;
 		this.local = local;
 		this.time = time;
+		this.client = client;
+		this.posts.addAll(posts);
+		this.replies.addAll(postReplies);
 	}
 
 	//
@@ -240,17 +245,6 @@ public class SoneImpl implements LocalSone {
 	}
 
 	/**
-	 * Sets the time of the last inserted update of this Sone.
-	 *
-	 * @param time
-	 * 		The time of the update (in milliseconds since Jan 1, 1970 UTC)
-	 * @return This Sone (for method chaining)
-	 */
-	public Sone setTime(long time) {
-		return this;
-	}
-
-	/**
 	 * Returns the status of this Sone.
 	 *
 	 * @return The status of this Sone
@@ -313,7 +307,6 @@ public class SoneImpl implements LocalSone {
 	 * @return This Sone (for method chaining)
 	 */
 	public Sone setClient(Client client) {
-		this.client = client;
 		return this;
 	}
 
@@ -365,52 +358,7 @@ public class SoneImpl implements LocalSone {
 	 * @return All posts of this Sone
 	 */
 	public List<Post> getPosts() {
-		List<Post> sortedPosts;
-		synchronized (this) {
-			sortedPosts = new ArrayList<Post>(posts);
-		}
-		Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
-		return sortedPosts;
-	}
-
-	/**
-	 * Sets all posts of this Sone at once.
-	 *
-	 * @param posts
-	 * 		The new (and only) posts of this Sone
-	 * @return This Sone (for method chaining)
-	 */
-	public Sone setPosts(Collection<Post> posts) {
-		synchronized (this) {
-			this.posts.clear();
-			this.posts.addAll(posts);
-		}
-		return this;
-	}
-
-	/**
-	 * Adds the given post to this Sone. The post will not be added if its {@link
-	 * Post#getSone() Sone} is not this Sone.
-	 *
-	 * @param post
-	 * 		The post to add
-	 */
-	public void addPost(Post post) {
-		if (post.getSone().equals(this) && posts.add(post)) {
-			logger.log(Level.FINEST, String.format("Adding %s to “%s”.", post, getName()));
-		}
-	}
-
-	/**
-	 * Removes the given post from this Sone.
-	 *
-	 * @param post
-	 * 		The post to remove
-	 */
-	public void removePost(Post post) {
-		if (post.getSone().equals(this)) {
-			posts.remove(post);
-		}
+		return FluentIterable.from(posts).toSortedList(Post.TIME_COMPARATOR);
 	}
 
 	/**