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:50 UTC
[ambari] 19/20: [AMBARI-23223] Review comments
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 fab74c2c5410aea5985e34b24155a9e75d5f80b8
Author: Madhuvanthi Radhakrishnan <mr...@hortonworks.com>
AuthorDate: Fri Mar 16 12:34:16 2018 -0700
[AMBARI-23223] Review comments
---
.../controller/internal/MpackResourceProvider.java | 45 +++++++++-------------
1 file changed, 19 insertions(+), 26 deletions(-)
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 110e0a2..ba52639 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
@@ -235,17 +235,9 @@ public class MpackResourceProvider extends AbstractControllerResourceProvider {
if (null == responses) {
responses = Collections.emptySet();
}
- for (MpackResponse response : responses){
- Resource resource = new ResourceImpl(Resource.Type.Mpack);
- resource.setProperty(MPACK_RESOURCE_ID, response.getId());
- resource.setProperty(MPACK_ID, response.getMpackId());
- resource.setProperty(MPACK_NAME, response.getMpackName());
- resource.setProperty(MPACK_VERSION, response.getMpackVersion());
- resource.setProperty(MPACK_URI, response.getMpackUri());
- resource.setProperty(MPACK_DESCRIPTION, response.getDescription());
- resource.setProperty(REGISTRY_ID, response.getRegistryId());
- resource.setProperty(MPACK_DISPLAY_NAME, response.getDisplayName());
+ for (MpackResponse response : responses) {
+ Resource resource = setResources(response);
results.add(resource);
}
} else {
@@ -257,15 +249,9 @@ public class MpackResourceProvider extends AbstractControllerResourceProvider {
mpackId = Long.valueOf((String) objMpackId);
}
MpackResponse response = getManagementController().getMpack(mpackId);
- Resource resource = new ResourceImpl(Resource.Type.Mpack);
+
if (null != response) {
- resource.setProperty(MPACK_RESOURCE_ID, response.getId());
- resource.setProperty(MPACK_ID, response.getMpackId());
- resource.setProperty(MPACK_NAME, response.getMpackName());
- resource.setProperty(MPACK_VERSION, response.getMpackVersion());
- resource.setProperty(MPACK_URI, response.getMpackUri());
- resource.setProperty(MPACK_DESCRIPTION, response.getDescription());
- resource.setProperty(REGISTRY_ID, response.getRegistryId());
+ Resource resource = setResources(response);
List<Module> modules = getManagementController().getModules(response.getId());
resource.setProperty(MODULES, modules);
results.add(resource);
@@ -278,15 +264,9 @@ public class MpackResourceProvider extends AbstractControllerResourceProvider {
StackEntity stackEntity = stackDAO.find(stackName, stackVersion);
mpackId = stackEntity.getMpackId();
MpackResponse response = getManagementController().getMpack(mpackId);
- Resource resource = new ResourceImpl(Resource.Type.Mpack);
+
if (null != response) {
- resource.setProperty(MPACK_RESOURCE_ID, response.getId());
- resource.setProperty(MPACK_ID, response.getMpackId());
- resource.setProperty(MPACK_NAME, response.getMpackName());
- resource.setProperty(MPACK_VERSION, response.getMpackVersion());
- resource.setProperty(MPACK_URI, response.getMpackUri());
- resource.setProperty(MPACK_DESCRIPTION, response.getDescription());
- resource.setProperty(REGISTRY_ID, response.getRegistryId());
+ Resource resource = setResources(response);
resource.setProperty(STACK_NAME_PROPERTY_ID, stackName);
resource.setProperty(STACK_VERSION_PROPERTY_ID, stackVersion);
results.add(resource);
@@ -324,6 +304,19 @@ public class MpackResourceProvider extends AbstractControllerResourceProvider {
return results;
}
+ private Resource setResources(MpackResponse response) {
+ Resource resource = new ResourceImpl(Resource.Type.Mpack);
+ resource.setProperty(MPACK_RESOURCE_ID, response.getId());
+ resource.setProperty(MPACK_ID, response.getMpackId());
+ resource.setProperty(MPACK_NAME, response.getMpackName());
+ resource.setProperty(MPACK_VERSION, response.getMpackVersion());
+ resource.setProperty(MPACK_URI, response.getMpackUri());
+ resource.setProperty(MPACK_DESCRIPTION, response.getDescription());
+ resource.setProperty(REGISTRY_ID, response.getRegistryId());
+ resource.setProperty(MPACK_DISPLAY_NAME, response.getDisplayName());
+ return resource;
+ }
+
@Override
protected RequestStatus deleteResourcesAuthorized(final Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {