X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSoneImpl.java;h=5678824e9ed794763cd55d14f4b7eaa6b9651a67;hb=43740d6a1dfc686ab54d0aebd4a5b1bce75b9ed6;hp=1fe971fbb401ecf4f0ccd0711c221b0afa22ec3a;hpb=ec06ae64c86f0b06bb0cf9f8b289e7907e81dffa;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/SoneImpl.java b/src/main/java/net/pterodactylus/sone/data/SoneImpl.java
index 1fe971f..5678824 100644
--- a/src/main/java/net/pterodactylus/sone/data/SoneImpl.java
+++ b/src/main/java/net/pterodactylus/sone/data/SoneImpl.java
@@ -18,7 +18,10 @@
 package net.pterodactylus.sone.data;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static java.lang.String.format;
+import static java.util.logging.Logger.getLogger;
 
+import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -30,7 +33,7 @@ import java.util.logging.Logger;
 
 import net.pterodactylus.sone.data.SoneOptions.DefaultSoneOptions;
 import net.pterodactylus.sone.freenet.wot.Identity;
-import net.pterodactylus.util.logging.Logging;
+import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 
 import freenet.keys.FreenetURI;
 
@@ -47,7 +50,7 @@ import com.google.common.hash.Hashing;
 public class SoneImpl implements Sone {
 
 	/** The logger. */
-	private static final Logger logger = Logging.getLogger(SoneImpl.class);
+	private static final Logger logger = getLogger("Sone.Data");
 
 	/** The ID of this Sone. */
 	private final String id;
@@ -56,7 +59,7 @@ public class SoneImpl implements Sone {
 	private final boolean local;
 
 	/** The identity of this Sone. */
-	private Identity identity;
+	private final Identity identity;
 
 	/** The URI under which the Sone is stored in Freenet. */
 	private volatile FreenetURI requestUri;
@@ -107,13 +110,14 @@ public class SoneImpl implements Sone {
 	/**
 	 * Creates a new Sone.
 	 *
-	 * @param id
-	 * 		The ID of the Sone
+	 * @param identity
+	 * 		The identity of the Sone
 	 * @param local
 	 * 		{@code true} if the Sone is a local Sone, {@code false} otherwise
 	 */
-	public SoneImpl(String id, boolean local) {
-		this.id = id;
+	public SoneImpl(Identity identity, boolean local) {
+		this.id = identity.getId();
+		this.identity = identity;
 		this.local = local;
 	}
 
@@ -140,24 +144,6 @@ public class SoneImpl implements 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 SoneImpl 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
@@ -181,26 +167,17 @@ public class SoneImpl implements Sone {
 	 * @return The request URI of this Sone
 	 */
 	public FreenetURI getRequestUri() {
-		return (requestUri != null) ? requestUri.setSuggestedEdition(latestEdition) : null;
-	}
-
-	/**
-	 * Sets the request URI of this Sone.
-	 *
-	 * @param requestUri
-	 * 		The request URI of this Sone
-	 * @return This Sone (for method chaining)
-	 */
-	public Sone setRequestUri(FreenetURI requestUri) {
-		if (this.requestUri == null) {
-			this.requestUri = requestUri.setKeyType("USK").setDocName("Sone").setMetaString(new String[0]);
-			return this;
-		}
-		if (!this.requestUri.equalsKeypair(requestUri)) {
-			logger.log(Level.WARNING, String.format("Request URI %s tried to overwrite %s!", requestUri, this.requestUri));
-			return this;
+		try {
+			return new FreenetURI(getIdentity().getRequestUri())
+					.setKeyType("USK")
+					.setDocName("Sone")
+					.setMetaString(new String[0])
+					.setSuggestedEdition(latestEdition);
+		} catch (MalformedURLException e) {
+			throw new IllegalStateException(
+					format("Identity %s's request URI is incorrect.",
+							getIdentity()), e);
 		}
-		return this;
 	}
 
 	/**
@@ -209,26 +186,17 @@ public class SoneImpl implements Sone {
 	 * @return The insert URI of this Sone
 	 */
 	public FreenetURI getInsertUri() {
-		return (insertUri != null) ? insertUri.setSuggestedEdition(latestEdition) : null;
-	}
-
-	/**
-	 * Sets the insert URI of this Sone.
-	 *
-	 * @param insertUri
-	 * 		The insert URI of this Sone
-	 * @return This Sone (for method chaining)
-	 */
-	public Sone setInsertUri(FreenetURI insertUri) {
-		if (this.insertUri == null) {
-			this.insertUri = insertUri.setKeyType("USK").setDocName("Sone").setMetaString(new String[0]);
-			return this;
+		if (!isLocal()) {
+			return null;
 		}
-		if (!this.insertUri.equalsKeypair(insertUri)) {
-			logger.log(Level.WARNING, String.format("Request URI %s tried to overwrite %s!", insertUri, this.insertUri));
-			return this;
+		try {
+			return new FreenetURI(((OwnIdentity) getIdentity()).getInsertUri())
+					.setDocName("Sone")
+					.setMetaString(new String[0])
+					.setSuggestedEdition(latestEdition);
+		} catch (MalformedURLException e) {
+			throw new IllegalStateException(format("Own identity %s's insert URI is incorrect.", getIdentity()), e);
 		}
-		return this;
 	}
 
 	/**