[38/46] ambari git commit: AMBARI-22325 Fix dependency injection for BlueprintV2Factory (benyoka)

[adoroszlai]

AMBARI-22325 Fix dependency injection for BlueprintV2Factory (benyoka)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/73050fca
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/73050fca
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/73050fca

Branch: refs/heads/branch-feature-AMBARI-14714-blueprintv2
Commit: 73050fcac37cc8bac27c8e9b0597e1b1cb465607
Parents: f12e9c9
Author: Balazs Bence Sari 
Authored: Wed Dec 6 16:07:11 2017 +0100
Committer: Doroszlai, Attila 
Committed: Fri Dec 8 20:24:25 2017 +0100

--
 .../ambari/server/controller/AmbariServer.java  | 10 +++
 .../server/controller/ControllerModule.java |  4 ++-
 .../server/controller/StackV2Factory.java   | 29 +++
 .../AbstractControllerResourceProvider.java |  1 +
 .../controller/internal/BaseClusterRequest.java | 10 +++
 .../internal/BlueprintV2ResourceProvider.java   |  7 ++---
 .../server/topology/BlueprintFactory.java   |  5 ++--
 .../server/topology/BlueprintV2Factory.java | 30 +++-
 .../server/topology/BlueprintV2FactoryTest.java |  3 +-
 9 files changed, 42 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/73050fca/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 5b3d79e..89d66b9 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -62,7 +62,6 @@ import 
org.apache.ambari.server.configuration.ComponentSSLConfiguration;
 import org.apache.ambari.server.configuration.Configuration;
 import 
org.apache.ambari.server.controller.internal.AbstractControllerResourceProvider;
 import 
org.apache.ambari.server.controller.internal.AmbariPrivilegeResourceProvider;
-import org.apache.ambari.server.controller.internal.BaseClusterRequest;
 import org.apache.ambari.server.controller.internal.BlueprintResourceProvider;
 import 
org.apache.ambari.server.controller.internal.BlueprintV2ResourceProvider;
 import 
org.apache.ambari.server.controller.internal.ClusterPrivilegeResourceProvider;
@@ -91,7 +90,6 @@ import org.apache.ambari.server.orm.dao.MetainfoDAO;
 import org.apache.ambari.server.orm.dao.PermissionDAO;
 import org.apache.ambari.server.orm.dao.PrincipalDAO;
 import org.apache.ambari.server.orm.dao.PrivilegeDAO;
-import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
 import org.apache.ambari.server.orm.dao.ResourceDAO;
 import org.apache.ambari.server.orm.dao.UserDAO;
 import org.apache.ambari.server.orm.dao.ViewInstanceDAO;
@@ -928,15 +926,15 @@ public class AmbariServer {
 injector.getInstance(BlueprintDAO.class), 
injector.getInstance(SecurityConfigurationFactory.class),
 injector.getInstance(Gson.class), ambariMetaInfo);
 
BlueprintV2ResourceProvider.init(injector.getInstance(BlueprintV2DAO.class),
-  injector.getInstance(SecurityConfigurationFactory.class), 
ambariMetaInfo);
+injector.getInstance(SecurityConfigurationFactory.class),
+ambariMetaInfo,
+injector.getInstance(BlueprintV2Factory.class));
 StackDependencyResourceProvider.init(ambariMetaInfo);
 ClusterResourceProvider.init(injector.getInstance(TopologyManager.class),
 injector.getInstance(TopologyRequestFactoryImpl.class), 
injector.getInstance(SecurityConfigurationFactory
 .class), injector.getInstance(Gson.class));
 
HostResourceProvider.setTopologyManager(injector.getInstance(TopologyManager.class));
 BlueprintFactory.init(injector.getInstance(BlueprintDAO.class));
-BlueprintV2Factory.init(injector.getInstance(BlueprintV2DAO.class), 
injector.getInstance(RepositoryVersionDAO.class));
-
BaseClusterRequest.init(injector.getInstance(AmbariManagementController.class));
 AmbariContext.init(injector.getInstance(HostRoleCommandFactory.class));
 
 PermissionResourceProvider.init(injector.getInstance(PermissionDAO.class));
