Update year in copyright lines

[Sone.git] / src / main / java / net / pterodactylus / sone / template / ReplyGroupFilter.java

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 (file)
--- 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 <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class ReplyGroupFilter implements Filter {
 
@@ -42,35 +41,36 @@ public class ReplyGroupFilter implements Filter {
         * {@inheritDoc}
         */
        @Override
-       public Object format(TemplateContext templateContext, Object data, Map<String, String> parameters) {
+       public Object format(TemplateContext templateContext, Object data, Map<String, Object> parameters) {
                @SuppressWarnings("unchecked")
                List<PostReply> allReplies = (List<PostReply>) data;
-               Map<Post, Set<Sone>> postSones = new HashMap<Post, Set<Sone>>();
-               Map<Post, Set<PostReply>> postReplies = new HashMap<Post, Set<PostReply>>();
+               Map<Post, Set<Sone>> postSones = new HashMap<>();
+               Map<Post, Set<PostReply>> 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<Sone> sones = postSones.get(post);
                        if (sones == null) {
-                               sones = new HashSet<Sone>();
+                               sones = new HashSet<>();
                                postSones.put(post, sones);
                        }
                        sones.add(reply.getSone());
                        Set<PostReply> replies = postReplies.get(post);
                        if (replies == null) {
-                               replies = new HashSet<PostReply>();
+                               replies = new HashSet<>();
                                postReplies.put(post, replies);
                        }
                        replies.add(reply);
                }
-               Map<Post, Map<String, Set<?>>> result = new HashMap<Post, Map<String, Set<?>>>();
-               for (Post post : postSones.keySet()) {
-                       if (result.containsKey(post)) {
-                               continue;
-                       }
-                       Map<String, Set<?>> postResult = new HashMap<String, Set<?>>();
-                       postResult.put("sones", postSones.get(post));
-                       postResult.put("replies", postReplies.get(post));
-                       result.put(post, postResult);
+               Map<Post, Map<String, Set<?>>> result = new HashMap<>();
+               for (Entry<Post, Set<Sone>> postEntry : postSones.entrySet()) {
+                       Map<String, Set<?>> postResult = new HashMap<>();
+                       postResult.put("sones", postEntry.getValue());
+                       postResult.put("replies", postReplies.get(postEntry.getKey()));
+                       result.put(postEntry.getKey(), postResult);
                }
                return result;
        }