/*
- * 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
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;
import net.pterodactylus.util.web.Response;
import com.fasterxml.jackson.databind.ObjectMapper;
-import freenet.clients.http.SessionManager.Session;
import freenet.clients.http.ToadletContext;
/**
public abstract class JsonPage implements FreenetPage {
/** The logger. */
- private static final Logger logger = getLogger("Sone.Web.Ajax");
+ private static final Logger logger = getLogger(JsonPage.class.getName());
/** The JSON serializer. */
private static final ObjectMapper objectMapper = new ObjectMapper();
/** The Sone web interface. */
protected final WebInterface webInterface;
+ private final SessionProvider sessionProvider;
/**
* Creates a new JSON page at the given path.
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);
}
//
*
* @return A reply signaling success
*/
+ @Nonnull
protected static JsonReturnObject createSuccessJsonObject() {
return new JsonReturnObject(true);
}
* 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);
}