Return an optional Sone from the current session.

[Sone.git] / src / main / java / net / pterodactylus / sone / web / ajax / JsonPage.java

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 3c7f587..bb32362 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import static java.util.logging.Logger.getLogger;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -30,12 +32,12 @@ import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetPage;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.io.Closer;
-import net.pterodactylus.util.logging.Logging;
 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 com.google.common.base.Optional;
+
 import freenet.clients.http.ToadletContext;
 
 /**
@@ -47,7 +49,7 @@ import freenet.clients.http.ToadletContext;
 public abstract class JsonPage implements FreenetPage {
 
        /** The logger. */
-       private static final Logger logger = Logging.getLogger(JsonPage.class);
+       private static final Logger logger = getLogger("Sone.Web.Ajax");
 
        /** The JSON serializer. */
        private static final ObjectMapper objectMapper = new ObjectMapper();
@@ -76,35 +78,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
@@ -112,7 +85,7 @@ public abstract class JsonPage implements FreenetPage {
         * @return The currently logged in Sone, or {@code null} if no Sone is
         *         currently logged in
         */
-       protected Sone getCurrentSone(ToadletContext toadletContext) {
+       protected Optional<Sone> getCurrentSone(ToadletContext toadletContext) {
                return webInterface.getCurrentSone(toadletContext);
        }
 
@@ -127,7 +100,7 @@ public abstract class JsonPage implements FreenetPage {
         * @return The currently logged in Sone, or {@code null} if no Sone is
         *         currently logged in
         */
-       protected Sone getCurrentSone(ToadletContext toadletContext, boolean create) {
+       protected Optional<Sone> getCurrentSone(ToadletContext toadletContext, boolean create) {
                return webInterface.getCurrentSone(toadletContext, create);
        }
 
@@ -227,7 +200,7 @@ public abstract class JsonPage implements FreenetPage {
                        }
                }
                if (requiresLogin()) {
-                       if (getCurrentSone(request.getToadletContext(), false) == null) {
+                       if (!getCurrentSone(request.getToadletContext(), false).isPresent()) {
                                return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(objectMapper.writeValueAsString(new JsonErrorReturnObject("auth-required")));
                        }
                }