This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.resourcebuilder-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcebuilder.git
commit 787fde474bbd50152eb6cdafd9e399a1d721bfc3 Author: Bertrand Delacretaz <[email protected]> AuthorDate: Fri Dec 11 14:27:05 2015 +0000 SLING-5356 - resetParent now implies hierarchyMode, seems more natural git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/resourcebuilder@1719429 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/sling/resourcebuilder/api/ResourceBuilder.java | 3 ++- .../sling/resourcebuilder/impl/ResourceBuilderImpl.java | 2 +- .../resourcebuilder/impl/ResourceBuilderImplTest.java | 15 +++++++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java b/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java index cd54db4..5ace56e 100644 --- a/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java +++ b/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java @@ -80,6 +80,7 @@ public interface ResourceBuilder { /** Return the current parent resource */ Resource getCurrentParent(); - /** Reset the current parent Resource to the original one */ + /** Reset the current parent Resource to the original one. + * Also activates hierarchyMode which is the default mode. */ ResourceBuilder resetParent(); } \ No newline at end of file diff --git a/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java b/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java index 58a6aaf..0abd07d 100644 --- a/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java +++ b/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java @@ -57,7 +57,6 @@ public class ResourceBuilderImpl implements ResourceBuilder { resourceResolver = originalParent.getResourceResolver(); withIntermediatePrimaryType(null); resetParent(); - hierarchyMode(); } @Override @@ -68,6 +67,7 @@ public class ResourceBuilderImpl implements ResourceBuilder { @Override public ResourceBuilder resetParent() { currentParent = originalParent; + hierarchyMode(); return this; } diff --git a/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java b/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java index 5758259..b054a2e 100644 --- a/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java +++ b/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java @@ -141,12 +141,24 @@ public class ResourceBuilderImplTest { public void resetParent() throws Exception { getBuilder(testRootPath) .resource("a/b/c") - .resetParent() + .siblingsMode() + .resource("one") + .resource("two") + .resetParent() // also sets hierarchyMode .resource("d/e") + .resource("f/g") + .siblingsMode() + .resource("three") + .resource("four") .commit(); A.assertResource("a/b/c"); + A.assertResource("a/b/c/one"); + A.assertResource("a/b/c/two"); A.assertResource("d/e"); + A.assertResource("d/e/f/g"); + A.assertResource("d/e/f/g/three"); + A.assertResource("d/e/f/g/four"); } @Test @@ -207,7 +219,6 @@ public class ResourceBuilderImplTest { .file("models.js", getClass().getResourceAsStream("/files/models.js"), "MT1", 42) .file("text.html", getClass().getResourceAsStream("/files/text.html"), "MT2", 43) .resetParent() - .hierarchyMode() .resource("apps") .file("myapp.json", getClass().getResourceAsStream("/files/myapp.json"), "MT3", 44) .resetParent() -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
