X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=b14c28f3620a6ecc002a9c31b8717002df31191e;hb=6f1e7806171eb6af95c8669f2ac0801e34b9246a;hp=da1967c1822d8a184bffd109abf96b4fd0d2394f;hpb=bfce6c4612f11230270eb1af6effda39bf0fd05d;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 da1967c..b14c28f 100644 --- a/src/main/java/net/pterodactylus/sone/data/Sone.java +++ b/src/main/java/net/pterodactylus/sone/data/Sone.java @@ -59,8 +59,11 @@ public class Sone { /** The logger. */ private static final Logger logger = Logging.getLogger(Sone.class); + /** The ID of this Sone. */ + private final String id; + /** The identity of this Sone. */ - private final Identity identity; + private Identity identity; /** The URI under which the Sone is stored in Freenet. */ private volatile FreenetURI requestUri; @@ -69,6 +72,9 @@ 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; @@ -76,7 +82,7 @@ public class Sone { private volatile Profile profile; /** 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,11 +102,11 @@ public class Sone { /** * Creates a new Sone. * - * @param identity - * The identity of the Sone + * @param id + * The ID of the Sone */ - public Sone(Identity identity) { - this.identity = identity; + public Sone(String id) { + this.id = id; } // @@ -113,7 +119,7 @@ public class Sone { * @return The identity of this Sone */ public String getId() { - return identity.getId(); + return id; } /** @@ -126,12 +132,30 @@ public class Sone { } /** + * Sets the identity of this Sone. The {@link Identity#getId() ID} of the + * identity has to match this Sone’s {@link #getId()}. + * + * @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 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.getNickname(); + return (identity != null) ? identity.getNickname() : null; } /** @@ -140,7 +164,7 @@ public class Sone { * @return The request URI of this Sone */ public FreenetURI getRequestUri() { - return requestUri; + return (requestUri != null) ? requestUri.setSuggestedEdition(latestEdition) : null; } /** @@ -152,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; } @@ -173,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; } /** @@ -185,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) @@ -250,19 +289,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; } @@ -273,7 +301,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; @@ -282,13 +310,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); } /** @@ -298,8 +326,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; @@ -308,12 +336,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; } @@ -323,15 +351,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; } @@ -380,8 +404,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); } @@ -569,41 +592,6 @@ public class Sone { this.modificationCounter = modificationCounter; } - /** - * 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); - } - if ((insertUri != null) && (insertUri.getEdition() < latestEdition)) { - insertUri = insertUri.setSuggestedEdition(latestEdition); - } - } - - // - // PRIVATE METHODS - // - - /** - * 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(); - } - long insertEdition = 0; - if (insertUri != null) { - insertEdition = insertUri.getEdition(); - } - updateUris(Math.max(requestEdition, insertEdition)); - } - // // OBJECT METHODS // @@ -613,7 +601,7 @@ public class Sone { */ @Override public int hashCode() { - return identity.getId().hashCode(); + return id.hashCode(); } /** @@ -624,7 +612,7 @@ public class Sone { if (!(object instanceof Sone)) { return false; } - return ((Sone) object).identity.getId().equals(identity.getId()); + return ((Sone) object).id.equals(id); } /** @@ -632,7 +620,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() + ")]"; } }