azkaban-aplcache

diff --git a/azkaban-exec-server/src/main/java/azkaban/execapp/event/JobCallbackRequestMaker.java b/azkaban-exec-server/src/main/java/azkaban/execapp/event/JobCallbackRequestMaker.java
index e5673c1..9446f64 100644
--- a/azkaban-exec-server/src/main/java/azkaban/execapp/event/JobCallbackRequestMaker.java
+++ b/azkaban-exec-server/src/main/java/azkaban/execapp/event/JobCallbackRequestMaker.java
@@ -30,10 +30,10 @@ import azkaban.utils.Props;
 
 /**
  * Responsible for making the job callback HTTP requests.
- * 
+ *
  * One of the requirements is to log out the request information and response
  * using the given logger, which should be the job logger.
- * 
+ *
  * @author hluu
  *
  */
@@ -177,11 +177,11 @@ public class JobCallbackRequestMaker {
   /**
    * Response handler for logging job callback response using the given logger
    * instance
-   * 
+   *
    * @author hluu
    *
    */
-  private final class LoggingResponseHandler implements
+  private static final class LoggingResponseHandler implements
       ResponseHandler<Integer> {
 
     private Logger logger;
@@ -193,6 +193,7 @@ public class JobCallbackRequestMaker {
       this.logger = logger;
     }
 
+    @Override
     public Integer handleResponse(final HttpResponse response)
         throws ClientProtocolException, IOException {
 

diff --git a/azkaban-exec-server/src/main/java/azkaban/execapp/ExecMetrics.java b/azkaban-exec-server/src/main/java/azkaban/execapp/ExecMetrics.java
index 8b84045..d3455fe 100644
--- a/azkaban-exec-server/src/main/java/azkaban/execapp/ExecMetrics.java
+++ b/azkaban-exec-server/src/main/java/azkaban/execapp/ExecMetrics.java
@@ -27,7 +27,7 @@ import com.codahale.metrics.MetricRegistry;
 public enum ExecMetrics {
   INSTANCE;
 
-  private MetricRegistry registry;
+  private final MetricRegistry registry;
 
   ExecMetrics() {
     registry = MetricsManager.INSTANCE.getRegistry();

diff --git a/azkaban-exec-server/src/main/java/azkaban/execapp/JMXHttpServlet.java b/azkaban-exec-server/src/main/java/azkaban/execapp/JMXHttpServlet.java
index 57aab17..b7e4df2 100644
--- a/azkaban-exec-server/src/main/java/azkaban/execapp/JMXHttpServlet.java
+++ b/azkaban-exec-server/src/main/java/azkaban/execapp/JMXHttpServlet.java
@@ -42,6 +42,7 @@ public class JMXHttpServlet extends HttpServlet implements ConnectorParams {
   private static final Logger logger = Logger.getLogger(JMXHttpServlet.class);
   private AzkabanExecutorServer server;
 
+  @Override
   public void init(ServletConfig config) throws ServletException {
     server =
         (AzkabanExecutorServer) config.getServletContext().getAttribute(

diff --git a/azkaban-exec-server/src/main/java/azkaban/execapp/JobRunner.java b/azkaban-exec-server/src/main/java/azkaban/execapp/JobRunner.java
index 2445920..82db1f2 100644
--- a/azkaban-exec-server/src/main/java/azkaban/execapp/JobRunner.java
+++ b/azkaban-exec-server/src/main/java/azkaban/execapp/JobRunner.java
@@ -87,7 +87,7 @@ public class JobRunner extends EventHandler implements Runnable {
   private String jobId;
 
   private static final Object logCreatorLock = new Object();
-  private Object syncObject = new Object();
+  private final Object syncObject = new Object();
 
   private final JobTypeManager jobtypeManager;
 

diff --git a/azkaban-exec-server/src/test/java/azkaban/execapp/event/BlockingStatusTest.java b/azkaban-exec-server/src/test/java/azkaban/execapp/event/BlockingStatusTest.java
index db8b74a..ece8677 100644
--- a/azkaban-exec-server/src/test/java/azkaban/execapp/event/BlockingStatusTest.java
+++ b/azkaban-exec-server/src/test/java/azkaban/execapp/event/BlockingStatusTest.java
@@ -24,7 +24,7 @@ import azkaban.executor.Status;
 
 public class BlockingStatusTest {
 
-  public class WatchingThread extends Thread {
+  public static class WatchingThread extends Thread {
     private BlockingStatus status;
     private long diff = 0;
 
@@ -74,9 +74,7 @@ public class BlockingStatusTest {
     WatchingThread thread = new WatchingThread(status);
     thread.start();
 
-    synchronized (this) {
-      wait(3000);
-    }
+    Thread.sleep(3000);
 
     status.changeStatus(Status.SUCCEEDED);
     thread.join();
@@ -96,16 +94,10 @@ public class BlockingStatusTest {
     WatchingThread thread = new WatchingThread(status);
     thread.start();
 
-    synchronized (this) {
-      wait(3000);
-    }
-
+    Thread.sleep(3000);
     status.changeStatus(Status.PAUSED);
 
-    synchronized (this) {
-      wait(1000);
-    }
-
+    Thread.sleep(1000);
     status.changeStatus(Status.FAILED);
 
     thread.join(1000);
@@ -125,17 +117,12 @@ public class BlockingStatusTest {
     WatchingThread thread1 = new WatchingThread(status);
     thread1.start();
 
-    synchronized (this) {
-      wait(2000);
-    }
+    Thread.sleep(2000);
 
     WatchingThread thread2 = new WatchingThread(status);
     thread2.start();
 
-    synchronized (this) {
-      wait(2000);
-    }
-
+    Thread.sleep(2000);
     status.changeStatus(Status.FAILED);
     thread2.join(1000);
     thread1.join(1000);

diff --git a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerPipelineTest.java b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerPipelineTest.java
index c53cf99..dbf3de1 100644
--- a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerPipelineTest.java
+++ b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerPipelineTest.java
@@ -610,11 +610,9 @@ public class FlowRunnerPipelineTest {
   }
 
   private void pause(long millisec) {
-    synchronized (this) {
-      try {
-        wait(millisec);
-      } catch (InterruptedException e) {
-      }
+    try {
+      Thread.sleep(millisec);
+    } catch (InterruptedException e) {
     }
   }
 

diff --git a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerPropertyResolutionTest.java b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerPropertyResolutionTest.java
index f79f2fe..f13a13c 100644
--- a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerPropertyResolutionTest.java
+++ b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerPropertyResolutionTest.java
@@ -265,11 +265,9 @@ public class FlowRunnerPropertyResolutionTest {
   }
 
   private void pause(long millisec) {
-    synchronized (this) {
-      try {
-        wait(millisec);
-      } catch (InterruptedException e) {
-      }
+    try {
+      Thread.sleep(millisec);
+    } catch (InterruptedException e) {
     }
   }
 }

diff --git a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest.java b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest.java
index c4289e4..c502def 100644
--- a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest.java
+++ b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest.java
@@ -228,14 +228,12 @@ public class FlowRunnerTest {
         "Expected flow " + Status.FAILED + " instead " + exFlow.getStatus(),
         exFlow.getStatus() == Status.FAILED);
 
-    synchronized (this) {
-      try {
-        wait(500);
-      } catch (InterruptedException e) {
-
-      }
+    try {
+        Thread.sleep(500);
+    } catch (InterruptedException e) {
     }
 
+
     testStatus(exFlow, "job1", Status.SUCCEEDED);
     testStatus(exFlow, "job2d", Status.FAILED);
     testStatus(exFlow, "job3", Status.CANCELLED);
@@ -275,13 +273,12 @@ public class FlowRunnerTest {
         "Expected flow " + Status.FAILED + " instead " + exFlow.getStatus(),
         exFlow.getStatus() == Status.FAILED);
 
-    synchronized (this) {
-      try {
-        wait(500);
-      } catch (InterruptedException e) {
-      }
+    try {
+      Thread.sleep(500);
+    } catch (InterruptedException e) {
     }
 
+
     testStatus(exFlow, "job1", Status.SUCCEEDED);
     testStatus(exFlow, "job2d", Status.FAILED);
     testStatus(exFlow, "job3", Status.SUCCEEDED);
@@ -315,27 +312,23 @@ public class FlowRunnerTest {
     Thread thread = new Thread(runner);
     thread.start();
 
-    synchronized (this) {
-      try {
-        wait(5000);
-      } catch (InterruptedException e) {
-        // TODO Auto-generated catch block
-        e.printStackTrace();
-      }
-
-      runner.kill("me");
-      Assert.assertTrue(runner.isKilled());
+    try {
+      Thread.sleep(5000);
+    } catch (InterruptedException e) {
+      // TODO Auto-generated catch block
+      e.printStackTrace();
     }
 
-    synchronized (this) {
-      // Wait for cleanup.
-      try {
-        wait(2000);
-      } catch (InterruptedException e) {
-        // TODO Auto-generated catch block
-        e.printStackTrace();
-      }
+    runner.kill("me");
+    Assert.assertTrue(runner.isKilled());
+
+    try {
+      Thread.sleep(2000);
+    } catch (InterruptedException e) {
+      // TODO Auto-generated catch block
+      e.printStackTrace();
     }
+
     ExecutableFlow exFlow = runner.getExecutableFlow();
     testStatus(exFlow, "job1", Status.SUCCEEDED);
     testStatus(exFlow, "job2", Status.SUCCEEDED);

diff --git a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest2.java b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest2.java
index 196fcd7..ce4b5fc 100644
--- a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest2.java
+++ b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest2.java
@@ -1342,12 +1342,10 @@ public class FlowRunnerTest2 {
   }
 
   private void pause(long millisec) {
-    synchronized(this) {
-      try {
-        wait(millisec);
-      }
-      catch (InterruptedException e) {
-      }
+    try {
+      Thread.sleep(millisec);
+    }
+    catch (InterruptedException e) {
     }
   }
 

diff --git a/azkaban-exec-server/src/test/java/azkaban/execapp/StatisticsServletTest.java b/azkaban-exec-server/src/test/java/azkaban/execapp/StatisticsServletTest.java
index 15078b4..1442a27 100644
--- a/azkaban-exec-server/src/test/java/azkaban/execapp/StatisticsServletTest.java
+++ b/azkaban-exec-server/src/test/java/azkaban/execapp/StatisticsServletTest.java
@@ -8,7 +8,7 @@ import azkaban.executor.ExecutorInfo;
 
 @Ignore
 public class StatisticsServletTest {
-  private class MockStatisticsServlet extends ServerStatisticsServlet {
+  private static class MockStatisticsServlet extends ServerStatisticsServlet {
     /** */
     private static final long serialVersionUID = 1L;