X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=79a6259f0b09286e164e7f11dce74629ccbadc46;hp=86bf049d62a9084e111d1c77bc7579da80e34d51;hb=179e7da4d8d8a474d0b622d60b5f5d32d6ab4052;hpb=f229fe41f708d2b275c20ceb9aba5993761218a3

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index 86bf049..79a6259 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SoneInserter.java - Copyright © 2010–2013 David Roden
+ * Sone - SoneInserter.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
@@ -59,7 +59,6 @@ import net.pterodactylus.util.template.XmlFilter;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Charsets;
-import com.google.common.base.Optional;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Ordering;
 import com.google.common.eventbus.EventBus;
@@ -73,13 +72,11 @@ import freenet.support.io.ArrayBucket;
 
 /**
  * A Sone inserter is responsible for inserting a Sone if it has changed.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class SoneInserter extends AbstractService {
 
 	/** The logger. */
-	private static final Logger logger = getLogger("Sone.Inserter");
+	private static final Logger logger = getLogger(SoneInserter.class.getName());
 
 	/** The insertion delay (in seconds). */
 	private static final AtomicInteger insertionDelay = new AtomicInteger(60);
@@ -125,20 +122,20 @@ public class SoneInserter extends AbstractService {
 		this(core, eventBus, freenetInterface, soneId, new SoneModificationDetector(new LockableFingerprintProvider() {
 			@Override
 			public boolean isLocked() {
-				final Optional<Sone> sone = core.getSone(soneId);
-				if (!sone.isPresent()) {
+				Sone sone = core.getSone(soneId);
+				if (sone == null) {
 					return false;
 				}
-				return core.isLocked(sone.get());
+				return core.isLocked(sone);
 			}
 
 			@Override
 			public String getFingerprint() {
-				final Optional<Sone> sone = core.getSone(soneId);
-				if (!sone.isPresent()) {
+				Sone sone = core.getSone(soneId);
+				if (sone == null) {
 					return null;
 				}
-				return sone.get().getFingerprint();
+				return sone.getFingerprint();
 			}
 		}, insertionDelay), 1000);
 	}
@@ -180,7 +177,7 @@ public class SoneInserter extends AbstractService {
 	 * @return The fingerprint of the last insert
 	 */
 	public String getLastInsertFingerprint() {
-		return soneModificationDetector.getOriginalFingerprint();
+		return soneModificationDetector.getLastInsertFingerprint();
 	}
 
 	/**
@@ -219,12 +216,11 @@ public class SoneInserter extends AbstractService {
 				sleep(delay);
 
 				if (soneModificationDetector.isEligibleForInsert()) {
-					Optional<Sone> soneOptional = core.getSone(soneId);
-					if (!soneOptional.isPresent()) {
+					Sone sone = core.getSone(soneId);
+					if (sone == null) {
 						logger.log(Level.WARNING, format("Sone %s has disappeared, exiting inserter.", soneId));
 						return;
 					}
-					Sone sone = soneOptional.get();
 					InsertInformation insertInformation = new InsertInformation(sone);
 					logger.log(Level.INFO, String.format("Inserting Sone “%s”…", sone.getName()));
 
@@ -282,14 +278,12 @@ public class SoneInserter extends AbstractService {
 	 * Container for information that are required to insert a Sone. This
 	 * container merely exists to copy all relevant data without holding a lock
 	 * on the {@link Sone} object for too long.
-	 *
-	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
 	@VisibleForTesting
 	class InsertInformation implements Closeable {
 
 		/** All properties of the Sone, copied for thread safety. */
-		private final Map<String, Object> soneProperties = new HashMap<String, Object>();
+		private final Map<String, Object> soneProperties = new HashMap<>();
 		private final String fingerprint;
 		private final ManifestCreator manifestCreator;
 
@@ -301,16 +295,16 @@ public class SoneInserter extends AbstractService {
 		 */
 		public InsertInformation(Sone sone) {
 			this.fingerprint = sone.getFingerprint();
-			Map<String, Object> soneProperties = new HashMap<String, Object>();
+			Map<String, Object> soneProperties = new HashMap<>();
 			soneProperties.put("id", sone.getId());
 			soneProperties.put("name", sone.getName());
 			soneProperties.put("time", currentTimeMillis());
 			soneProperties.put("requestUri", sone.getRequestUri());
 			soneProperties.put("profile", sone.getProfile());
-			soneProperties.put("posts", Ordering.from(Post.TIME_COMPARATOR).sortedCopy(sone.getPosts()));
+			soneProperties.put("posts", Ordering.from(Post.NEWEST_FIRST).sortedCopy(sone.getPosts()));
 			soneProperties.put("replies", Ordering.from(Reply.TIME_COMPARATOR).reverse().sortedCopy(sone.getReplies()));
-			soneProperties.put("likedPostIds", new HashSet<String>(sone.getLikedPostIds()));
-			soneProperties.put("likedReplyIds", new HashSet<String>(sone.getLikedReplyIds()));
+			soneProperties.put("likedPostIds", new HashSet<>(sone.getLikedPostIds()));
+			soneProperties.put("likedReplyIds", new HashSet<>(sone.getLikedReplyIds()));
 			soneProperties.put("albums", FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).filter(NOT_EMPTY).toList());
 			manifestCreator = new ManifestCreator(core, soneProperties);
 		}
@@ -334,7 +328,7 @@ public class SoneInserter extends AbstractService {
 		 * @return The manifest entries for the Sone insert
 		 */
 		public HashMap<String, Object> generateManifestEntries() {
-			HashMap<String, Object> manifestEntries = new HashMap<String, Object>();
+			HashMap<String, Object> manifestEntries = new HashMap<>();
 
 			/* first, create an index.html. */
 			manifestEntries.put("index.html", manifestCreator.createManifestElement(
@@ -358,15 +352,13 @@ public class SoneInserter extends AbstractService {
 
 	/**
 	 * Creates manifest elements for an insert by rendering a template.
-	 *
-	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
 	@VisibleForTesting
 	static class ManifestCreator implements Closeable {
 
 		private final Core core;
 		private final Map<String, Object> soneProperties;
-		private final Set<Bucket> buckets = new HashSet<Bucket>();
+		private final Set<Bucket> buckets = new HashSet<>();
 
 		ManifestCreator(Core core, Map<String, Object> soneProperties) {
 			this.core = core;
@@ -393,7 +385,7 @@ public class SoneInserter extends AbstractService {
 			templateContext.set("core", core);
 			templateContext.set("currentSone", soneProperties);
 			templateContext.set("currentEdition", core.getUpdateChecker().getLatestEdition());
-			templateContext.set("version", SonePlugin.VERSION);
+			templateContext.set("version", SonePlugin.getPluginVersion());
 			StringWriter writer = new StringWriter();
 			try {
 				template.render(templateContext, writer);