X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.java;h=6f9d24642b80854ac8588a5e304f396435f91c53;hb=3e725ad179b064f164019fdd80d3d2e6838914bf;hp=264571ef0cd51cac648a9bafa255d6edc81bf331;hpb=3ff261bd1cdb77acd9e4015ec0c5b98a1c487f9a;p=Sone.git
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 264571e..6f9d246 100644
--- 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
@@ -17,45 +17,64 @@
package net.pterodactylus.sone.database.memory;
+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 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.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
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.UUID;
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;
import net.pterodactylus.sone.data.PostReply;
-import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.data.impl.AbstractPostReplyBuilder;
+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;
+import net.pterodactylus.sone.database.SoneBuilder;
import net.pterodactylus.sone.database.SoneProvider;
import net.pterodactylus.util.config.Configuration;
import net.pterodactylus.util.config.ConfigurationException;
import com.google.common.base.Optional;
+import com.google.common.base.Predicate;
+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;
import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import kotlin.jvm.functions.Function1;
/**
* Memory-based {@link PostDatabase} implementation.
*
* @author David âBombeâ Roden
*/
+@Singleton
public class MemoryDatabase extends AbstractService implements Database {
/** The lock. */
@@ -66,15 +85,15 @@ public class MemoryDatabase extends AbstractService implements Database {
/** The configuration. */
private final Configuration configuration;
+ private final ConfigurationLoader configurationLoader;
+
+ private final Map allSones = new HashMap();
/** All posts by their ID. */
private final Map allPosts = new HashMap();
/** All posts by their Sones. */
- private final Map> sonePosts = new HashMap>();
-
- /** All posts by their recipient. */
- private final Map> recipientPosts = new HashMap>();
+ private final Multimap sonePosts = HashMultimap.create();
/** Whether posts are known. */
private final Set knownPosts = new HashSet();
@@ -82,24 +101,43 @@ public class MemoryDatabase extends AbstractService implements Database {
/** All post replies by their ID. */
private final Map allPostReplies = new HashMap();
- /** Replies by post. */
- private final Map> postReplies = new HashMap>();
+ /** Replies sorted by Sone. */
+ private final SortedSetMultimap sonePostReplies = TreeMultimap.create(new Comparator() {
+
+ @Override
+ public int compare(String leftString, String rightString) {
+ return leftString.compareTo(rightString);
+ }
+ }, TIME_COMPARATOR);
/** Whether post replies are known. */
private final Set knownPostReplies = new HashSet();
+ private final Map allAlbums = new HashMap();
+ private final Multimap soneAlbums = HashMultimap.create();
+
+ private final Map allImages = new HashMap();
+ private final Multimap soneImages = HashMultimap.create();
+
+ private final MemoryBookmarkDatabase memoryBookmarkDatabase;
+ private final MemoryFriendDatabase memoryFriendDatabase;
+
/**
* 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) {
this.soneProvider = soneProvider;
this.configuration = configuration;
+ this.configurationLoader = new ConfigurationLoader(configuration);
+ memoryBookmarkDatabase =
+ new MemoryBookmarkDatabase(this, configurationLoader);
+ memoryFriendDatabase = new MemoryFriendDatabase(configurationLoader);
}
//
@@ -110,7 +148,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 {
@@ -122,22 +160,20 @@ public class MemoryDatabase extends AbstractService implements Database {
// SERVICE METHODS
//
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
protected void doStart() {
+ memoryBookmarkDatabase.start();
loadKnownPosts();
loadKnownPostReplies();
notifyStarted();
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
protected void doStop() {
try {
+ memoryBookmarkDatabase.stop();
save();
notifyStopped();
} catch (DatabaseException de1) {
@@ -145,40 +181,184 @@ public class MemoryDatabase extends AbstractService implements Database {
}
}
+ @Override
+ public SoneBuilder newSoneBuilder() {
+ return new MemorySoneBuilder(this);
+ }
+
+ @Override
+ public void storeSone(Sone sone) {
+ lock.writeLock().lock();
+ try {
+ removeSone(sone);
+
+ allSones.put(sone.getId(), sone);
+ sonePosts.putAll(sone.getId(), sone.getPosts());
+ for (Post post : sone.getPosts()) {
+ allPosts.put(post.getId(), post);
+ }
+ sonePostReplies.putAll(sone.getId(), sone.getReplies());
+ for (PostReply postReply : sone.getReplies()) {
+ allPostReplies.put(postReply.getId(), postReply);
+ }
+ soneAlbums.putAll(sone.getId(), toAllAlbums.apply(sone));
+ for (Album album : toAllAlbums.apply(sone)) {
+ allAlbums.put(album.getId(), album);
+ }
+ soneImages.putAll(sone.getId(), toAllImages.apply(sone));
+ for (Image image : toAllImages.apply(sone)) {
+ allImages.put(image.getId(), image);
+ }
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ @Override
+ public void removeSone(Sone sone) {
+ lock.writeLock().lock();
+ try {
+ allSones.remove(sone.getId());
+ Collection removedPosts = sonePosts.removeAll(sone.getId());
+ for (Post removedPost : removedPosts) {
+ allPosts.remove(removedPost.getId());
+ }
+ Collection removedPostReplies =
+ sonePostReplies.removeAll(sone.getId());
+ for (PostReply removedPostReply : removedPostReplies) {
+ allPostReplies.remove(removedPostReply.getId());
+ }
+ Collection removedAlbums =
+ soneAlbums.removeAll(sone.getId());
+ for (Album removedAlbum : removedAlbums) {
+ allAlbums.remove(removedAlbum.getId());
+ }
+ Collection removedImages =
+ soneImages.removeAll(sone.getId());
+ for (Image removedImage : removedImages) {
+ allImages.remove(removedImage.getId());
+ }
+ } finally {
+ lock.writeLock().unlock();
+ }
+ }
+
+ @Nonnull
+ @Override
+ public Function1 getSoneLoader() {
+ return new Function1() {
+ @Override
+ public Sone invoke(String soneId) {
+ return getSone(soneId);
+ }
+ };
+ }
+
+ @Override
+ public Sone getSone(String soneId) {
+ lock.readLock().lock();
+ try {
+ return allSones.get(soneId);
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public Collection getSones() {
+ lock.readLock().lock();
+ try {
+ return new HashSet(allSones.values());
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public Collection getLocalSones() {
+ lock.readLock().lock();
+ try {
+ return from(allSones.values()).filter(LOCAL_SONE_FILTER).toSet();
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public Collection getRemoteSones() {
+ lock.readLock().lock();
+ try {
+ return from(allSones.values())
+ .filter(not(LOCAL_SONE_FILTER)) .toSet();
+ } finally {
+ lock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public Collection 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
//
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public Optional 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 getPosts(String soneId) {
return new HashSet(getPostsFrom(soneId));
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
- public Collection getDirectedPosts(String recipientId) {
+ public Collection getDirectedPosts(final String recipientId) {
lock.readLock().lock();
try {
- Collection posts = recipientPosts.get(recipientId);
- return (posts == null) ? Collections. emptySet() : new HashSet(posts);
+ return from(sonePosts.values()).filter(new Predicate() {
+ @Override
+ public boolean apply(Post post) {
+ return post.getRecipientId().asSet().contains(recipientId);
+ }
+ }).toSet();
} finally {
lock.readLock().unlock();
}
@@ -188,9 +368,7 @@ public class MemoryDatabase extends AbstractService implements Database {
// POSTBUILDERFACTORY METHODS
//
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public PostBuilder newPostBuilder() {
return new MemoryPostBuilder(this, soneProvider);
@@ -200,9 +378,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");
@@ -210,17 +386,12 @@ public class MemoryDatabase extends AbstractService implements Database {
try {
allPosts.put(post.getId(), post);
getPostsFrom(post.getSone().getId()).add(post);
- if (post.getRecipientId().isPresent()) {
- getPostsTo(post.getRecipientId().get()).add(post);
- }
} finally {
lock.writeLock().unlock();
}
}
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
public void removePost(Post post) {
checkNotNull(post, "post must not be null");
@@ -228,208 +399,198 @@ public class MemoryDatabase extends AbstractService implements Database {
try {
allPosts.remove(post.getId());
getPostsFrom(post.getSone().getId()).remove(post);
- if (post.getRecipientId().isPresent()) {
- getPostsTo(post.getRecipientId().get()).remove(post);
- }
post.getSone().removePost(post);
} finally {
lock.writeLock().unlock();
}
}
- /**
- * {@inheritDocs}
- */
+ //
+ // POSTREPLYPROVIDER METHODS
+ //
+
+ /** {@inheritDocs} */
@Override
- public void storePosts(Sone sone, Collection 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));
- }
+ public Optional getPostReply(String id) {
+ lock.readLock().lock();
+ try {
+ return fromNullable(allPostReplies.get(id));
+ } finally {
+ lock.readLock().unlock();
}
+ }
- lock.writeLock().lock();
+ /** {@inheritDocs} */
+ @Override
+ public List getReplies(final String postId) {
+ lock.readLock().lock();
try {
- /* remove all posts by the Sone. */
- getPostsFrom(sone.getId()).clear();
- for (Post post : posts) {
- allPosts.remove(post.getId());
- if (post.getRecipientId().isPresent()) {
- getPostsTo(post.getRecipientId().get()).remove(post);
- }
- }
-
- /* add new posts. */
- getPostsFrom(sone.getId()).addAll(posts);
- for (Post post : posts) {
- allPosts.put(post.getId(), post);
- if (post.getRecipientId().isPresent()) {
- getPostsTo(post.getRecipientId().get()).add(post);
- }
- }
+ return from(allPostReplies.values())
+ .filter(new Predicate() {
+ @Override
+ public boolean apply(PostReply postReply) {
+ return postReply.getPostId().equals(postId);
+ }
+ }).toSortedList(TIME_COMPARATOR);
} finally {
- lock.writeLock().unlock();
+ lock.readLock().unlock();
}
}
- /**
- * {@inheritDocs}
- */
+ //
+ // POSTREPLYBUILDERFACTORY METHODS
+ //
+
+ /** {@inheritDocs} */
@Override
- public void removePosts(Sone sone) {
- checkNotNull(sone, "sone must not be null");
+ public PostReplyBuilder newPostReplyBuilder() {
+ return new MemoryPostReplyBuilder(this, soneProvider);
+ }
+
+ //
+ // POSTREPLYSTORE METHODS
+ //
+
+ /** {@inheritDocs} */
+ @Override
+ public void storePostReply(PostReply postReply) {
lock.writeLock().lock();
try {
- /* remove all posts by the Sone. */
- getPostsFrom(sone.getId()).clear();
- for (Post post : sone.getPosts()) {
- allPosts.remove(post.getId());
- if (post.getRecipientId().isPresent()) {
- getPostsTo(post.getRecipientId().get()).remove(post);
- }
- }
+ allPostReplies.put(postReply.getId(), postReply);
} finally {
lock.writeLock().unlock();
}
}
- //
- // POSTREPLYPROVIDER METHODS
- //
-
- /**
- * {@inheritDocs}
- */
+ /** {@inheritDocs} */
@Override
- public Optional getPostReply(String id) {
- lock.readLock().lock();
+ public void removePostReply(PostReply postReply) {
+ lock.writeLock().lock();
try {
- return Optional.fromNullable(allPostReplies.get(id));
+ allPostReplies.remove(postReply.getId());
} finally {
- lock.readLock().unlock();
+ lock.writeLock().unlock();
}
}
- /**
- * {@inheritDocs}
- */
+ //
+ // ALBUMPROVDER METHODS
+ //
+
@Override
- public List getReplies(String postId) {
+ public Optional getAlbum(String albumId) {
lock.readLock().lock();
try {
- if (!postReplies.containsKey(postId)) {
- return Collections.emptyList();
- }
- return new ArrayList(postReplies.get(postId));
+ return fromNullable(allAlbums.get(albumId));
} finally {
lock.readLock().unlock();
}
}
//
- // POSTREPLYBUILDERFACTORY METHODS
+ // ALBUMBUILDERFACTORY METHODS
//
- /**
- * {@inheritDocs}
- */
@Override
- public PostReplyBuilder newPostReplyBuilder() {
- return new MemoryPostReplyBuilder();
+ public AlbumBuilder newAlbumBuilder() {
+ return new AlbumBuilderImpl();
}
//
- // POSTREPLYSTORE METHODS
+ // ALBUMSTORE METHODS
//
- /**
- * {@inheritDocs}
- */
@Override
- public void storePostReply(PostReply postReply) {
+ public void storeAlbum(Album album) {
lock.writeLock().lock();
try {
- allPostReplies.put(postReply.getId(), postReply);
- if (postReplies.containsKey(postReply.getPostId())) {
- postReplies.get(postReply.getPostId()).add(postReply);
- } else {
- TreeSet replies = new TreeSet(Reply.TIME_COMPARATOR);
- replies.add(postReply);
- postReplies.put(postReply.getPostId(), replies);
- }
+ allAlbums.put(album.getId(), album);
+ soneAlbums.put(album.getSone().getId(), album);
} finally {
lock.writeLock().unlock();
}
}
- /**
- * {@inheritDocs}
- */
@Override
- public void storePostReplies(Sone sone, Collection 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));
- }
- }
-
+ public void removeAlbum(Album album) {
lock.writeLock().lock();
try {
- for (PostReply postReply : postReplies) {
- allPostReplies.put(postReply.getId(), postReply);
- if (this.postReplies.containsKey(postReply.getPostId())) {
- this.postReplies.get(postReply.getPostId()).add(postReply);
- } else {
- TreeSet replies = new TreeSet(Reply.TIME_COMPARATOR);
- replies.add(postReply);
- this.postReplies.put(postReply.getPostId(), replies);
- }
- }
+ allAlbums.remove(album.getId());
+ soneAlbums.remove(album.getSone().getId(), album);
} finally {
lock.writeLock().unlock();
}
}
- /**
- * {@inheritDocs}
- */
+ //
+ // IMAGEPROVIDER METHODS
+ //
+
@Override
- public void removePostReply(PostReply postReply) {
+ public Optional 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 {
- 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());
- }
- }
+ allImages.put(image.getId(), image);
+ soneImages.put(image.getSone().getId(), image);
} finally {
lock.writeLock().unlock();
}
}
- /**
- * {@inheritDocs}
- */
@Override
- public void removePostReplies(Sone sone) {
- checkNotNull(sone, "sone must not be null");
-
+ public void removeImage(Image image) {
lock.writeLock().lock();
try {
- for (PostReply postReply : sone.getReplies()) {
- removePostReply(postReply);
- }
+ allImages.remove(image.getId());
+ soneImages.remove(image.getSone().getId(), image);
} finally {
lock.writeLock().unlock();
}
}
+ @Override
+ public void bookmarkPost(Post post) {
+ memoryBookmarkDatabase.bookmarkPost(post);
+ }
+
+ @Override
+ public void unbookmarkPost(Post post) {
+ memoryBookmarkDatabase.unbookmarkPost(post);
+ }
+
+ @Override
+ public boolean isPostBookmarked(Post post) {
+ return memoryBookmarkDatabase.isPostBookmarked(post);
+ }
+
+ @Override
+ public Set getBookmarkedPosts() {
+ return memoryBookmarkDatabase.getBookmarkedPosts();
+ }
+
//
// PACKAGE-PRIVATE METHODS
//
@@ -438,7 +599,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) {
@@ -454,9 +615,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();
@@ -475,7 +636,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
*/
@@ -492,10 +653,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();
@@ -519,77 +679,25 @@ 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 getPostsFrom(String soneId) {
- Collection posts = null;
- lock.readLock().lock();
- try {
- posts = sonePosts.get(soneId);
- } finally {
- lock.readLock().unlock();
- }
- if (posts != null) {
- return posts;
- }
-
- posts = new HashSet();
- 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.
- *
- * @param recipientId
- * The ID of the Sone to get the posts for
- * @return All posts
- */
- private Collection getPostsTo(String recipientId) {
- Collection posts = null;
lock.readLock().lock();
try {
- posts = recipientPosts.get(recipientId);
+ return sonePosts.get(soneId);
} finally {
lock.readLock().unlock();
}
- if (posts != null) {
- return posts;
- }
-
- posts = new HashSet();
- 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() {
+ Set knownPosts = configurationLoader.loadKnownPosts();
lock.writeLock().lock();
try {
- int postCounter = 0;
- while (true) {
- String knownPostId = configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").getValue(null);
- if (knownPostId == null) {
- break;
- }
- knownPosts.add(knownPostId);
- }
+ this.knownPosts.clear();
+ this.knownPosts.addAll(knownPosts);
} finally {
lock.writeLock().unlock();
}
@@ -599,7 +707,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();
@@ -616,20 +724,13 @@ public class MemoryDatabase extends AbstractService implements Database {
}
}
- /**
- * Loads the known post replies.
- */
+ /** Loads the known post replies. */
private void loadKnownPostReplies() {
+ Set knownPostReplies = configurationLoader.loadKnownPostReplies();
lock.writeLock().lock();
try {
- int replyCounter = 0;
- while (true) {
- String knownReplyId = configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").getValue(null);
- if (knownReplyId == null) {
- break;
- }
- knownPostReplies.add(knownReplyId);
- }
+ this.knownPostReplies.clear();
+ this.knownPostReplies.addAll(knownPostReplies);
} finally {
lock.writeLock().unlock();
}
@@ -639,7 +740,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();
@@ -656,26 +757,4 @@ public class MemoryDatabase extends AbstractService implements Database {
}
}
- /**
- * {@link PostReplyBuilder} implementation that creates
- * {@link MemoryPostReply} objects.
- *
- * @author David âBombeâ Roden
- */
- private class MemoryPostReplyBuilder extends AbstractPostReplyBuilder {
-
- /**
- * {@inheritDocs}
- */
- @Override
- public PostReply build() throws IllegalStateException {
- validate();
-
- PostReply postReply = new MemoryPostReply(MemoryDatabase.this, soneProvider, randomId ? UUID.randomUUID().toString() : id, senderId, currentTime ? System.currentTimeMillis() : time, text, postId);
- postReply.setKnown(isPostReplyKnown(postReply));
- return postReply;
- }
-
- }
-
}