azkaban-aplcache

diff --git a/azkaban-common/src/main/java/azkaban/project/JdbcProjectLoader.java b/azkaban-common/src/main/java/azkaban/project/JdbcProjectLoader.java
index b7d165d..03dfa00 100644
--- a/azkaban-common/src/main/java/azkaban/project/JdbcProjectLoader.java
+++ b/azkaban-common/src/main/java/azkaban/project/JdbcProjectLoader.java
@@ -385,6 +385,7 @@ public class JdbcProjectLoader extends AbstractJdbcLoader implements
     updateChunksInProjectVersions(connection, projectId, version, chunks);
   }
 
+  @Override
   public void addProjectVersion(
       int projectId,
       int version,
@@ -548,6 +549,7 @@ public class JdbcProjectLoader extends AbstractJdbcLoader implements
     return handler;
   }
 
+  @Override
   public ProjectFileHandler fetchProjectMetaData(int projectId, int version) {
     ProjectVersionResultHandler pfHandler = new ProjectVersionResultHandler();
 
@@ -827,6 +829,7 @@ public class JdbcProjectLoader extends AbstractJdbcLoader implements
    * @return
    * @throws ProjectManagerException
    */
+  @Override
   public List<ProjectLogEvent> getProjectEvents(Project project, int num,
       int skip) throws ProjectManagerException {
     QueryRunner runner = createQueryRunner();

diff --git a/azkaban-common/src/main/java/azkaban/project/ProjectLogEvent.java b/azkaban-common/src/main/java/azkaban/project/ProjectLogEvent.java
index 1e78168..451e402 100644
--- a/azkaban-common/src/main/java/azkaban/project/ProjectLogEvent.java
+++ b/azkaban-common/src/main/java/azkaban/project/ProjectLogEvent.java
@@ -36,7 +36,7 @@ public class ProjectLogEvent {
     PURGE(10),
     PROPERTY_OVERRIDE(11);
 
-    private int numVal;
+    private final int numVal;
 
     EventType(int numVal) {
       this.numVal = numVal;

diff --git a/azkaban-common/src/main/java/azkaban/project/validator/ValidatorClassLoader.java b/azkaban-common/src/main/java/azkaban/project/validator/ValidatorClassLoader.java
index 1c00cf5..8bec05a 100644
--- a/azkaban-common/src/main/java/azkaban/project/validator/ValidatorClassLoader.java
+++ b/azkaban-common/src/main/java/azkaban/project/validator/ValidatorClassLoader.java
@@ -11,6 +11,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Vector;
 import java.util.jar.JarFile;
+import sun.net.www.protocol.jar.JarURLConnection;
 
 /**
  * Workaround for jdk 6 disgrace with open jar files & native libs,
@@ -42,33 +43,25 @@ public class ValidatorClassLoader extends URLClassLoader {
   @SuppressWarnings({ "nls", "rawtypes" })
   public boolean cleanupJarFileFactory() throws ValidatorManagerException {
     boolean res = false;
-    Class classJarURLConnection = null;
-    try {
-      classJarURLConnection = Class.forName("sun.net.www.protocol.jar.JarURLConnection");
-    } catch (ClassNotFoundException e) {
-      throw new ValidatorManagerException(e);
-    }
-    if (classJarURLConnection == null) {
-      return res;
-    }
-    Field f = null;
+    final Class classJarURLConnection = JarURLConnection.class;
+    Field f;
     try {
       f = classJarURLConnection.getDeclaredField("factory");
     } catch (NoSuchFieldException e) {
       throw new ValidatorManagerException(e);
     }
     if (f == null) {
-      return res;
+      return false;
     }
     f.setAccessible(true);
-    Object obj = null;
+    Object obj;
     try {
       obj = f.get(null);
     } catch (IllegalAccessException e) {
       throw new ValidatorManagerException(e);
     }
     if (obj == null) {
-      return res;
+      return false;
     }
     Class classJarFileFactory = obj.getClass();
 
@@ -80,9 +73,7 @@ public class ValidatorClassLoader extends URLClassLoader {
       if (obj instanceof HashMap) {
         fileCache = (HashMap) obj;
       }
-    } catch (NoSuchFieldException e) {
-      throw new ValidatorManagerException(e);
-    } catch (IllegalAccessException e) {
+    } catch (NoSuchFieldException | IllegalAccessException e) {
       throw new ValidatorManagerException(e);
     }
     HashMap urlCache = null;
@@ -93,9 +84,7 @@ public class ValidatorClassLoader extends URLClassLoader {
       if (obj instanceof HashMap) {
         urlCache = (HashMap) obj;
       }
-    } catch (NoSuchFieldException e) {
-      throw new ValidatorManagerException(e);
-    } catch (IllegalAccessException e) {
+    } catch (NoSuchFieldException | IllegalAccessException e) {
       throw new ValidatorManagerException(e);
     }
     if (urlCache != null) {

diff --git a/azkaban-common/src/test/java/azkaban/project/ProjectManagerTest.java b/azkaban-common/src/test/java/azkaban/project/ProjectManagerTest.java
index 6a1674b..f4f5adf 100644
--- a/azkaban-common/src/test/java/azkaban/project/ProjectManagerTest.java
+++ b/azkaban-common/src/test/java/azkaban/project/ProjectManagerTest.java
@@ -47,6 +47,7 @@ public class ProjectManagerTest {
     when(loader.getLatestProjectVersion(project1)).thenReturn(PROJECT_VERSION);
 
     doAnswer(new Answer<Void>() {
+      @Override
       public Void answer(InvocationOnMock invocation) {
         project1.setActive(false);
         return null;
@@ -54,6 +55,7 @@ public class ProjectManagerTest {
     }).when(loader).removeProject(project1, user.getUserId());
 
     doAnswer(new Answer<Void>() {
+      @Override
       public Void answer(InvocationOnMock invocation) {
         project1.setVersion(PROJECT_VERSION + 1);
         return null;