Replace Sone provider interface with Kotlin version

[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 eb0d20a..6f9d246 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
@@ -1,5 +1,5 @@
 /*
- * Sone - MemoryDatabase.java - Copyright © 2013 David Roden
+ * Sone - MemoryDatabase.java - Copyright © 2013–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,13 +21,13 @@ import static com.google.common.base.Optional.fromNullable;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Predicates.not;
 import static com.google.common.collect.FluentIterable.from;
-import static java.util.Collections.unmodifiableCollection;
 import static net.pterodactylus.sone.data.Reply.TIME_COMPARATOR;
 import static net.pterodactylus.sone.data.Sone.LOCAL_SONE_FILTER;
 import static net.pterodactylus.sone.data.Sone.toAllAlbums;
 import static net.pterodactylus.sone.data.Sone.toAllImages;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -37,6 +37,8 @@ import java.util.Set;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import javax.annotation.Nonnull;
+
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
@@ -65,6 +67,7 @@ import com.google.common.collect.TreeMultimap;
 import com.google.common.util.concurrent.AbstractService;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import kotlin.jvm.functions.Function1;
 
 /**
  * Memory-based {@link PostDatabase} implementation.
@@ -117,6 +120,7 @@ public class MemoryDatabase extends AbstractService implements Database {
        private final Multimap<String, Image> soneImages = HashMultimap.create();
 
        private final MemoryBookmarkDatabase memoryBookmarkDatabase;
+       private final MemoryFriendDatabase memoryFriendDatabase;
 
        /**
         * Creates a new memory database.
@@ -133,6 +137,7 @@ public class MemoryDatabase extends AbstractService implements Database {
                this.configurationLoader = new ConfigurationLoader(configuration);
                memoryBookmarkDatabase =
                                new MemoryBookmarkDatabase(this, configurationLoader);
+               memoryFriendDatabase = new MemoryFriendDatabase(configurationLoader);
        }
 
        //
@@ -178,7 +183,7 @@ public class MemoryDatabase extends AbstractService implements Database {
 
        @Override
        public SoneBuilder newSoneBuilder() {
-               return new MemorySoneBuilder();
+               return new MemorySoneBuilder(this);
        }
 
        @Override
@@ -238,11 +243,22 @@ public class MemoryDatabase extends AbstractService implements Database {
                }
        }
 
+       @Nonnull
+       @Override
+       public Function1<String, Sone> getSoneLoader() {
+               return new Function1<String, Sone>() {
+                       @Override
+                       public Sone invoke(String soneId) {
+                               return getSone(soneId);
+                       }
+               };
+       }
+
        @Override
-       public Optional<Sone> getSone(String soneId) {
+       public Sone getSone(String soneId) {
                lock.readLock().lock();
                try {
-                       return fromNullable(allSones.get(soneId));
+                       return allSones.get(soneId);
                } finally {
                        lock.readLock().unlock();
                }
@@ -279,6 +295,38 @@ public class MemoryDatabase extends AbstractService implements Database {
                }
        }
 
+       @Override
+       public Collection<String> getFriends(Sone localSone) {
+               if (!localSone.isLocal()) {
+                       return Collections.emptySet();
+               }
+               return memoryFriendDatabase.getFriends(localSone.getId());
+       }
+
+       @Override
+       public boolean isFriend(Sone localSone, String friendSoneId) {
+               if (!localSone.isLocal()) {
+                       return false;
+               }
+               return memoryFriendDatabase.isFriend(localSone.getId(), friendSoneId);
+       }
+
+       @Override
+       public void addFriend(Sone localSone, String friendSoneId) {
+               if (!localSone.isLocal()) {
+                       return;
+               }
+               memoryFriendDatabase.addFriend(localSone.getId(), friendSoneId);
+       }
+
+       @Override
+       public void removeFriend(Sone localSone, String friendSoneId) {
+               if (!localSone.isLocal()) {
+                       return;
+               }
+               memoryFriendDatabase.removeFriend(localSone.getId(), friendSoneId);
+       }
+
        //
        // POSTPROVIDER METHODS
        //
@@ -676,22 +724,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();