Add method to expose a Sone loader to the Sone provider.

[Sone.git] / src / main / java / net / pterodactylus / sone / database / memory / MemoryDatabase.java

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 0f795eb..4ee375e 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
@@ -56,6 +56,7 @@ import net.pterodactylus.sone.database.SoneProvider;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
 
+import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.collect.HashMultimap;
@@ -239,6 +240,16 @@ public class MemoryDatabase extends AbstractService implements Database {
        }
 
        @Override
+       public Function<String, Optional<Sone>> soneLoader() {
+               return new Function<String, Optional<Sone>>() {
+                       @Override
+                       public Optional<Sone> apply(String soneId) {
+                               return getSone(soneId);
+                       }
+               };
+       }
+
+       @Override
        public Optional<Sone> getSone(String soneId) {
                lock.readLock().lock();
                try {
@@ -357,51 +368,6 @@ public class MemoryDatabase extends AbstractService implements Database {
                }
        }
 
-       /** {@inheritDocs} */
-       @Override
-       public void storePosts(Sone sone, Collection<Post> posts) throws IllegalArgumentException {
-               checkNotNull(sone, "sone must not be null");
-               /* verify that all posts are from the same Sone. */
-               for (Post post : posts) {
-                       if (!sone.equals(post.getSone())) {
-                               throw new IllegalArgumentException(String.format("Post from different Sone found: %s", post));
-                       }
-               }
-
-               lock.writeLock().lock();
-               try {
-                       /* remove all posts by the Sone. */
-                       Collection<Post> oldPosts = getPostsFrom(sone.getId());
-                       for (Post post : oldPosts) {
-                               allPosts.remove(post.getId());
-                       }
-
-                       /* add new posts. */
-                       getPostsFrom(sone.getId()).addAll(posts);
-                       for (Post post : posts) {
-                               allPosts.put(post.getId(), post);
-                       }
-               } finally {
-                       lock.writeLock().unlock();
-               }
-       }
-
-       /** {@inheritDocs} */
-       @Override
-       public void removePosts(Sone sone) {
-               checkNotNull(sone, "sone must not be null");
-               lock.writeLock().lock();
-               try {
-                       /* remove all posts by the Sone. */
-                       getPostsFrom(sone.getId()).clear();
-                       for (Post post : sone.getPosts()) {
-                               allPosts.remove(post.getId());
-                       }
-               } finally {
-                       lock.writeLock().unlock();
-               }
-       }
-
        //
        // POSTREPLYPROVIDER METHODS
        //
@@ -461,32 +427,6 @@ public class MemoryDatabase extends AbstractService implements Database {
 
        /** {@inheritDocs} */
        @Override
-       public void storePostReplies(Sone sone, Collection<PostReply> postReplies) {
-               checkNotNull(sone, "sone must not be null");
-               /* verify that all posts are from the same Sone. */
-               for (PostReply postReply : postReplies) {
-                       if (!sone.equals(postReply.getSone())) {
-                               throw new IllegalArgumentException(String.format("PostReply from different Sone found: %s", postReply));
-                       }
-               }
-
-               lock.writeLock().lock();
-               try {
-                       /* remove all post replies of the Sone. */
-                       for (PostReply postReply : getRepliesFrom(sone.getId())) {
-                               removePostReply(postReply);
-                       }
-                       for (PostReply postReply : postReplies) {
-                               allPostReplies.put(postReply.getId(), postReply);
-                               sonePostReplies.put(postReply.getSone().getId(), postReply);
-                       }
-               } finally {
-                       lock.writeLock().unlock();
-               }
-       }
-
-       /** {@inheritDocs} */
-       @Override
        public void removePostReply(PostReply postReply) {
                lock.writeLock().lock();
                try {
@@ -496,21 +436,6 @@ public class MemoryDatabase extends AbstractService implements Database {
                }
        }
 
-       /** {@inheritDocs} */
-       @Override
-       public void removePostReplies(Sone sone) {
-               checkNotNull(sone, "sone must not be null");
-
-               lock.writeLock().lock();
-               try {
-                       for (PostReply postReply : sone.getReplies()) {
-                               removePostReply(postReply);
-                       }
-               } finally {
-                       lock.writeLock().unlock();
-               }
-       }
-
        //
        // ALBUMPROVDER METHODS
        //
@@ -762,22 +687,6 @@ public class MemoryDatabase extends AbstractService implements Database {
                }
        }
 
-       /**
-        * 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<PostReply> getRepliesFrom(String id) {
-               lock.readLock().lock();
-               try {
-                       return unmodifiableCollection(sonePostReplies.get(id));
-               } finally {
-                       lock.readLock().unlock();
-               }
-       }
-
        /** Loads the known post replies. */
        private void loadKnownPostReplies() {
                Set<String> knownPostReplies = configurationLoader.loadKnownPostReplies();