X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.java;h=8343cafbdfbb8b67662f88989268ac1a72bf1a67;hb=b72418365155d4c0dd89215c5aeff27feeae68dd;hp=9edab5771eea29932b8dca41e7266bb49a9bbad6;hpb=af60c5fcbfd2098b564e587b33dc7229715b0bcf;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 9edab57..8343caf 100644
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
@@ -33,8 +33,6 @@ 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.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
@@ -42,8 +40,8 @@ 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.DefaultSoneBuilder;
 import net.pterodactylus.sone.database.Database;
 import net.pterodactylus.sone.database.DatabaseException;
 import net.pterodactylus.sone.database.PostDatabase;
@@ -175,6 +173,16 @@ public class MemoryDatabase extends AbstractService implements Database {
 	}
 
 	@Override
+	public Function<String, Optional<Sone>> getSone() {
+		return new Function<String, Optional<Sone>>() {
+			@Override
+			public Optional<Sone> apply(String soneId) {
+				return (soneId == null) ? Optional.<Sone>absent() : getSone(soneId);
+			}
+		};
+	}
+
+	@Override
 	public Optional<Sone> getSone(String soneId) {
 		lock.readLock().lock();
 		try {
@@ -216,7 +224,19 @@ public class MemoryDatabase extends AbstractService implements Database {
 
 	@Override
 	public SoneBuilder newSoneBuilder() {
-		return null;
+		return new DefaultSoneBuilder(this) {
+			@Override
+			public Sone build(Optional<SoneCreated> soneCreated) throws IllegalStateException {
+				Sone sone = super.build(soneCreated);
+				lock.writeLock().lock();
+				try {
+					sones.put(sone.getId(), sone);
+				} finally {
+					lock.writeLock().unlock();
+				}
+				return sone;
+			}
+		};
 	}
 
 	//
@@ -224,6 +244,16 @@ public class MemoryDatabase extends AbstractService implements Database {
 	//
 
 	@Override
+	public Function<String, Optional<Post>> getPost() {
+		return new Function<String, Optional<Post>>() {
+			@Override
+			public Optional<Post> apply(String postId) {
+				return (postId == null) ? Optional.<Post>absent() : getPost(postId);
+			}
+		};
+	}
+
+	@Override
 	public Optional<Post> getPost(String postId) {
 		lock.readLock().lock();
 		try {
@@ -526,7 +556,9 @@ public class MemoryDatabase extends AbstractService implements Database {
 		lock.writeLock().lock();
 		try {
 			allAlbums.put(album.getId(), album);
-			albumChildren.put(album.getParent().getId(), album.getId());
+			if (!album.isRoot()) {
+				albumChildren.put(album.getParent().getId(), album.getId());
+			}
 		} finally {
 			lock.writeLock().unlock();
 		}