[AMBARI-22875] Use mpacks specified in cluster creation request

ambari-project/pom.xml

@@ -485,6 +485,13 @@
         <artifactId>swagger-maven-plugin</artifactId>
         <version>${swagger.maven.plugin.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.inferred</groupId>
+        <artifactId>freebuilder</artifactId>
+        <version>1.14.8</version>
+        <optional>true</optional>
+        <scope>provided</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>

ambari-server/pom.xml

@@ -1644,6 +1644,10 @@
       <version>0.1.10</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.inferred</groupId>
+      <artifactId>freebuilder</artifactId>
+    </dependency>
   </dependencies>
 
   <pluginRepositories>

ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java

@@ -197,7 +197,7 @@ private Resource createBlueprintResource(TreeNode<Resource> clusterNode) {
     BlueprintConfigurationProcessor configProcessor = new BlueprintConfigurationProcessor(topology);
     configProcessor.doUpdateForBlueprintExport();
 
-    Set<StackId> stackIds = topology.getBlueprint().getStackIds();
+    Set<StackId> stackIds = topology.getStackIds();
     if (stackIds.size() == 1) {
       StackId stackId = Iterables.getOnlyElement(stackIds);
       blueprintResource.setProperty("Blueprints/stack_name", stackId.getStackName());
@@ -210,8 +210,7 @@ private Resource createBlueprintResource(TreeNode<Resource> clusterNode) {
 
       try {
         String clusterName = topology.getAmbariContext().getClusterName(topology.getClusterId());
-        Map<String, Object> kerberosDescriptor = getKerberosDescriptor(topology.getAmbariContext()
-          .getClusterController(), clusterName);
+        Map<String, Object> kerberosDescriptor = getKerberosDescriptor(AmbariContext.getClusterController(), clusterName);
         if (kerberosDescriptor != null) {
           securityConfigMap.put(SecurityConfigurationFactory.KERBEROS_DESCRIPTOR_PROPERTY_ID, kerberosDescriptor);
         }

ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java

@@ -719,13 +719,20 @@ public Collection<StackInfo> getStacks(String stackName) throws AmbariException
    * @param stackId
    *            the stack id
    * @return  the stack info
-   * @throws AmbariException
    */
-  public StackInfo getStack(StackId stackId) throws AmbariException {
+  public StackInfo getStack(StackId stackId) throws StackAccessException {
     return getStack(stackId.getStackName(), stackId.getStackVersion());
   }
 
-  public StackInfo getStack(String stackName, String version) throws AmbariException {
+  public boolean isKnownStack(StackId stackId) {
+    try {
+      return getStack(stackId) != null;
+    } catch (StackAccessException e) {
+      return false;
+    }
+  }
+
+  public StackInfo getStack(String stackName, String version) throws StackAccessException {
     StackInfo stackInfoResult = stackManager.getStack(stackName, version);
 
     if (stackInfoResult == null) {

ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessor.java

@@ -31,7 +31,6 @@
 import org.apache.ambari.server.state.StackId;
 import org.apache.ambari.server.state.ValueAttributesInfo;
 import org.apache.ambari.server.topology.AdvisedConfiguration;
-import org.apache.ambari.server.topology.Blueprint;
 import org.apache.ambari.server.topology.ClusterTopology;
 import org.apache.ambari.server.topology.ConfigRecommendationStrategy;
 import org.apache.ambari.server.topology.HostGroup;
@@ -76,7 +75,7 @@ public static void init(StackAdvisorHelper instance) {
    * @param userProvidedConfigurations User configurations of cluster provided in Blueprint + Cluster template
    */
   public void adviseConfiguration(ClusterTopology clusterTopology, Map<String, Map<String, String>> userProvidedConfigurations) throws ConfigurationTopologyException {
-    for (StackId stackId : clusterTopology.getBlueprint().getStackIds()) {
+    for (StackId stackId : clusterTopology.getStackIds()) {
       StackAdvisorRequest request = createStackAdvisorRequest(clusterTopology, stackId, StackAdvisorRequestType.CONFIGURATIONS);
       try {
         RecommendationResponse response = stackAdvisorHelper.recommend(request);
@@ -96,7 +95,7 @@ private StackAdvisorRequest createStackAdvisorRequest(ClusterTopology clusterTop
             hgHostsMap);
     return StackAdvisorRequest.StackAdvisorRequestBuilder
       .forStack(stackId)
-      .forServices(clusterTopology.getBlueprint().getStack().getServices(stackId))
+      .forServices(clusterTopology.getStack().getServices(stackId))
       .forHosts(gatherHosts(clusterTopology))
       .forHostsGroupBindings(gatherHostGroupBindings(clusterTopology))
       .forHostComponents(gatherHostGroupComponents(clusterTopology))
@@ -176,12 +175,11 @@ private void addAdvisedConfigurationsToTopology(RecommendationResponse response,
 
     Map<String, BlueprintConfigurations> recommendedConfigurations =
       response.getRecommendations().getBlueprint().getConfigurations();
-    Blueprint blueprint = topology.getBlueprint();
 
     for (Map.Entry<String, BlueprintConfigurations> configEntry : recommendedConfigurations.entrySet()) {
       String configType = configEntry.getKey();
       // add recommended config type only if related service is present in Blueprint
-      if (blueprint.isValidConfigType(configType)) {
+      if (topology.isValidConfigType(configType)) {
         BlueprintConfigurations blueprintConfig = filterBlueprintConfig(configType, configEntry.getValue(),
                 userProvidedConfigurations, topology);
         topology.getAdvisedConfigurations().put(configType, new AdvisedConfiguration(

ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java

@@ -81,7 +81,6 @@
 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.ClusterDAO;
 import org.apache.ambari.server.orm.dao.GroupDAO;
 import org.apache.ambari.server.orm.dao.MetainfoDAO;
@@ -948,7 +947,6 @@ public void performStaticInjection() {
         injector.getInstance(TopologyRequestFactoryImpl.class), injector.getInstance(SecurityConfigurationFactory
             .class), injector.getInstance(Gson.class));
     HostResourceProvider.setTopologyManager(injector.getInstance(TopologyManager.class));
-    BlueprintFactory.init(injector.getInstance(BlueprintDAO.class));
     BaseClusterRequest.init(injector.getInstance(BlueprintFactory.class));
     AmbariContext.init(injector.getInstance(HostRoleCommandFactory.class));
 

ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java

@@ -169,12 +169,16 @@
 import org.apache.ambari.server.state.stack.OsFamily;
 import org.apache.ambari.server.state.svccomphost.ServiceComponentHostImpl;
 import org.apache.ambari.server.topology.BlueprintFactory;
-import org.apache.ambari.server.topology.BlueprintValidator;
-import org.apache.ambari.server.topology.BlueprintValidatorImpl;
+import org.apache.ambari.server.topology.ComponentResolver;
+import org.apache.ambari.server.topology.DefaultStackFactory;
 import org.apache.ambari.server.topology.PersistedState;
 import org.apache.ambari.server.topology.PersistedStateImpl;
 import org.apache.ambari.server.topology.SecurityConfigurationFactory;
+import org.apache.ambari.server.topology.StackComponentResolver;
+import org.apache.ambari.server.topology.StackFactory;
 import org.apache.ambari.server.topology.tasks.ConfigureClusterTaskFactory;
+import org.apache.ambari.server.topology.validators.BasicBlueprintValidator;
+import org.apache.ambari.server.topology.validators.BlueprintValidator;
 import org.apache.ambari.server.utils.PasswordUtils;
 import org.apache.ambari.server.view.ViewInstanceHandlerList;
 import org.eclipse.jetty.server.SessionIdManager;
@@ -414,6 +418,7 @@ protected void configure() {
     bind(SecurityConfigurationFactory.class).in(Scopes.SINGLETON);
 
     bind(PersistedState.class).to(PersistedStateImpl.class);
+    bind(ComponentResolver.class).to(StackComponentResolver.class);
 
     // factory to create LoggingRequestHelper instances for LogSearch integration
     bind(LoggingRequestHelperFactory.class).to(LoggingRequestHelperFactoryImpl.class);
@@ -541,7 +546,8 @@ private void installFactories() {
     bind(RegistryFactory.class).to(RegistryFactoryImpl.class);
     bind(HostRoleCommandFactory.class).to(HostRoleCommandFactoryImpl.class);
     bind(SecurityHelper.class).toInstance(SecurityHelperImpl.getInstance());
-    bind(BlueprintValidator.class).to(BlueprintValidatorImpl.class);
+    bind(BlueprintValidator.class).to(BasicBlueprintValidator.class);
+    bind(StackFactory.class).to(DefaultStackFactory.class);
     bind(BlueprintFactory.class);
 
     install(new FactoryModuleBuilder().implement(AmbariEvent.class, Names.named("userCreated"), UserCreatedEvent.class).build(AmbariEventFactory.class));

ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentRequest.java

@@ -19,6 +19,8 @@
 package org.apache.ambari.server.controller;
 
 
+import java.util.Objects;
+
 public class ServiceComponentRequest {
 
   private String clusterName; // REF
@@ -145,4 +147,29 @@ public String toString() {
       "desiredState=%s, recoveryEnabled=%s, componentCategory=%s]", clusterName, serviceGroupName,
       serviceName, clusterName, desiredState, recoveryEnabled, componentCategory);
   }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
+    }
+
+    ServiceComponentRequest other = (ServiceComponentRequest) obj;
+
+    return Objects.equals(clusterName, other.clusterName) &&
+      Objects.equals(serviceGroupName, other.serviceGroupName) &&
+      Objects.equals(serviceName, other.serviceName) &&
+      Objects.equals(componentCategory, other.componentCategory) &&
+      Objects.equals(componentName, other.componentName) &&
+      Objects.equals(desiredState, other.desiredState) &&
+      Objects.equals(recoveryEnabled, other.recoveryEnabled);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(clusterName, serviceGroupName, serviceName, componentCategory, componentName, desiredState, recoveryEnabled);
+  }
 }

ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java

@@ -17,6 +17,8 @@
  */
 package org.apache.ambari.server.controller;
 
+import java.util.Objects;
+
 import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
 import org.apache.ambari.server.state.StackId;
 
@@ -196,4 +198,32 @@ public String toString() {
   public void setResolvedRepository(RepositoryVersionEntity repositoryVersion) { resolvedRepository = repositoryVersion; }
 
   public RepositoryVersionEntity getResolvedRepository() { return resolvedRepository; }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
+    }
+
+    ServiceRequest other = (ServiceRequest) obj;
+
+    return Objects.equals(clusterName, other.clusterName) &&
+      Objects.equals(serviceGroupName, other.serviceGroupName) &&
+      Objects.equals(serviceType, other.serviceType) &&
+      Objects.equals(serviceName, other.serviceName) &&
+      Objects.equals(desiredState, other.desiredState) &&
+      Objects.equals(maintenanceState, other.maintenanceState) &&
+      Objects.equals(credentialStoreEnabled, other.credentialStoreEnabled) &&
+      Objects.equals(credentialStoreSupported, other.credentialStoreSupported) &&
+      Objects.equals(desiredStackId, other.desiredStackId) &&
+      Objects.equals(desiredRepositoryVersionId, other.desiredRepositoryVersionId);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(clusterName, serviceGroupName, serviceType, serviceName, desiredState, maintenanceState, credentialStoreEnabled, credentialStoreSupported, desiredStackId, desiredRepositoryVersionId);
+  }
 }