X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=03dff753563a50a7932047239fb48be29b2da90b;hb=2581da10bc2578b9390fb9aed15a57c81e17400e;hp=430973cf6064883f56a38f80f32df2bdffcdf7ac;hpb=f740e30811efaa1f1a0e110218984e242755f897;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index 430973c..03dff75 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -40,7 +40,7 @@ import freenet.keys.FreenetURI;
*
* @author David âBombeâ Roden
*/
-public class Sone {
+public class Sone implements Fingerprintable {
/** comparator that sorts Sones by their nice name. */
public static final Comparator NICE_NAME_COMPARATOR = new Comparator() {
@@ -79,10 +79,13 @@ public class Sone {
private volatile long time;
/** The profile of this Sone. */
- private volatile Profile profile;
+ private volatile Profile profile = new Profile();
+
+ /** The client used by the Sone. */
+ private volatile Client client;
/** All friend Sones. */
- private final Set friendSones = Collections.synchronizedSet(new HashSet());
+ private final Set friendSones = Collections.synchronizedSet(new HashSet());
/** All posts. */
private final Set posts = Collections.synchronizedSet(new HashSet());
@@ -96,9 +99,6 @@ public class Sone {
/** The IDs of all liked replies. */
private final Set likedReplyIds = Collections.synchronizedSet(new HashSet());
- /** Modification count. */
- private volatile long modificationCounter = 0;
-
/**
* Creates a new Sone.
*
@@ -164,7 +164,7 @@ public class Sone {
* @return The request URI of this Sone
*/
public FreenetURI getRequestUri() {
- return requestUri.setSuggestedEdition(latestEdition);
+ return (requestUri != null) ? requestUri.setSuggestedEdition(latestEdition) : null;
}
/**
@@ -183,7 +183,6 @@ public class Sone {
logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { requestUri, this.requestUri });
return this;
}
- setLatestEdition(requestUri.getEdition());
return this;
}
@@ -212,7 +211,6 @@ public class Sone {
logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { insertUri, this.insertUri });
return this;
}
- setLatestEdition(insertUri.getEdition());
return this;
}
@@ -269,7 +267,7 @@ public class Sone {
*
* @return A copy of the profile
*/
- public Profile getProfile() {
+ public synchronized Profile getProfile() {
return new Profile(profile);
}
@@ -283,7 +281,27 @@ public class Sone {
*/
public synchronized void setProfile(Profile profile) {
this.profile = new Profile(profile);
- modificationCounter++;
+ }
+
+ /**
+ * Returns the client used by this Sone.
+ *
+ * @return The client used by this Sone, or {@code null}
+ */
+ public Client getClient() {
+ return client;
+ }
+
+ /**
+ * Sets the client used by this Sone.
+ *
+ * @param client
+ * The client used by this Sone, or {@code null}
+ * @return This Sone (for method chaining)
+ */
+ public Sone setClient(Client client) {
+ this.client = client;
+ return this;
}
/**
@@ -291,19 +309,8 @@ public class Sone {
*
* @return The friend Sones of this Sone
*/
- public List getFriends() {
- List friends = new ArrayList(friendSones);
- Collections.sort(friends, new Comparator() {
-
- @Override
- public int compare(Sone leftSone, Sone rightSone) {
- int diff = SoneAccessor.getNiceName(leftSone).compareToIgnoreCase(SoneAccessor.getNiceName(rightSone));
- if (diff != 0) {
- return diff;
- }
- return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightSone.getTime() - leftSone.getTime()));
- }
- });
+ public List getFriends() {
+ List friends = new ArrayList(friendSones);
return friends;
}
@@ -314,7 +321,7 @@ public class Sone {
* The new (and only) friends of this Sone
* @return This Sone (for method chaining)
*/
- public Sone setFriends(Collection friends) {
+ public Sone setFriends(Collection friends) {
friendSones.clear();
friendSones.addAll(friends);
return this;
@@ -323,13 +330,13 @@ public class Sone {
/**
* Returns whether this Sone has the given Sone as a friend Sone.
*
- * @param friendSone
- * The friend Sone to check for
+ * @param friendSoneId
+ * The ID of the Sone to check for
* @return {@code true} if this Sone has the given Sone as a friend,
* {@code false} otherwise
*/
- public boolean hasFriend(Sone friendSone) {
- return friendSones.contains(friendSone);
+ public boolean hasFriend(String friendSoneId) {
+ return friendSones.contains(friendSoneId);
}
/**
@@ -339,8 +346,8 @@ public class Sone {
* The friend Sone to add
* @return This Sone (for method chaining)
*/
- public Sone addFriend(Sone friendSone) {
- if (!friendSone.equals(this)) {
+ public Sone addFriend(String friendSone) {
+ if (!friendSone.equals(id)) {
friendSones.add(friendSone);
}
return this;
@@ -349,12 +356,12 @@ public class Sone {
/**
* Removes the given Sone as a friend Sone.
*
- * @param friendSone
- * The friend Sone to remove
+ * @param friendSoneId
+ * The ID of the friend Sone to remove
* @return This Sone (for method chaining)
*/
- public Sone removeFriend(Sone friendSone) {
- friendSones.remove(friendSone);
+ public Sone removeFriend(String friendSoneId) {
+ friendSones.remove(friendSoneId);
return this;
}
@@ -364,15 +371,11 @@ public class Sone {
* @return All posts of this Sone
*/
public List getPosts() {
- List sortedPosts = new ArrayList(posts);
- Collections.sort(sortedPosts, new Comparator() {
-
- @Override
- public int compare(Post leftPost, Post rightPost) {
- return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightPost.getTime() - leftPost.getTime()));
- }
-
- });
+ List sortedPosts;
+ synchronized (this) {
+ sortedPosts = new ArrayList(posts);
+ }
+ Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
return sortedPosts;
}
@@ -386,7 +389,6 @@ public class Sone {
public synchronized Sone setPosts(Collection posts) {
this.posts.clear();
this.posts.addAll(posts);
- modificationCounter++;
return this;
}
@@ -400,7 +402,6 @@ public class Sone {
public synchronized void addPost(Post post) {
if (post.getSone().equals(this) && posts.add(post)) {
logger.log(Level.FINEST, "Adding %s to â%sâ.", new Object[] { post, getName() });
- modificationCounter++;
}
}
@@ -411,8 +412,8 @@ public class Sone {
* The post to remove
*/
public synchronized void removePost(Post post) {
- if (post.getSone().equals(this) && posts.remove(post)) {
- modificationCounter++;
+ if (post.getSone().equals(this)) {
+ posts.remove(post);
}
}
@@ -421,8 +422,7 @@ public class Sone {
*
* @return All replies this Sone made
*/
- public Set getReplies() {
- logger.log(Level.FINEST, "Friends of %s: %s", new Object[] { this, friendSones });
+ public synchronized Set getReplies() {
return Collections.unmodifiableSet(replies);
}
@@ -436,7 +436,6 @@ public class Sone {
public synchronized Sone setReplies(Collection replies) {
this.replies.clear();
this.replies.addAll(replies);
- modificationCounter++;
return this;
}
@@ -448,8 +447,8 @@ public class Sone {
* The reply to add
*/
public synchronized void addReply(Reply reply) {
- if (reply.getSone().equals(this) && replies.add(reply)) {
- modificationCounter++;
+ if (reply.getSone().equals(this)) {
+ replies.add(reply);
}
}
@@ -460,8 +459,8 @@ public class Sone {
* The reply to remove
*/
public synchronized void removeReply(Reply reply) {
- if (reply.getSone().equals(this) && replies.remove(reply)) {
- modificationCounter++;
+ if (reply.getSone().equals(this)) {
+ replies.remove(reply);
}
}
@@ -484,7 +483,6 @@ public class Sone {
public synchronized Sone setLikePostIds(Set likedPostIds) {
this.likedPostIds.clear();
this.likedPostIds.addAll(likedPostIds);
- modificationCounter++;
return this;
}
@@ -508,9 +506,7 @@ public class Sone {
* @return This Sone (for method chaining)
*/
public synchronized Sone addLikedPostId(String postId) {
- if (likedPostIds.add(postId)) {
- modificationCounter++;
- }
+ likedPostIds.add(postId);
return this;
}
@@ -522,9 +518,7 @@ public class Sone {
* @return This Sone (for method chaining)
*/
public synchronized Sone removeLikedPostId(String postId) {
- if (likedPostIds.remove(postId)) {
- modificationCounter++;
- }
+ likedPostIds.remove(postId);
return this;
}
@@ -547,7 +541,6 @@ public class Sone {
public synchronized Sone setLikeReplyIds(Set likedReplyIds) {
this.likedReplyIds.clear();
this.likedReplyIds.addAll(likedReplyIds);
- modificationCounter++;
return this;
}
@@ -571,9 +564,7 @@ public class Sone {
* @return This Sone (for method chaining)
*/
public synchronized Sone addLikedReplyId(String replyId) {
- if (likedReplyIds.add(replyId)) {
- modificationCounter++;
- }
+ likedReplyIds.add(replyId);
return this;
}
@@ -585,29 +576,53 @@ public class Sone {
* @return This Sone (for method chaining)
*/
public synchronized Sone removeLikedReplyId(String replyId) {
- if (likedReplyIds.remove(replyId)) {
- modificationCounter++;
- }
+ likedReplyIds.remove(replyId);
return this;
}
- /**
- * Returns the modification counter.
- *
- * @return The modification counter
- */
- public synchronized long getModificationCounter() {
- return modificationCounter;
- }
+ //
+ // FINGERPRINTABLE METHODS
+ //
/**
- * Sets the modification counter.
- *
- * @param modificationCounter
- * The new modification counter
+ * {@inheritDoc}
*/
- public synchronized void setModificationCounter(long modificationCounter) {
- this.modificationCounter = modificationCounter;
+ @Override
+ public synchronized String getFingerprint() {
+ StringBuilder fingerprint = new StringBuilder();
+ fingerprint.append(profile.getFingerprint());
+
+ fingerprint.append("Posts(");
+ for (Post post : getPosts()) {
+ fingerprint.append("Post(").append(post.getId()).append(')');
+ }
+ fingerprint.append(")");
+
+ List replies = new ArrayList(getReplies());
+ Collections.sort(replies, Reply.TIME_COMPARATOR);
+ fingerprint.append("Replies(");
+ for (Reply reply : replies) {
+ fingerprint.append("Reply(").append(reply.getId()).append(')');
+ }
+ fingerprint.append(')');
+
+ List likedPostIds = new ArrayList(getLikedPostIds());
+ Collections.sort(likedPostIds);
+ fingerprint.append("LikedPosts(");
+ for (String likedPostId : likedPostIds) {
+ fingerprint.append("Post(").append(likedPostId).append(')');
+ }
+ fingerprint.append(')');
+
+ List likedReplyIds = new ArrayList(getLikedReplyIds());
+ Collections.sort(likedReplyIds);
+ fingerprint.append("LikedReplies(");
+ for (String likedReplyId : likedReplyIds) {
+ fingerprint.append("Reply(").append(likedReplyId).append(')');
+ }
+ fingerprint.append(')');
+
+ return fingerprint.toString();
}
//
@@ -638,7 +653,7 @@ public class Sone {
*/
@Override
public String toString() {
- return getClass().getName() + "[identity=" + identity + ",requestUri=" + requestUri + ",insertUri=" + insertUri + ",friends(" + friendSones.size() + "),posts(" + posts.size() + "),replies(" + replies.size() + ")]";
+ return getClass().getName() + "[identity=" + identity + ",requestUri=" + requestUri + ",insertUri(" + String.valueOf(insertUri).length() + "),friends(" + friendSones.size() + "),posts(" + posts.size() + "),replies(" + replies.size() + ")]";
}
}