/**
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.apache.aurora.common.util;

import java.io.Serializable;

/**
 * An abstraction of the system clock.
 *
 * @author John Sirois
 */
public interface Clock {

  /**
   * A clock that returns the the actual time reported by the system.
   * This clock is guaranteed to be serializable.
   */
  Clock SYSTEM_CLOCK = new SerializableClock() {
    @Override public long nowMillis() {
      return System.currentTimeMillis();
    }
    @Override public long nowNanos() {
      return System.nanoTime();
    }
    @Override public void waitFor(long millis) throws InterruptedException {
      Thread.sleep(millis);
    }
  };

  /**
   * Returns the current time in milliseconds since the epoch.
   *
   * @return The current time in milliseconds since the epoch.
   * @see System#currentTimeMillis()
   */
  long nowMillis();

  /**
   * Returns the current time in nanoseconds.  Should be used only for relative timing.
   * See {@code System.nanoTime()} for tips on using the value returned here.
   *
   * @return A measure of the current time in nanoseconds.
   * @see System#nanoTime()
   */
  long nowNanos();

  /**
   * Waits for the given amount of time to pass on this clock before returning.
   *
   * @param millis the amount of time to wait in milliseconds
   * @throws InterruptedException if this wait was interrupted
   */
  void waitFor(long millis) throws InterruptedException;
}

/**
 * A typedef to support anonymous {@link Clock} implementations that are also {@link Serializable}.
 */
interface SerializableClock extends Clock, Serializable { }

@@ -600,38 +600,8 @@
 l;%0A%0A
-import java.io.Serializable;%0A%0A
 /**%0A
@@ -639,19 +639,16 @@
  clock.%0A
- *%0A
  * @auth
@@ -691,16 +691,79 @@
 Clock %7B%0A
+  // TODO(zmanji): Consider replacing this with java.time.Clock
 %0A  /**%0A 
@@ -914,28 +914,16 @@
 K = new 
-Serializable
 Clock() 
@@ -1982,172 +1982,4 @@
 %0A%7D%0A%0A
-/**%0A * A typedef to support anonymous %7B@link Clock%7D implementations that are also %7B@link Serializable%7D.%0A */%0Ainterface SerializableClock extends Clock, Serializable %7B %7D%0A

Remove SerializableClock interface.