You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2015/03/27 18:03:13 UTC
ambari git commit: AMBARI-10241. API to get theme resources for
several services by one request. (mpapyrkovskyy)
Repository: ambari
Updated Branches:
refs/heads/trunk 250c24399 -> fd9649dd0
AMBARI-10241. API to get theme resources for several services by one request. (mpapyrkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fd9649dd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fd9649dd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fd9649dd
Branch: refs/heads/trunk
Commit: fd9649dd0083380b659894a79e486acfe0f4e0a3
Parents: 250c243
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Fri Mar 27 17:26:44 2015 +0200
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Fri Mar 27 19:03:15 2015 +0200
----------------------------------------------------------------------
.../server/api/resources/StackServiceResourceDefinition.java | 1 +
.../api/resources/StackServiceResourceDefinitionTest.java | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fd9649dd/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinition.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinition.java
index 8a40a65..45302ff 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinition.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinition.java
@@ -51,6 +51,7 @@ public class StackServiceResourceDefinition extends BaseResourceDefinition {
setChildren.add(new SubResourceDefinition(Resource.Type.StackConfiguration));
setChildren.add(new SubResourceDefinition(Resource.Type.StackServiceComponent));
setChildren.add(new SubResourceDefinition(Type.StackArtifact));
+ setChildren.add(new SubResourceDefinition(Resource.Type.Theme));
return setChildren;
http://git-wip-us.apache.org/repos/asf/ambari/blob/fd9649dd/ambari-server/src/test/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinitionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinitionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinitionTest.java
index 1b12738..65f54d5 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinitionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinitionTest.java
@@ -42,11 +42,12 @@ public class StackServiceResourceDefinitionTest {
ResourceDefinition def = new StackServiceResourceDefinition();
Set<SubResourceDefinition> subResources = def.getSubResourceDefinitions();
- assertEquals(3, subResources.size());
+ assertEquals(4, subResources.size());
boolean configReturned = false;
boolean componentReturned = false;
boolean artifactReturned = false;
+ boolean themesReturned = false;
for (SubResourceDefinition subResource : subResources) {
Resource.Type type = subResource.getType();
@@ -56,10 +57,14 @@ public class StackServiceResourceDefinitionTest {
componentReturned = true;
} else if (type.equals(Resource.Type.StackArtifact)) {
artifactReturned = true;
+ } else if (type.equals(Resource.Type.Theme)) {
+ themesReturned = true;
}
}
+
assertTrue(configReturned);
assertTrue(componentReturned);
assertTrue(artifactReturned);
+ assertTrue(themesReturned);
}
}