Repository: incubator-slider Updated Branches: refs/heads/develop 1a3fb79d5 -> cf00b9a5d
SLIDER-964 AggregateConfResource exports appconf under internal/ Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0fce42fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0fce42fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0fce42fb Branch: refs/heads/develop Commit: 0fce42fb7a6de4c4e9139e439fd304efd4b595df Parents: ca43d1b Author: Steve Loughran <[email protected]> Authored: Fri Nov 6 14:08:47 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Fri Nov 6 14:08:47 2015 +0000 ---------------------------------------------------------------------- .../resources/AggregateConfResource.java | 2 +- .../management/TestAMManagementWebServices.java | 20 +++++++++++++++++--- .../core/conf/examples/app_configuration.json | 4 +++- .../core/conf/examples/internal-resolved.json | 2 +- .../slider/core/conf/examples/internal.json | 2 +- .../slider/core/conf/examples/resources.json | 2 +- 6 files changed, 24 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0fce42fb/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/management/resources/AggregateConfResource.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/management/resources/AggregateConfResource.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/management/resources/AggregateConfResource.java index ebffd1a..794daf9 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/management/resources/AggregateConfResource.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/management/resources/AggregateConfResource.java @@ -38,7 +38,7 @@ public class AggregateConfResource { public AggregateConfResource(AggregateConf conf, UriBuilder uriBuilder) { if (uriBuilder != null) { this.href = uriBuilder.build().toASCIIString(); - resources = ResourceFactory.createConfTreeResource(conf.getAppConf(), + resources = ResourceFactory.createConfTreeResource(conf.getResources(), uriBuilder.clone().path("configurations").path("resources")); internal = ResourceFactory.createConfTreeResource(conf.getInternal(), uriBuilder.clone().path("configurations").path("internal")); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0fce42fb/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java ---------------------------------------------------------------------- diff --git a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java index 44eb692..49ad71a 100644 --- a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java +++ b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/management/TestAMManagementWebServices.java @@ -66,6 +66,7 @@ import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; public class TestAMManagementWebServices extends JerseyTest { protected static final Logger log = @@ -215,9 +216,19 @@ public class TestAMManagementWebServices extends JerseyTest { assertEquals("wrong href", "http://localhost:9998/slideram/ws/v1/slider/mgmt/app/configurations/internal";, json.getHref()); - assertEquals("wrong description", - "Internal configuration DO NOT EDIT", - json.getMetadata().get("description")); + + assertDescriptionContains("org/apache/slider/core/conf/examples/internal.json", json); + } + + private void assertDescriptionContains(String expected, ConfTreeResource json) { + + Map<String, Object> metadata = json.getMetadata(); + assertNotNull("No metadata", metadata); + Object actual = metadata.get("description"); + assertNotNull("No description", actual); + + assertTrue(String.format("Did not find \"%s\" in \"%s\"", expected, actual), + actual.toString().contains(expected)); } @Test @@ -239,6 +250,7 @@ public class TestAMManagementWebServices extends JerseyTest { assertNotNull("no components", components); assertEquals("incorrect number of components", 2, components.size()); assertNotNull("wrong component", components.get("worker")); + assertDescriptionContains("org/apache/slider/core/conf/examples/resources.json", json); } @Test @@ -259,5 +271,7 @@ public class TestAMManagementWebServices extends JerseyTest { assertNotNull("no components", components); assertEquals("incorrect number of components", 2, components.size()); assertNotNull("wrong component", components.get("worker")); + assertDescriptionContains("org/apache/slider/core/conf/examples/app_configuration.json", json); + } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0fce42fb/slider-core/src/test/resources/org/apache/slider/core/conf/examples/app_configuration.json ---------------------------------------------------------------------- diff --git a/slider-core/src/test/resources/org/apache/slider/core/conf/examples/app_configuration.json b/slider-core/src/test/resources/org/apache/slider/core/conf/examples/app_configuration.json index 489acda..5690225 100644 --- a/slider-core/src/test/resources/org/apache/slider/core/conf/examples/app_configuration.json +++ b/slider-core/src/test/resources/org/apache/slider/core/conf/examples/app_configuration.json @@ -1,6 +1,8 @@ { "schema": "http://example.org/specification/v2.0.0";, - + "metadata": { + "description": "org/apache/slider/core/conf/examples/app_configuration.json" + }, "global": { "zookeeper.port": "2181", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0fce42fb/slider-core/src/test/resources/org/apache/slider/core/conf/examples/internal-resolved.json ---------------------------------------------------------------------- diff --git a/slider-core/src/test/resources/org/apache/slider/core/conf/examples/internal-resolved.json b/slider-core/src/test/resources/org/apache/slider/core/conf/examples/internal-resolved.json index 592b4dc..da53b94 100644 --- a/slider-core/src/test/resources/org/apache/slider/core/conf/examples/internal-resolved.json +++ b/slider-core/src/test/resources/org/apache/slider/core/conf/examples/internal-resolved.json @@ -2,7 +2,7 @@ "schema": "http://example.org/specification/v2.0.0";, "metadata": { - "description": "Internal configuration DO NOT EDIT" + "description": "Internal resolved - org/apache/slider/core/conf/examples/internal-resolved.json" }, "global": { "application.name": "small_cluster", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0fce42fb/slider-core/src/test/resources/org/apache/slider/core/conf/examples/internal.json ---------------------------------------------------------------------- diff --git a/slider-core/src/test/resources/org/apache/slider/core/conf/examples/internal.json b/slider-core/src/test/resources/org/apache/slider/core/conf/examples/internal.json index 4c782fb..b628d10 100644 --- a/slider-core/src/test/resources/org/apache/slider/core/conf/examples/internal.json +++ b/slider-core/src/test/resources/org/apache/slider/core/conf/examples/internal.json @@ -2,7 +2,7 @@ "schema": "http://example.org/specification/v2.0.0";, "metadata": { - "description": "Internal configuration DO NOT EDIT" + "description": "Internal unresolved - org/apache/slider/core/conf/examples/internal.json" }, "global": { "application.name": "small_cluster", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0fce42fb/slider-core/src/test/resources/org/apache/slider/core/conf/examples/resources.json ---------------------------------------------------------------------- diff --git a/slider-core/src/test/resources/org/apache/slider/core/conf/examples/resources.json b/slider-core/src/test/resources/org/apache/slider/core/conf/examples/resources.json index 9d1e916..206424d 100644 --- a/slider-core/src/test/resources/org/apache/slider/core/conf/examples/resources.json +++ b/slider-core/src/test/resources/org/apache/slider/core/conf/examples/resources.json @@ -2,7 +2,7 @@ "schema": "http://example.org/specification/v2.0.0";, "metadata": { - "description": "example of a resources file" + "description": "example of a resources file: org/apache/slider/core/conf/examples/resources.json" }, "global": {
