You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:58:24 UTC
[sling-org-apache-sling-resourcebuilder] 15/36: SLING-5356 - better
name for atParent() method
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 5fd3322a82c879710f465e671a27cd2b3afa92e4
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Dec 14 12:17:34 2015 +0000
SLING-5356 - better name for atParent() method
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/resourcebuilder@1719887 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/resourcebuilder/api/ResourceBuilder.java | 2 +-
.../apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java | 4 ++--
.../sling/resourcebuilder/impl/ResourceBuilderImplTest.java | 8 ++++----
3 files changed, 7 insertions(+), 7 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 bc6b46d..0d73fcc 100644
--- a/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java
+++ b/src/main/java/org/apache/sling/resourcebuilder/api/ResourceBuilder.java
@@ -86,5 +86,5 @@ public interface ResourceBuilder {
/** Reset the current parent Resource to the original one.
* Also activates hierarchyMode which is the default mode. */
- ResourceBuilder resetParent();
+ ResourceBuilder atParent();
}
\ 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 6d356f1..5dac7fa 100644
--- a/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java
+++ b/src/main/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImpl.java
@@ -56,7 +56,7 @@ public class ResourceBuilderImpl implements ResourceBuilder {
originalParent = parent;
resourceResolver = originalParent.getResourceResolver();
withIntermediatePrimaryType(null);
- resetParent();
+ atParent();
}
@Override
@@ -65,7 +65,7 @@ public class ResourceBuilderImpl implements ResourceBuilder {
}
@Override
- public ResourceBuilder resetParent() {
+ public ResourceBuilder atParent() {
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 189a3c1..e4ef669 100644
--- a/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java
+++ b/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java
@@ -144,7 +144,7 @@ public class ResourceBuilderImplTest {
.siblingsMode()
.resource("one")
.resource("two")
- .resetParent() // also sets hierarchyMode
+ .atParent() // also sets hierarchyMode
.resource("d/e")
.resource("f/g")
.siblingsMode()
@@ -223,12 +223,12 @@ public class ResourceBuilderImplTest {
.siblingsMode()
.file("models.js", getClass().getResourceAsStream("/files/models.js"), "MT1", 42)
.file("text.html", getClass().getResourceAsStream("/files/text.html"), "MT2", 43)
- .resetParent()
+ .atParent()
.resource("apps")
.file("myapp.json", getClass().getResourceAsStream("/files/myapp.json"), "MT3", 44)
- .resetParent()
+ .atParent()
.resource("apps/content/myapp/resource")
- .resetParent()
+ .atParent()
.resource("apps/content", "title", "foo")
.file("myapp.json", getClass().getResourceAsStream("/files/myapp.json"), "MT4", 45)
.commit()
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.