AMBARI-22325 Use javax.inject.Inject (benyoka)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5ab1e5b5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5ab1e5b5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5ab1e5b5 Branch: refs/heads/branch-feature-AMBARI-14714-blueprintv2 Commit: 5ab1e5b597440edac1cb70cbba838e5322a58994 Parents: 73050fc Author: Balazs Bence Sari <beny...@apache.org> Authored: Wed Dec 6 18:58:44 2017 +0100 Committer: Doroszlai, Attila <adorosz...@hortonworks.com> Committed: Fri Dec 8 20:24:25 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/controller/StackV2Factory.java | 4 ++-- .../ambari/server/controller/internal/BaseClusterRequest.java | 4 ++-- .../org/apache/ambari/server/topology/BlueprintV2Factory.java | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5ab1e5b5/ambari-server/src/main/java/org/apache/ambari/server/controller/StackV2Factory.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackV2Factory.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackV2Factory.java index 0cd5ecd..8c81ffa 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackV2Factory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackV2Factory.java @@ -25,6 +25,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.ObjectNotFoundException; import org.apache.ambari.server.orm.dao.RepositoryVersionDAO; @@ -37,8 +39,6 @@ import org.apache.ambari.server.state.StackId; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.inject.Inject; - public class StackV2Factory { private final static Logger LOG = LoggerFactory.getLogger(StackV2Factory.class); http://git-wip-us.apache.org/repos/asf/ambari/blob/5ab1e5b5/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseClusterRequest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseClusterRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseClusterRequest.java index b575a92..ab7c698 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseClusterRequest.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseClusterRequest.java @@ -26,6 +26,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + import org.apache.ambari.server.StaticallyInject; import org.apache.ambari.server.api.predicate.InvalidQueryException; import org.apache.ambari.server.api.predicate.QueryLexer; @@ -41,8 +43,6 @@ import org.apache.ambari.server.topology.SecurityConfiguration; import org.apache.ambari.server.topology.Service; import org.apache.ambari.server.topology.TopologyRequest; -import com.google.inject.Inject; - /** * Provides common cluster request functionality. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/5ab1e5b5/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintV2Factory.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintV2Factory.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintV2Factory.java index eea2771..e5b8e13 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintV2Factory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintV2Factory.java @@ -24,6 +24,8 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; +import javax.inject.Inject; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.controller.StackV2; import org.apache.ambari.server.controller.StackV2Factory; @@ -41,7 +43,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.module.SimpleAbstractTypeResolver; import com.fasterxml.jackson.databind.module.SimpleModule; -import com.google.inject.Inject; public class BlueprintV2Factory { // Blueprints
