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=da1967c1822d8a184bffd109abf96b4fd0d2394f;hb=d0104f792aec1befd7c18bb46c174682dc416322;hpb=bfce6c4612f11230270eb1af6effda39bf0fd05d

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index da1967c..0afbf3b 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;
 
@@ -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.setSuggestedEdition(latestEdition);
 	}
 
 	/**
@@ -152,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;
 	}
 
@@ -173,7 +193,7 @@ public class Sone {
 	 * @return The insert URI of this Sone
 	 */
 	public FreenetURI getInsertUri() {
-		return insertUri;
+		return insertUri.setSuggestedEdition(latestEdition);
 	}
 
 	/**
@@ -185,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)
@@ -569,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
 	//
@@ -613,7 +619,7 @@ public class Sone {
 	 */
 	@Override
 	public int hashCode() {
-		return identity.getId().hashCode();
+		return id.hashCode();
 	}
 
 	/**
@@ -624,7 +630,7 @@ public class Sone {
 		if (!(object instanceof Sone)) {
 			return false;
 		}
-		return ((Sone) object).identity.getId().equals(identity.getId());
+		return ((Sone) object).id.equals(id);
 	}
 
 	/**