X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=2ff27c954f9d7e9c1f4307ce7fb730e767d2ffad;hp=ccf633c180b3a3a01fe7c5445df3d70c6411fd4f;hb=04709e23f38e9d447337682ba27201da5dc19bd9;hpb=4b42574c9ec4490100ac3e87b9c2f3aac965a202

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index ccf633c..2ff27c9 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -1,5 +1,5 @@
 /*
- * Sone - Core.java - Copyright © 2010–2016 David Roden
+ * Sone - Core.java - Copyright © 2010–2019 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,8 +48,6 @@ import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidImageFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidParentAlbumFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidPostFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidPostReplyFound;
-import net.pterodactylus.sone.core.SoneChangeDetector.PostProcessor;
-import net.pterodactylus.sone.core.SoneChangeDetector.PostReplyProcessor;
 import net.pterodactylus.sone.core.event.ImageInsertFinishedEvent;
 import net.pterodactylus.sone.core.event.InsertionDelayChangedEvent;
 import net.pterodactylus.sone.core.event.MarkPostKnownEvent;
@@ -100,7 +98,6 @@ import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.thread.NamedThreadFactory;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -113,8 +110,6 @@ import kotlin.jvm.functions.Function1;
 
 /**
  * The Sone core.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 @Singleton
 public class Core extends AbstractService implements SoneProvider, PostProvider, PostReplyProvider {
@@ -160,18 +155,18 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 
 	/** Locked local Sones. */
 	/* synchronize on itself. */
-	private final Set<Sone> lockedSones = new HashSet<Sone>();
+	private final Set<Sone> lockedSones = new HashSet<>();
 
 	/** Sone inserters. */
 	/* synchronize access on this on sones. */
-	private final Map<Sone, SoneInserter> soneInserters = new HashMap<Sone, SoneInserter>();
+	private final Map<Sone, SoneInserter> soneInserters = new HashMap<>();
 
 	/** Sone rescuers. */
 	/* synchronize access on this on sones. */
-	private final Map<Sone, SoneRescuer> soneRescuers = new HashMap<Sone, SoneRescuer>();
+	private final Map<Sone, SoneRescuer> soneRescuers = new HashMap<>();
 
 	/** All known Sones. */
-	private final Set<String> knownSones = new HashSet<String>();
+	private final Set<String> knownSones = new HashSet<>();
 
 	/** The post database. */
 	private final Database database;
@@ -180,7 +175,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	private final Multimap<OwnIdentity, Identity> trustedIdentities = Multimaps.synchronizedSetMultimap(HashMultimap.<OwnIdentity, Identity>create());
 
 	/** All temporary images. */
-	private final Map<String, TemporaryImage> temporaryImages = new HashMap<String, TemporaryImage>();
+	private final Map<String, TemporaryImage> temporaryImages = new HashMap<>();
 
 	/** Ticker for threads that mark own elements as known. */
 	private final ScheduledExecutorService localElementTicker = Executors.newScheduledThreadPool(1);
