X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.java;h=5a292851bfa9024e19e8048b760296330afd601e;hb=ebd842a2ffdd117073401ce0f47a7dfd598c7a61;hp=cd3be84c02484e99b5da22744e3c6100bc3fc1df;hpb=b1c20256cc7b28a80eafb8edfa1e000dbc61b4e1;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
index cd3be84..5a29285 100644
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
@@ -19,6 +19,7 @@ package net.pterodactylus.sone.database.memory;
 
 import static com.google.common.base.Optional.fromNullable;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.collect.FluentIterable.from;
 import static net.pterodactylus.sone.data.Reply.TIME_COMPARATOR;
 
 import java.util.ArrayList;
@@ -52,6 +53,7 @@ import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
 
 import com.google.common.base.Optional;
+import com.google.common.base.Predicate;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.SortedSetMultimap;
@@ -83,9 +85,6 @@ public class MemoryDatabase extends AbstractService implements Database {
 	/** All posts by their Sones. */
 	private final Multimap<String, Post> sonePosts = HashMultimap.create();
 
-	/** All posts by their recipient. */
-	private final Multimap<String, Post> recipientPosts = HashMultimap.create();
-
 	/** Whether posts are known. */
 	private final Set<String> knownPosts = new HashSet<String>();
 
@@ -101,15 +100,6 @@ public class MemoryDatabase extends AbstractService implements Database {
 		}
 	}, TIME_COMPARATOR);
 
-	/** Replies by post. */
-	private final SortedSetMultimap<String, PostReply> postReplies = TreeMultimap.create(new Comparator<String>() {
-
-		@Override
-		public int compare(String leftString, String rightString) {
-			return leftString.compareTo(rightString);
-		}
-	}, TIME_COMPARATOR);
-
 	/** Whether post replies are known. */
 	private final Set<String> knownPostReplies = new HashSet<String>();
 
@@ -195,11 +185,15 @@ public class MemoryDatabase extends AbstractService implements Database {
 
 	/** {@inheritDocs} */
 	@Override
-	public Collection<Post> getDirectedPosts(String recipientId) {
+	public Collection<Post> getDirectedPosts(final String recipientId) {
 		lock.readLock().lock();
 		try {
-			Collection<Post> posts = recipientPosts.get(recipientId);
-			return (posts == null) ? Collections.<Post>emptySet() : new HashSet<Post>(posts);
+			return from(sonePosts.values()).filter(new Predicate<Post>() {
+				@Override
+				public boolean apply(Post post) {
+					return post.getRecipientId().asSet().contains(recipientId);
+				}
+			}).toSet();
 		} finally {
 			lock.readLock().unlock();
 		}
@@ -227,9 +221,6 @@ public class MemoryDatabase extends AbstractService implements Database {
 		try {
 			allPosts.put(post.getId(), post);
 			getPostsFrom(post.getSone().getId()).add(post);
-			if (post.getRecipientId().isPresent()) {
-				getPostsTo(post.getRecipientId().get()).add(post);
-			}
 		} finally {
 			lock.writeLock().unlock();
 		}
@@ -243,9 +234,6 @@ public class MemoryDatabase extends AbstractService implements Database {
 		try {
 			allPosts.remove(post.getId());
 			getPostsFrom(post.getSone().getId()).remove(post);
-			if (post.getRecipientId().isPresent()) {
-				getPostsTo(post.getRecipientId().get()).remove(post);
-			}
 			post.getSone().removePost(post);
 		} finally {
 			lock.writeLock().unlock();
@@ -269,18 +257,12 @@ public class MemoryDatabase extends AbstractService implements Database {
 			Collection<Post> oldPosts = getPostsFrom(sone.getId());
 			for (Post post : oldPosts) {
 				allPosts.remove(post.getId());
-				if (post.getRecipientId().isPresent()) {
-					getPostsTo(post.getRecipientId().get()).remove(post);
-				}
 			}
 
 			/* add new posts. */
 			getPostsFrom(sone.getId()).addAll(posts);
 			for (Post post : posts) {
 				allPosts.put(post.getId(), post);
-				if (post.getRecipientId().isPresent()) {
-					getPostsTo(post.getRecipientId().get()).add(post);
-				}
 			}
 		} finally {
 			lock.writeLock().unlock();
@@ -297,9 +279,6 @@ public class MemoryDatabase extends AbstractService implements Database {
 			getPostsFrom(sone.getId()).clear();
 			for (Post post : sone.getPosts()) {
 				allPosts.remove(post.getId());
-				if (post.getRecipientId().isPresent()) {
-					getPostsTo(post.getRecipientId().get()).remove(post);
-				}
 			}
 		} finally {
 			lock.writeLock().unlock();
@@ -323,13 +302,16 @@ public class MemoryDatabase extends AbstractService implements Database {
 
 	/** {@inheritDocs} */
 	@Override
-	public List<PostReply> getReplies(String postId) {
+	public List<PostReply> getReplies(final String postId) {
 		lock.readLock().lock();
 		try {
-			if (!postReplies.containsKey(postId)) {
-				return Collections.emptyList();
-			}
-			return new ArrayList<PostReply>(postReplies.get(postId));
+			return from(allPostReplies.values())
+					.filter(new Predicate<PostReply>() {
+						@Override
+						public boolean apply(PostReply postReply) {
+							return postReply.getPostId().equals(postId);
+						}
+					}).toSortedList(TIME_COMPARATOR);
 		} finally {
 			lock.readLock().unlock();
 		}
@@ -355,7 +337,6 @@ public class MemoryDatabase extends AbstractService implements Database {
 		lock.writeLock().lock();
 		try {
 			allPostReplies.put(postReply.getId(), postReply);
-			postReplies.put(postReply.getPostId(), postReply);
 		} finally {
 			lock.writeLock().unlock();
 		}
@@ -381,7 +362,6 @@ public class MemoryDatabase extends AbstractService implements Database {
 			for (PostReply postReply : postReplies) {
 				allPostReplies.put(postReply.getId(), postReply);
 				sonePostReplies.put(postReply.getSone().getId(), postReply);
-				this.postReplies.put(postReply.getPostId(), postReply);
 			}
 		} finally {
 			lock.writeLock().unlock();
@@ -394,9 +374,6 @@ public class MemoryDatabase extends AbstractService implements Database {
 		lock.writeLock().lock();
 		try {
 			allPostReplies.remove(postReply.getId());
-			if (postReplies.containsKey(postReply.getPostId())) {
-				postReplies.get(postReply.getPostId()).remove(postReply);
-			}
 		} finally {
 			lock.writeLock().unlock();
 		}
@@ -615,23 +592,6 @@ public class MemoryDatabase extends AbstractService implements Database {
 		}
 	}
 
-	/**
-	 * Gets all posts that are directed the given Sone, creating a new collection
-	 * if there is none yet.
-	 *
-	 * @param recipientId
-	 * 		The ID of the Sone to get the posts for
-	 * @return All posts
-	 */
-	private Collection<Post> getPostsTo(String recipientId) {
-		lock.readLock().lock();
-		try {
-			return recipientPosts.get(recipientId);
-		} finally {
-			lock.readLock().unlock();
-		}
-	}
-
 	/** Loads the known posts. */
 	private void loadKnownPosts() {
 		lock.writeLock().lock();