Rename state machine context clock to time.

atomic/src/main/java/net/kuujo/copycat/atomic/state/ReferenceState.java

@@ -132,7 +132,7 @@ protected Object get(Commit<ReferenceCommands.Get> commit) {
    * Applies a set commit.
    */
   protected void set(Commit<ReferenceCommands.Set> commit) {
-    if (!isActive(commit, context().clock().instant())) {
+    if (!isActive(commit, context().time().instant())) {
       commit.clean();
     } else {
       if (current != null) {
@@ -148,7 +148,7 @@ protected void set(Commit<ReferenceCommands.Set> commit) {
    * Handles a compare and set commit.
    */
   protected boolean compareAndSet(Commit<ReferenceCommands.CompareAndSet> commit) {
-    if (!isActive(commit, context().clock().instant())) {
+    if (!isActive(commit, context().time().instant())) {
       commit.clean();
       return false;
     } else if (isActive(current, commit.time())) {
@@ -178,7 +178,7 @@ protected boolean compareAndSet(Commit<ReferenceCommands.CompareAndSet> commit)
    * Handles a get and set commit.
    */
   protected Object getAndSet(Commit<ReferenceCommands.GetAndSet> commit) {
-    if (!isActive(commit, context().clock().instant())) {
+    if (!isActive(commit, context().time().instant())) {
       commit.clean();
 
     }

collections/src/main/java/net/kuujo/copycat/collections/state/MapState.java

@@ -88,7 +88,7 @@ protected boolean containsKey(Commit<MapCommands.ContainsKey> commit) {
       }
 
       Commit<? extends MapCommands.TtlCommand> command = map.get(commit.operation().key());
-      if (!isActive(command, context().clock().instant())) {
+      if (!isActive(command, context().time().instant())) {
         map.remove(commit.operation().key());
         return false;
       }
@@ -109,7 +109,7 @@ protected Object get(Commit<MapCommands.Get> commit) {
     try {
       Commit<? extends MapCommands.TtlCommand> command = map.get(commit.operation().key());
       if (command != null) {
-        if (!isActive(command, context().clock().instant())) {
+        if (!isActive(command, context().time().instant())) {
           map.remove(commit.operation().key());
         } else {
           return command.operation().value();
@@ -133,7 +133,7 @@ protected Object getOrDefault(Commit<MapCommands.GetOrDefault> commit) {
       Commit<? extends MapCommands.TtlCommand> previous = map.get(commit.operation().key());
       if (previous == null) {
         return commit.operation().defaultValue();
-      } else if (isActive(previous, context().clock().instant())) {
+      } else if (isActive(previous, context().time().instant())) {
         return previous.operation().value();
       }
       return commit.operation().defaultValue();
@@ -152,7 +152,7 @@ protected Object put(Commit<MapCommands.Put> commit) {
 
     Commit<? extends MapCommands.TtlCommand> previous = map.get(commit.operation().key());
     if (previous == null) {
-      if (!isActive(commit, context().clock().instant())) {
+      if (!isActive(commit, context().time().instant())) {
         commit.clean();
       } else {
         map.put(commit.operation().key(), commit);
@@ -175,7 +175,7 @@ protected Object putIfAbsent(Commit<MapCommands.PutIfAbsent> commit) {
 
     Commit<? extends MapCommands.TtlCommand> previous = map.get(commit.operation().key());
     if (previous == null) {
-      if (!isActive(commit, context().clock().instant())) {
+      if (!isActive(commit, context().time().instant())) {
         commit.clean();
       } else {
         map.put(commit.operation().key(), commit);

collections/src/main/java/net/kuujo/copycat/collections/state/SetState.java

@@ -104,7 +104,7 @@ protected boolean add(Commit<SetCommands.Add> commit) {
     }
 
     Commit<? extends SetCommands.TtlCommand> previous = map.get(commit.operation().value());
-    if (!isActive(commit, context().clock().instant())) {
+    if (!isActive(commit, context().time().instant())) {
       commit.clean();
       return false;
     } else if (!isActive(previous, commit.time())) {

coordination/src/main/java/net/kuujo/copycat/coordination/state/LockState.java

@@ -64,7 +64,7 @@ protected void unlock(Commit<LockCommands.Unlock> commit) {
         throw new IllegalStateException("not the lock holder");
 
       lock = queue.poll();
-      while (lock != null && (lock.operation().timeout() != -1 && lock.time().toEpochMilli() + lock.operation().timeout() < context().clock().instant().toEpochMilli())) {
+      while (lock != null && (lock.operation().timeout() != -1 && lock.time().toEpochMilli() + lock.operation().timeout() < context().time().instant().toEpochMilli())) {
         lock.clean();
         lock = queue.poll();
       }

server/src/main/java/net/kuujo/copycat/raft/server/StateMachineContext.java

@@ -33,11 +33,11 @@ public interface StateMachineContext {
   long version();
 
   /**
-   * Returns the deterministic state machine clock.
+   * Returns the deterministic state machine time.
    *
-   * @return The deterministic state machine clock.
+   * @return The deterministic state machine time.
    */
-  Clock clock();
+  Clock time();
 
   /**
    * Returns the state machine sessions.

server/src/main/java/net/kuujo/copycat/raft/server/state/ServerStateMachineContext.java

@@ -45,7 +45,7 @@ public long version() {
   }
 
   @Override
-  public Clock clock() {
+  public Clock time() {
     return clock;
   }
 
@@ -56,7 +56,7 @@ public SessionManager sessions() {
 
   @Override
   public String toString() {
-    return String.format("%s[version=%d, clock=%s]", getClass().getSimpleName(), version, clock);
+    return String.format("%s[version=%d, time=%s]", getClass().getSimpleName(), version, clock);
   }
 
 }

server/src/main/java/net/kuujo/copycat/raft/server/state/ServerStateMachineExecutor.java

@@ -30,7 +30,6 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
-import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -232,7 +231,7 @@ private ServerScheduledTask(long delay, long interval, Runnable callback) {
       this.delay = delay;
       this.interval = interval;
       this.callback = callback;
-      this.time = context.clock().instant().toEpochMilli() + delay;
+      this.time = context.time().instant().toEpochMilli() + delay;
     }
 
     /**
@@ -275,7 +274,7 @@ private ScheduledTask schedule() {
      */
     private void reschedule() {
       if (interval > 0) {
-        time = context.clock().instant().toEpochMilli() + delay;
+        time = context.time().instant().toEpochMilli() + delay;
         schedule();
       }
     }

server/src/main/java/net/kuujo/copycat/raft/server/state/StateClock.java

@@ -21,7 +21,7 @@
 import java.time.ZoneId;
 
 /**
- * State machine clock.
+ * State machine time.
  *
  * @author <a href="http://github.com/kuujo>Jordan Halterman</a>
  */
@@ -30,7 +30,7 @@ public class StateClock extends Clock {
   private Instant instant;
 
   /**
-   * Sets the state machine clock instant.
+   * Sets the state machine time instant.
    */
   void set(Instant instant) {
     this.instant = instant;