X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.java;h=237d32141536a0a32c1b41a0f2c0646c93c64594;hb=5bcdc1b924c598b1e59551d44e2302ef29258dad;hp=8b2595403ebf22d508d6cb453e22b6a428c2d479;hpb=f4f5fb752ff9aff0235a907e170c6961576562f6;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 8b25954..237d321 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 net.pterodactylus.sone.data.Reply.TIME_COMPARATOR;
import java.util.ArrayList;
import java.util.Collection;
@@ -29,8 +30,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -38,7 +37,6 @@ import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.PostReply;
-import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.impl.AlbumBuilderImpl;
import net.pterodactylus.sone.data.impl.ImageBuilderImpl;
@@ -54,16 +52,20 @@ import net.pterodactylus.util.config.Configuration;
import net.pterodactylus.util.config.ConfigurationException;
import com.google.common.base.Optional;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
import com.google.common.collect.SortedSetMultimap;
import com.google.common.collect.TreeMultimap;
import com.google.common.util.concurrent.AbstractService;
import com.google.inject.Inject;
+import com.google.inject.Singleton;
/**
* Memory-based {@link PostDatabase} implementation.
*
* @author David âBombeâ Roden
*/
+@Singleton
public class MemoryDatabase extends AbstractService implements Database {
/** The lock. */
@@ -79,10 +81,10 @@ public class MemoryDatabase extends AbstractService implements Database {
private final Map allPosts = new HashMap();
/** All posts by their Sones. */
- private final Map> sonePosts = new HashMap>();
+ private final Multimap sonePosts = HashMultimap.create();
/** All posts by their recipient. */
- private final Map> recipientPosts = new HashMap>();
+ private final Multimap recipientPosts = HashMultimap.create();
/** Whether posts are known. */
private final Set knownPosts = new HashSet();
@@ -97,10 +99,16 @@ public class MemoryDatabase extends AbstractService implements Database {
public int compare(String leftString, String rightString) {
return leftString.compareTo(rightString);
}
- }, PostReply.TIME_COMPARATOR);
+ }, TIME_COMPARATOR);
/** Replies by post. */
- private final Map> postReplies = new HashMap>();
+ private final SortedSetMultimap postReplies = TreeMultimap.create(new Comparator() {
+
+ @Override
+ public int compare(String leftString, String rightString) {
+ return leftString.compareTo(rightString);
+ }
+ }, TIME_COMPARATOR);
/** Whether post replies are known. */
private final Set knownPostReplies = new HashSet();
@@ -256,8 +264,8 @@ public class MemoryDatabase extends AbstractService implements Database {
lock.writeLock().lock();
try {
/* remove all posts by the Sone. */
- getPostsFrom(sone.getId()).clear();
- for (Post post : posts) {
+ Collection oldPosts = getPostsFrom(sone.getId());
+ for (Post post : oldPosts) {
allPosts.remove(post.getId());
if (post.getRecipientId().isPresent()) {
getPostsTo(post.getRecipientId().get()).remove(post);
@@ -345,13 +353,7 @@ public class MemoryDatabase extends AbstractService implements Database {
lock.writeLock().lock();
try {
allPostReplies.put(postReply.getId(), postReply);
- if (postReplies.containsKey(postReply.getPostId())) {
- postReplies.get(postReply.getPostId()).add(postReply);
- } else {
- TreeSet replies = new TreeSet(Reply.TIME_COMPARATOR);
- replies.add(postReply);
- postReplies.put(postReply.getPostId(), replies);
- }
+ postReplies.put(postReply.getPostId(), postReply);
} finally {
lock.writeLock().unlock();
}
@@ -377,13 +379,7 @@ public class MemoryDatabase extends AbstractService implements Database {
for (PostReply postReply : postReplies) {
allPostReplies.put(postReply.getId(), postReply);
sonePostReplies.put(postReply.getSone().getId(), postReply);
- if (this.postReplies.containsKey(postReply.getPostId())) {
- this.postReplies.get(postReply.getPostId()).add(postReply);
- } else {
- TreeSet replies = new TreeSet(Reply.TIME_COMPARATOR);
- replies.add(postReply);
- this.postReplies.put(postReply.getPostId(), replies);
- }
+ this.postReplies.put(postReply.getPostId(), postReply);
}
} finally {
lock.writeLock().unlock();
@@ -398,9 +394,6 @@ public class MemoryDatabase extends AbstractService implements Database {
allPostReplies.remove(postReply.getId());
if (postReplies.containsKey(postReply.getPostId())) {
postReplies.get(postReply.getPostId()).remove(postReply);
- if (postReplies.get(postReply.getPostId()).isEmpty()) {
- postReplies.remove(postReply.getPostId());
- }
}
} finally {
lock.writeLock().unlock();
@@ -608,26 +601,12 @@ public class MemoryDatabase extends AbstractService implements Database {
* @return All posts
*/
private Collection getPostsFrom(String soneId) {
- Collection posts = null;
lock.readLock().lock();
try {
- posts = sonePosts.get(soneId);
+ return sonePosts.get(soneId);
} finally {
lock.readLock().unlock();
}
- if (posts != null) {
- return posts;
- }
-
- posts = new HashSet();
- lock.writeLock().lock();
- try {
- sonePosts.put(soneId, posts);
- } finally {
- lock.writeLock().unlock();
- }
-
- return posts;
}
/**
@@ -639,26 +618,12 @@ public class MemoryDatabase extends AbstractService implements Database {
* @return All posts
*/
private Collection getPostsTo(String recipientId) {
- Collection posts = null;
lock.readLock().lock();
try {
- posts = recipientPosts.get(recipientId);
+ return recipientPosts.get(recipientId);
} finally {
lock.readLock().unlock();
}
- if (posts != null) {
- return posts;
- }
-
- posts = new HashSet();
- lock.writeLock().lock();
- try {
- recipientPosts.put(recipientId, posts);
- } finally {
- lock.writeLock().unlock();
- }
-
- return posts;
}
/** Loads the known posts. */
@@ -709,10 +674,7 @@ public class MemoryDatabase extends AbstractService implements Database {
private Collection getRepliesFrom(String id) {
lock.readLock().lock();
try {
- if (sonePostReplies.containsKey(id)) {
- return Collections.unmodifiableCollection(sonePostReplies.get(id));
- }
- return Collections.emptySet();
+ return Collections.unmodifiableCollection(sonePostReplies.get(id));
} finally {
lock.readLock().unlock();
}