X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=f183b390636c8c4984e59a3c5d37ac2b4412aabb;hb=62521859cae9cd16eb86ba450900170bd7c327f9;hp=2149a6895014149fcdad5adfa20fa221e27b7698;hpb=e2dfce49f775ca0084ed326ad56fe77321cb3d2d;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 2149a68..f183b39 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.
*
@@ -176,7 +176,7 @@ public class Sone {
*/
public Sone setRequestUri(FreenetURI requestUri) {
if (this.requestUri == null) {
- this.requestUri = requestUri.setDocName("Sone").setMetaString(new String[0]);
+ this.requestUri = requestUri.setKeyType("USK").setDocName("Sone").setMetaString(new String[0]);
return this;
}
if (!this.requestUri.equalsKeypair(requestUri)) {
@@ -204,7 +204,7 @@ public class Sone {
*/
public Sone setInsertUri(FreenetURI insertUri) {
if (this.insertUri == null) {
- this.insertUri = insertUri.setDocName("Sone").setMetaString(new String[0]);
+ this.insertUri = insertUri.setKeyType("USK").setDocName("Sone").setMetaString(new String[0]);
return this;
}
if (!this.insertUri.equalsKeypair(insertUri)) {
@@ -267,7 +267,7 @@ public class Sone {
*
* @return A copy of the profile
*/
- public Profile getProfile() {
+ public synchronized Profile getProfile() {
return new Profile(profile);
}
@@ -281,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;
}
/**
@@ -289,9 +309,8 @@ public class Sone {
*
* @return The friend Sones of this Sone
*/
- public List getFriends() {
- List friends = new ArrayList(friendSones);
- Collections.sort(friends, NICE_NAME_COMPARATOR);
+ public List getFriends() {
+ List friends = new ArrayList(friendSones);
return friends;
}
@@ -302,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;
@@ -311,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);
}
/**
@@ -327,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;
@@ -337,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;
}
@@ -370,7 +389,6 @@ public class Sone {
public synchronized Sone setPosts(Collection posts) {
this.posts.clear();
this.posts.addAll(posts);
- modificationCounter++;
return this;
}
@@ -384,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++;
}
}
@@ -395,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);
}
}
@@ -419,7 +436,6 @@ public class Sone {
public synchronized Sone setReplies(Collection replies) {
this.replies.clear();
this.replies.addAll(replies);
- modificationCounter++;
return this;
}
@@ -431,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);
}
}
@@ -443,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);
}
}
@@ -467,7 +483,6 @@ public class Sone {
public synchronized Sone setLikePostIds(Set likedPostIds) {
this.likedPostIds.clear();
this.likedPostIds.addAll(likedPostIds);
- modificationCounter++;
return this;
}
@@ -491,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;
}
@@ -505,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;
}
@@ -530,7 +541,6 @@ public class Sone {
public synchronized Sone setLikeReplyIds(Set likedReplyIds) {
this.likedReplyIds.clear();
this.likedReplyIds.addAll(likedReplyIds);
- modificationCounter++;
return this;
}
@@ -554,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;
}
@@ -568,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();
}
//