X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPage.java;h=8ddbacda044affa8946ed0041e76e1f06480e697;hb=07dea8de0ececbfe3b782c7eb6cf56fdfadc147a;hp=2392b126ad56a94a5e39399593d89aa95486c99b;hpb=32998f6979928e57b9b7a4eac4dabe668a821471;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 2392b12..8ddbacd 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - JsonPage.java - Copyright © 2010–2013 David Roden
+ * Sone - JsonPage.java - Copyright © 2010–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,10 @@ 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.SessionProvider;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetPage;
 import net.pterodactylus.sone.web.page.FreenetRequest;
@@ -36,7 +39,6 @@ import net.pterodactylus.util.web.Page;
 import net.pterodactylus.util.web.Response;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import freenet.clients.http.SessionManager.Session;
 import freenet.clients.http.ToadletContext;
 
 /**
@@ -58,6 +60,7 @@ public abstract class JsonPage implements FreenetPage {
 
 	/** The Sone web interface. */
 	protected final WebInterface webInterface;
+	private final SessionProvider sessionProvider;
 
 	/**
 	 * Creates a new JSON page at the given path.
@@ -70,66 +73,19 @@ public abstract class JsonPage implements FreenetPage {
 	public JsonPage(String path, WebInterface webInterface) {
 		this.path = path;
 		this.webInterface = webInterface;
+		this.sessionProvider = webInterface;
 	}
 
 	//
 	// ACCESSORS
 	//
 
-	/**
-	 * 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
-	 *            The toadlet context
-	 * @return The currently logged in Sone, or {@code null} if no Sone is
-	 *         currently logged in
-	 */
 	protected Sone getCurrentSone(ToadletContext toadletContext) {
-		return webInterface.getCurrentSone(toadletContext);
+		return sessionProvider.getCurrentSone(toadletContext, true);
 	}
 
-	/**
-	 * 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 getCurrentSone(ToadletContext toadletContext, boolean createSession) {
+		return sessionProvider.getCurrentSone(toadletContext, createSession);
 	}
 
 	//
@@ -144,7 +100,8 @@ public abstract class JsonPage implements FreenetPage {
 	 *            The request to handle
 	 * @return The created JSON object
 	 */
-	protected abstract JsonReturnObject createJsonObject(FreenetRequest request);
+	@Nonnull
+	protected abstract JsonReturnObject createJsonObject(@Nonnull FreenetRequest request);
 
 	/**
 	 * Returns whether this command needs the form password for authentication
@@ -178,6 +135,7 @@ public abstract class JsonPage implements FreenetPage {
 	 *
 	 * @return A reply signaling success
 	 */
+	@Nonnull
 	protected static JsonReturnObject createSuccessJsonObject() {
 		return new JsonReturnObject(true);
 	}
@@ -189,6 +147,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);
 	}