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 10:00:45 UTC
[sling-org-apache-sling-resourcemerger] 08/11: SLING-6457 correctly
expose child resources in MergedResource's toString()
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git
commit 909df36c3992ea31484d465360aeb3ab3a8b223f
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Jan 13 12:57:19 2017 +0000
SLING-6457 correctly expose child resources in MergedResource's toString()
by printing out all entries of the string array.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1778578 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/resourcemerger/impl/MergedResource.java | 7 +++++--
.../sling/resourcemerger/impl/MergedResourceTest.java | 18 ++++++++++++++++++
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java
index 5ad80bd..1880d87 100644
--- a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java
+++ b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java
@@ -18,6 +18,7 @@
*/
package org.apache.sling.resourcemerger.impl;
+import java.util.Arrays;
import java.util.List;
import org.apache.sling.api.resource.AbstractResource;
@@ -184,7 +185,9 @@ public class MergedResource extends AbstractResource {
@Override
public String toString() {
- return "MergedResource [path=" + this.path +
- ", resources=" + this.metadata.get(MergedResourceConstants.METADATA_RESOURCES) + "]";
+ final Object resources = this.metadata.get(MergedResourceConstants.METADATA_RESOURCES);
+ return "MergedResource [path=" + this.path + ", resources="
+ + ((resources instanceof String[]) ? Arrays.toString((String[]) resources) : resources.toString())
+ + "]";
}
}
diff --git a/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceTest.java b/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceTest.java
index 591037d..8659fa3 100644
--- a/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceTest.java
+++ b/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceTest.java
@@ -20,6 +20,7 @@ package org.apache.sling.resourcemerger.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Collections;
@@ -139,4 +140,21 @@ public class MergedResourceTest {
assertEquals("c", mr2.getResourceType());
assertEquals("vmb", mr2.getResourceSuperType());
}
+
+ @Test public void testToString() throws Exception {
+ final ValueMap vm = new ValueMapDecorator(
+ Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object) "vm"));
+ final Resource r = new MockResource("/innerResourcePath", vm, null) {
+
+ @Override
+ public String getResourceType() {
+ return "innerResource";
+ }
+ };
+
+ final Resource mr = new MergedResource(null, "/merged", "merged", Collections.singletonList(r),
+ Collections.singletonList(vm));
+
+ assertTrue(mr.toString().contains("/innerResourcePath"));
+ }
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.