Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-14714 d8406d0be -> 93a6dbf94
AMBARI-22325 Blueprint Service uses Blueprint V2 resource provider (benyoka) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/93a6dbf9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/93a6dbf9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/93a6dbf9 Branch: refs/heads/branch-feature-AMBARI-14714 Commit: 93a6dbf94f9016a101550df20fc9ec4bab1756b3 Parents: 36013fe Author: Balazs Bence Sari <beny...@apache.org> Authored: Fri Oct 27 14:44:37 2017 +0200 Committer: Balazs Bence Sari <beny...@apache.org> Committed: Fri Oct 27 14:45:44 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/controller/AmbariServer.java | 5 +++++ .../controller/internal/AbstractControllerResourceProvider.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/93a6dbf9/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 afe5647..e2553cb 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 @@ -64,6 +64,7 @@ import org.apache.ambari.server.controller.internal.AbstractControllerResourcePr 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; import org.apache.ambari.server.controller.internal.ClusterResourceProvider; import org.apache.ambari.server.controller.internal.HostResourceProvider; @@ -82,6 +83,7 @@ import org.apache.ambari.server.metrics.system.MetricsService; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.PersistenceType; import org.apache.ambari.server.orm.dao.BlueprintDAO; +import org.apache.ambari.server.orm.dao.BlueprintV2DAO; import org.apache.ambari.server.orm.dao.ClusterDAO; import org.apache.ambari.server.orm.dao.GroupDAO; import org.apache.ambari.server.orm.dao.MetainfoDAO; @@ -921,6 +923,9 @@ public class AmbariServer { BlueprintResourceProvider.init(injector.getInstance(BlueprintFactory.class), injector.getInstance(BlueprintDAO.class), injector.getInstance(SecurityConfigurationFactory.class), injector.getInstance(Gson.class), ambariMetaInfo); + BlueprintV2ResourceProvider.init(injector.getInstance(BlueprintV2Factory.class), + injector.getInstance(BlueprintV2DAO.class), injector.getInstance(SecurityConfigurationFactory.class), + ambariMetaInfo); StackDependencyResourceProvider.init(ambariMetaInfo); ClusterResourceProvider.init(injector.getInstance(TopologyManager.class), injector.getInstance(TopologyRequestFactoryImpl.class), injector.getInstance(SecurityConfigurationFactory http://git-wip-us.apache.org/repos/asf/ambari/blob/93a6dbf9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java index afca803..4ffd8d1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java @@ -233,7 +233,7 @@ public abstract class AbstractControllerResourceProvider extends AbstractAuthori case HostComponentProcess: return new HostComponentProcessResourceProvider(propertyIds, keyPropertyIds, managementController); case Blueprint: - return new BlueprintResourceProvider(propertyIds, keyPropertyIds, managementController); + return new BlueprintV2ResourceProvider(propertyIds, keyPropertyIds, managementController); case KerberosDescriptor: return resourceProviderFactory.getKerberosDescriptorResourceProvider(managementController, propertyIds, keyPropertyIds); case Recommendation:
