X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.java;h=67ea6710798633be7af108f0ddda902216822894;hp=eed00eab1e3607a08b69a2fdb047f7230b9d72cc;hb=7fdd5f77272f3f1305d65caf36606bd783b5bfb0;hpb=60fda3f6fd8cd72151338c831f509dd8d9d0f9ff 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 eed00ea..67ea671 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 - MemoryPostDatabase.java - Copyright © 2013 David Roden + * Sone - MemoryDatabase.java - Copyright © 2013 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,28 +17,46 @@ package net.pterodactylus.sone.database.memory; +import static com.google.common.base.Optional.fromNullable; import static com.google.common.base.Preconditions.checkNotNull; +import static net.pterodactylus.sone.data.Reply.TIME_COMPARATOR; +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.UUID; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +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.Sone; -import net.pterodactylus.sone.data.impl.AbstractPostBuilder; +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.SoneProvider; import net.pterodactylus.util.config.Configuration; import net.pterodactylus.util.config.ConfigurationException; import com.google.common.base.Optional; +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; /** @@ -46,7 +64,7 @@ import com.google.inject.Inject; * * @author David ‘Bombe’ Roden */ -public class MemoryPostDatabase implements PostDatabase { +public class MemoryDatabase extends AbstractService implements Database { /** The lock. */ private final ReadWriteLock lock = new ReentrantReadWriteLock(); @@ -54,63 +72,130 @@ public class MemoryPostDatabase implements PostDatabase { /** The Sone provider. */ private final SoneProvider soneProvider; + /** The configuration. */ + private final Configuration configuration; + /** All posts by their ID. */ private final Map allPosts = new HashMap(); /** All posts by their Sones. */ - private final Map> sonePosts = new HashMap>(); + private final Multimap sonePosts = HashMultimap.create(); /** All posts by their recipient. */ - private final Map> recipientPosts = new HashMap>(); + private final Multimap recipientPosts = HashMultimap.create(); /** Whether posts are known. */ private final Set knownPosts = new HashSet(); + /** All post replies by their ID. */ + private final Map allPostReplies = 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); + + /** Replies by post. */ + private final SortedSetMultimap postReplies = 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 Map allImages = new HashMap(); + /** * Creates a new memory database. * * @param soneProvider - * The Sone provider + * The Sone provider + * @param configuration + * The configuration for loading and saving elements */ @Inject - public MemoryPostDatabase(SoneProvider soneProvider) { + public MemoryDatabase(SoneProvider soneProvider, Configuration configuration) { this.soneProvider = soneProvider; + this.configuration = configuration; } // - // POSTPROVIDER METHODS + // DATABASE METHODS // /** - * {@inheritDocs} + * Saves the database. + * + * @throws DatabaseException + * if an error occurs while saving */ @Override + public void save() throws DatabaseException { + saveKnownPosts(); + saveKnownPostReplies(); + } + + // + // SERVICE METHODS + // + + /** {@inheritDocs} */ + @Override + protected void doStart() { + loadKnownPosts(); + loadKnownPostReplies(); + notifyStarted(); + } + + /** {@inheritDocs} */ + @Override + protected void doStop() { + try { + save(); + notifyStopped(); + } catch (DatabaseException de1) { + notifyFailed(de1); + } + } + + // + // POSTPROVIDER METHODS + // + + /** {@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) { lock.readLock().lock(); try { Collection posts = recipientPosts.get(recipientId); - return (posts == null) ? Collections. emptySet() : new HashSet(posts); + return (posts == null) ? Collections.emptySet() : new HashSet(posts); } finally { lock.readLock().unlock(); } @@ -120,21 +205,17 @@ public class MemoryPostDatabase implements PostDatabase { // POSTBUILDERFACTORY METHODS // - /** - * {@inheritDocs} - */ + /** {@inheritDocs} */ @Override public PostBuilder newPostBuilder() { - return new MemoryPostBuilder(soneProvider); + return new MemoryPostBuilder(this, soneProvider); } // // POSTSTORE METHODS // - /** - * {@inheritDocs} - */ + /** {@inheritDocs} */ @Override public void storePost(Post post) { checkNotNull(post, "post must not be null"); @@ -150,9 +231,7 @@ public class MemoryPostDatabase implements PostDatabase { } } - /** - * {@inheritDocs} - */ + /** {@inheritDocs} */ @Override public void removePost(Post post) { checkNotNull(post, "post must not be null"); @@ -169,9 +248,7 @@ public class MemoryPostDatabase implements PostDatabase { } } - /** - * {@inheritDocs} - */ + /** {@inheritDocs} */ @Override public void storePosts(Sone sone, Collection posts) throws IllegalArgumentException { checkNotNull(sone, "sone must not be null"); @@ -185,8 +262,8 @@ public class MemoryPostDatabase implements PostDatabase { lock.writeLock().lock(); try { /* remove all posts by the Sone. */ - getPostsFrom(sone.getId()).clear(); - for (Post post : posts) { + Collection oldPosts = getPostsFrom(sone.getId()); + for (Post post : oldPosts) { allPosts.remove(post.getId()); if (post.getRecipientId().isPresent()) { getPostsTo(post.getRecipientId().get()).remove(post); @@ -206,9 +283,7 @@ public class MemoryPostDatabase implements PostDatabase { } } - /** - * {@inheritDocs} - */ + /** {@inheritDocs} */ @Override public void removePosts(Sone sone) { checkNotNull(sone, "sone must not be null"); @@ -228,47 +303,211 @@ public class MemoryPostDatabase implements PostDatabase { } // - // POSTDATABASE METHODS + // POSTREPLYPROVIDER METHODS // - /** - * {@inheritDocs} - */ + /** {@inheritDocs} */ + @Override + public Optional getPostReply(String id) { + lock.readLock().lock(); + try { + return fromNullable(allPostReplies.get(id)); + } finally { + lock.readLock().unlock(); + } + } + + /** {@inheritDocs} */ @Override - public void loadKnownPosts(Configuration configuration, String prefix) { + public List getReplies(String postId) { + lock.readLock().lock(); + try { + if (!postReplies.containsKey(postId)) { + return Collections.emptyList(); + } + return new ArrayList(postReplies.get(postId)); + } finally { + lock.readLock().unlock(); + } + } + + // + // POSTREPLYBUILDERFACTORY METHODS + // + + /** {@inheritDocs} */ + @Override + public PostReplyBuilder newPostReplyBuilder() { + return new MemoryPostReplyBuilder(this, soneProvider); + } + + // + // POSTREPLYSTORE METHODS + // + + /** {@inheritDocs} */ + @Override + public void storePostReply(PostReply postReply) { lock.writeLock().lock(); try { - int postCounter = 0; - while (true) { - String knownPostId = configuration.getStringValue(prefix + postCounter++ + "/ID").getValue(null); - if (knownPostId == null) { - break; - } - knownPosts.add(knownPostId); + allPostReplies.put(postReply.getId(), postReply); + postReplies.put(postReply.getPostId(), postReply); + } 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)); + } + } + + 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); + this.postReplies.put(postReply.getPostId(), postReply); } } finally { lock.writeLock().unlock(); } } - /** - * {@inheritDocs} - */ + /** {@inheritDocs} */ @Override - public void saveKnownPosts(Configuration configuration, String prefix) throws ConfigurationException { - lock.readLock().lock(); + public void removePostReply(PostReply postReply) { + lock.writeLock().lock(); try { - int postCounter = 0; - for (String knownPostId : knownPosts) { - configuration.getStringValue(prefix + postCounter++ + "/ID").setValue(knownPostId); + allPostReplies.remove(postReply.getId()); + if (postReplies.containsKey(postReply.getPostId())) { + postReplies.get(postReply.getPostId()).remove(postReply); + } + } finally { + lock.writeLock().unlock(); + } + } + + /** {@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); } - configuration.getStringValue(prefix + postCounter + "/ID").setValue(null); + } finally { + lock.writeLock().unlock(); + } + } + + // + // ALBUMPROVDER METHODS + // + + @Override + public Optional getAlbum(String albumId) { + lock.readLock().lock(); + try { + return fromNullable(allAlbums.get(albumId)); + } finally { + lock.readLock().unlock(); + } + } + + // + // ALBUMBUILDERFACTORY METHODS + // + + @Override + public AlbumBuilder newAlbumBuilder() { + return new AlbumBuilderImpl(); + } + + // + // ALBUMSTORE METHODS + // + + @Override + public void storeAlbum(Album album) { + lock.writeLock().lock(); + try { + allAlbums.put(album.getId(), album); + } finally { + lock.writeLock().unlock(); + } + } + + @Override + public void removeAlbum(Album album) { + lock.writeLock().lock(); + try { + allAlbums.remove(album.getId()); + } finally { + lock.writeLock().unlock(); + } + } + + // + // IMAGEPROVIDER METHODS + // + + @Override + 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 { + allImages.put(image.getId(), image); + } finally { + lock.writeLock().unlock(); + } + } + + @Override + public void removeImage(Image image) { + lock.writeLock().lock(); + try { + allImages.remove(image.getId()); + } finally { + lock.writeLock().unlock(); + } + } + + // // PACKAGE-PRIVATE METHODS // @@ -276,7 +515,7 @@ public class MemoryPostDatabase implements PostDatabase { * 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) { @@ -292,9 +531,9 @@ public class MemoryPostDatabase implements PostDatabase { * 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(); @@ -309,6 +548,44 @@ public class MemoryPostDatabase implements PostDatabase { } } + /** + * Returns whether the given post reply is known. + * + * @param postReply + * The post reply + * @return {@code true} if the given post reply is known, {@code false} + * otherwise + */ + boolean isPostReplyKnown(PostReply postReply) { + lock.readLock().lock(); + try { + return knownPostReplies.contains(postReply.getId()); + } finally { + lock.readLock().unlock(); + } + } + + /** + * Sets whether the given post reply is known. + * + * @param postReply + * The post reply + * @param known + * {@code true} if the post reply is known, {@code false} otherwise + */ + void setPostReplyKnown(PostReply postReply, boolean known) { + lock.writeLock().lock(); + try { + if (known) { + knownPostReplies.add(postReply.getId()); + } else { + knownPostReplies.remove(postReply.getId()); + } + } finally { + lock.writeLock().unlock(); + } + } + // // PRIVATE METHODS // @@ -318,91 +595,125 @@ public class MemoryPostDatabase implements PostDatabase { * 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); + return sonePosts.get(soneId); } finally { lock.readLock().unlock(); } - if (posts != null) { - 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) { + lock.readLock().lock(); + try { + return recipientPosts.get(recipientId); + } finally { + lock.readLock().unlock(); } + } - posts = new HashSet(); + /** Loads the known posts. */ + private void loadKnownPosts() { lock.writeLock().lock(); try { - sonePosts.put(soneId, posts); + int postCounter = 0; + while (true) { + String knownPostId = configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").getValue(null); + if (knownPostId == null) { + break; + } + knownPosts.add(knownPostId); + } } finally { lock.writeLock().unlock(); } - - return posts; } /** - * Gets all posts that are directed the given Sone, creating a new - * collection if there is none yet. + * Saves the known posts to the configuration. * - * @param recipientId - * The ID of the Sone to get the posts for - * @return All posts + * @throws DatabaseException + * if a configuration error occurs */ - private Collection getPostsTo(String recipientId) { - Collection posts = null; + private void saveKnownPosts() throws DatabaseException { lock.readLock().lock(); try { - posts = recipientPosts.get(recipientId); + int postCounter = 0; + for (String knownPostId : knownPosts) { + configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").setValue(knownPostId); + } + configuration.getStringValue("KnownPosts/" + postCounter + "/ID").setValue(null); + } catch (ConfigurationException ce1) { + throw new DatabaseException("Could not save database.", ce1); } finally { lock.readLock().unlock(); } - if (posts != null) { - return posts; + } + + /** + * 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 getRepliesFrom(String id) { + lock.readLock().lock(); + try { + return Collections.unmodifiableCollection(sonePostReplies.get(id)); + } finally { + lock.readLock().unlock(); } + } - posts = new HashSet(); + /** Loads the known post replies. */ + private void loadKnownPostReplies() { lock.writeLock().lock(); try { - recipientPosts.put(recipientId, posts); + int replyCounter = 0; + while (true) { + String knownReplyId = configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").getValue(null); + if (knownReplyId == null) { + break; + } + knownPostReplies.add(knownReplyId); + } } finally { lock.writeLock().unlock(); } - - return posts; } /** - * {@link PostBuilder} implementation that creates a {@link MemoryPost}. + * Saves the known post replies to the configuration. * - * @author David ‘Bombe’ Roden + * @throws DatabaseException + * if a configuration error occurs */ - private class MemoryPostBuilder extends AbstractPostBuilder { - - /** - * Creates a new memory post builder. - * - * @param soneProvider - * The Sone provider - */ - public MemoryPostBuilder(SoneProvider soneProvider) { - super(soneProvider); - } - - /** - * {@inheritDocs} - */ - @Override - public Post build() throws IllegalStateException { - validate(); - Post post = new MemoryPost(MemoryPostDatabase.this, soneProvider, randomId ? UUID.randomUUID().toString() : id, senderId, recipientId, currentTime ? System.currentTimeMillis() : time, text); - post.setKnown(isPostKnown(post)); - return post; + private void saveKnownPostReplies() throws DatabaseException { + lock.readLock().lock(); + try { + int replyCounter = 0; + for (String knownReplyId : knownPostReplies) { + configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").setValue(knownReplyId); + } + configuration.getStringValue("KnownReplies/" + replyCounter + "/ID").setValue(null); + } catch (ConfigurationException ce1) { + throw new DatabaseException("Could not save database.", ce1); + } finally { + lock.readLock().unlock(); } - } }