@@ -448,7 +443,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @return The Sones that like the given post
 	 */
 	public Set<Sone> getLikes(Post post) {
-		Set<Sone> sones = new HashSet<Sone>();
+		Set<Sone> sones = new HashSet<>();
 		for (Sone sone : getSones()) {
 			if (sone.getLikedPostIds().contains(post.getId())) {
 				sones.add(sone);
@@ -465,7 +460,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @return The Sones that like the given reply
 	 */
 	public Set<Sone> getLikes(PostReply reply) {
-		Set<Sone> sones = new HashSet<Sone>();
+		Set<Sone> sones = new HashSet<>();
 		for (Sone sone : getSones()) {
 			if (sone.getLikedReplyIds().contains(reply.getId())) {
 				sones.add(sone);
@@ -853,44 +848,33 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		}
 	}
 
-	private List<Object> collectEventsForChangesInSone(Sone oldSone,
-			final Sone newSone) {
-		final List<Object> events = new ArrayList<Object>();
-		SoneChangeDetector soneChangeDetector = new SoneChangeDetector(
-				oldSone);
-		soneChangeDetector.onNewPosts(new PostProcessor() {
-			@Override
-			public void processPost(Post post) {
-				if (post.getTime() < database.getFollowingTime(newSone.getId())) {
-					post.setKnown(true);
-				} else if (!post.isKnown()) {
-					events.add(new NewPostFoundEvent(post));
-				}
-			}
-		});
-		soneChangeDetector.onRemovedPosts(new PostProcessor() {
-			@Override
-			public void processPost(Post post) {
-				events.add(new PostRemovedEvent(post));
-			}
-		});
-		soneChangeDetector.onNewPostReplies(new PostReplyProcessor() {
-			@Override
-			public void processPostReply(PostReply postReply) {
-				if (postReply.getTime() < database.getFollowingTime(newSone.getId())) {
-					postReply.setKnown(true);
-				} else if (!postReply.isKnown()) {
-					events.add(new NewPostReplyFoundEvent(postReply));
-				}
+	private List<Object> collectEventsForChangesInSone(Sone oldSone, Sone newSone) {
+		List<Object> events = new ArrayList<>();
+		SoneComparison soneComparison = new SoneComparison(oldSone, newSone);
+		for (Post newPost : soneComparison.getNewPosts()) {
+			if (newPost.getSone().equals(newSone)) {
+				newPost.setKnown(true);
+			} else if (newPost.getTime() < database.getFollowingTime(newSone.getId())) {
+				newPost.setKnown(true);
+			} else if (!newPost.isKnown()) {
+				events.add(new NewPostFoundEvent(newPost));
 			}
-		});
-		soneChangeDetector.onRemovedPostReplies(new PostReplyProcessor() {
-			@Override
-			public void processPostReply(PostReply postReply) {
-				events.add(new PostReplyRemovedEvent(postReply));
+		}
+		for (Post post : soneComparison.getRemovedPosts()) {
+			events.add(new PostRemovedEvent(post));
+		}
+		for (PostReply postReply : soneComparison.getNewPostReplies()) {
+			if (postReply.getSone().equals(newSone)) {
+				postReply.setKnown(true);
+			} else if (postReply.getTime() < database.getFollowingTime(newSone.getId())) {
+				postReply.setKnown(true);
+			} else if (!postReply.isKnown()) {
+				events.add(new NewPostReplyFoundEvent(postReply));
 			}
-		});
-		soneChangeDetector.detectChanges(newSone);
+		}
+		for (PostReply postReply : soneComparison.getRemovedPostReplies()) {
+			events.add(new PostReplyRemovedEvent(postReply));
+		}
 		return events;
 	}
 
@@ -1078,7 +1062,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *            The text of the post
 	 * @return The created post
 	 */
-	public Post createPost(Sone sone, Optional<Sone> recipient, String text) {
+	public Post createPost(Sone sone, @Nullable Sone recipient, String text) {
 		checkNotNull(text, "text must not be null");
 		checkArgument(text.trim().length() > 0, "text must not be empty");
 		if (!sone.isLocal()) {
@@ -1087,8 +1071,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		}
 		PostBuilder postBuilder = database.newPostBuilder();
 		postBuilder.from(sone.getId()).randomId().currentTime().withText(text.trim());
-		if (recipient.isPresent()) {
-			postBuilder.to(recipient.get().getId());
+		if (recipient != null) {
+			postBuilder.to(recipient.getId());
 		}
 		final Post post = postBuilder.build();
 		database.storePost(post);
@@ -1343,7 +1327,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		identityManager.start();
 		webOfTrustUpdater.init();
 		webOfTrustUpdater.start();
-		database.start();
+		database.startAsync();
 	}
 
 	/**
@@ -1383,7 +1367,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			}
 		}
 		saveConfiguration();
-		database.stop();
+		database.stopAsync();
 		webOfTrustUpdater.stop();
 		updateChecker.stop();
 		soneDownloader.stop();
@@ -1695,9 +1679,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Subscribe
 	public void imageInsertFinished(ImageInsertFinishedEvent imageInsertFinishedEvent) {
-		logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", imageInsertFinishedEvent.image(), imageInsertFinishedEvent.resultingUri()));
-		imageInsertFinishedEvent.image().modify().setKey(imageInsertFinishedEvent.resultingUri().toString()).update();
-		deleteTemporaryImage(imageInsertFinishedEvent.image().getId());
+		logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", imageInsertFinishedEvent.getImage(), imageInsertFinishedEvent.getResultingUri()));
+		imageInsertFinishedEvent.getImage().modify().setKey(imageInsertFinishedEvent.getResultingUri().toString()).update();
+		deleteTemporaryImage(imageInsertFinishedEvent.getImage().getId());
 		touchConfiguration();
 	}