X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FReplyGroupFilter.java;h=c093e6fe01969fc665954909d38e9997470433f7;hb=5b6ead5721c404ab629187a03a7590824f93bd4d;hp=8bc17a7f6e061d96eacc4f1f9a1f2640e0d89cda;hpb=43a21f859e9fec31096c1540148bdd44a8e3702f;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java b/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java
index 8bc17a7..c093e6f 100644
--- a/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java
@@ -1,5 +1,5 @@
/*
- * Sone - ReplyGroupFilter.java - Copyright © 2010 David Roden
+ * Sone - ReplyGroupFilter.java - Copyright © 2010â2019 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
@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import net.pterodactylus.sone.data.Post;
@@ -33,8 +34,6 @@ import net.pterodactylus.util.template.TemplateContext;
* {@link Filter} implementation that groups replies by the post the are in
* reply to, returning a map with the post as key and the list of replies as
* values.
- *
- * @author David âBombeâ Roden
*/
public class ReplyGroupFilter implements Filter {
@@ -42,35 +41,36 @@ public class ReplyGroupFilter implements Filter {
* {@inheritDoc}
*/
@Override
- public Object format(TemplateContext templateContext, Object data, Map parameters) {
+ public Object format(TemplateContext templateContext, Object data, Map parameters) {
@SuppressWarnings("unchecked")
List allReplies = (List) data;
- Map> postSones = new HashMap>();
- Map> postReplies = new HashMap>();
+ Map> postSones = new HashMap<>();
+ Map> postReplies = new HashMap<>();
for (PostReply reply : allReplies) {
- Post post = reply.getPost();
+ /*
+ * All replies from a new-reply notification have posts,
+ * ListNotificationFilters takes care of that.
+ */
+ Post post = reply.getPost().get();
Set sones = postSones.get(post);
if (sones == null) {
- sones = new HashSet();
+ sones = new HashSet<>();
postSones.put(post, sones);
}
sones.add(reply.getSone());
Set replies = postReplies.get(post);
if (replies == null) {
- replies = new HashSet();
+ replies = new HashSet<>();
postReplies.put(post, replies);
}
replies.add(reply);
}
- Map>> result = new HashMap>>();
- for (Post post : postSones.keySet()) {
- if (result.containsKey(post)) {
- continue;
- }
- Map> postResult = new HashMap>();
- postResult.put("sones", postSones.get(post));
- postResult.put("replies", postReplies.get(post));
- result.put(post, postResult);
+ Map>> result = new HashMap<>();
+ for (Entry> postEntry : postSones.entrySet()) {
+ Map> postResult = new HashMap<>();
+ postResult.put("sones", postEntry.getValue());
+ postResult.put("replies", postReplies.get(postEntry.getKey()));
+ result.put(postEntry.getKey(), postResult);
}
return result;
}