Replace unnecessary type parameters with <>

[Sone.git] / src / test / java / net / pterodactylus / sone / database / memory / MemoryBookmarkDatabaseTest.java

diff --git a/src/test/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabaseTest.java b/src/test/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabaseTest.java
index e6bfffe..188b740 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabaseTest.java
+++ b/src/test/java/net/pterodactylus/sone/database/memory/MemoryBookmarkDatabaseTest.java
@@ -1,6 +1,5 @@
 package net.pterodactylus.sone.database.memory;
 
-import static com.google.common.base.Optional.fromNullable;
 import static net.pterodactylus.sone.test.Matchers.isPostWithId;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
@@ -19,7 +18,6 @@ import java.util.Set;
 
 import net.pterodactylus.sone.data.Post;
 
-import com.google.common.base.Optional;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
@@ -27,8 +25,6 @@ import org.mockito.stubbing.Answer;
 
 /**
  * Unit test for {@link MemoryBookmarkDatabase}.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class MemoryBookmarkDatabaseTest {
 
@@ -37,17 +33,16 @@ public class MemoryBookmarkDatabaseTest {
                        mock(ConfigurationLoader.class);
        private final MemoryBookmarkDatabase bookmarkDatabase =
                        new MemoryBookmarkDatabase(memoryDatabase, configurationLoader);
-       private final Map<String, Post> posts = new HashMap<String, Post>();
+       private final Map<String, Post> posts = new HashMap<>();
 
        @Before
        public void setupMemoryDatabase() {
                when(memoryDatabase.getPost(anyString())).thenAnswer(
-                               new Answer<Optional<Post>>() {
+                               new Answer<Post>() {
                                        @Override
-                                       public Optional<Post> answer(
+                                       public Post answer(
                                                        InvocationOnMock invocation) {
-                                               return fromNullable(
-                                                               posts.get(invocation.getArguments()[0]));
+                                               return posts.get(invocation.getArguments()[0]);
                                        }
                                });
        }
@@ -72,7 +67,7 @@ public class MemoryBookmarkDatabaseTest {
 
        @Test
        public void bookmarkDatabaseRetainsBookmarkedPosts() {
-               Set<Post> allPosts = new HashSet<Post>(posts.values());
+               Set<Post> allPosts = new HashSet<>(posts.values());
                for (Post post : allPosts) {
                        bookmarkDatabase.bookmarkPost(post);
                }
@@ -103,7 +98,7 @@ public class MemoryBookmarkDatabaseTest {
 
        @Test
        public void removingABookmarkRemovesTheCorrectBookmark() {
-               Set<Post> allPosts = new HashSet<Post>(posts.values());
+               Set<Post> allPosts = new HashSet<>(posts.values());
                for (Post post : allPosts) {
                        bookmarkDatabase.bookmarkPost(post);
                }