X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPage.java;h=70ecb2bcc9ca886a37b370688264ad1eff49e3fc;hb=787aa8a7839dcb32c07a8e2b6d982c7e2cb67244;hp=289b5a401912481f1ac69304384aaf28bc3f39c4;hpb=3d6cffe82270a1faacf1f0d39c34b11ab316e0db;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
index 289b5a4..70ecb2b 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
@@ -27,6 +27,8 @@ import java.net.URI;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import javax.annotation.Nonnull;
+
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetPage;
@@ -77,35 +79,6 @@ public abstract class JsonPage implements FreenetPage {
 	//
 
 	/**
-	 * Returns the current session, creating a new session if there is no
-	 * current session.
-	 *
-	 * @param toadletContenxt
-	 *            The toadlet context
-	 * @return The current session, or {@code null} if there is no current
-	 *         session
-	 */
-	protected Session getCurrentSession(ToadletContext toadletContenxt) {
-		return webInterface.getCurrentSession(toadletContenxt);
-	}
-
-	/**
-	 * Returns the current session, creating a new session if there is no
-	 * current session and {@code create} is {@code true}.
-	 *
-	 * @param toadletContenxt
-	 *            The toadlet context
-	 * @param create
-	 *            {@code true} to create a new session if there is no current
-	 *            session, {@code false} otherwise
-	 * @return The current session, or {@code null} if there is no current
-	 *         session
-	 */
-	protected Session getCurrentSession(ToadletContext toadletContenxt, boolean create) {
-		return webInterface.getCurrentSession(toadletContenxt, create);
-	}
-
-	/**
 	 * Returns the currently logged in Sone.
 	 *
 	 * @param toadletContext
@@ -114,22 +87,11 @@ public abstract class JsonPage implements FreenetPage {
 	 *         currently logged in
 	 */
 	protected Sone getCurrentSone(ToadletContext toadletContext) {
-		return webInterface.getCurrentSone(toadletContext);
+		return webInterface.getCurrentSoneCreatingSession(toadletContext);
 	}
 
-	/**
-	 * Returns the currently logged in Sone.
-	 *
-	 * @param toadletContext
-	 *            The toadlet context
-	 * @param create
-	 *            {@code true} to create a new session if no session exists,
-	 *            {@code false} to not create a new session
-	 * @return The currently logged in Sone, or {@code null} if no Sone is
-	 *         currently logged in
-	 */
-	protected Sone getCurrentSone(ToadletContext toadletContext, boolean create) {
-		return webInterface.getCurrentSone(toadletContext, create);
+	protected Sone getCurrentSoneWithoutCreatingSession(ToadletContext toadletContext) {
+		return webInterface.getCurrentSoneWithoutCreatingSession(toadletContext);
 	}
 
 	//
@@ -178,6 +140,7 @@ public abstract class JsonPage implements FreenetPage {
 	 *
 	 * @return A reply signaling success
 	 */
+	@Nonnull
 	protected static JsonReturnObject createSuccessJsonObject() {
 		return new JsonReturnObject(true);
 	}
@@ -189,6 +152,7 @@ public abstract class JsonPage implements FreenetPage {
 	 *            The error that has occured
 	 * @return The JSON object, signalling failure and the error code
 	 */
+	@Nonnull
 	protected static JsonReturnObject createErrorJsonObject(String error) {
 		return new JsonErrorReturnObject(error);
 	}
@@ -228,7 +192,7 @@ public abstract class JsonPage implements FreenetPage {
 			}
 		}
 		if (requiresLogin()) {
-			if (getCurrentSone(request.getToadletContext(), false) == null) {
+			if (getCurrentSoneWithoutCreatingSession(request.getToadletContext()) == null) {
 				return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(objectMapper.writeValueAsString(new JsonErrorReturnObject("auth-required")));
 			}
 		}