X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPage.java;h=d11cc0d2c8b65a01f6766796333511c445c5dcbc;hp=994f90cc3574433dd9d37e5915894b9753294f67;hb=e1b8776c14874e9ae59b614b542255f72290dff1;hpb=6f019de1d4d9742981d851ac3c9097cca8bff58e

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 994f90c..d11cc0d 100644
--- 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,11 @@ 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.json.JsonObject;
-import net.pterodactylus.util.json.JsonUtils;
-import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.web.Page;
 import net.pterodactylus.util.web.Response;
-import freenet.clients.http.SessionManager.Session;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import freenet.clients.http.ToadletContext;
 
 /**
@@ -47,7 +48,10 @@ 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();
 
 	/** The path of the page. */
 	private final String path;
@@ -73,35 +77,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
@@ -140,7 +115,7 @@ public abstract class JsonPage implements FreenetPage {
 	 *            The request to handle
 	 * @return The created JSON object
 	 */
-	protected abstract JsonObject createJsonObject(FreenetRequest request);
+	protected abstract JsonReturnObject createJsonObject(FreenetRequest request);
 
 	/**
 	 * Returns whether this command needs the form password for authentication
@@ -174,8 +149,8 @@ public abstract class JsonPage implements FreenetPage {
 	 *
 	 * @return A reply signaling success
 	 */
-	protected static JsonObject createSuccessJsonObject() {
-		return new JsonObject().put("success", true);
+	protected static JsonReturnObject createSuccessJsonObject() {
+		return new JsonReturnObject(true);
 	}
 
 	/**
@@ -185,8 +160,8 @@ public abstract class JsonPage implements FreenetPage {
 	 *            The error that has occured
 	 * @return The JSON object, signalling failure and the error code
 	 */
-	protected static JsonObject createErrorJsonObject(String error) {
-		return new JsonObject().put("success", false).put("error", error);
+	protected static JsonReturnObject createErrorJsonObject(String error) {
+		return new JsonErrorReturnObject(error);
 	}
 
 	//
@@ -215,22 +190,22 @@ public abstract class JsonPage implements FreenetPage {
 	@Override
 	public Response handleRequest(FreenetRequest request, Response response) throws IOException {
 		if (webInterface.getCore().getPreferences().isRequireFullAccess() && !request.getToadletContext().isAllowedFullAccess()) {
-			return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(JsonUtils.format(new JsonObject().put("success", false).put("error", "auth-required")));
+			return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(objectMapper.writeValueAsString(new JsonErrorReturnObject("auth-required")));
 		}
 		if (needsFormPassword()) {
 			String formPassword = request.getHttpRequest().getParam("formPassword");
 			if (!webInterface.getFormPassword().equals(formPassword)) {
-				return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(JsonUtils.format(new JsonObject().put("success", false).put("error", "auth-required")));
+				return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(objectMapper.writeValueAsString(new JsonErrorReturnObject("auth-required")));
 			}
 		}
 		if (requiresLogin()) {
 			if (getCurrentSone(request.getToadletContext(), false) == null) {
-				return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(JsonUtils.format(new JsonObject().put("success", false).put("error", "auth-required")));
+				return response.setStatusCode(403).setStatusText("Forbidden").setContentType("application/json").write(objectMapper.writeValueAsString(new JsonErrorReturnObject("auth-required")));
 			}
 		}
 		try {
-			JsonObject jsonObject = createJsonObject(request);
-			return response.setStatusCode(200).setStatusText("OK").setContentType("application/json").write(JsonUtils.format(jsonObject));
+			JsonReturnObject jsonObject = createJsonObject(request);
+			return response.setStatusCode(200).setStatusText("OK").setContentType("application/json").write(objectMapper.writeValueAsString(jsonObject));
 		} catch (Exception e1) {
 			logger.log(Level.WARNING, "Error executing JSON page!", e1);
 			return response.setStatusCode(500).setStatusText(e1.getMessage()).setContentType("text/plain").write(dumpStackTrace(e1));