X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=da1967c1822d8a184bffd109abf96b4fd0d2394f;hp=661a13c8ddd0b4cdcd03cf1e1f2c94b94fd0992e;hb=bfce6c4612f11230270eb1af6effda39bf0fd05d;hpb=dca29fe497ecbaefad9af7795309d2ec45ea15c8 diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java index 661a13c..da1967c 100644 --- a/src/main/java/net/pterodactylus/sone/data/Sone.java +++ b/src/main/java/net/pterodactylus/sone/data/Sone.java @@ -24,10 +24,10 @@ import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.UUID; 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; @@ -42,45 +42,53 @@ 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); - /** A GUID for this Sone. */ - private final UUID id; - - /** The name of this Sone. */ - private String name; + /** The identity of this Sone. */ + private final Identity identity; /** The URI under which the Sone is stored in Freenet. */ - private FreenetURI requestUri; + private volatile FreenetURI requestUri; /** The URI used to insert a new version of this Sone. */ /* This will be null for remote Sones! */ - private FreenetURI insertUri; + private volatile FreenetURI insertUri; /** The time of the last inserted update. */ - private long time; + private volatile long time; /** The profile of this Sone. */ - private Profile profile; + private volatile Profile profile; /** All friend Sones. */ - private final Set friendSones = new HashSet(); + private final Set friendSones = Collections.synchronizedSet(new HashSet()); /** All posts. */ - private final Set posts = new HashSet(); + private final Set posts = Collections.synchronizedSet(new HashSet()); /** All replies. */ - private final Set replies = new HashSet(); - - /** The IDs of all blocked Sones. */ - private final Set blockedSoneIds = new HashSet(); + private final Set replies = Collections.synchronizedSet(new HashSet()); /** The IDs of all liked posts. */ - private final Set likedPostIds = new HashSet(); + private final Set likedPostIds = Collections.synchronizedSet(new HashSet()); /** The IDs of all liked replies. */ - private final Set likedReplyIds = new HashSet(); + private final Set likedReplyIds = Collections.synchronizedSet(new HashSet()); /** Modification count. */ private volatile long modificationCounter = 0; @@ -88,11 +96,11 @@ public class Sone { /** * Creates a new Sone. * - * @param id - * The ID of this Sone + * @param identity + * The identity of the Sone */ - public Sone(String id) { - this.id = UUID.fromString(id); + public Sone(Identity identity) { + this.identity = identity; } // @@ -100,33 +108,30 @@ 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.toString(); + return identity.getId(); } /** - * 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. + * Returns the name of this Sone. * - * @param name - * The name of this Sone - * @return This sone (for method chaining) + * @return The name of this Sone */ - public Sone setName(String name) { - this.name = name; - return this; + public String getName() { + return identity.getNickname(); } /** @@ -146,7 +151,19 @@ public class Sone { * @return This Sone (for method chaining) */ public Sone setRequestUri(FreenetURI requestUri) { - this.requestUri = requestUri; + if (this.requestUri == null) { + this.requestUri = requestUri; + updateEditions(); + 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 +184,19 @@ public class Sone { * @return This Sone (for method chaining) */ public Sone setInsertUri(FreenetURI insertUri) { - this.insertUri = insertUri; + if (this.insertUri == null) { + this.insertUri = insertUri; + updateEditions(); + 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; } @@ -227,7 +256,7 @@ public class Sone { @Override public int compare(Sone leftSone, Sone rightSone) { - int diff = SoneAccessor.getNiceName(leftSone).compareTo(SoneAccessor.getNiceName(rightSone)); + int diff = SoneAccessor.getNiceName(leftSone).compareToIgnoreCase(SoneAccessor.getNiceName(rightSone)); if (diff != 0) { return diff; } @@ -396,52 +425,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 @@ -589,16 +572,36 @@ public class Sone { /** * Updates the suggested edition in both the request URI and the insert URI. * - * @param requestUri - * The request URI that resulted from an insert - */ - public void updateUris(FreenetURI requestUri) { - /* TODO - check for the correct URI. */ - long latestEdition = requestUri.getSuggestedEdition(); - this.requestUri = this.requestUri.setSuggestedEdition(latestEdition); - if (this.insertUri != null) { - this.insertUri = this.insertUri.setSuggestedEdition(latestEdition); + * @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)); } // @@ -610,7 +613,7 @@ public class Sone { */ @Override public int hashCode() { - return id.hashCode(); + return identity.getId().hashCode(); } /** @@ -621,7 +624,7 @@ public class Sone { if (!(object instanceof Sone)) { return false; } - return ((Sone) object).id.equals(id); + return ((Sone) object).identity.getId().equals(identity.getId()); } /** @@ -629,7 +632,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() + ")]"; } }