Rename Clock getter to adhere to naming standards.

atomix · Jan 11, 2018 · 76c9238 · 76c9238
1 parent e758d3d
commit 76c9238
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 25 deletions.
diff --git a/core/src/main/java/io/atomix/core/election/impl/LeaderElectionService.java b/core/src/main/java/io/atomix/core/election/impl/LeaderElectionService.java
@@ -204,7 +204,7 @@ protected boolean anoint(Commit<? extends Anoint> commit) {
       if (newLeader != null) {
         this.leader = newLeader;
         this.term = termCounter.incrementAndGet();
-        this.termStartTime = context().wallClock().time().unixTimestamp();
+        this.termStartTime = context().wallClock().getTime().unixTimestamp();
       }
       Leadership<byte[]> newLeadership = leadership();
       if (!Objects.equal(oldLeadership, newLeadership)) {
@@ -278,7 +278,7 @@ protected void evict(Commit<? extends Evict> commit) {
             this.registrations = updatedRegistrations;
             this.leader = updatedRegistrations.get(0);
             this.term = termCounter.incrementAndGet();
-            this.termStartTime = context().wallClock().time().unixTimestamp();
+            this.termStartTime = context().wallClock().getTime().unixTimestamp();
           } else {
             this.registrations = updatedRegistrations;
             this.leader = null;
@@ -364,7 +364,7 @@ protected void cleanup(byte[] id) {
           this.registrations = updatedRegistrations;
           this.leader = updatedRegistrations.get(0);
           this.term = termCounter.incrementAndGet();
-          this.termStartTime = context().wallClock().time().unixTimestamp();
+          this.termStartTime = context().wallClock().getTime().unixTimestamp();
         } else {
           this.registrations = updatedRegistrations;
           this.leader = null;
@@ -388,7 +388,7 @@ protected void cleanup(Session session) {
           this.registrations = updatedRegistrations;
           this.leader = updatedRegistrations.get(0);
           this.term = termCounter.incrementAndGet();
-          this.termStartTime = context().wallClock().time().unixTimestamp();
+          this.termStartTime = context().wallClock().getTime().unixTimestamp();
         } else {
           this.registrations = updatedRegistrations;
           this.leader = null;
@@ -421,7 +421,7 @@ protected void addRegistration(Registration registration) {
       if (newLeader) {
         this.leader = registration;
         this.term = termCounter.incrementAndGet();
-        this.termStartTime = context().wallClock().time().unixTimestamp();
+        this.termStartTime = context().wallClock().getTime().unixTimestamp();
       }
     }
   }

diff --git a/core/src/main/java/io/atomix/core/lock/impl/DistributedLockService.java b/core/src/main/java/io/atomix/core/lock/impl/DistributedLockService.java
@@ -73,7 +73,7 @@ public void restore(BufferInput<?> reader) {
     timers.clear();
     for (LockHolder holder : queue) {
       if (holder.expire > 0) {
-        timers.put(holder.index, scheduler().schedule(Duration.ofMillis(holder.expire - context().wallClock().time().unixTimestamp()), () -> {
+        timers.put(holder.index, scheduler().schedule(Duration.ofMillis(holder.expire - context().wallClock().getTime().unixTimestamp()), () -> {
           timers.remove(holder.index);
           queue.remove(holder);
           Session session = sessions().getSession(holder.session);
@@ -113,7 +113,7 @@ protected void lock(Commit<Lock> commit) {
           commit.value().id(),
           commit.index(),
           commit.session().sessionId().id(),
-          context().wallClock().time().unixTimestamp() + commit.value().timeout());
+          context().wallClock().getTime().unixTimestamp() + commit.value().timeout());
       queue.add(holder);
       timers.put(commit.index(), scheduler().schedule(Duration.ofMillis(commit.value().timeout()), () -> {
         timers.remove(commit.index());

diff --git a/core/src/main/java/io/atomix/core/map/impl/ConsistentMapService.java b/core/src/main/java/io/atomix/core/map/impl/ConsistentMapService.java
@@ -155,7 +155,7 @@ public void restore(BufferInput<?> reader) {
     currentVersion = reader.readLong();
     map.forEach((key, value) -> {
       if (value.ttl() > 0) {
-        value.timer = scheduler().schedule(Duration.ofMillis(value.ttl() - (wallClock().time().unixTimestamp() - value.created())), () -> {
+        value.timer = scheduler().schedule(Duration.ofMillis(value.ttl() - (wallClock().getTime().unixTimestamp() - value.created())), () -> {
           entries().remove(key, value);
           publish(new MapEvent<>(MapEvent.Type.REMOVE, "", key, null, toVersioned(value)));
         });

diff --git a/...up/src/main/java/io/atomix/protocols/backup/service/impl/PrimaryBackupServiceContext.java b/...up/src/main/java/io/atomix/protocols/backup/service/impl/PrimaryBackupServiceContext.java
@@ -87,13 +87,13 @@ public class PrimaryBackupServiceContext implements ServiceContext {
   private OperationType currentOperation = OperationType.COMMAND;
   private final LogicalClock logicalClock = new LogicalClock() {
     @Override
-    public LogicalTimestamp time() {
+    public LogicalTimestamp getTime() {
       return new LogicalTimestamp(operationIndex);
     }
   };
   private final WallClock wallClock = new WallClock() {
     @Override
-    public WallClockTimestamp time() {
+    public WallClockTimestamp getTime() {
       return WallClockTimestamp.from(currentTimestamp);
     }
   };

diff --git a/protocols/raft/src/main/java/io/atomix/protocols/raft/service/RaftServiceContext.java b/protocols/raft/src/main/java/io/atomix/protocols/raft/service/RaftServiceContext.java
@@ -82,13 +82,13 @@ public class RaftServiceContext implements ServiceContext {
   private OperationType currentOperation;
   private final LogicalClock logicalClock = new LogicalClock() {
     @Override
-    public LogicalTimestamp time() {
+    public LogicalTimestamp getTime() {
       return new LogicalTimestamp(currentIndex);
     }
   };
   private final WallClock wallClock = new WallClock() {
     @Override
-    public WallClockTimestamp time() {
+    public WallClockTimestamp getTime() {
       return new WallClockTimestamp(currentTimestamp);
     }
   };

diff --git a/utils/src/main/java/io/atomix/utils/time/Clock.java b/utils/src/main/java/io/atomix/utils/time/Clock.java
@@ -25,6 +25,6 @@ public interface Clock<T extends Timestamp> {
    *
    * @return the current time
    */
-  T time();
+  T getTime();
 
 }
diff --git a/utils/src/main/java/io/atomix/utils/time/LogicalClock.java b/utils/src/main/java/io/atomix/utils/time/LogicalClock.java
@@ -32,7 +32,7 @@ public LogicalClock(LogicalTimestamp currentTimestamp) {
   }
 
   @Override
-  public LogicalTimestamp time() {
+  public LogicalTimestamp getTime() {
     return currentTimestamp;
   }
 
@@ -75,7 +75,7 @@ public LogicalTimestamp incrementAndUpdate(LogicalTimestamp timestamp) {
   @Override
   public String toString() {
     return toStringHelper(this)
-        .add("time", time())
+        .add("time", getTime())
         .toString();
   }
 }
diff --git a/utils/src/main/java/io/atomix/utils/time/VectorClock.java b/utils/src/main/java/io/atomix/utils/time/VectorClock.java
@@ -50,7 +50,7 @@ public VectorClock(VectorTimestamp<T> localTimestamp, Collection<VectorTimestamp
   }
 
   @Override
-  public VectorTimestamp<T> time() {
+  public VectorTimestamp<T> getTime() {
     return vector.get(localIdentifier);
   }
 
@@ -60,7 +60,7 @@ public VectorTimestamp<T> time() {
    * @return the logical timestamp for the local identifier
    */
   public LogicalTimestamp getLocalTimestamp() {
-    return time();
+    return getTime();
   }
 
   /**
@@ -108,7 +108,7 @@ public void update(VectorClock<T> clock) {
   @Override
   public String toString() {
     return toStringHelper(this)
-        .add("time", time())
+        .add("time", getTime())
         .add("vector", getTimestamps())
         .toString();
   }

diff --git a/utils/src/main/java/io/atomix/utils/time/WallClock.java b/utils/src/main/java/io/atomix/utils/time/WallClock.java
@@ -22,14 +22,14 @@
  */
 public class WallClock implements Clock<WallClockTimestamp> {
   @Override
-  public WallClockTimestamp time() {
+  public WallClockTimestamp getTime() {
     return new WallClockTimestamp();
   }
 
   @Override
   public String toString() {
     return toStringHelper(this)
-        .add("time", time())
+        .add("time", getTime())
         .toString();
   }
 }
diff --git a/utils/src/test/java/io/atomix/utils/time/LogicalClockTest.java b/utils/src/test/java/io/atomix/utils/time/LogicalClockTest.java
@@ -27,11 +27,11 @@ public class LogicalClockTest {
   public void testLogicalClock() throws Exception {
     LogicalClock clock = new LogicalClock();
     assertEquals(1, clock.increment().value());
-    assertEquals(1, clock.time().value());
+    assertEquals(1, clock.getTime().value());
     assertEquals(2, clock.increment().value());
-    assertEquals(2, clock.time().value());
+    assertEquals(2, clock.getTime().value());
     assertEquals(5, clock.update(LogicalTimestamp.of(5)).value());
-    assertEquals(5, clock.time().value());
+    assertEquals(5, clock.getTime().value());
     assertEquals(5, clock.update(LogicalTimestamp.of(3)).value());
   }
 }
diff --git a/utils/src/test/java/io/atomix/utils/time/WallClockTest.java b/utils/src/test/java/io/atomix/utils/time/WallClockTest.java
@@ -27,9 +27,9 @@ public class WallClockTest {
   @Test
   public void testWallClock() throws Exception {
     WallClock clock = new WallClock();
-    WallClockTimestamp time = clock.time();
+    WallClockTimestamp time = clock.getTime();
     assertNotNull(time);
     Thread.sleep(5);
-    assertTrue(clock.time().unixTimestamp() > time.unixTimestamp());
+    assertTrue(clock.getTime().unixTimestamp() > time.unixTimestamp());
   }
 }