projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8bae6b0
)
Rename fields to better reflect their purpose
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 22 Jul 2015 04:43:00 +0000
(06:43 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 22 Jul 2015 04:43:00 +0000
(06:43 +0200)
src/main/java/net/pterodactylus/sone/core/SoneInserter.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
patch
|
blob
|
history
src/test/java/net/pterodactylus/sone/core/SoneModificationDetectorTest.java
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index
45c617c
..
dbb7ef1
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/
src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@
-180,7
+180,7
@@
public class SoneInserter extends AbstractService {
* @return The fingerprint of the last insert
*/
public String getLastInsertFingerprint() {
* @return The fingerprint of the last insert
*/
public String getLastInsertFingerprint() {
- return soneModificationDetector.get
Original
Fingerprint();
+ return soneModificationDetector.get
LastInsert
Fingerprint();
}
/**
}
/**
diff --git
a/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
b/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
index
71c28bb
..
810241a
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
+++ b/
src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
@@
-27,8
+27,8
@@
class SoneModificationDetector {
private final LockableFingerprintProvider lockableFingerprintProvider;
private final AtomicInteger insertionDelay;
private Optional<Long> lastModificationTime;
private final LockableFingerprintProvider lockableFingerprintProvider;
private final AtomicInteger insertionDelay;
private Optional<Long> lastModificationTime;
- private String
original
Fingerprint;
- private String lastFingerprint;
+ private String
lastInsert
Fingerprint;
+ private String last
Check
Fingerprint;
SoneModificationDetector(LockableFingerprintProvider lockableFingerprintProvider, AtomicInteger insertionDelay) {
this(systemTicker(), lockableFingerprintProvider, insertionDelay);
SoneModificationDetector(LockableFingerprintProvider lockableFingerprintProvider, AtomicInteger insertionDelay) {
this(systemTicker(), lockableFingerprintProvider, insertionDelay);
@@
-39,36
+39,36
@@
class SoneModificationDetector {
this.ticker = ticker;
this.lockableFingerprintProvider = lockableFingerprintProvider;
this.insertionDelay = insertionDelay;
this.ticker = ticker;
this.lockableFingerprintProvider = lockableFingerprintProvider;
this.insertionDelay = insertionDelay;
- last
Fingerprint = original
Fingerprint;
+ last
CheckFingerprint = lastInsert
Fingerprint;
}
public boolean isEligibleForInsert() {
if (lockableFingerprintProvider.isLocked()) {
lastModificationTime = absent();
}
public boolean isEligibleForInsert() {
if (lockableFingerprintProvider.isLocked()) {
lastModificationTime = absent();
- lastFingerprint = "";
+ last
Check
Fingerprint = "";
return false;
}
String fingerprint = lockableFingerprintProvider.getFingerprint();
return false;
}
String fingerprint = lockableFingerprintProvider.getFingerprint();
- if (fingerprint.equals(
original
Fingerprint)) {
+ if (fingerprint.equals(
lastInsert
Fingerprint)) {
lastModificationTime = absent();
lastModificationTime = absent();
- lastFingerprint = fingerprint;
+ last
Check
Fingerprint = fingerprint;
return false;
}
return false;
}
- if (!Objects.equal(lastFingerprint, fingerprint)) {
+ if (!Objects.equal(last
Check
Fingerprint, fingerprint)) {
lastModificationTime = of(ticker.read());
lastModificationTime = of(ticker.read());
- lastFingerprint = fingerprint;
+ last
Check
Fingerprint = fingerprint;
return false;
}
return insertionDelayHasPassed();
}
return false;
}
return insertionDelayHasPassed();
}
- public String get
Original
Fingerprint() {
- return
original
Fingerprint;
+ public String get
LastInsert
Fingerprint() {
+ return
lastInsert
Fingerprint;
}
public void setFingerprint(String fingerprint) {
}
public void setFingerprint(String fingerprint) {
-
original
Fingerprint = fingerprint;
- last
Fingerprint = original
Fingerprint;
+
lastInsert
Fingerprint = fingerprint;
+ last
CheckFingerprint = lastInsert
Fingerprint;
lastModificationTime = absent();
}
lastModificationTime = absent();
}
@@
-77,7
+77,7
@@
class SoneModificationDetector {
}
public boolean isModified() {
}
public boolean isModified() {
- return !Objects.equal(lockableFingerprintProvider.getFingerprint(),
original
Fingerprint);
+ return !Objects.equal(lockableFingerprintProvider.getFingerprint(),
lastInsert
Fingerprint);
}
/**
}
/**
diff --git
a/src/test/java/net/pterodactylus/sone/core/SoneModificationDetectorTest.java
b/src/test/java/net/pterodactylus/sone/core/SoneModificationDetectorTest.java
index
8153e3b
..
230f0b6
100644
(file)
--- a/
src/test/java/net/pterodactylus/sone/core/SoneModificationDetectorTest.java
+++ b/
src/test/java/net/pterodactylus/sone/core/SoneModificationDetectorTest.java
@@
-71,7
+71,7
@@
public class SoneModificationDetectorTest {
@Test
public void originalFingerprintIsRetained() {
@Test
public void originalFingerprintIsRetained() {
- assertThat(soneModificationDetector.get
Original
Fingerprint(), is("original"));
+ assertThat(soneModificationDetector.get
LastInsert
Fingerprint(), is("original"));
}
@Test
}
@Test