X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.java;h=79c34d7e72c911b124b150d505c613483b0db3da;hb=3b711e4ff7898c71778dd3a8695ee3e0e3542861;hp=c611eea01d4b7c24650ed65983ab5d532456a8e6;hpb=d0170947a5968260c73b9b985466ede0f7c12336;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 c611eea..79c34d7 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
@@ -21,13 +21,13 @@ 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 java.util.Collections.unmodifiableCollection;
 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.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -37,6 +37,9 @@ import java.util.Set;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
@@ -65,6 +68,7 @@ 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.
@@ -117,6 +121,7 @@ public class MemoryDatabase extends AbstractService implements Database {
 	private final Multimap<String, Image> soneImages = HashMultimap.create();
 
 	private final MemoryBookmarkDatabase memoryBookmarkDatabase;
+	private final MemoryFriendDatabase memoryFriendDatabase;
 
 	/**
 	 * Creates a new memory database.
@@ -133,6 +138,7 @@ public class MemoryDatabase extends AbstractService implements Database {
 		this.configurationLoader = new ConfigurationLoader(configuration);
 		memoryBookmarkDatabase =
 				new MemoryBookmarkDatabase(this, configurationLoader);
+		memoryFriendDatabase = new MemoryFriendDatabase(configurationLoader);
 	}
 
 	//
@@ -178,7 +184,7 @@ public class MemoryDatabase extends AbstractService implements Database {
 
 	@Override
 	public SoneBuilder newSoneBuilder() {
-		return new MemorySoneBuilder();
+		return new MemorySoneBuilder(this);
 	}
 
 	@Override
@@ -238,11 +244,22 @@ public class MemoryDatabase extends AbstractService implements Database {
 		}
 	}
 
+	@Nonnull
+	@Override
+	public Function1<String, Sone> getSoneLoader() {
+		return new Function1<String, Sone>() {
+			@Override
+			public Sone invoke(String soneId) {
+				return getSone(soneId);
+			}
+		};
+	}
+
 	@Override
-	public Optional<Sone> getSone(String soneId) {
+	public Sone getSone(String soneId) {
 		lock.readLock().lock();
 		try {
-			return fromNullable(allSones.get(soneId));
+			return allSones.get(soneId);
 		} finally {
 			lock.readLock().unlock();
 		}
@@ -279,6 +296,38 @@ public class MemoryDatabase extends AbstractService implements Database {
 		}
 	}
 
+	@Override
+	public Collection<String> 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
 	//
@@ -361,12 +410,12 @@ public class MemoryDatabase extends AbstractService implements Database {
 	// POSTREPLYPROVIDER METHODS
 	//
 
-	/** {@inheritDocs} */
+	@Nullable
 	@Override
-	public Optional<PostReply> getPostReply(String id) {
+	public PostReply getPostReply(String id) {
 		lock.readLock().lock();
 		try {
-			return fromNullable(allPostReplies.get(id));
+			return allPostReplies.get(id);
 		} finally {
 			lock.readLock().unlock();
 		}
@@ -478,11 +527,12 @@ public class MemoryDatabase extends AbstractService implements Database {
 	// IMAGEPROVIDER METHODS
 	//
 
+	@Nullable
 	@Override
-	public Optional<Image> getImage(String imageId) {
+	public Image getImage(@Nonnull String imageId) {
 		lock.readLock().lock();
 		try {
-			return fromNullable(allImages.get(imageId));
+			return allImages.get(imageId);
 		} finally {
 			lock.readLock().unlock();
 		}