X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FSoneTextParserTest.java;h=79f197411a156eeb265b080882f103e2d915ddc2;hb=fd32e307db87c617a4c455f592b6e649ec50ae8a;hp=940c1577e58bf3c39aa3b2ced5b45dae0915ff87;hpb=a21cf1224cebf99f3210883efbf4afb9bd8da87c;p=Sone.git

diff --git a/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java b/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java
index 940c157..79f1974 100644
--- a/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java
+++ b/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java
@@ -26,14 +26,17 @@ import static org.hamcrest.Matchers.notNullValue;
 import java.io.IOException;
 import java.util.Collection;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.impl.IdOnlySone;
 import net.pterodactylus.sone.database.PostProvider;
 import net.pterodactylus.sone.database.SoneProvider;
 
-import com.google.common.base.Function;
 import com.google.common.base.Optional;
+import kotlin.jvm.functions.Function1;
 import org.junit.Test;
 
 /**
@@ -410,22 +413,21 @@ public class SoneTextParserTest {
 	 */
 	private static class TestSoneProvider implements SoneProvider {
 
+		@Nonnull
 		@Override
-		public Function<String, Optional<Sone>> soneLoader() {
-			return new Function<String, Optional<Sone>>() {
+		public Function1<String, Sone> getSoneLoader() {
+			return new Function1<String, Sone>() {
 				@Override
-				public Optional<Sone> apply(String soneId) {
+				public Sone invoke(String soneId) {
 					return getSone(soneId);
 				}
 			};
 		}
 
-		/**
-		 * {@inheritDoc}
-		 */
+		@Nullable
 		@Override
-		public Optional<Sone> getSone(final String soneId) {
-			return Optional.<Sone>of(new IdOnlySone(soneId));
+		public Sone getSone(final String soneId) {
+			return new IdOnlySone(soneId);
 		}
 
 		/**
@@ -457,17 +459,18 @@ public class SoneTextParserTest {
 	private static class AbsentSoneProvider extends TestSoneProvider {
 
 		@Override
-		public Optional<Sone> getSone(String soneId) {
-			return Optional.absent();
+		public Sone getSone(String soneId) {
+			return null;
 		}
 
 	}
 
 	private static class TestPostProvider implements PostProvider {
 
+		@Nullable
 		@Override
-		public Optional<Post> getPost(final String postId) {
-			return Optional.<Post>of(new Post() {
+		public Post getPost(@Nonnull final String postId) {
+			return new Post() {
 				@Override
 				public String getId() {
 					return postId;
@@ -512,7 +515,7 @@ public class SoneTextParserTest {
 				public Post setKnown(boolean known) {
 					return null;
 				}
-			});
+			};
 		}
 
 		@Override
@@ -529,9 +532,10 @@ public class SoneTextParserTest {
 
 	private static class AbsentPostProvider extends TestPostProvider {
 
+		@Nullable
 		@Override
-		public Optional<Post> getPost(String postId) {
-			return Optional.absent();
+		public Post getPost(@Nonnull String postId) {
+			return null;
 		}
 
 	}