🔥 Remove unnecessary imports

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

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java b/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
index 0a26e9e..793d332 100644 (file)
--- 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,68 +8,82 @@ 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 Core core;
-       private final Sone sone;
+       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(Core core, Sone sone, AtomicInteger insertionDelay) {
-               this(systemTicker(), core, sone, insertionDelay);
+       SoneModificationDetector(LockableFingerprintProvider lockableFingerprintProvider, AtomicInteger insertionDelay) {
+               this(systemTicker(), lockableFingerprintProvider, insertionDelay);
        }
 
        @VisibleForTesting
-       SoneModificationDetector(Ticker ticker, Core core, Sone sone, AtomicInteger insertionDelay) {
+       SoneModificationDetector(Ticker ticker, LockableFingerprintProvider lockableFingerprintProvider, AtomicInteger insertionDelay) {
                this.ticker = ticker;
-               this.core = core;
-               this.sone = sone;
+               this.lockableFingerprintProvider = lockableFingerprintProvider;
                this.insertionDelay = insertionDelay;
-               originalFingerprint = sone.getFingerprint();
-               lastFingerprint = originalFingerprint;
+               lastCheckFingerprint = lastInsertFingerprint;
        }
 
        public boolean isEligibleForInsert() {
-               if (core.isLocked(sone)) {
-                       lastModificationTime = absent();
-                       lastFingerprint = "";
+               if (lockableFingerprintProvider.isLocked()) {
+                       lastModificationTime = null;
+                       lastCheckFingerprint = "";
                        return false;
                }
-               String fingerprint = sone.getFingerprint();
-               if (originalFingerprint.equals(fingerprint)) {
-                       lastModificationTime = absent();
-                       lastFingerprint = fingerprint;
+               String fingerprint = lockableFingerprintProvider.getFingerprint();
+               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 getLastInsertFingerprint() {
+               return lastInsertFingerprint;
+       }
+
        public void setFingerprint(String fingerprint) {
-               originalFingerprint = fingerprint;
-               lastFingerprint = originalFingerprint;
-               lastModificationTime = absent();
+               lastInsertFingerprint = fingerprint;
+               lastCheckFingerprint = lastInsertFingerprint;
+               lastModificationTime = null;
        }
 
        private boolean insertionDelayHasPassed() {
-               return lastModificationTime.isPresent() && (NANOSECONDS.toSeconds(ticker.read() - lastModificationTime.get()) >= insertionDelay.get());
+               return NANOSECONDS.toSeconds(ticker.read() - lastModificationTime) >= insertionDelay.get();
+       }
+
+       public boolean isModified() {
+               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.
+        */
+       static interface LockableFingerprintProvider {
+
+               boolean isLocked();
+               String getFingerprint();
+
        }
 
 }