X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.java;h=237d32141536a0a32c1b41a0f2c0646c93c64594;hb=5bcdc1b924c598b1e59551d44e2302ef29258dad;hp=6e5546b25ccbfe9309943c3a906a1bd3d9602cf2;hpb=c1eb83f20e772ece19a173f26f28c4a810249679;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 6e5546b..237d321 100644
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
@@ -17,27 +17,33 @@
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;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
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;
+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;
+import net.pterodactylus.sone.database.AlbumBuilder;
import net.pterodactylus.sone.database.Database;
import net.pterodactylus.sone.database.DatabaseException;
+import net.pterodactylus.sone.database.ImageBuilder;
import net.pterodactylus.sone.database.PostBuilder;
import net.pterodactylus.sone.database.PostDatabase;
import net.pterodactylus.sone.database.PostReplyBuilder;
@@ -46,14 +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. */
@@ -69,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();
@@ -80,19 +92,38 @@ public class MemoryDatabase extends AbstractService implements Database {
/** All post replies by their ID. */
private final Map allPostReplies = new HashMap();
+ /** Replies sorted by Sone. */
+ private final SortedSetMultimap sonePostReplies = TreeMultimap.create(new Comparator() {
+
+ @Override
+ public int compare(String leftString, String rightString) {
+ return leftString.compareTo(rightString);
+ }
+ }, 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();
+ private final Map allAlbums = new HashMap();
+
+ private final Map allImages = new HashMap();
+
/**
* Creates a new memory database.
*
* @param soneProvider
- * The Sone provider
+ * The Sone provider
* @param configuration
- * The configuration for loading and saving elements
+ * The configuration for loading and saving elements
*/
@Inject
public MemoryDatabase(SoneProvider soneProvider, Configuration configuration) {
@@ -108,7 +139,7 @@ public class MemoryDatabase extends AbstractService implements Database {
* Saves the database.
*
* @throws DatabaseException
- * if an error occurs while saving
+ * if an error occurs while saving
*/
@Override
public void save() throws DatabaseException {
@@ -120,9 +151,7 @@ public class MemoryDatabase extends AbstractService implements Database {
// SERVICE METHODS
//
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
protected void doStart() {
loadKnownPosts();
@@ -130,9 +159,7 @@ public class MemoryDatabase extends AbstractService implements Database {
notifyStarted();
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
protected void doStop() {
try {
@@ -147,36 +174,30 @@ public class MemoryDatabase extends AbstractService implements Database {
// POSTPROVIDER METHODS
//
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public Optional getPost(String postId) {
lock.readLock().lock();
try {
- return Optional.fromNullable(allPosts.get(postId));
+ return fromNullable(allPosts.get(postId));
} finally {
lock.readLock().unlock();
}
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public Collection getPosts(String soneId) {
return new HashSet(getPostsFrom(soneId));
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public Collection getDirectedPosts(String recipientId) {
lock.readLock().lock();
try {
Collection posts = recipientPosts.get(recipientId);
- return (posts == null) ? Collections. emptySet() : new HashSet(posts);
+ return (posts == null) ? Collections.emptySet() : new HashSet(posts);
} finally {
lock.readLock().unlock();
}
@@ -186,9 +207,7 @@ public class MemoryDatabase extends AbstractService implements Database {
// POSTBUILDERFACTORY METHODS
//
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public PostBuilder newPostBuilder() {
return new MemoryPostBuilder(this, soneProvider);
@@ -198,9 +217,7 @@ public class MemoryDatabase extends AbstractService implements Database {
// POSTSTORE METHODS
//
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public void storePost(Post post) {
checkNotNull(post, "post must not be null");
@@ -216,9 +233,7 @@ public class MemoryDatabase extends AbstractService implements Database {
}
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public void removePost(Post post) {
checkNotNull(post, "post must not be null");
@@ -235,9 +250,7 @@ public class MemoryDatabase extends AbstractService implements Database {
}
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public void storePosts(Sone sone, Collection posts) throws IllegalArgumentException {
checkNotNull(sone, "sone must not be null");
@@ -251,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);
@@ -272,9 +285,7 @@ public class MemoryDatabase extends AbstractService implements Database {
}
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public void removePosts(Sone sone) {
checkNotNull(sone, "sone must not be null");
@@ -297,22 +308,18 @@ public class MemoryDatabase extends AbstractService implements Database {
// POSTREPLYPROVIDER METHODS
//
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public Optional getPostReply(String id) {
lock.readLock().lock();
try {
- return Optional.fromNullable(allPostReplies.get(id));
+ return fromNullable(allPostReplies.get(id));
} finally {
lock.readLock().unlock();
}
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public List getReplies(String postId) {
lock.readLock().lock();
@@ -330,9 +337,7 @@ public class MemoryDatabase extends AbstractService implements Database {
// POSTREPLYBUILDERFACTORY METHODS
//
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public PostReplyBuilder newPostReplyBuilder() {
return new MemoryPostReplyBuilder(this, soneProvider);
@@ -342,29 +347,19 @@ public class MemoryDatabase extends AbstractService implements Database {
// POSTREPLYSTORE METHODS
//
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public void storePostReply(PostReply postReply) {
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();
}
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public void storePostReplies(Sone sone, Collection postReplies) {
checkNotNull(sone, "sone must not be null");
@@ -383,22 +378,15 @@ public class MemoryDatabase extends AbstractService implements Database {
}
for (PostReply postReply : postReplies) {
allPostReplies.put(postReply.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);
- }
+ sonePostReplies.put(postReply.getSone().getId(), postReply);
+ this.postReplies.put(postReply.getPostId(), postReply);
}
} finally {
lock.writeLock().unlock();
}
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public void removePostReply(PostReply postReply) {
lock.writeLock().lock();
@@ -406,18 +394,13 @@ 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();
}
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public void removePostReplies(Sone sone) {
checkNotNull(sone, "sone must not be null");
@@ -433,6 +416,100 @@ public class MemoryDatabase extends AbstractService implements Database {
}
//
+ // ALBUMPROVDER METHODS
+ //
+
+ @Override
+ public Optional getAlbum(String albumId) {
+ lock.readLock().lock();
+ try {
+ return fromNullable(allAlbums.get(albumId));
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ //
+ // ALBUMBUILDERFACTORY METHODS
+ //
+
+ @Override
+ public AlbumBuilder newAlbumBuilder() {
+ return new AlbumBuilderImpl();
+ }
+
+ //
+ // ALBUMSTORE METHODS
+ //
+
+ @Override
+ public void storeAlbum(Album album) {
+ lock.writeLock().lock();
+ try {
+ allAlbums.put(album.getId(), album);
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ @Override
+ public void removeAlbum(Album album) {
+ lock.writeLock().lock();
+ try {
+ allAlbums.remove(album.getId());
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ //
+ // IMAGEPROVIDER METHODS
+ //
+
+ @Override
+ public Optional getImage(String imageId) {
+ lock.readLock().lock();
+ try {
+ return fromNullable(allImages.get(imageId));
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ //
+ // IMAGEBUILDERFACTORY METHODS
+ //
+
+ @Override
+ public ImageBuilder newImageBuilder() {
+ return new ImageBuilderImpl();
+ }
+
+ //
+ // IMAGESTORE METHODS
+ //
+
+ @Override
+ public void storeImage(Image image) {
+ lock.writeLock().lock();
+ try {
+ allImages.put(image.getId(), image);
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ @Override
+ public void removeImage(Image image) {
+ lock.writeLock().lock();
+ try {
+ allImages.remove(image.getId());
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ //
// PACKAGE-PRIVATE METHODS
//
@@ -440,7 +517,7 @@ public class MemoryDatabase extends AbstractService implements Database {
* Returns whether the given post is known.
*
* @param post
- * The post
+ * The post
* @return {@code true} if the post is known, {@code false} otherwise
*/
boolean isPostKnown(Post post) {
@@ -456,9 +533,9 @@ public class MemoryDatabase extends AbstractService implements Database {
* Sets whether the given post is known.
*
* @param post
- * The post
+ * The post
* @param known
- * {@code true} if the post is known, {@code false} otherwise
+ * {@code true} if the post is known, {@code false} otherwise
*/
void setPostKnown(Post post, boolean known) {
lock.writeLock().lock();
@@ -477,7 +554,7 @@ public class MemoryDatabase extends AbstractService implements Database {
* Returns whether the given post reply is known.
*
* @param postReply
- * The post reply
+ * The post reply
* @return {@code true} if the given post reply is known, {@code false}
* otherwise
*/
@@ -494,10 +571,9 @@ public class MemoryDatabase extends AbstractService implements Database {
* Sets whether the given post reply is known.
*
* @param postReply
- * The post reply
+ * The post reply
* @param known
- * {@code true} if the post reply is known, {@code false}
- * otherwise
+ * {@code true} if the post reply is known, {@code false} otherwise
*/
void setPostReplyKnown(PostReply postReply, boolean known) {
lock.writeLock().lock();
@@ -521,66 +597,36 @@ public class MemoryDatabase extends AbstractService implements Database {
* none yet.
*
* @param soneId
- * The ID of the Sone to get the posts for
+ * The ID of the Sone to get the posts for
* @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;
}
/**
- * Gets all posts that are directed the given Sone, creating a new
- * collection if there is none yet.
+ * 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
+ * The ID of the Sone to get the posts for
* @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.
- */
+ /** Loads the known posts. */
private void loadKnownPosts() {
lock.writeLock().lock();
try {
@@ -601,7 +647,7 @@ public class MemoryDatabase extends AbstractService implements Database {
* Saves the known posts to the configuration.
*
* @throws DatabaseException
- * if a configuration error occurs
+ * if a configuration error occurs
*/
private void saveKnownPosts() throws DatabaseException {
lock.readLock().lock();
@@ -619,8 +665,22 @@ public class MemoryDatabase extends AbstractService implements Database {
}
/**
- * Loads the known post replies.
+ * Returns all replies by the given Sone.
+ *
+ * @param id
+ * The ID of the Sone
+ * @return The post replies of the Sone, sorted by time (newest first)
*/
+ private Collection getRepliesFrom(String id) {
+ lock.readLock().lock();
+ try {
+ return Collections.unmodifiableCollection(sonePostReplies.get(id));
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ /** Loads the known post replies. */
private void loadKnownPostReplies() {
lock.writeLock().lock();
try {
@@ -641,7 +701,7 @@ public class MemoryDatabase extends AbstractService implements Database {
* Saves the known post replies to the configuration.
*
* @throws DatabaseException
- * if a configuration error occurs
+ * if a configuration error occurs
*/
private void saveKnownPostReplies() throws DatabaseException {
lock.readLock().lock();