Replace unnecessary type parameters with <>

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

diff --git a/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java b/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java
index 594cf2b..1a4e119 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java
+++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabase.java
@@ -1,5 +1,6 @@
 package net.pterodactylus.sone.database.memory;
 
+import static com.google.common.base.Optional.fromNullable;
 import static com.google.common.collect.FluentIterable.from;
 
 import java.util.HashSet;
@@ -15,15 +16,13 @@ import com.google.common.base.Function;
 
 /**
  * Memory-based {@link BookmarkDatabase} implementation.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class MemoryBookmarkDatabase implements BookmarkDatabase {
 
        private final ReadWriteLock lock = new ReentrantReadWriteLock();
        private final MemoryDatabase memoryDatabase;
        private final ConfigurationLoader configurationLoader;
-       private final Set<String> bookmarkedPosts = new HashSet<String>();
+       private final Set<String> bookmarkedPosts = new HashSet<>();
 
        public MemoryBookmarkDatabase(MemoryDatabase memoryDatabase,
                        ConfigurationLoader configurationLoader) {
@@ -99,7 +98,7 @@ public class MemoryBookmarkDatabase implements BookmarkDatabase {
                                        new Function<String, Post>() {
                                                @Override
                                                public Post apply(String postId) {
-                                                       return memoryDatabase.getPost(postId)
+                                                       return fromNullable(memoryDatabase.getPost(postId))
                                                                        .or(new EmptyPost(postId));
                                                }
                                        }).toSet();