azkaban-aplcache

diff --git a/azkaban-common/src/main/java/azkaban/metric/AbstractMetric.java b/azkaban-common/src/main/java/azkaban/metric/AbstractMetric.java
index 57e6495..790336d 100644
--- a/azkaban-common/src/main/java/azkaban/metric/AbstractMetric.java
+++ b/azkaban-common/src/main/java/azkaban/metric/AbstractMetric.java
@@ -64,6 +64,7 @@ public abstract class AbstractMetric<T> implements IMetric<T>, Cloneable{
    * {@inheritDoc}
    * @see azkaban.metric.IMetric#updateMetricManager(azkaban.metric.MetricReportManager)
    */
+  @Override
   public void updateMetricManager(final MetricReportManager manager) {
     metricManager = manager;
   }

diff --git a/azkaban-common/src/main/java/azkaban/trigger/builtin/BasicTimeChecker.java b/azkaban-common/src/main/java/azkaban/trigger/builtin/BasicTimeChecker.java
index 52ff2e0..bae43c9 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/builtin/BasicTimeChecker.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/builtin/BasicTimeChecker.java
@@ -32,7 +32,6 @@ import azkaban.utils.Utils;
 
 public class BasicTimeChecker implements ConditionChecker {
 
-  private static Logger logger = Logger.getLogger(BasicTimeChecker.class);
 
   public static final String type = "BasicTimeChecker";
 
@@ -82,6 +81,7 @@ public class BasicTimeChecker implements ConditionChecker {
     return period;
   }
 
+  @Override
   public long getNextCheckTime() {
     return nextCheckTime;
   }

diff --git a/azkaban-common/src/main/java/azkaban/trigger/ConditionChecker.java b/azkaban-common/src/main/java/azkaban/trigger/ConditionChecker.java
index e8d356f..784fa61 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/ConditionChecker.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/ConditionChecker.java
@@ -39,5 +39,4 @@ public interface ConditionChecker {
   void setContext(Map<String, Object> context);
 
   long getNextCheckTime();
-
 }

diff --git a/azkaban-common/src/test/java/azkaban/metric/MetricManagerTest.java b/azkaban-common/src/test/java/azkaban/metric/MetricManagerTest.java
index 45bfc5f..f67e25e 100644
--- a/azkaban-common/src/test/java/azkaban/metric/MetricManagerTest.java
+++ b/azkaban-common/src/test/java/azkaban/metric/MetricManagerTest.java
@@ -74,15 +74,9 @@ public class MetricManagerTest {
     Date from = new Date();
     metric.notifyManager();
 
-    synchronized (this) {
-      try {
-        wait(2000);
-      } catch (InterruptedException e) {
-        e.printStackTrace();
-      }
-    }
-    Date to = new Date();
-    List<InMemoryHistoryNode> nodes = emitter.getMetrics("FakeMetric", from, to, false);
+    Thread.sleep(2000);
+
+    List<InMemoryHistoryNode> nodes = emitter.getMetrics("FakeMetric", from, new Date(), false);
 
     assertEquals("Failed to report metric", 1, nodes.size());
     assertEquals("Failed to report metric", nodes.get(0).getValue(), 4);