X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2Fimpl%2FSoneImpl.java;h=24792763c471032b345278998095d8ab3ae97cc0;hb=90d193f69c4aa12c232f937a9d2b7d5afdda81dd;hp=154bfc8d24300b91d57704d7bf9b90f3ac6057c9;hpb=3d78e0dc7fc96009e708b19e0c69d6e3112eac72;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 154bfc8..2479276 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;
@@ -33,6 +34,7 @@ import java.util.logging.Logger;
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Client;
+import net.pterodactylus.sone.data.LocalSone;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Profile;
@@ -40,11 +42,13 @@ import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.SoneOptions;
import net.pterodactylus.sone.data.SoneOptions.DefaultSoneOptions;
+import net.pterodactylus.sone.database.Database;
import net.pterodactylus.sone.freenet.wot.Identity;
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;
@@ -55,11 +59,14 @@ import com.google.common.hash.Hashing;
*
* @author David âBombeâ Roden
*/
-public class SoneImpl implements Sone {
+public class SoneImpl implements LocalSone {
/** The logger. */
private static final Logger logger = getLogger("Sone.Data");
+ /** The database. */
+ private final Database database;
+
/** The ID of this Sone. */
private final String id;
@@ -73,7 +80,7 @@ public class SoneImpl implements Sone {
private volatile long latestEdition;
/** The time of the last inserted update. */
- private volatile long time;
+ private final long time;
/** The status of this Sone. */
private volatile SoneStatus status = SoneStatus.unknown;
@@ -82,16 +89,13 @@ public class SoneImpl implements Sone {
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 friend Sones. */
- private final Set friendSones = new CopyOnWriteArraySet();
-
/** All posts. */
- private final Set posts = new CopyOnWriteArraySet();
+ private final Collection posts = new HashSet();
/** All replies. */
private final Set replies = new CopyOnWriteArraySet();
@@ -111,15 +115,20 @@ public class SoneImpl implements Sone {
/**
* Creates a new Sone.
*
+ * @param database The database
* @param identity
* The identity of the Sone
* @param local
* {@code true} if the Sone is a local Sone, {@code false} otherwise
*/
- public SoneImpl(Identity identity, boolean local) {
+ public SoneImpl(Database database, Identity identity, boolean local, long time, Client client, Collection posts) {
+ this.database = database;
this.id = identity.getId();
this.identity = identity;
this.local = local;
+ this.time = time;
+ this.client = client;
+ this.posts.addAll(posts);
}
//
@@ -235,18 +244,6 @@ public class SoneImpl implements Sone {
}
/**
- * 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) {
- this.time = time;
- return this;
- }
-
- /**
* Returns the status of this Sone.
*
* @return The status of this Sone
@@ -309,7 +306,6 @@ public class SoneImpl implements Sone {
* @return This Sone (for method chaining)
*/
public Sone setClient(Client client) {
- this.client = client;
return this;
}
@@ -340,7 +336,7 @@ public class SoneImpl implements Sone {
* @return The friend Sones of this Sone
*/
public Collection getFriends() {
- return new ArrayList(friendSones);
+ return database.getFriends(this);
}
/**
@@ -352,33 +348,7 @@ public class SoneImpl implements Sone {
* false} otherwise
*/
public boolean hasFriend(String friendSoneId) {
- return friendSones.contains(friendSoneId);
- }
-
- /**
- * Adds the given Sone as a friend Sone.
- *
- * @param friendSone
- * The friend Sone to add
- * @return This Sone (for method chaining)
- */
- public Sone addFriend(String friendSone) {
- if (!friendSone.equals(id)) {
- friendSones.add(friendSone);
- }
- return this;
- }
-
- /**
- * Removes the given Sone as a friend Sone.
- *
- * @param friendSoneId
- * The ID of the friend Sone to remove
- * @return This Sone (for method chaining)
- */
- public Sone removeFriend(String friendSoneId) {
- friendSones.remove(friendSoneId);
- return this;
+ return database.isFriend(this, friendSoneId);
}
/**
@@ -387,12 +357,9 @@ public class SoneImpl implements Sone {
* @return All posts of this Sone
*/
public List getPosts() {
- List sortedPosts;
synchronized (this) {
- sortedPosts = new ArrayList(posts);
+ return FluentIterable.from(posts).toSortedList(Post.TIME_COMPARATOR);
}
- Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
- return sortedPosts;
}
/**
@@ -403,10 +370,6 @@ public class SoneImpl implements Sone {
* @return This Sone (for method chaining)
*/
public Sone setPosts(Collection posts) {
- synchronized (this) {
- this.posts.clear();
- this.posts.addAll(posts);
- }
return this;
}
@@ -711,7 +674,7 @@ public class SoneImpl implements Sone {
/** {@inheritDoc} */
@Override
public String toString() {
- return getClass().getName() + "[identity=" + identity + ",friends(" + friendSones.size() + "),posts(" + posts.size() + "),replies(" + replies.size() + "),albums(" + getRootAlbum().getAlbums().size() + ")]";
+ return getClass().getName() + "[identity=" + identity + ",posts(" + posts.size() + "),replies(" + replies.size() + "),albums(" + getRootAlbum().getAlbums().size() + ")]";
}
}