You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2017/01/13 12:57:19 UTC
svn commit: r1778578 - in /sling/trunk/contrib/extensions/resourcemerger/src:
main/java/org/apache/sling/resourcemerger/impl/MergedResource.java
test/java/org/apache/sling/resourcemerger/impl/MergedResourceTest.java
Author: kwin
Date: Fri Jan 13 12:57:19 2017
New Revision: 1778578
URL: http://svn.apache.org/viewvc?rev=1778578&view=rev
Log:
SLING-6457 correctly expose child resources in MergedResource's toString()
by printing out all entries of the string array.
Modified:
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceTest.java
Modified: sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java?rev=1778578&r1=1778577&r2=1778578&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java (original)
+++ sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java Fri Jan 13 12:57:19 2017
@@ -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 Abst
@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())
+ + "]";
}
}
Modified: sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceTest.java?rev=1778578&r1=1778577&r2=1778578&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceTest.java (original)
+++ sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceTest.java Fri Jan 13 12:57:19 2017
@@ -20,6 +20,7 @@ package org.apache.sling.resourcemerger.
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"));
+ }
}