X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetReplyAjaxPage.java;h=0f009dc2c877a98091c4a415ab73878332b9ffee;hb=2e03e9dddbea4b81aacaf1aa316f5c3ccffd4bf9;hp=b617608377429b16b95afc2a1e2a7ecf40df4030;hpb=cf16e1fef9f9db74f50fb1d12dbc48a552ec2a1a;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java
index b617608..0f009dc 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java
@@ -17,20 +17,23 @@
 
 package net.pterodactylus.sone.web.ajax;
 
-import java.io.StringWriter;
+import static com.fasterxml.jackson.databind.node.JsonNodeFactory.instance;
 
-import com.google.common.base.Optional;
+import java.io.StringWriter;
 
 import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.io.Closer;
-import net.pterodactylus.util.json.JsonObject;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.template.TemplateException;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.base.Optional;
+
 /**
  * This AJAX page returns the details of a reply.
  *
@@ -58,22 +61,16 @@ public class GetReplyAjaxPage extends JsonPage {
 	// JSONPAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		String replyId = request.getHttpRequest().getParam("reply");
-		Optional<PostReply> reply = webInterface.getCore().getPostReply(replyId);
+		Optional<PostReply> reply = webInterface.getCore().getDatabase().getPostReply(replyId);
 		if (!reply.isPresent()) {
 			return createErrorJsonObject("invalid-reply-id");
 		}
 		return createSuccessJsonObject().put("reply", createJsonReply(request, reply.get(), getCurrentSone(request.getToadletContext())));
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected boolean needsFormPassword() {
 		return false;
@@ -94,8 +91,8 @@ public class GetReplyAjaxPage extends JsonPage {
 	 *            The currently logged in Sone (to store in the template)
 	 * @return The JSON representation of the reply
 	 */
-	private JsonObject createJsonReply(FreenetRequest request, PostReply reply, Sone currentSone) {
-		JsonObject jsonReply = new JsonObject();
+	private JsonNode createJsonReply(FreenetRequest request, PostReply reply, Sone currentSone) {
+		ObjectNode jsonReply = new ObjectNode(instance);
 		jsonReply.put("id", reply.getId());
 		jsonReply.put("postId", reply.getPostId());
 		jsonReply.put("soneId", reply.getSone().getId());