Merge branch 'release-0.9.8'

[Sone.git] / src / main / java / net / pterodactylus / sone / database / memory / MemoryDatabase.java

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 248592c..5e5021c 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
@@ -59,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;
@@ -332,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();
                }
@@ -478,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();
                }
@@ -527,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();
                }