You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mr...@apache.org on 2018/09/28 21:20:43 UTC
[ambari] 12/20: AMBARI-22283 : Add stack name and version to mpack
API (mradhakrishnan)
This is an automated email from the ASF dual-hosted git repository.
mradhakrishnan pushed a commit to branch AMBARI-24711
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 562e52bde1d7a85acec5be10eb4419997fa42e76
Author: Madhuvanthi Radhakrishnan <mr...@hortonworks.com>
AuthorDate: Tue Oct 24 14:44:07 2017 -0700
AMBARI-22283 : Add stack name and version to mpack API (mradhakrishnan)
---
.../server/api/resources/StackVersionResourceDefinition.java | 1 +
.../server/controller/internal/MpackResourceProvider.java | 10 ----------
.../controller/internal/StackVersionResourceProvider.java | 5 +----
3 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackVersionResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackVersionResourceDefinition.java
index b0786e1..d621210 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackVersionResourceDefinition.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackVersionResourceDefinition.java
@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.ambari.server.api.services.Request;
import org.apache.ambari.server.api.util.TreeNode;
import org.apache.ambari.server.controller.internal.ResourceImpl;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java
index 8e1dbf5..11fe3a8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java
@@ -142,16 +142,12 @@ public class MpackResourceProvider extends AbstractControllerResourceProvider {
MpackResponse response = getManagementController().registerMpack(mpackRequest);
if (response != null) {
notifyCreate(Resource.Type.Mpack, request);
- String[] stackNameVersion = response.getStackId().split("-");
Resource resource = new ResourceImpl(Resource.Type.Mpack);
resource.setProperty(MPACK_ID, response.getMpackId());
resource.setProperty(REGISTRY_ID, response.getRegistryId());
resource.setProperty(MPACK_NAME, response.getMpackName());
resource.setProperty(MPACK_VERSION, response.getMpackVersion());
resource.setProperty(MPACK_URI, response.getMpackUri());
- resource.setProperty(STACK_NAME_PROPERTY_ID, stackNameVersion[0]);
- resource.setProperty(STACK_VERSION_PROPERTY_ID, stackNameVersion[1]);
-
associatedResources.add(resource);
return getRequestStatus(null, associatedResources);
}
@@ -236,9 +232,6 @@ public class MpackResourceProvider extends AbstractControllerResourceProvider {
resource.setProperty(MPACK_VERSION, entity.getMpackVersion());
resource.setProperty(MPACK_URI, entity.getMpackUri());
resource.setProperty(REGISTRY_ID, entity.getRegistryId());
- StackEntity stackEntity = stackDAO.findByMpack(entity.getMpackId());
- resource.setProperty(STACK_NAME_PROPERTY_ID, stackEntity.getStackName());
- resource.setProperty(STACK_VERSION_PROPERTY_ID, stackEntity.getStackVersion());
results.add(resource);
}
} else {
@@ -277,9 +270,6 @@ public class MpackResourceProvider extends AbstractControllerResourceProvider {
resource.setProperty(MPACK_VERSION, entity.getMpackVersion());
resource.setProperty(MPACK_URI, entity.getMpackUri());
resource.setProperty(REGISTRY_ID, entity.getRegistryId());
- StackEntity stackEntity = stackDAO.findByMpack(entity.getMpackId());
- resource.setProperty(STACK_NAME_PROPERTY_ID, stackEntity.getStackName());
- resource.setProperty(STACK_VERSION_PROPERTY_ID, stackEntity.getStackVersion());
List<Packlet> packlets = getManagementController().getPacklets(entity.getMpackId());
resource.setProperty(PACKLETS, packlets);
results.add(resource);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
index 86a994a..d1e8a42 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
@@ -45,9 +45,6 @@ import org.apache.ambari.server.orm.entities.StackEntity;
import com.google.inject.Inject;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
-
@StaticallyInject
public class StackVersionResourceProvider extends ReadOnlyResourceProvider {
public static final String RESPONSE_KEY = "Versions";
@@ -70,7 +67,6 @@ public class StackVersionResourceProvider extends ReadOnlyResourceProvider {
@Inject
protected static StackDAO stackDAO;
-
private static Set<String> pkPropertyIds = new HashSet<>(
Arrays.asList(new String[]{STACK_NAME_PROPERTY_ID, STACK_VERSION_PROPERTY_ID, MPACK_ID}));
@@ -103,6 +99,7 @@ public class StackVersionResourceProvider extends ReadOnlyResourceProvider {
StackVersionResourceProvider(AmbariManagementController controller) {
super(Resource.Type.StackVersion, PROPERTY_IDS, KEY_PROPERTY_IDS, controller);
+
}