X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneModificationDetector.java;h=793d332bec70a69bb947fab4cf49263ed90d32e6;hp=290fcbeefaedce946659db626634aa108cf1ff0a;hb=64740709990291688170ebd1f192af5eb9090618;hpb=0e8f7804ce344bdd69f5ecc7febe25a60a53561d

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java b/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
index 290fcbe..793d332 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
@@ -1,7 +1,5 @@
 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.Ticker.systemTicker;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
@@ -10,24 +8,22 @@ import java.util.concurrent.atomic.AtomicInteger;
 import net.pterodactylus.sone.data.Sone;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
+import com.google.common.base.Objects;
 import com.google.common.base.Ticker;
 
 /**
  * Class that detects {@link Sone} modifications (as per their {@link
  * Sone#getFingerprint() fingerprints} and determines when a modified Sone may
  * be inserted.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 class SoneModificationDetector {
 
 	private final Ticker ticker;
 	private final LockableFingerprintProvider lockableFingerprintProvider;
 	private final AtomicInteger insertionDelay;
-	private Optional<Long> lastModificationTime;
-	private String originalFingerprint;
-	private String lastFingerprint;
+	private Long lastModificationTime;
+	private String lastInsertFingerprint;
+	private String lastCheckFingerprint;
 
 	SoneModificationDetector(LockableFingerprintProvider lockableFingerprintProvider, AtomicInteger insertionDelay) {
 		this(systemTicker(), lockableFingerprintProvider, insertionDelay);
@@ -38,52 +34,50 @@ class SoneModificationDetector {
 		this.ticker = ticker;
 		this.lockableFingerprintProvider = lockableFingerprintProvider;
 		this.insertionDelay = insertionDelay;
-		lastFingerprint = originalFingerprint;
+		lastCheckFingerprint = lastInsertFingerprint;
 	}
 
 	public boolean isEligibleForInsert() {
 		if (lockableFingerprintProvider.isLocked()) {
-			lastModificationTime = absent();
-			lastFingerprint = "";
+			lastModificationTime = null;
+			lastCheckFingerprint = "";
 			return false;
 		}
 		String fingerprint = lockableFingerprintProvider.getFingerprint();
-		if (originalFingerprint.equals(fingerprint)) {
-			lastModificationTime = absent();
-			lastFingerprint = fingerprint;
+		if (fingerprint.equals(lastInsertFingerprint)) {
+			lastModificationTime = null;
+			lastCheckFingerprint = fingerprint;
 			return false;
 		}
-		if (!lastFingerprint.equals(fingerprint)) {
-			lastModificationTime = of(ticker.read());
-			lastFingerprint = fingerprint;
+		if (!Objects.equal(lastCheckFingerprint, fingerprint)) {
+			lastModificationTime = ticker.read();
+			lastCheckFingerprint = fingerprint;
 			return false;
 		}
 		return insertionDelayHasPassed();
 	}
 
-	public String getOriginalFingerprint() {
-		return originalFingerprint;
+	public String getLastInsertFingerprint() {
+		return lastInsertFingerprint;
 	}
 
 	public void setFingerprint(String fingerprint) {
-		originalFingerprint = fingerprint;
-		lastFingerprint = originalFingerprint;
-		lastModificationTime = absent();
+		lastInsertFingerprint = fingerprint;
+		lastCheckFingerprint = lastInsertFingerprint;
+		lastModificationTime = null;
 	}
 
 	private boolean insertionDelayHasPassed() {
-		return NANOSECONDS.toSeconds(ticker.read() - lastModificationTime.get()) >= insertionDelay.get();
+		return NANOSECONDS.toSeconds(ticker.read() - lastModificationTime) >= insertionDelay.get();
 	}
 
 	public boolean isModified() {
-		return !lockableFingerprintProvider.getFingerprint().equals(originalFingerprint);
+		return !Objects.equal(lockableFingerprintProvider.getFingerprint(), lastInsertFingerprint);
 	}
 
 	/**
 	 * Provider for a fingerprint and the information if a {@link Sone} is locked. This
 	 * prevents us from having to lug a Sone object around.
-	 *
-	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
 	static interface LockableFingerprintProvider {