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=d7e9f58189a9456911d3c770e75f78c7409be388;hp=3f30d1191783091355523cd050c77fd860f7f3c5;hb=e641b6984bf4d67fb842d7a858e8521f2b34155f;hpb=6e9a43ccd93ae125720547c0fe421dc81a54ba90

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 3f30d11..d7e9f58 100644
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
@@ -17,7 +17,8 @@
 
 package net.pterodactylus.sone.database.memory;
 
-import static com.google.common.base.Preconditions.*;
+import static com.google.common.base.Optional.fromNullable;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -33,12 +34,18 @@ import java.util.TreeSet;
 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.Reply;
 import net.pterodactylus.sone.data.Sone;
+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;
@@ -47,6 +54,8 @@ 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;
@@ -72,10 +81,10 @@ public class MemoryDatabase extends AbstractService implements Database {
 	private final Map<String, Post> allPosts = new HashMap<String, Post>();
 
 	/** All posts by their Sones. */
-	private final Map<String, Collection<Post>> sonePosts = new HashMap<String, Collection<Post>>();
+	private final Multimap<String, Post> sonePosts = HashMultimap.create();
 
 	/** All posts by their recipient. */
-	private final Map<String, Collection<Post>> recipientPosts = new HashMap<String, Collection<Post>>();
+	private final Multimap<String, Post> recipientPosts = HashMultimap.create();
 
 	/** Whether posts are known. */
 	private final Set<String> knownPosts = new HashSet<String>();
@@ -98,6 +107,10 @@ public class MemoryDatabase extends AbstractService implements Database {
 	/** Whether post replies are known. */
 	private final Set<String> knownPostReplies = new HashSet<String>();
 
+	private final Map<String, Album> allAlbums = new HashMap<String, Album>();
+
+	private final Map<String, Image> allImages = new HashMap<String, Image>();
+
 	/**
 	 * Creates a new memory database.
 	 *
@@ -160,7 +173,7 @@ public class MemoryDatabase extends AbstractService implements Database {
 	public Optional<Post> getPost(String postId) {
 		lock.readLock().lock();
 		try {
-			return Optional.fromNullable(allPosts.get(postId));
+			return fromNullable(allPosts.get(postId));
 		} finally {
 			lock.readLock().unlock();
 		}
@@ -245,8 +258,8 @@ public class MemoryDatabase extends AbstractService implements Database {
 		lock.writeLock().lock();
 		try {
 			/* remove all posts by the Sone. */
-			getPostsFrom(sone.getId()).clear();
-			for (Post post : posts) {
+			Collection<Post> oldPosts = getPostsFrom(sone.getId());
+			for (Post post : oldPosts) {
 				allPosts.remove(post.getId());
 				if (post.getRecipientId().isPresent()) {
 					getPostsTo(post.getRecipientId().get()).remove(post);
@@ -294,7 +307,7 @@ public class MemoryDatabase extends AbstractService implements Database {
 	public Optional<PostReply> getPostReply(String id) {
 		lock.readLock().lock();
 		try {
-			return Optional.fromNullable(allPostReplies.get(id));
+			return fromNullable(allPostReplies.get(id));
 		} finally {
 			lock.readLock().unlock();
 		}
@@ -412,6 +425,100 @@ public class MemoryDatabase extends AbstractService implements Database {
 	}
 
 	//
+	// ALBUMPROVDER METHODS
+	//
+
+	@Override
+	public Optional<Album> 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<Image> 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
 	//
 
@@ -503,26 +610,12 @@ public class MemoryDatabase extends AbstractService implements Database {
 	 * @return All posts
 	 */
 	private Collection<Post> getPostsFrom(String soneId) {
-		Collection<Post> posts = null;
 		lock.readLock().lock();
 		try {
-			posts = sonePosts.get(soneId);
+			return sonePosts.get(soneId);
 		} finally {
 			lock.readLock().unlock();
 		}
-		if (posts != null) {
-			return posts;
-		}
-
-		posts = new HashSet<Post>();
-		lock.writeLock().lock();
-		try {
-			sonePosts.put(soneId, posts);
-		} finally {
-			lock.writeLock().unlock();
-		}
-
-		return posts;
 	}
 
 	/**
@@ -534,26 +627,12 @@ public class MemoryDatabase extends AbstractService implements Database {
 	 * @return All posts
 	 */
 	private Collection<Post> getPostsTo(String recipientId) {
-		Collection<Post> posts = null;
 		lock.readLock().lock();
 		try {
-			posts = recipientPosts.get(recipientId);
+			return recipientPosts.get(recipientId);
 		} finally {
 			lock.readLock().unlock();
 		}
-		if (posts != null) {
-			return posts;
-		}
-
-		posts = new HashSet<Post>();
-		lock.writeLock().lock();
-		try {
-			recipientPosts.put(recipientId, posts);
-		} finally {
-			lock.writeLock().unlock();
-		}
-
-		return posts;
 	}
 
 	/** Loads the known posts. */