X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=0afbf3b7133449e987df36916f8d758bef482250;hp=5613828d870ff2d0eaad2f8583c06362c1adae63;hb=d0104f792aec1befd7c18bb46c174682dc416322;hpb=0d4c0d1807ed83cbed7fd11fde34944be2864908 diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java index 5613828..0afbf3b 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; @@ -41,14 +42,28 @@ import freenet.keys.FreenetURI; */ public class Sone { + /** comparator that sorts Sones by their nice name. */ + public static final Comparator NICE_NAME_COMPARATOR = 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 leftSone.getId().compareToIgnoreCase(rightSone.getId()); + } + + }; + /** The logger. */ private static final Logger logger = Logging.getLogger(Sone.class); /** 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,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; @@ -72,9 +90,6 @@ public class Sone { /** All replies. */ private final Set replies = Collections.synchronizedSet(new HashSet()); - /** The IDs of all blocked Sones. */ - private final Set blockedSoneIds = Collections.synchronizedSet(new HashSet()); - /** The IDs of all liked posts. */ private final Set likedPostIds = Collections.synchronizedSet(new HashSet()); @@ -88,7 +103,7 @@ public class Sone { * 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.setSuggestedEdition(latestEdition); } /** @@ -146,18 +176,14 @@ 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); - } + setLatestEdition(requestUri.getEdition()); return this; } @@ -167,7 +193,7 @@ public class Sone { * @return The insert URI of this Sone */ public FreenetURI getInsertUri() { - return insertUri; + return insertUri.setSuggestedEdition(latestEdition); } /** @@ -179,22 +205,43 @@ 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); - } + setLatestEdition(insertUri.getEdition()); 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) @@ -419,52 +466,6 @@ public class Sone { } /** - * 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 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++; - } - } - - /** * Returns the IDs of all liked posts. * * @return All liked posts’ IDs @@ -609,41 +610,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 // @@ -672,7 +638,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=" + insertUri + ",friends(" + friendSones.size() + "),posts(" + posts.size() + "),replies(" + replies.size() + ")]"; } }