X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetLikesAjaxPage.java;h=f4bf648f6c968173ce1c15ef1b5ae69f94106cf1;hb=2e03e9dddbea4b81aacaf1aa316f5c3ccffd4bf9;hp=1a5286f27f9df48ac306c79715340becfff1a401;hpb=6e9a43ccd93ae125720547c0fe421dc81a54ba90;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.java
index 1a5286f..f4bf648 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.java
@@ -17,9 +17,9 @@
 
 package net.pterodactylus.sone.web.ajax;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import static com.fasterxml.jackson.databind.node.JsonNodeFactory.instance;
+import static net.pterodactylus.sone.data.Sone.NICE_NAME_COMPARATOR;
+
 import java.util.Set;
 
 import net.pterodactylus.sone.data.Post;
@@ -28,10 +28,12 @@ import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.template.SoneAccessor;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.json.JsonArray;
-import net.pterodactylus.util.json.JsonObject;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Optional;
+import com.google.common.collect.FluentIterable;
 
 /**
  * AJAX page that retrieves the number of “likes” a {@link Post} has.
@@ -54,37 +56,31 @@ public class GetLikesAjaxPage extends JsonPage {
 	// JSONPAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		String type = request.getHttpRequest().getParam("type", null);
 		String id = request.getHttpRequest().getParam(type, null);
 		if ((id == null) || (id.length() == 0)) {
 			return createErrorJsonObject("invalid-" + type + "-id");
 		}
 		if ("post".equals(type)) {
-			Optional<Post> post = webInterface.getCore().getPost(id);
+			Optional<Post> post = webInterface.getCore().getDatabase().getPost(id);
 			if (!post.isPresent()) {
 				return createErrorJsonObject("invalid-post-id");
 			}
-			Set<Sone> sones = webInterface.getCore().getLikes(post.get());
+			Set<Sone> sones = post.get().getLikes();
 			return createSuccessJsonObject().put("likes", sones.size()).put("sones", getSones(sones));
 		} else if ("reply".equals(type)) {
-			Optional<PostReply> reply = webInterface.getCore().getPostReply(id);
+			Optional<PostReply> reply = webInterface.getCore().getDatabase().getPostReply(id);
 			if (!reply.isPresent()) {
 				return createErrorJsonObject("invalid-reply-id");
 			}
-			Set<Sone> sones = webInterface.getCore().getLikes(reply.get());
+			Set<Sone> sones = reply.get().getLikes();
 			return createSuccessJsonObject().put("likes", sones.size()).put("sones", getSones(sones));
 		}
 		return createErrorJsonObject("invalid-type");
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected boolean needsFormPassword() {
 		return false;
@@ -102,12 +98,10 @@ public class GetLikesAjaxPage extends JsonPage {
 	 *            The Sones to convert to an array
 	 * @return The Sones, sorted by name
 	 */
-	private static JsonArray getSones(Set<Sone> sones) {
-		JsonArray soneArray = new JsonArray();
-		List<Sone> sortedSones = new ArrayList<Sone>(sones);
-		Collections.sort(sortedSones, Sone.NICE_NAME_COMPARATOR);
-		for (Sone sone : sortedSones) {
-			soneArray.add(new JsonObject().put("id", sone.getId()).put("name", SoneAccessor.getNiceName(sone)));
+	private static JsonNode getSones(Set<Sone> sones) {
+		ArrayNode soneArray = new ArrayNode(instance);
+		for (Sone sone : FluentIterable.from(sones).toSortedList(NICE_NAME_COMPARATOR)) {
+			soneArray.add(new ObjectNode(instance).put("id", sone.getId()).put("name", SoneAccessor.getNiceName(sone)));
 		}
 		return soneArray;
 	}