Remove @author tags

[Sone.git] / src / main / java / net / pterodactylus / sone / core / SoneInserter.java

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index dbb7ef1..ba5d0a9 100644 (file)
--- 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–2016 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,8 +72,6 @@ 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 {
 
@@ -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);
        }
@@ -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,8 +278,6 @@ 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 {
@@ -307,7 +301,7 @@ public class SoneInserter extends AbstractService {
                        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()));
@@ -358,8 +352,6 @@ 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 {
@@ -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);