Use an optional instead of a magic value.

[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 9e5d578..d5fe9a2 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -17,7 +17,10 @@
 
 package net.pterodactylus.sone.core;
 
+import static com.google.common.base.Optional.absent;
+import static com.google.common.base.Optional.of;
 import static com.google.common.base.Preconditions.checkArgument;
+import static java.lang.System.currentTimeMillis;
 import static net.pterodactylus.sone.data.Album.NOT_EMPTY;
 
 import java.io.InputStreamReader;
@@ -51,6 +54,7 @@ import net.pterodactylus.util.template.TemplateException;
 import net.pterodactylus.util.template.TemplateParser;
 import net.pterodactylus.util.template.XmlFilter;
 
+import com.google.common.base.Optional;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Ordering;
 import com.google.common.eventbus.EventBus;
@@ -188,24 +192,23 @@ public class SoneInserter extends AbstractService {
         */
        @Override
        protected void serviceRun() {
-               long lastModificationTime = 0;
+               Optional<Long> lastModificationTime = absent();
                String lastInsertedFingerprint = lastInsertFingerprint;
                String lastFingerprint = "";
-               Sone sone;
                while (!shouldStop()) {
                        try {
                                /* check every second. */
                                sleep(1000);
 
                                /* don’t insert locked Sones. */
-                               sone = this.sone;
+                               Sone sone = this.sone;
                                if (core.isLocked(sone)) {
                                        /* trigger redetection when the Sone is unlocked. */
                                        synchronized (sone) {
                                                modified = !sone.getFingerprint().equals(lastInsertedFingerprint);
                                        }
                                        lastFingerprint = "";
-                                       lastModificationTime = 0;
+                                       lastModificationTime = absent();
                                        continue;
                                }
 
@@ -215,16 +218,16 @@ public class SoneInserter extends AbstractService {
                                        if (!fingerprint.equals(lastFingerprint)) {
                                                if (fingerprint.equals(lastInsertedFingerprint)) {
                                                        modified = false;
-                                                       lastModificationTime = 0;
+                                                       lastModificationTime = absent();
                                                        logger.log(Level.FINE, String.format("Sone %s has been reverted to last insert state.", sone));
                                                } else {
-                                                       lastModificationTime = System.currentTimeMillis();
+                                                       lastModificationTime = of(currentTimeMillis());
                                                        modified = true;
                                                        logger.log(Level.FINE, String.format("Sone %s has been modified, waiting %d seconds before inserting.", sone.getName(), insertionDelay));
                                                }
                                                lastFingerprint = fingerprint;
                                        }
-                                       if (modified && (lastModificationTime > 0) && ((System.currentTimeMillis() - lastModificationTime) > (insertionDelay * 1000))) {
+                                       if (modified && lastModificationTime.isPresent() && ((currentTimeMillis() - lastModificationTime.get()) > (insertionDelay * 1000))) {
                                                lastInsertedFingerprint = fingerprint;
                                                insertInformation = new InsertInformation(sone);
                                        }
@@ -236,11 +239,11 @@ public class SoneInserter extends AbstractService {
                                        boolean success = false;
                                        try {
                                                sone.setStatus(SoneStatus.inserting);
-                                               long insertTime = System.currentTimeMillis();
+                                               long insertTime = currentTimeMillis();
                                                insertInformation.setTime(insertTime);
                                                eventBus.post(new SoneInsertingEvent(sone));
                                                FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri(), insertInformation.generateManifestEntries(), "index.html");
-                                               eventBus.post(new SoneInsertedEvent(sone, System.currentTimeMillis() - insertTime));
+                                               eventBus.post(new SoneInsertedEvent(sone, currentTimeMillis() - insertTime));
                                                /* at this point we might already be stopped. */
                                                if (shouldStop()) {
                                                        /* if so, bail out, don’t change anything. */
@@ -266,7 +269,7 @@ public class SoneInserter extends AbstractService {
                                                synchronized (sone) {
                                                        if (lastInsertedFingerprint.equals(sone.getFingerprint())) {
                                                                logger.log(Level.FINE, String.format("Sone “%s” was not modified further, resetting counter…", sone));
-                                                               lastModificationTime = 0;
+                                                               lastModificationTime = absent();
                                                                lastInsertFingerprint = lastInsertedFingerprint;
                                                                core.touchConfiguration();
                                                                modified = false;