X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=03dff753563a50a7932047239fb48be29b2da90b;hb=76e7a20f5212d9c202dbe92e958834ce3f99bd0e;hp=5613828d870ff2d0eaad2f8583c06362c1adae63;hpb=0d4c0d1807ed83cbed7fd11fde34944be2864908;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 5613828..03dff75 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -27,6 +27,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.sone.template.SoneAccessor;
 import net.pterodactylus.util.logging.Logging;
 import freenet.keys.FreenetURI;
@@ -39,7 +40,21 @@ import freenet.keys.FreenetURI;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class Sone {
+public class Sone implements Fingerprintable {
+
+	/** comparator that sorts Sones by their nice name. */
+	public static final Comparator<Sone> NICE_NAME_COMPARATOR = new Comparator<Sone>() {
+
+		@Override
+		public int compare(Sone leftSone, Sone rightSone) {
+			int diff = SoneAccessor.getNiceName(leftSone).compareToIgnoreCase(SoneAccessor.getNiceName(rightSone));
+			if (diff != 0) {
+				return diff;
+			}
+			return leftSone.getId().compareToIgnoreCase(rightSone.getId());
+		}
+
+	};
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(Sone.class);
@@ -47,8 +62,8 @@ public class Sone {
 	/** The ID of this Sone. */
 	private final String id;
 
-	/** The name of this Sone. */
-	private volatile String name;
+	/** The identity of this Sone. */
+	private Identity identity;
 
 	/** The URI under which the Sone is stored in Freenet. */
 	private volatile FreenetURI requestUri;
@@ -57,14 +72,20 @@ public class Sone {
 	/* This will be null for remote Sones! */
 	private volatile FreenetURI insertUri;
 
+	/** The latest edition of the Sone. */
+	private volatile long latestEdition;
+
 	/** The time of the last inserted update. */
 	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<Sone> friendSones = Collections.synchronizedSet(new HashSet<Sone>());
+	private final Set<String> friendSones = Collections.synchronizedSet(new HashSet<String>());
 
 	/** All posts. */
 	private final Set<Post> posts = Collections.synchronizedSet(new HashSet<Post>());
@@ -72,23 +93,17 @@ public class Sone {
 	/** All replies. */
 	private final Set<Reply> replies = Collections.synchronizedSet(new HashSet<Reply>());
 
-	/** The IDs of all blocked Sones. */
-	private final Set<String> blockedSoneIds = Collections.synchronizedSet(new HashSet<String>());
-
 	/** The IDs of all liked posts. */
 	private final Set<String> likedPostIds = Collections.synchronizedSet(new HashSet<String>());
 
 	/** The IDs of all liked replies. */
 	private final Set<String> likedReplyIds = Collections.synchronizedSet(new HashSet<String>());
 
-	/** Modification count. */
-	private volatile long modificationCounter = 0;
-
 	/**
 	 * Creates a new Sone.
 	 *
 	 * @param id
-	 *            The ID of this Sone
+	 *            The ID of the Sone
 	 */
 	public Sone(String id) {
 		this.id = id;
@@ -99,42 +114,57 @@ public class Sone {
 	//
 
 	/**
-	 * Returns the ID of this Sone.
+	 * Returns the identity of this Sone.
 	 *
-	 * @return The ID of this Sone
+	 * @return The identity of this Sone
 	 */
 	public String getId() {
 		return id;
 	}
 
 	/**
-	 * Returns the name of this Sone.
+	 * Returns the identity of this Sone.
 	 *
-	 * @return The name of this Sone
+	 * @return The identity of this Sone
 	 */
-	public String getName() {
-		return name;
+	public Identity getIdentity() {
+		return identity;
 	}
 
 	/**
-	 * Sets the name of this Sone.
+	 * Sets the identity of this Sone. The {@link Identity#getId() ID} of the
+	 * identity has to match this Sone’s {@link #getId()}.
 	 *
-	 * @param name
-	 *            The name of this Sone
-	 * @return This sone (for method chaining)
+	 * @param identity
+	 *            The identity of this Sone
+	 * @return This Sone (for method chaining)
+	 * @throws IllegalArgumentException
+	 *             if the ID of the identity does not match this Sone’s ID
 	 */
-	public Sone setName(String name) {
-		this.name = name;
+	public Sone setIdentity(Identity identity) throws IllegalArgumentException {
+		if (!identity.getId().equals(id)) {
+			throw new IllegalArgumentException("Identity’s ID does not match Sone’s ID!");
+		}
+		this.identity = identity;
 		return this;
 	}
 
 	/**
+	 * Returns the name of this Sone.
+	 *
+	 * @return The name of this Sone
+	 */
+	public String getName() {
+		return (identity != null) ? identity.getNickname() : null;
+	}
+
+	/**
 	 * Returns the request URI of this Sone.
 	 *
 	 * @return The request URI of this Sone
 	 */
 	public FreenetURI getRequestUri() {
-		return requestUri;
+		return (requestUri != null) ? requestUri.setSuggestedEdition(latestEdition) : null;
 	}
 
 	/**
@@ -146,18 +176,13 @@ public class Sone {
 	 */
 	public Sone setRequestUri(FreenetURI requestUri) {
 		if (this.requestUri == null) {
-			this.requestUri = requestUri;
-			updateEditions();
+			this.requestUri = requestUri.setDocName("Sone").setMetaString(new String[0]);
 			return this;
 		}
 		if (!this.requestUri.equalsKeypair(requestUri)) {
 			logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { requestUri, this.requestUri });
 			return this;
 		}
-		long latestEdition = requestUri.getEdition();
-		if ((latestEdition > this.requestUri.getEdition()) || (latestEdition > this.requestUri.getSuggestedEdition())) {
-			this.requestUri.setSuggestedEdition(latestEdition);
-		}
 		return this;
 	}
 
@@ -167,7 +192,7 @@ public class Sone {
 	 * @return The insert URI of this Sone
 	 */
 	public FreenetURI getInsertUri() {
-		return insertUri;
+		return (insertUri != null) ? insertUri.setSuggestedEdition(latestEdition) : null;
 	}
 
 	/**
@@ -179,22 +204,42 @@ public class Sone {
 	 */
 	public Sone setInsertUri(FreenetURI insertUri) {
 		if (this.insertUri == null) {
-			this.insertUri = insertUri;
-			updateEditions();
+			this.insertUri = insertUri.setDocName("Sone").setMetaString(new String[0]);
 			return this;
 		}
 		if (!this.insertUri.equalsKeypair(insertUri)) {
 			logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { insertUri, this.insertUri });
 			return this;
 		}
-		long latestEdition = insertUri.getEdition();
-		if ((latestEdition > this.insertUri.getEdition()) || (latestEdition > this.insertUri.getSuggestedEdition())) {
-			this.insertUri.setSuggestedEdition(latestEdition);
-		}
 		return this;
 	}
 
 	/**
+	 * Returns the latest edition of this Sone.
+	 *
+	 * @return The latest edition of this Sone
+	 */
+	public long getLatestEdition() {
+		return latestEdition;
+	}
+
+	/**
+	 * Sets the latest edition of this Sone. If the given latest edition is not
+	 * greater than the current latest edition, the latest edition of this Sone
+	 * is not changed.
+	 *
+	 * @param latestEdition
+	 *            The latest edition of this Sone
+	 */
+	public void setLatestEdition(long latestEdition) {
+		if (!(latestEdition > this.latestEdition)) {
+			logger.log(Level.INFO, "New latest edition %d is not greater than current latest edition %d!", new Object[] { latestEdition, this.latestEdition });
+			return;
+		}
+		this.latestEdition = latestEdition;
+	}
+
+	/**
 	 * Return the time of the last inserted update of this Sone.
 	 *
 	 * @return The time of the update (in milliseconds since Jan 1, 1970 UTC)
@@ -222,7 +267,7 @@ public class Sone {
 	 *
 	 * @return A copy of the profile
 	 */
-	public Profile getProfile() {
+	public synchronized Profile getProfile() {
 		return new Profile(profile);
 	}
 
@@ -236,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;
 	}
 
 	/**
@@ -244,19 +309,8 @@ public class Sone {
 	 *
 	 * @return The friend Sones of this Sone
 	 */
-	public List<Sone> getFriends() {
-		List<Sone> friends = new ArrayList<Sone>(friendSones);
-		Collections.sort(friends, new Comparator<Sone>() {
-
-			@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<String> getFriends() {
+		List<String> friends = new ArrayList<String>(friendSones);
 		return friends;
 	}
 
@@ -267,7 +321,7 @@ public class Sone {
 	 *            The new (and only) friends of this Sone
 	 * @return This Sone (for method chaining)
 	 */
-	public Sone setFriends(Collection<Sone> friends) {
+	public Sone setFriends(Collection<String> friends) {
 		friendSones.clear();
 		friendSones.addAll(friends);
 		return this;
@@ -276,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);
 	}
 
 	/**
@@ -292,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;
@@ -302,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;
 	}
 
@@ -317,15 +371,11 @@ public class Sone {
 	 * @return All posts of this Sone
 	 */
 	public List<Post> getPosts() {
-		List<Post> sortedPosts = new ArrayList<Post>(posts);
-		Collections.sort(sortedPosts, new Comparator<Post>() {
-
-			@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<Post> sortedPosts;
+		synchronized (this) {
+			sortedPosts = new ArrayList<Post>(posts);
+		}
+		Collections.sort(sortedPosts, Post.TIME_COMPARATOR);
 		return sortedPosts;
 	}
 
@@ -339,7 +389,6 @@ public class Sone {
 	public synchronized Sone setPosts(Collection<Post> posts) {
 		this.posts.clear();
 		this.posts.addAll(posts);
-		modificationCounter++;
 		return this;
 	}
 
@@ -353,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++;
 		}
 	}
 
@@ -364,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);
 		}
 	}
 
@@ -374,8 +422,7 @@ public class Sone {
 	 *
 	 * @return All replies this Sone made
 	 */
-	public Set<Reply> getReplies() {
-		logger.log(Level.FINEST, "Friends of %s: %s", new Object[] { this, friendSones });
+	public synchronized Set<Reply> getReplies() {
 		return Collections.unmodifiableSet(replies);
 	}
 
@@ -389,7 +436,6 @@ public class Sone {
 	public synchronized Sone setReplies(Collection<Reply> replies) {
 		this.replies.clear();
 		this.replies.addAll(replies);
-		modificationCounter++;
 		return this;
 	}
 
@@ -401,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);
 		}
 	}
 
@@ -413,54 +459,8 @@ public class Sone {
 	 *            The reply to remove
 	 */
 	public synchronized void removeReply(Reply reply) {
-		if (reply.getSone().equals(this) && replies.remove(reply)) {
-			modificationCounter++;
-		}
-	}
-
-	/**
-	 * 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++;
+		if (reply.getSone().equals(this)) {
+			replies.remove(reply);
 		}
 	}
 
@@ -483,7 +483,6 @@ public class Sone {
 	public synchronized Sone setLikePostIds(Set<String> likedPostIds) {
 		this.likedPostIds.clear();
 		this.likedPostIds.addAll(likedPostIds);
-		modificationCounter++;
 		return this;
 	}
 
@@ -507,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;
 	}
 
@@ -521,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;
 	}
 
@@ -546,7 +541,6 @@ public class Sone {
 	public synchronized Sone setLikeReplyIds(Set<String> likedReplyIds) {
 		this.likedReplyIds.clear();
 		this.likedReplyIds.addAll(likedReplyIds);
-		modificationCounter++;
 		return this;
 	}
 
@@ -570,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;
 	}
 
@@ -584,64 +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());
 
-	/**
-	 * Updates the suggested edition in both the request URI and the insert URI.
-	 *
-	 * @param latestEdition
-	 *            The latest edition to update the URIs to
-	 */
-	public void updateUris(long latestEdition) {
-		if ((requestUri != null) && (requestUri.getEdition() < latestEdition)) {
-			requestUri = requestUri.setSuggestedEdition(latestEdition);
+		fingerprint.append("Posts(");
+		for (Post post : getPosts()) {
+			fingerprint.append("Post(").append(post.getId()).append(')');
 		}
-		if ((insertUri != null) && (insertUri.getEdition() < latestEdition)) {
-			insertUri = insertUri.setSuggestedEdition(latestEdition);
-		}
-	}
+		fingerprint.append(")");
 
-	//
-	// PRIVATE METHODS
-	//
+		List<Reply> replies = new ArrayList<Reply>(getReplies());
+		Collections.sort(replies, Reply.TIME_COMPARATOR);
+		fingerprint.append("Replies(");
+		for (Reply reply : replies) {
+			fingerprint.append("Reply(").append(reply.getId()).append(')');
+		}
+		fingerprint.append(')');
 
-	/**
-	 * Updates the editions of the request URI and the insert URI (if latter is
-	 * not {@code null}) with the greater edition of either one.
-	 */
-	private void updateEditions() {
-		long requestEdition = 0;
-		if (requestUri != null) {
-			requestEdition = requestUri.getEdition();
+		List<String> likedPostIds = new ArrayList<String>(getLikedPostIds());
+		Collections.sort(likedPostIds);
+		fingerprint.append("LikedPosts(");
+		for (String likedPostId : likedPostIds) {
+			fingerprint.append("Post(").append(likedPostId).append(')');
 		}
-		long insertEdition = 0;
-		if (insertUri != null) {
-			insertEdition = insertUri.getEdition();
+		fingerprint.append(')');
+
+		List<String> likedReplyIds = new ArrayList<String>(getLikedReplyIds());
+		Collections.sort(likedReplyIds);
+		fingerprint.append("LikedReplies(");
+		for (String likedReplyId : likedReplyIds) {
+			fingerprint.append("Reply(").append(likedReplyId).append(')');
 		}
-		updateUris(Math.max(requestEdition, insertEdition));
+		fingerprint.append(')');
+
+		return fingerprint.toString();
 	}
 
 	//
@@ -672,7 +653,7 @@ public class Sone {
 	 */
 	@Override
 	public String toString() {
-		return getClass().getName() + "[id=" + id + ",name=" + name + ",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() + ")]";
 	}
 
 }