azkaban-aplcache

replace com.google.inject.{Inject, Singleton} by javax.inject …

9/6/2017 2:04:37 PM

package (#1434)

Use IntelliJ to find and replace all occurrences. This PR is a follow-up of #1428.

Liang Tang

Commit: 88e0577

Tree: 22bc3e7

Parents: ee032ee

Changes

azkaban-common/src/main/java/azkaban/AzkabanCommonModule.java 4(+2 -2)

azkaban-common/src/main/java/azkaban/AzkabanCommonModuleConfig.java 2(+1 -1)

azkaban-common/src/main/java/azkaban/executor/AlerterHolder.java 4(+2 -2)

azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java 4(+2 -2)

azkaban-common/src/main/java/azkaban/executor/JdbcExecutorLoader.java 4(+2 -2)

azkaban-common/src/main/java/azkaban/metrics/CommonMetrics.java 4(+2 -2)

azkaban-common/src/main/java/azkaban/metrics/MetricsManager.java 4(+2 -2)

azkaban-common/src/main/java/azkaban/project/AzkabanProjectLoader.java 2(+1 -1)

azkaban-common/src/main/java/azkaban/project/JdbcProjectImpl.java 4(+2 -2)

azkaban-common/src/main/java/azkaban/project/ProjectManager.java 4(+2 -2)

azkaban-common/src/main/java/azkaban/scheduler/ScheduleManager.java 2(+1 -1)

azkaban-common/src/main/java/azkaban/scheduler/TriggerBasedScheduleLoader.java 2(+1 -1)

azkaban-common/src/main/java/azkaban/server/session/SessionCache.java 2(+1 -1)

azkaban-common/src/main/java/azkaban/storage/DatabaseStorage.java 2(+1 -1)

azkaban-common/src/main/java/azkaban/storage/HdfsAuth.java 4(+2 -2)

azkaban-common/src/main/java/azkaban/storage/HdfsStorage.java 4(+2 -2)

azkaban-common/src/main/java/azkaban/storage/LocalStorage.java 4(+2 -2)

azkaban-common/src/main/java/azkaban/trigger/JdbcTriggerImpl.java 4(+2 -2)

azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java 4(+2 -2)

azkaban-common/src/main/java/azkaban/utils/SystemMemoryInfo.java 2(+1 -1)

azkaban-db/src/main/java/azkaban/db/DatabaseOperatorImpl.java 4(+2 -2)

azkaban-exec-server/src/main/java/azkaban/execapp/ExecMetrics.java 4(+2 -2)

azkaban-solo-server/src/main/java/azkaban/soloserver/AzkabanSingleServer.java 2(+1 -1)

azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServerModule.java 4(+2 -2)

azkaban-web-server/src/main/java/azkaban/webapp/StatusService.java 4(+2 -2)

azkaban-web-server/src/main/java/azkaban/webapp/WebMetrics.java 4(+2 -2)

azkaban-web-server/src/main/java/azkaban/webapp/WebServerProvider.java 2(+1 -1)

Details

azkaban-common/src/main/java/azkaban/AzkabanCommonModule.java 4(+2 -2)

diff --git a/azkaban-common/src/main/java/azkaban/AzkabanCommonModule.java b/azkaban-common/src/main/java/azkaban/AzkabanCommonModule.java
index 1397bb2..8aaf69e 100644
--- a/azkaban-common/src/main/java/azkaban/AzkabanCommonModule.java
+++ b/azkaban-common/src/main/java/azkaban/AzkabanCommonModule.java
@@ -39,10 +39,10 @@ import azkaban.trigger.TriggerLoader;
 import azkaban.utils.Props;
 import com.codahale.metrics.MetricRegistry;
 import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
-import com.google.inject.Singleton;
+import javax.inject.Singleton;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;

azkaban-common/src/main/java/azkaban/AzkabanCommonModuleConfig.java 2(+1 -1)

diff --git a/azkaban-common/src/main/java/azkaban/AzkabanCommonModuleConfig.java b/azkaban-common/src/main/java/azkaban/AzkabanCommonModuleConfig.java
index 6de763d..d20ed95 100644
--- a/azkaban-common/src/main/java/azkaban/AzkabanCommonModuleConfig.java
+++ b/azkaban-common/src/main/java/azkaban/AzkabanCommonModuleConfig.java
@@ -24,7 +24,7 @@ import static azkaban.storage.StorageImplementationType.DATABASE;
 
 import azkaban.storage.StorageImplementationType;
 import azkaban.utils.Props;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import java.net.URI;
 import org.apache.log4j.Logger;

azkaban-common/src/main/java/azkaban/executor/AlerterHolder.java 4(+2 -2)

diff --git a/azkaban-common/src/main/java/azkaban/executor/AlerterHolder.java b/azkaban-common/src/main/java/azkaban/executor/AlerterHolder.java
index b6e63db..f542a12 100644
--- a/azkaban-common/src/main/java/azkaban/executor/AlerterHolder.java
+++ b/azkaban-common/src/main/java/azkaban/executor/AlerterHolder.java
@@ -22,8 +22,8 @@ import azkaban.utils.Emailer;
 import azkaban.utils.FileIOUtils;
 import azkaban.utils.Props;
 import azkaban.utils.PropsUtils;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.net.MalformedURLException;

azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java 4(+2 -2)

diff --git a/azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java b/azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java
index b4632ec..a83a798 100644
--- a/azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java
+++ b/azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java
@@ -32,8 +32,8 @@ import azkaban.utils.JSONUtils;
 import azkaban.utils.Pair;
 import azkaban.utils.Props;
 import com.google.common.collect.Lists;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.io.File;
 import java.io.IOException;
 import java.lang.Thread.State;

azkaban-common/src/main/java/azkaban/executor/JdbcExecutorLoader.java 4(+2 -2)

diff --git a/azkaban-common/src/main/java/azkaban/executor/JdbcExecutorLoader.java b/azkaban-common/src/main/java/azkaban/executor/JdbcExecutorLoader.java
index 5eb87b6..debe44e 100644
--- a/azkaban-common/src/main/java/azkaban/executor/JdbcExecutorLoader.java
+++ b/azkaban-common/src/main/java/azkaban/executor/JdbcExecutorLoader.java
@@ -20,8 +20,8 @@ import azkaban.executor.ExecutorLogEvent.EventType;
 import azkaban.utils.FileIOUtils.LogData;
 import azkaban.utils.Pair;
 import azkaban.utils.Props;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.io.File;
 import java.time.Duration;
 import java.util.List;

azkaban-common/src/main/java/azkaban/metrics/CommonMetrics.java 4(+2 -2)

diff --git a/azkaban-common/src/main/java/azkaban/metrics/CommonMetrics.java b/azkaban-common/src/main/java/azkaban/metrics/CommonMetrics.java
index 7e91f7a..bca65ff 100644
--- a/azkaban-common/src/main/java/azkaban/metrics/CommonMetrics.java
+++ b/azkaban-common/src/main/java/azkaban/metrics/CommonMetrics.java
@@ -17,8 +17,8 @@
 package azkaban.metrics;
 
 import com.codahale.metrics.Meter;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.concurrent.atomic.AtomicLong;
 
 /**

azkaban-common/src/main/java/azkaban/metrics/MetricsManager.java 4(+2 -2)

diff --git a/azkaban-common/src/main/java/azkaban/metrics/MetricsManager.java b/azkaban-common/src/main/java/azkaban/metrics/MetricsManager.java
index b5760fc..d75349e 100644
--- a/azkaban-common/src/main/java/azkaban/metrics/MetricsManager.java
+++ b/azkaban-common/src/main/java/azkaban/metrics/MetricsManager.java
@@ -26,8 +26,8 @@ import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.jvm.GarbageCollectorMetricSet;
 import com.codahale.metrics.jvm.MemoryUsageGaugeSet;
 import com.codahale.metrics.jvm.ThreadStatesGaugeSet;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.lang.reflect.Constructor;
 import java.util.function.Supplier;
 import org.slf4j.Logger;

azkaban-common/src/main/java/azkaban/project/AzkabanProjectLoader.java 2(+1 -1)

diff --git a/azkaban-common/src/main/java/azkaban/project/AzkabanProjectLoader.java b/azkaban-common/src/main/java/azkaban/project/AzkabanProjectLoader.java
index 51ffa11..695e7b6 100644
--- a/azkaban-common/src/main/java/azkaban/project/AzkabanProjectLoader.java
+++ b/azkaban-common/src/main/java/azkaban/project/AzkabanProjectLoader.java
@@ -31,7 +31,7 @@ import azkaban.storage.StorageManager;
 import azkaban.user.User;
 import azkaban.utils.Props;
 import azkaban.utils.Utils;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;

azkaban-common/src/main/java/azkaban/project/JdbcProjectImpl.java 4(+2 -2)

diff --git a/azkaban-common/src/main/java/azkaban/project/JdbcProjectImpl.java b/azkaban-common/src/main/java/azkaban/project/JdbcProjectImpl.java
index ade70e3..890b44c 100644
--- a/azkaban-common/src/main/java/azkaban/project/JdbcProjectImpl.java
+++ b/azkaban-common/src/main/java/azkaban/project/JdbcProjectImpl.java
@@ -40,8 +40,8 @@ import azkaban.utils.Props;
 import azkaban.utils.PropsUtils;
 import azkaban.utils.Triple;
 import com.google.common.io.Files;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;

azkaban-common/src/main/java/azkaban/project/ProjectManager.java 4(+2 -2)

diff --git a/azkaban-common/src/main/java/azkaban/project/ProjectManager.java b/azkaban-common/src/main/java/azkaban/project/ProjectManager.java
index 1b8c986..79caa97 100644
--- a/azkaban-common/src/main/java/azkaban/project/ProjectManager.java
+++ b/azkaban-common/src/main/java/azkaban/project/ProjectManager.java
@@ -29,8 +29,8 @@ import azkaban.user.Permission.Type;
 import azkaban.user.User;
 import azkaban.utils.Props;
 import azkaban.utils.PropsUtils;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;

azkaban-common/src/main/java/azkaban/scheduler/ScheduleManager.java 2(+1 -1)

diff --git a/azkaban-common/src/main/java/azkaban/scheduler/ScheduleManager.java b/azkaban-common/src/main/java/azkaban/scheduler/ScheduleManager.java
index ab1ad1e..db42b88 100644
--- a/azkaban-common/src/main/java/azkaban/scheduler/ScheduleManager.java
+++ b/azkaban-common/src/main/java/azkaban/scheduler/ScheduleManager.java
@@ -22,7 +22,7 @@ import azkaban.trigger.TriggerAgent;
 import azkaban.trigger.TriggerStatus;
 import azkaban.utils.Pair;
 import azkaban.utils.Props;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;

azkaban-common/src/main/java/azkaban/scheduler/TriggerBasedScheduleLoader.java 2(+1 -1)

diff --git a/azkaban-common/src/main/java/azkaban/scheduler/TriggerBasedScheduleLoader.java b/azkaban-common/src/main/java/azkaban/scheduler/TriggerBasedScheduleLoader.java
index 95003cc..e4900e0 100644
--- a/azkaban-common/src/main/java/azkaban/scheduler/TriggerBasedScheduleLoader.java
+++ b/azkaban-common/src/main/java/azkaban/scheduler/TriggerBasedScheduleLoader.java
@@ -26,7 +26,7 @@ import azkaban.trigger.TriggerManagerAdapter;
 import azkaban.trigger.TriggerManagerException;
 import azkaban.trigger.builtin.BasicTimeChecker;
 import azkaban.trigger.builtin.ExecuteFlowAction;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

azkaban-common/src/main/java/azkaban/server/session/SessionCache.java 2(+1 -1)

diff --git a/azkaban-common/src/main/java/azkaban/server/session/SessionCache.java b/azkaban-common/src/main/java/azkaban/server/session/SessionCache.java
index 81d11b9..505a59d 100644
--- a/azkaban-common/src/main/java/azkaban/server/session/SessionCache.java
+++ b/azkaban-common/src/main/java/azkaban/server/session/SessionCache.java
@@ -19,7 +19,7 @@ package azkaban.server.session;
 import azkaban.utils.Props;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import java.util.concurrent.TimeUnit;
 
 /**

azkaban-common/src/main/java/azkaban/storage/DatabaseStorage.java 2(+1 -1)

diff --git a/azkaban-common/src/main/java/azkaban/storage/DatabaseStorage.java b/azkaban-common/src/main/java/azkaban/storage/DatabaseStorage.java
index 7c6b15e..58190ec 100644
--- a/azkaban-common/src/main/java/azkaban/storage/DatabaseStorage.java
+++ b/azkaban-common/src/main/java/azkaban/storage/DatabaseStorage.java
@@ -21,7 +21,7 @@ import azkaban.project.ProjectFileHandler;
 import azkaban.project.ProjectLoader;
 import azkaban.spi.Storage;
 import azkaban.spi.StorageMetadata;
-import com.google.inject.Singleton;
+import javax.inject.Singleton;
 import java.io.File;
 import java.io.InputStream;
 import javax.inject.Inject;

azkaban-common/src/main/java/azkaban/storage/HdfsAuth.java 4(+2 -2)

diff --git a/azkaban-common/src/main/java/azkaban/storage/HdfsAuth.java b/azkaban-common/src/main/java/azkaban/storage/HdfsAuth.java
index 331627c..2b8035c 100644
--- a/azkaban-common/src/main/java/azkaban/storage/HdfsAuth.java
+++ b/azkaban-common/src/main/java/azkaban/storage/HdfsAuth.java
@@ -23,8 +23,8 @@ import static java.util.Objects.requireNonNull;
 
 import azkaban.spi.AzkabanException;
 import azkaban.utils.Props;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.io.IOException;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;

azkaban-common/src/main/java/azkaban/storage/HdfsStorage.java 4(+2 -2)

diff --git a/azkaban-common/src/main/java/azkaban/storage/HdfsStorage.java b/azkaban-common/src/main/java/azkaban/storage/HdfsStorage.java
index 3679150..25efcdb 100644
--- a/azkaban-common/src/main/java/azkaban/storage/HdfsStorage.java
+++ b/azkaban-common/src/main/java/azkaban/storage/HdfsStorage.java
@@ -24,8 +24,8 @@ import azkaban.AzkabanCommonModuleConfig;
 import azkaban.spi.Storage;
 import azkaban.spi.StorageException;
 import azkaban.spi.StorageMetadata;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

azkaban-common/src/main/java/azkaban/storage/LocalStorage.java 4(+2 -2)

diff --git a/azkaban-common/src/main/java/azkaban/storage/LocalStorage.java b/azkaban-common/src/main/java/azkaban/storage/LocalStorage.java
index 1ae9f95..286a784 100644
--- a/azkaban-common/src/main/java/azkaban/storage/LocalStorage.java
+++ b/azkaban-common/src/main/java/azkaban/storage/LocalStorage.java
@@ -24,8 +24,8 @@ import azkaban.spi.Storage;
 import azkaban.spi.StorageException;
 import azkaban.spi.StorageMetadata;
 import azkaban.utils.FileIOUtils;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;

azkaban-common/src/main/java/azkaban/trigger/JdbcTriggerImpl.java 4(+2 -2)

diff --git a/azkaban-common/src/main/java/azkaban/trigger/JdbcTriggerImpl.java b/azkaban-common/src/main/java/azkaban/trigger/JdbcTriggerImpl.java
index 61134b2..5c6a69e 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/JdbcTriggerImpl.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/JdbcTriggerImpl.java
@@ -21,8 +21,8 @@ import azkaban.db.DatabaseOperator;
 import azkaban.db.SQLTransaction;
 import azkaban.utils.GZIPUtils;
 import azkaban.utils.JSONUtils;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.io.IOException;
 import java.sql.ResultSet;
 import java.sql.SQLException;

azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java 4(+2 -2)

diff --git a/azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java b/azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java
index 5b52abe..5bb993e 100644
--- a/azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java
+++ b/azkaban-common/src/main/java/azkaban/trigger/TriggerManager.java
@@ -21,8 +21,8 @@ import static java.util.Objects.requireNonNull;
 import azkaban.event.EventHandler;
 import azkaban.executor.ExecutorManager;
 import azkaban.utils.Props;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;

azkaban-common/src/main/java/azkaban/utils/SystemMemoryInfo.java 2(+1 -1)

diff --git a/azkaban-common/src/main/java/azkaban/utils/SystemMemoryInfo.java b/azkaban-common/src/main/java/azkaban/utils/SystemMemoryInfo.java
index 8d0af8c..20a0fa6 100644
--- a/azkaban-common/src/main/java/azkaban/utils/SystemMemoryInfo.java
+++ b/azkaban-common/src/main/java/azkaban/utils/SystemMemoryInfo.java
@@ -1,6 +1,6 @@
 package azkaban.utils;
 
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import org.slf4j.LoggerFactory;

azkaban-db/src/main/java/azkaban/db/DatabaseOperatorImpl.java 4(+2 -2)

diff --git a/azkaban-db/src/main/java/azkaban/db/DatabaseOperatorImpl.java b/azkaban-db/src/main/java/azkaban/db/DatabaseOperatorImpl.java
index 9a89eda..bde8022 100644
--- a/azkaban-db/src/main/java/azkaban/db/DatabaseOperatorImpl.java
+++ b/azkaban-db/src/main/java/azkaban/db/DatabaseOperatorImpl.java
@@ -17,8 +17,8 @@ package azkaban.db;
 
 import static java.util.Objects.requireNonNull;
 
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.sql.Connection;
 import java.sql.SQLException;
 import org.apache.commons.dbutils.DbUtils;

azkaban-exec-server/src/main/java/azkaban/execapp/ExecMetrics.java 4(+2 -2)

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 39209c1..58aba26 100644
--- a/azkaban-exec-server/src/main/java/azkaban/execapp/ExecMetrics.java
+++ b/azkaban-exec-server/src/main/java/azkaban/execapp/ExecMetrics.java
@@ -17,8 +17,8 @@
 package azkaban.execapp;
 
 import azkaban.metrics.MetricsManager;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 
 /**
  * This class ExecMetrics is in charge of collecting metrics from executors.

azkaban-solo-server/src/main/java/azkaban/soloserver/AzkabanSingleServer.java 2(+1 -1)

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 3fa95b1..60f65f4 100644
--- a/azkaban-solo-server/src/main/java/azkaban/soloserver/AzkabanSingleServer.java
+++ b/azkaban-solo-server/src/main/java/azkaban/soloserver/AzkabanSingleServer.java
@@ -28,7 +28,7 @@ import azkaban.utils.Props;
 import azkaban.webapp.AzkabanWebServer;
 import azkaban.webapp.AzkabanWebServerModule;
 import com.google.inject.Guice;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Injector;
 import org.apache.log4j.Logger;

azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServerModule.java 4(+2 -2)

diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServerModule.java b/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServerModule.java
index d234fad..2297905 100644
--- a/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServerModule.java
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServerModule.java
@@ -23,9 +23,9 @@ import azkaban.user.UserManager;
 import azkaban.user.XmlUserManager;
 import azkaban.utils.Props;
 import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Provides;
-import com.google.inject.Singleton;
+import javax.inject.Singleton;
 import java.lang.reflect.Constructor;
 import org.apache.log4j.Logger;
 import org.apache.velocity.app.VelocityEngine;

azkaban-web-server/src/main/java/azkaban/webapp/StatusService.java 4(+2 -2)

diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/StatusService.java b/azkaban-web-server/src/main/java/azkaban/webapp/StatusService.java
index b44d029..588cf76 100644
--- a/azkaban-web-server/src/main/java/azkaban/webapp/StatusService.java
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/StatusService.java
@@ -26,8 +26,8 @@ import azkaban.executor.ExecutorLoader;
 import azkaban.executor.ExecutorManagerException;
 import azkaban.utils.Props;
 import com.google.common.io.Files;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

azkaban-web-server/src/main/java/azkaban/webapp/WebMetrics.java 4(+2 -2)

diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/WebMetrics.java b/azkaban-web-server/src/main/java/azkaban/webapp/WebMetrics.java
index 01af3e9..8e13296 100644
--- a/azkaban-web-server/src/main/java/azkaban/webapp/WebMetrics.java
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/WebMetrics.java
@@ -18,8 +18,8 @@ package azkaban.webapp;
 
 import azkaban.metrics.MetricsManager;
 import com.codahale.metrics.Meter;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.concurrent.atomic.AtomicLong;

azkaban-web-server/src/main/java/azkaban/webapp/WebServerProvider.java 2(+1 -1)

diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/WebServerProvider.java b/azkaban-web-server/src/main/java/azkaban/webapp/WebServerProvider.java
index 7ae86e1..96117ae 100644
--- a/azkaban-web-server/src/main/java/azkaban/webapp/WebServerProvider.java
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/WebServerProvider.java
@@ -21,7 +21,7 @@ import static java.util.Objects.requireNonNull;
 
 import azkaban.Constants;
 import azkaban.utils.Props;
-import com.google.inject.Inject;
+import javax.inject.Inject;
 import com.google.inject.Provider;
 import java.util.List;
 import org.apache.log4j.Logger;