X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryBookmarkDatabase.java;h=cc0127c6b15d1305c372d19c2b81e7d81a4654a2;hb=62573c314957b1851f4fbe693b8746686caa940a;hp=1aec5734090e61aac828aa3a1a60d99f9f40714b;hpb=aba6bd1d58ef244050703e1b99d7389e024809c6;p=Sone.git
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..cc0127c 100644
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java
@@ -1,5 +1,6 @@
package net.pterodactylus.sone.database.memory;
+import static com.google.common.base.Optional.fromNullable;
import static com.google.common.collect.FluentIterable.from;
import java.util.HashSet;
@@ -8,40 +9,61 @@ import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.Post.EmptyPost;
import net.pterodactylus.sone.database.BookmarkDatabase;
import com.google.common.base.Function;
/**
* Memory-based {@link BookmarkDatabase} implementation.
- *
- * @author David âBombeâ Roden
*/
public class MemoryBookmarkDatabase implements BookmarkDatabase {
private final ReadWriteLock lock = new ReentrantReadWriteLock();
private final MemoryDatabase memoryDatabase;
+ private final ConfigurationLoader configurationLoader;
private final Set bookmarkedPosts = new HashSet();
- public MemoryBookmarkDatabase(MemoryDatabase memoryDatabase) {
+ public MemoryBookmarkDatabase(MemoryDatabase memoryDatabase,
+ ConfigurationLoader configurationLoader) {
this.memoryDatabase = memoryDatabase;
+ this.configurationLoader = configurationLoader;
}
- @Override
- public void bookmarkPost(String postId) {
+ public void start() {
+ loadBookmarkedPosts();
+ }
+
+ private void loadBookmarkedPosts() {
+ Set bookmarkedPosts = configurationLoader.loadBookmarkedPosts();
lock.writeLock().lock();
try {
- bookmarkedPosts.add(postId);
+ this.bookmarkedPosts.clear();
+ this.bookmarkedPosts.addAll(bookmarkedPosts);
} finally {
lock.writeLock().unlock();
}
}
+ public void stop() {
+ saveBookmarkedPosts();
+ }
+
+ private void saveBookmarkedPosts() {
+ lock.readLock().lock();
+ try {
+ configurationLoader.saveBookmarkedPosts(this.bookmarkedPosts);
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
@Override
public void bookmarkPost(Post post) {
lock.writeLock().lock();
try {
bookmarkedPosts.add(post.getId());
+ saveBookmarkedPosts();
} finally {
lock.writeLock().unlock();
}
@@ -52,6 +74,7 @@ public class MemoryBookmarkDatabase implements BookmarkDatabase {
lock.writeLock().lock();
try {
bookmarkedPosts.remove(post.getId());
+ saveBookmarkedPosts();
} finally {
lock.writeLock().unlock();
}
@@ -71,11 +94,12 @@ public class MemoryBookmarkDatabase implements BookmarkDatabase {
public Set getBookmarkedPosts() {
lock.readLock().lock();
try {
- return from(bookmarkedPosts).transformAndConcat(
- new Function>() {
+ return from(bookmarkedPosts).transform(
+ new Function() {
@Override
- public Iterable apply(String postId) {
- return memoryDatabase.getPost(postId).asSet();
+ public Post apply(String postId) {
+ return fromNullable(memoryDatabase.getPost(postId))
+ .or(new EmptyPost(postId));
}
}).toSet();
} finally {