Load bookmarked posts in configuration loader, too.

diff --git a/src/main/java/net/pterodactylus/sone/database/memory/ConfigurationLoader.java b/src/main/java/net/pterodactylus/sone/database/memory/ConfigurationLoader.java
index 078b5f4..24505ac 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/database/memory/ConfigurationLoader.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/ConfigurationLoader.java
@@ -48,4 +48,19 @@ public class ConfigurationLoader {
                return knownPostReplies;
        }
 
+       public synchronized Set<String> loadBookmarkedPosts() {
+               Set<String> bookmarkedPosts = new HashSet<String>();
+               int postCounter = 0;
+               while (true) {
+                       String bookmarkedPostId = configuration
+                                       .getStringValue("Bookmarks/Post/" + postCounter++ + "/ID")
+                                       .getValue(null);
+                       if (bookmarkedPostId == null) {
+                               break;
+                       }
+                       bookmarkedPosts.add(bookmarkedPostId);
+               }
+               return bookmarkedPosts;
+       }
+
 }

diff --git a/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java b/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java
index 1aec573..78c8a4f 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java
@@ -21,10 +21,28 @@ public class MemoryBookmarkDatabase implements BookmarkDatabase {
 
        private final ReadWriteLock lock = new ReentrantReadWriteLock();
        private final MemoryDatabase memoryDatabase;
+       private final ConfigurationLoader configurationLoader;
        private final Set<String> bookmarkedPosts = new HashSet<String>();
 
-       public MemoryBookmarkDatabase(MemoryDatabase memoryDatabase) {
+       public MemoryBookmarkDatabase(MemoryDatabase memoryDatabase,
+                       ConfigurationLoader configurationLoader) {
                this.memoryDatabase = memoryDatabase;
+               this.configurationLoader = configurationLoader;
+       }
+
+       public void start() {
+               loadBookmarkedPosts();
+       }
+
+       private void loadBookmarkedPosts() {
+               Set<String> bookmarkedPosts = configurationLoader.loadBookmarkedPosts();
+               lock.writeLock().lock();
+               try {
+                       this.bookmarkedPosts.clear();
+                       this.bookmarkedPosts.addAll(bookmarkedPosts);
+               } finally {
+                       lock.writeLock().unlock();
+               }
        }
 
        @Override

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 3c5ef55..6481a1b 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
@@ -116,8 +116,7 @@ public class MemoryDatabase extends AbstractService implements Database {
        private final Map<String, Image> allImages = new HashMap<String, Image>();
        private final Multimap<String, Image> soneImages = HashMultimap.create();
 
-       private final MemoryBookmarkDatabase memoryBookmarkDatabase =
-                       new MemoryBookmarkDatabase(this);
+       private final MemoryBookmarkDatabase memoryBookmarkDatabase;
 
        /**
         * Creates a new memory database.
@@ -132,6 +131,8 @@ public class MemoryDatabase extends AbstractService implements Database {
                this.soneProvider = soneProvider;
                this.configuration = configuration;
                this.configurationLoader = new ConfigurationLoader(configuration);
+               memoryBookmarkDatabase =
+                               new MemoryBookmarkDatabase(this, configurationLoader);
        }
 
        //
@@ -157,6 +158,7 @@ public class MemoryDatabase extends AbstractService implements Database {
        /** {@inheritDocs} */
        @Override
        protected void doStart() {
+               memoryBookmarkDatabase.start();
                loadKnownPosts();
                loadKnownPostReplies();
                notifyStarted();

diff --git a/src/test/java/net/pterodactylus/sone/database/memory/ConfigurationLoaderTest.java b/src/test/java/net/pterodactylus/sone/database/memory/ConfigurationLoaderTest.java
index 82d465b..de357e9 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/database/memory/ConfigurationLoaderTest.java
+++ b/src/test/java/net/pterodactylus/sone/database/memory/ConfigurationLoaderTest.java
@@ -48,4 +48,16 @@ public class ConfigurationLoaderTest {
                                containsInAnyOrder("PostReply1", "PostReply2"));
        }
 
+       @Test
+       public void loaderCanLoadBookmarkedPosts() {
+               when(configuration.getStringValue("Bookmarks/Post/0/ID"))
+                               .thenReturn(new TestValue<String>("Post2"));
+               when(configuration.getStringValue("Bookmarks/Post/1/ID"))
+                               .thenReturn(new TestValue<String>("Post1"));
+               when(configuration.getStringValue("Bookmarks/Post/2/ID"))
+                               .thenReturn(new TestValue<String>(null));
+               Set<String> knownPosts = configurationLoader.loadBookmarkedPosts();
+               assertThat(knownPosts, containsInAnyOrder("Post1", "Post2"));
+       }
+
 }

diff --git a/src/test/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabaseTest.java b/src/test/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabaseTest.java
index 93efe11..ce61ade 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabaseTest.java
+++ b/src/test/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabaseTest.java
@@ -29,8 +29,9 @@ import org.mockito.stubbing.Answer;
 public class MemoryBookmarkDatabaseTest {
 
        private final MemoryDatabase memoryDatabase = mock(MemoryDatabase.class);
+       private final ConfigurationLoader configurationLoader = mock(ConfigurationLoader.class);
        private final MemoryBookmarkDatabase bookmarkDatabase =
-                       new MemoryBookmarkDatabase(memoryDatabase);
+                       new MemoryBookmarkDatabase(memoryDatabase, configurationLoader);
        private final Map<String, Post> posts = new HashMap<String, Post>();
 
        @Before