azkaban-aplcache

diff --git a/az-core/src/main/java/azkaban/AzkabanCoreModule.java b/az-core/src/main/java/azkaban/AzkabanCoreModule.java
new file mode 100644
index 0000000..5ce276b
--- /dev/null
+++ b/az-core/src/main/java/azkaban/AzkabanCoreModule.java
@@ -0,0 +1,44 @@
+/*
+ * 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;
+
+import azkaban.utils.Props;
+import com.codahale.metrics.MetricRegistry;
+import com.google.inject.AbstractModule;
+import com.google.inject.Scopes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * The Guice launching place for az-core.
+ */
+public class AzkabanCoreModule extends AbstractModule {
+
+  private static final Logger log = LoggerFactory.getLogger(AzkabanCoreModule.class);
+  private final Props props;
+
+  public AzkabanCoreModule(final Props props) {
+    this.props = props;
+  }
+
+  @Override
+  protected void configure() {
+    bind(Props.class).toInstance(this.props);
+    bind(MetricRegistry.class).in(Scopes.SINGLETON);
+  }
+}

diff --git a/azkaban-common/src/main/java/azkaban/AzkabanCommonModule.java b/azkaban-common/src/main/java/azkaban/AzkabanCommonModule.java
index 02ca44e..e3d6e06 100644
--- a/azkaban-common/src/main/java/azkaban/AzkabanCommonModule.java
+++ b/azkaban-common/src/main/java/azkaban/AzkabanCommonModule.java
@@ -35,10 +35,8 @@ import azkaban.storage.StorageImplementationType;
 import azkaban.trigger.JdbcTriggerImpl;
 import azkaban.trigger.TriggerLoader;
 import azkaban.utils.Props;
-import com.codahale.metrics.MetricRegistry;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
-import com.google.inject.Scopes;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -72,13 +70,12 @@ public class AzkabanCommonModule extends AbstractModule {
 
   @Override
   protected void configure() {
-    bind(Props.class).toInstance(this.config.getProps());
+    install(new AzkabanCoreModule(this.props));
     bind(Storage.class).to(resolveStorageClassType());
     bind(TriggerLoader.class).to(JdbcTriggerImpl.class);
     bind(ProjectLoader.class).to(JdbcProjectImpl.class);
     bind(DataSource.class).to(AzkabanDataSource.class);
     bind(ExecutorLoader.class).to(JdbcExecutorLoader.class);
-    bind(MetricRegistry.class).in(Scopes.SINGLETON);
   }
 
   public Class<? extends Storage> resolveStorageClassType() {

diff --git a/azkaban-exec-server/src/main/java/azkaban/execapp/AzkabanExecutorServer.java b/azkaban-exec-server/src/main/java/azkaban/execapp/AzkabanExecutorServer.java
index 49fa145..b6b7ccc 100644
--- a/azkaban-exec-server/src/main/java/azkaban/execapp/AzkabanExecutorServer.java
+++ b/azkaban-exec-server/src/main/java/azkaban/execapp/AzkabanExecutorServer.java
@@ -140,8 +140,10 @@ public class AzkabanExecutorServer {
     }
 
     /* Initialize Guice Injector */
-    final Injector injector = Guice
-        .createInjector(new AzkabanCommonModule(props), new AzkabanExecServerModule());
+    final Injector injector = Guice .createInjector (
+        new AzkabanCommonModule(props),
+        new AzkabanExecServerModule()
+    );
     SERVICE_PROVIDER.setInjector(injector);
 
     launch(injector.getInstance(AzkabanExecutorServer.class));

diff --git a/azkaban-solo-server/src/main/java/azkaban/soloserver/AzkabanSingleServer.java b/azkaban-solo-server/src/main/java/azkaban/soloserver/AzkabanSingleServer.java
index f920705..5d04bef 100644
--- a/azkaban-solo-server/src/main/java/azkaban/soloserver/AzkabanSingleServer.java
+++ b/azkaban-solo-server/src/main/java/azkaban/soloserver/AzkabanSingleServer.java
@@ -28,10 +28,10 @@ import azkaban.utils.Props;
 import azkaban.webapp.AzkabanWebServer;
 import azkaban.webapp.AzkabanWebServerModule;
 import com.google.inject.Guice;
-import javax.inject.Inject;
 import com.google.inject.Injector;
 import java.io.File;
 import java.io.IOException;
+import javax.inject.Inject;
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
 

diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java b/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java
index a625e26..e0a921e 100644
--- a/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java
@@ -206,8 +206,10 @@ public class AzkabanWebServer extends AzkabanServer {
     }
 
     /* Initialize Guice Injector */
-    final Injector injector = Guice
-        .createInjector(new AzkabanCommonModule(props), new AzkabanWebServerModule());
+    final Injector injector = Guice.createInjector(
+        new AzkabanCommonModule(props),
+        new AzkabanWebServerModule()
+    );
     SERVICE_PROVIDER.setInjector(injector);
 
     launch(injector.getInstance(AzkabanWebServer.class));