You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2015/12/11 15:27:05 UTC
svn commit: r1719429 - in /sling/trunk/bundles/commons/resourcebuilder/src:
main/java/org/apache/sling/resourcebuilder/api/
main/java/org/apache/sling/resourcebuilder/impl/
test/java/org/apache/sling/resourcebuilder/impl/
Author: bdelacretaz
Date: Fri Dec 11 14:27:05 2015
New Revision: 1719429
URL: http://svn.apache.org/viewvc?rev=1719429&view=rev
Log:
SLING-5356 - resetParent now implies hierarchyMode, seems more natural
Modified:
sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java
sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java
sling/trunk/bundles/commons/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java
Modified: sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java?rev=1719429&r1=1719428&r2=1719429&view=diff
==============================================================================
--- sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java (original)
+++ sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java Fri Dec 11 14:27:05 2015
@@ -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
Modified: sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java?rev=1719429&r1=1719428&r2=1719429&view=diff
==============================================================================
--- sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java (original)
+++ sling/trunk/bundles/commons/resourcebuilder/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java Fri Dec 11 14:27:05 2015
@@ -57,7 +57,6 @@ public class ResourceBuilderImpl impleme
resourceResolver = originalParent.getResourceResolver();
withIntermediatePrimaryType(null);
resetParent();
- hierarchyMode();
}
@Override
@@ -68,6 +67,7 @@ public class ResourceBuilderImpl impleme
@Override
public ResourceBuilder resetParent() {
currentParent = originalParent;
+ hierarchyMode();
return this;
}
Modified: sling/trunk/bundles/commons/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java?rev=1719429&r1=1719428&r2=1719429&view=diff
==============================================================================
--- sling/trunk/bundles/commons/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java (original)
+++ sling/trunk/bundles/commons/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java Fri Dec 11 14:27:05 2015
@@ -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()