azkaban-aplcache

diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java
index dd41056..38b03a1 100644
--- a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/ExecutorServlet.java
@@ -72,7 +72,6 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
   private ProjectManager projectManager;
   private ExecutorManagerAdapter executorManager;
   private ScheduleManager scheduleManager;
-  private ExecutorVelocityHelper velocityHelper;
   private UserManager userManager;
 
   @Override
@@ -83,7 +82,6 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
     this.projectManager = server.getProjectManager();
     this.executorManager = server.getExecutorManager();
     this.scheduleManager = server.getScheduleManager();
-    this.velocityHelper = new ExecutorVelocityHelper();
     // TODO: reallocf fully guicify
     this.webMetrics = SERVICE_PROVIDER.getInstance(WebMetrics.class);
   }
@@ -349,7 +347,7 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
     final List<ExecutableFlow> finishedFlows =
         this.executorManager.getRecentlyFinishedFlows();
     page.add("recentlyFinished", finishedFlows.isEmpty() ? null : finishedFlows);
-    page.add("vmutils", this.velocityHelper);
+    page.add("vmutils", new VelocityUtil(this.projectManager));
     page.render();
   }
 
@@ -950,16 +948,4 @@ public class ExecutorServlet extends LoginAbstractAzkabanServlet {
 
     ret.put("execid", exflow.getExecutionId());
   }
-
-  public class ExecutorVelocityHelper {
-
-    public String getProjectName(final int id) {
-      final Project project = ExecutorServlet.this.projectManager.getProject(id);
-      if (project == null) {
-        return String.valueOf(id);
-      }
-
-      return project.getName();
-    }
-  }
 }

diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/HistoryServlet.java b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/HistoryServlet.java
index 574569d..4a354da 100644
--- a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/HistoryServlet.java
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/HistoryServlet.java
@@ -19,7 +19,6 @@ package azkaban.webapp.servlet;
 import azkaban.executor.ExecutableFlow;
 import azkaban.executor.ExecutorManagerAdapter;
 import azkaban.executor.ExecutorManagerException;
-import azkaban.project.Project;
 import azkaban.project.ProjectManager;
 import azkaban.server.session.Session;
 import azkaban.webapp.AzkabanWebServer;
@@ -38,7 +37,6 @@ public class HistoryServlet extends LoginAbstractAzkabanServlet {
   private static final long serialVersionUID = 1L;
   private ExecutorManagerAdapter executorManager;
   private ProjectManager projectManager;
-  private ExecutorVMHelper vmHelper;
 
   @Override
   public void init(final ServletConfig config) throws ServletException {
@@ -46,7 +44,6 @@ public class HistoryServlet extends LoginAbstractAzkabanServlet {
     final AzkabanWebServer server = (AzkabanWebServer) getApplication();
     this.executorManager = server.getExecutorManager();
     this.projectManager = server.getProjectManager();
-    this.vmHelper = new ExecutorVMHelper();
   }
 
   @Override
@@ -91,7 +88,7 @@ public class HistoryServlet extends LoginAbstractAzkabanServlet {
             "azkaban/webapp/servlet/velocity/historypage.vm");
     int pageNum = getIntParam(req, "page", 1);
     final int pageSize = getIntParam(req, "size", 16);
-    page.add("vmutils", this.vmHelper);
+    page.add("vmutils", new VelocityUtil(this.projectManager));
 
     if (pageNum < 0) {
       pageNum = 1;
@@ -237,16 +234,4 @@ public class HistoryServlet extends LoginAbstractAzkabanServlet {
       this.selected = selected;
     }
   }
-
-  public class ExecutorVMHelper {
-
-    public String getProjectName(final int id) {
-      final Project project = HistoryServlet.this.projectManager.getProject(id);
-      if (project == null) {
-        return String.valueOf(id);
-      }
-
-      return project.getName();
-    }
-  }
 }

diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/VelocityUtil.java b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/VelocityUtil.java
new file mode 100644
index 0000000..985a41c
--- /dev/null
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/VelocityUtil.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2017 LinkedIn Corp.
+ *
+ * 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 azkaban.webapp.servlet;
+
+import azkaban.project.Project;
+import azkaban.project.ProjectManager;
+
+public class VelocityUtil {
+
+  ProjectManager projectManager;
+
+  public VelocityUtil(final ProjectManager projectManager) {
+    this.projectManager = projectManager;
+  }
+
+  public String getProjectName(final int id) {
+    final Project project = this.projectManager.getProject(id);
+    if (project == null) {
+      return String.valueOf(id);
+    }
+    return project.getName();
+  }
+}