X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneModificationDetector.java;h=e5e20d90961dcb4053b44f41357112da4f7d9c45;hb=c00c2dea5bbe698a46c443d3610855720baa69a4;hp=810241a9c34de54cfeff5f75eb55b55b266328b1;hpb=34cc31a6120dce9f25652e002f25697dc0596567;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java b/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
index 810241a..e5e20d9 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
@@ -18,15 +18,13 @@ 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 David âBombeâ Roden
*/
class SoneModificationDetector {
private final Ticker ticker;
private final LockableFingerprintProvider lockableFingerprintProvider;
private final AtomicInteger insertionDelay;
- private Optional lastModificationTime;
+ private Long lastModificationTime;
private String lastInsertFingerprint;
private String lastCheckFingerprint;
@@ -44,18 +42,18 @@ class SoneModificationDetector {
public boolean isEligibleForInsert() {
if (lockableFingerprintProvider.isLocked()) {
- lastModificationTime = absent();
+ lastModificationTime = null;
lastCheckFingerprint = "";
return false;
}
String fingerprint = lockableFingerprintProvider.getFingerprint();
if (fingerprint.equals(lastInsertFingerprint)) {
- lastModificationTime = absent();
+ lastModificationTime = null;
lastCheckFingerprint = fingerprint;
return false;
}
if (!Objects.equal(lastCheckFingerprint, fingerprint)) {
- lastModificationTime = of(ticker.read());
+ lastModificationTime = ticker.read();
lastCheckFingerprint = fingerprint;
return false;
}
@@ -69,11 +67,11 @@ class SoneModificationDetector {
public void setFingerprint(String fingerprint) {
lastInsertFingerprint = fingerprint;
lastCheckFingerprint = lastInsertFingerprint;
- lastModificationTime = absent();
+ 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() {
@@ -83,8 +81,6 @@ class SoneModificationDetector {
/**
* 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 David âBombeâ Roden
*/
static interface LockableFingerprintProvider {