X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=508d167021bae531afac70a9763f95ecf8072420;hp=37ef0ac9b43e32aaa7e6f0363e9f225ba78b00e1;hb=fafe0029dcbef27ce918fdf7007e78c8705ca20f;hpb=d6b58f43646ef0b2ab92291a0f096a240db7edc6

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 37ef0ac..508d167 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -99,7 +99,6 @@ import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.thread.NamedThreadFactory;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.HashMultimap;
@@ -109,6 +108,7 @@ import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import kotlin.jvm.functions.Function1;
 
 /**
  * The Sone core.
@@ -323,9 +323,10 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		return database.getSones();
 	}
 
+	@Nonnull
 	@Override
-	public Function<String, Optional<Sone>> soneLoader() {
-		return database.soneLoader();
+	public Function1<String, Sone> getSoneLoader() {
+		return database.getSoneLoader();
 	}
 
 	/**
@@ -338,7 +339,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *         Sone
 	 */
 	@Override
-	public Optional<Sone> getSone(String id) {
+	@Nullable
+	public Sone getSone(@Nonnull String id) {
 		return database.getSone(id);
 	}
 
@@ -358,9 +360,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @return The Sone with the given ID, or {@code null}
 	 */
 	public Sone getLocalSone(String id) {
-		Optional<Sone> sone = database.getSone(id);
-		if (sone.isPresent() && sone.get().isLocal()) {
-			return sone.get();
+		Sone sone = database.getSone(id);
+		if ((sone != null) && sone.isLocal()) {
+			return sone;
 		}
 		return null;
 	}
@@ -382,7 +384,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @return The Sone with the given ID
 	 */
 	public Sone getRemoteSone(String id) {
-		return database.getSone(id).orNull();
+		return database.getSone(id);
 	}
 
 	/**
@@ -457,8 +459,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	/**
 	 * {@inheritDoc}
 	 */
+	@Nullable
 	@Override
-	public Optional<PostReply> getPostReply(String replyId) {
+	public PostReply getPostReply(String replyId) {
 		return database.getPostReply(replyId);
 	}
 
@@ -554,6 +557,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *            The ID of the image
 	 * @return The image with the given ID
 	 */
+	@Nullable
 	public Image getImage(String imageId) {
 		return getImage(imageId, true);
 	}
@@ -570,6 +574,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @return The image with the given ID, or {@code null} if none exists and
 	 *         none was created
 	 */
+	@Nullable
 	public Image getImage(String imageId, boolean create) {
 		Optional<Image> image = database.getImage(imageId);
 		if (image.isPresent()) {
@@ -695,12 +700,12 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		}
 		String property = fromNullable(identity.getProperty("Sone.LatestEdition")).or("0");
 		long latestEdition = fromNullable(tryParse(property)).or(0L);
-		Optional<Sone> existingSone = getSone(identity.getId());
-		if (existingSone.isPresent() && existingSone.get().isLocal()) {
-			return existingSone.get();
+		Sone existingSone = getSone(identity.getId());
+		if ((existingSone != null )&& existingSone.isLocal()) {
+			return existingSone;
 		}
-		boolean newSone = !existingSone.isPresent();
-		Sone sone = !newSone ? existingSone.get() : database.newSoneBuilder().from(identity).build();
+		boolean newSone = existingSone == null;
+		Sone sone = !newSone ? existingSone : database.newSoneBuilder().from(identity).build();
 		sone.setLatestEdition(latestEdition);
 		if (newSone) {
 			synchronized (knownSones) {
@@ -738,16 +743,16 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			if (!soneFollowingTimes.containsKey(soneId)) {
 				long now = System.currentTimeMillis();
 				soneFollowingTimes.put(soneId, now);
-				Optional<Sone> followedSone = getSone(soneId);
-				if (!followedSone.isPresent()) {
+				Sone followedSone = getSone(soneId);
+				if (followedSone == null) {
 					return;
 				}
-				for (Post post : followedSone.get().getPosts()) {
+				for (Post post : followedSone.getPosts()) {
 					if (post.getTime() < now) {
 						markPostKnown(post);
 					}
 				}
-				for (PostReply reply : followedSone.get().getReplies()) {
+				for (PostReply reply : followedSone.getReplies()) {
 					if (reply.getTime() < now) {
 						markReplyKnown(reply);
 					}
@@ -872,20 +877,20 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *            of the age of the given Sone
 	 */
 	public void updateSone(final Sone sone, boolean soneRescueMode) {
-		Optional<Sone> storedSone = getSone(sone.getId());
-		if (storedSone.isPresent()) {
-			if (!soneRescueMode && !(sone.getTime() > storedSone.get().getTime())) {
+		Sone storedSone = getSone(sone.getId());
+		if (storedSone != null) {
+			if (!soneRescueMode && !(sone.getTime() > storedSone.getTime())) {
 				logger.log(Level.FINE, String.format("Downloaded Sone %s is not newer than stored Sone %s.", sone, storedSone));
 				return;
 			}
 			List<Object> events =
-					collectEventsForChangesInSone(storedSone.get(), sone);
+					collectEventsForChangesInSone(storedSone, sone);
 			database.storeSone(sone);
 			for (Object event : events) {
 				eventBus.post(event);
 			}
-			sone.setOptions(storedSone.get().getOptions());
-			sone.setKnown(storedSone.get().isKnown());
+			sone.setOptions(storedSone.getOptions());
+			sone.setKnown(storedSone.isKnown());
 			sone.setStatus((sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
 			if (sone.isLocal()) {
 				touchConfiguration();
@@ -1731,19 +1736,19 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				return;
 			}
 		}
-		Optional<Sone> sone = getSone(identity.getId());
-		if (!sone.isPresent()) {
+		Sone sone = getSone(identity.getId());
+		if (sone == null) {
 			/* TODO - we don’t have the Sone anymore. should this happen? */
 			return;
 		}
-		for (PostReply postReply : sone.get().getReplies()) {
+		for (PostReply postReply : sone.getReplies()) {
 			eventBus.post(new PostReplyRemovedEvent(postReply));
 		}
-		for (Post post : sone.get().getPosts()) {
+		for (Post post : sone.getPosts()) {
 			eventBus.post(new PostRemovedEvent(post));
 		}
-		eventBus.post(new SoneRemovedEvent(sone.get()));
-		database.removeSone(sone.get());
+		eventBus.post(new SoneRemovedEvent(sone));
+		database.removeSone(sone);
 	}
 
 	/**