X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.java;h=5e5021c1eba108b7815713cb9dc09d9af57eca92;hb=fd32e307db87c617a4c455f592b6e649ec50ae8a;hp=6f9d24642b80854ac8588a5e304f396435f91c53;hpb=8e313509a42a8c638fcac018dd73dd975bf9cb68;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 6f9d246..5e5021c 100644
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
@@ -38,6 +38,7 @@ 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;
@@ -58,7 +59,6 @@ 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;
@@ -331,12 +331,12 @@ public class MemoryDatabase extends AbstractService implements Database {
 	// POSTPROVIDER METHODS
 	//
 
-	/** {@inheritDocs} */
+	@Nullable
 	@Override
-	public Optional<Post> getPost(String postId) {
+	public Post getPost(@Nonnull String postId) {
 		lock.readLock().lock();
 		try {
-			return fromNullable(allPosts.get(postId));
+			return allPosts.get(postId);
 		} finally {
 			lock.readLock().unlock();
 		}
@@ -409,12 +409,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();
 		}
@@ -477,11 +477,12 @@ public class MemoryDatabase extends AbstractService implements Database {
 	// ALBUMPROVDER METHODS
 	//
 
+	@Nullable
 	@Override
-	public Optional<Album> getAlbum(String albumId) {
+	public Album getAlbum(@Nonnull String albumId) {
 		lock.readLock().lock();
 		try {
-			return fromNullable(allAlbums.get(albumId));
+			return allAlbums.get(albumId);
 		} finally {
 			lock.readLock().unlock();
 		}
@@ -526,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();
 		}