Use a multimap for storing replies.
[Sone.git] / src / main / java / net / pterodactylus / sone / database / memory / MemoryDatabase.java
index db64c79..67ea671 100644 (file)
@@ -17,7 +17,9 @@
 
 package net.pterodactylus.sone.database.memory;
 
-import static com.google.common.base.Preconditions.*;
+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;
@@ -28,17 +30,20 @@ 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;
@@ -47,6 +52,8 @@ 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;
@@ -72,10 +79,10 @@ public class MemoryDatabase extends AbstractService implements Database {
        private final Map<String, Post> allPosts = new HashMap<String, Post>();
 
        /** All posts by their Sones. */
-       private final Map<String, Collection<Post>> sonePosts = new HashMap<String, Collection<Post>>();
+       private final Multimap<String, Post> sonePosts = HashMultimap.create();
 
        /** All posts by their recipient. */
-       private final Map<String, Collection<Post>> recipientPosts = new HashMap<String, Collection<Post>>();
+       private final Multimap<String, Post> recipientPosts = HashMultimap.create();
 
        /** Whether posts are known. */
        private final Set<String> knownPosts = new HashSet<String>();
@@ -90,21 +97,31 @@ 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<String, SortedSet<PostReply>> postReplies = new HashMap<String, SortedSet<PostReply>>();
+       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>();
 
+       private final Map<String, Album> allAlbums = new HashMap<String, Album>();
+
+       private final Map<String, Image> allImages = new HashMap<String, Image>();
+
        /**
         * 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) {
@@ -120,7 +137,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 {
@@ -132,9 +149,7 @@ public class MemoryDatabase extends AbstractService implements Database {
        // SERVICE METHODS
        //
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
        protected void doStart() {
                loadKnownPosts();
@@ -142,9 +157,7 @@ public class MemoryDatabase extends AbstractService implements Database {
                notifyStarted();
        }
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
        protected void doStop() {
                try {
@@ -159,36 +172,30 @@ public class MemoryDatabase extends AbstractService implements Database {
        // POSTPROVIDER METHODS
        //
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
        public Optional<Post> 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<Post> getPosts(String soneId) {
                return new HashSet<Post>(getPostsFrom(soneId));
        }
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
        public Collection<Post> getDirectedPosts(String recipientId) {
                lock.readLock().lock();
                try {
                        Collection<Post> posts = recipientPosts.get(recipientId);
-                       return (posts == null) ? Collections.<Post> emptySet() : new HashSet<Post>(posts);
+                       return (posts == null) ? Collections.<Post>emptySet() : new HashSet<Post>(posts);
                } finally {
                        lock.readLock().unlock();
                }
@@ -198,9 +205,7 @@ public class MemoryDatabase extends AbstractService implements Database {
        // POSTBUILDERFACTORY METHODS
        //
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
        public PostBuilder newPostBuilder() {
                return new MemoryPostBuilder(this, soneProvider);
@@ -210,9 +215,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");
@@ -228,9 +231,7 @@ public class MemoryDatabase extends AbstractService implements Database {
                }
        }
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
        public void removePost(Post post) {
                checkNotNull(post, "post must not be null");
@@ -247,9 +248,7 @@ public class MemoryDatabase extends AbstractService implements Database {
                }
        }
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
        public void storePosts(Sone sone, Collection<Post> posts) throws IllegalArgumentException {
                checkNotNull(sone, "sone must not be null");
@@ -263,8 +262,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<Post> oldPosts = getPostsFrom(sone.getId());
+                       for (Post post : oldPosts) {
                                allPosts.remove(post.getId());
                                if (post.getRecipientId().isPresent()) {
                                        getPostsTo(post.getRecipientId().get()).remove(post);
@@ -284,9 +283,7 @@ public class MemoryDatabase extends AbstractService implements Database {
                }
        }
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
        public void removePosts(Sone sone) {
                checkNotNull(sone, "sone must not be null");
@@ -309,22 +306,18 @@ public class MemoryDatabase extends AbstractService implements Database {
        // POSTREPLYPROVIDER METHODS
        //
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
        public Optional<PostReply> 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<PostReply> getReplies(String postId) {
                lock.readLock().lock();
@@ -342,9 +335,7 @@ public class MemoryDatabase extends AbstractService implements Database {
        // POSTREPLYBUILDERFACTORY METHODS
        //
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
        public PostReplyBuilder newPostReplyBuilder() {
                return new MemoryPostReplyBuilder(this, soneProvider);
@@ -354,29 +345,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<PostReply> replies = new TreeSet<PostReply>(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<PostReply> postReplies) {
                checkNotNull(sone, "sone must not be null");
@@ -396,22 +377,14 @@ 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<PostReply> replies = new TreeSet<PostReply>(Reply.TIME_COMPARATOR);
-                                       replies.add(postReply);
-                                       this.postReplies.put(postReply.getPostId(), replies);
-                               }
+                               this.postReplies.put(postReply.getPostId(), postReply);
                        }
                } finally {
                        lock.writeLock().unlock();
                }
        }
 
-       /**
-        * {@inheritDocs}
-        */
+       /** {@inheritDocs} */
        @Override
        public void removePostReply(PostReply postReply) {
                lock.writeLock().lock();
@@ -419,18 +392,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");
@@ -446,6 +414,100 @@ public class MemoryDatabase extends AbstractService implements Database {
        }
 
        //
+       // ALBUMPROVDER METHODS
+       //
+
+       @Override
+       public Optional<Album> 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<Image> 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
        //
 
@@ -453,7 +515,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) {
@@ -469,9 +531,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();
@@ -490,7 +552,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
         */
@@ -507,10 +569,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();
@@ -534,66 +595,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<Post> getPostsFrom(String soneId) {
-               Collection<Post> 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<Post>();
-               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<Post> getPostsTo(String recipientId) {
-               Collection<Post> 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<Post>();
-               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 {
@@ -614,7 +645,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();
@@ -641,10 +672,7 @@ public class MemoryDatabase extends AbstractService implements Database {
        private Collection<PostReply> 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();
                }
@@ -671,7 +699,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();