X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FJsonPage.java;h=ea8d52b4c2c780babfc3842c4c025af660b1e42f;hb=83f434470c6fb4d604c04a69c873d30b5fac5ec9;hp=994f90cc3574433dd9d37e5915894b9753294f67;hpb=6e9a43ccd93ae125720547c0fe421dc81a54ba90;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 994f90c..ea8d52b 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java
@@ -30,14 +30,15 @@ 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 freenet.clients.http.ToadletContext;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 /**
  * A JSON page is a specialized {@link Page} that will always return a JSON
  * object to the browser, e.g. for use with AJAX or other scripting frameworks.
@@ -49,6 +50,9 @@ public abstract class JsonPage implements FreenetPage {
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(JsonPage.class);
 
+	/** The JSON serializer. */
+	private static final ObjectMapper objectMapper = new ObjectMapper();
+
 	/** The path of the page. */
 	private final String path;
 
@@ -140,7 +144,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 +178,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,61 +189,49 @@ 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);
 	}
 
 	//
 	// PAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public String getPath() {
 		return path;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public boolean isPrefixPage() {
 		return false;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@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));
 		}
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public boolean isLinkExcepted(URI link) {
 		return false;