@@ -1074,10 +1072,10 @@ public class AmbariServer {
 
   public static void main(String[] args) throws Exception {
 logStartup();
-Injector injector = Guice.createInjector(new ControllerModule(), new 
AuditLoggerModule(), new LdapModule());
 
 AmbariServer server = null;
 try {
+  Injector injector = Guice.createInjector(new ControllerModule(), new 
AuditLoggerModule(), new LdapModule());
   LOG.info("Getting the controller");
 
   // check if this instance 

ambari git commit: AMBARI-22325 Fix dependency injection for BlueprintV2Factory (benyoka)

[benyoka]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-14714-blueprintv2 bcc0277aa -> 9c70083f8


AMBARI-22325 Fix dependency injection for BlueprintV2Factory (benyoka)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9c70083f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9c70083f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9c70083f

Branch: refs/heads/branch-feature-AMBARI-14714-blueprintv2
Commit: 9c70083f84244f3f44c5ff850d558ccc45521483
Parents: bcc0277
Author: Balazs Bence Sari 
Authored: Wed Dec 6 16:07:11 2017 +0100
Committer: Balazs Bence Sari 
Committed: Wed Dec 6 16:07:22 2017 +0100

--
 .../ambari/server/controller/AmbariServer.java  | 10 +++
 .../server/controller/ControllerModule.java |  4 ++-
 .../server/controller/StackV2Factory.java   | 29 +++
 .../AbstractControllerResourceProvider.java |  1 +
 .../controller/internal/BaseClusterRequest.java | 10 +++
 .../internal/BlueprintV2ResourceProvider.java   |  7 ++---
 .../server/topology/BlueprintFactory.java   |  5 ++--
 .../server/topology/BlueprintV2Factory.java | 30 +++-
 .../server/topology/BlueprintV2FactoryTest.java |  3 +-
 9 files changed, 42 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9c70083f/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 5b3d79e..89d66b9 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -62,7 +62,6 @@ import 
org.apache.ambari.server.configuration.ComponentSSLConfiguration;
 import org.apache.ambari.server.configuration.Configuration;
 import 
org.apache.ambari.server.controller.internal.AbstractControllerResourceProvider;
 import 
org.apache.ambari.server.controller.internal.AmbariPrivilegeResourceProvider;
-import org.apache.ambari.server.controller.internal.BaseClusterRequest;
 import org.apache.ambari.server.controller.internal.BlueprintResourceProvider;
 import 
org.apache.ambari.server.controller.internal.BlueprintV2ResourceProvider;
 import 
org.apache.ambari.server.controller.internal.ClusterPrivilegeResourceProvider;
@@ -91,7 +90,6 @@ import org.apache.ambari.server.orm.dao.MetainfoDAO;
 import org.apache.ambari.server.orm.dao.PermissionDAO;
 import org.apache.ambari.server.orm.dao.PrincipalDAO;
 import org.apache.ambari.server.orm.dao.PrivilegeDAO;
-import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
 import org.apache.ambari.server.orm.dao.ResourceDAO;
 import org.apache.ambari.server.orm.dao.UserDAO;
 import org.apache.ambari.server.orm.dao.ViewInstanceDAO;
@@ -928,15 +926,15 @@ public class AmbariServer {
 injector.getInstance(BlueprintDAO.class), 
injector.getInstance(SecurityConfigurationFactory.class),
 injector.getInstance(Gson.class), ambariMetaInfo);
 
BlueprintV2ResourceProvider.init(injector.getInstance(BlueprintV2DAO.class),
-  injector.getInstance(SecurityConfigurationFactory.class), 
ambariMetaInfo);
+injector.getInstance(SecurityConfigurationFactory.class),
+ambariMetaInfo,
+injector.getInstance(BlueprintV2Factory.class));
 StackDependencyResourceProvider.init(ambariMetaInfo);
 ClusterResourceProvider.init(injector.getInstance(TopologyManager.class),
 injector.getInstance(TopologyRequestFactoryImpl.class), 
injector.getInstance(SecurityConfigurationFactory
 .class), injector.getInstance(Gson.class));
 
HostResourceProvider.setTopologyManager(injector.getInstance(TopologyManager.class));
 BlueprintFactory.init(injector.getInstance(BlueprintDAO.class));
-BlueprintV2Factory.init(injector.getInstance(BlueprintV2DAO.class), 
injector.getInstance(RepositoryVersionDAO.class));
-
BaseClusterRequest.init(injector.getInstance(AmbariManagementController.class));
 AmbariContext.init(injector.getInstance(HostRoleCommandFactory.class));
 
 PermissionResourceProvider.init(injector.getInstance(PermissionDAO.class));
@@ -1074,10 +1072,10 @@ public class AmbariServer {
 
   public static void main(String[] args) throws Exception {
 logStartup();
-Injector injector = Guice.createInjector(new ControllerModule(), new 
AuditLoggerModule(), new LdapModule());
 
 AmbariServer server = null;
 try {
+  Injector injector = Guice.createInjector(new ControllerModule(), new