This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.2.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git
commit 35e7df35393b528d823c7c3975a0aef509754b72 Author: Carsten Ziegeler <[email protected]> AuthorDate: Mon Sep 15 13:23:32 2014 +0000 SLING-3423/SLING-3657 : Change return type of picker interface from iterator to List git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1625029 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/sling/resourcemerger/impl/CRUDMergedResource.java | 2 +- .../sling/resourcemerger/impl/CRUDMergingResourceProvider.java | 2 +- .../apache/sling/resourcemerger/impl/MergingResourceProvider.java | 4 ++-- .../sling/resourcemerger/impl/picker/MergingResourcePicker.java | 5 ++--- .../sling/resourcemerger/impl/picker/OverridingResourcePicker.java | 7 +++---- .../org/apache/sling/resourcemerger/spi/MergedResourcePicker.java | 7 +++---- .../sling/resourcemerger/impl/MergedResourceProviderTest.java | 2 +- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergedResource.java b/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergedResource.java index 756a722..716209f 100644 --- a/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergedResource.java +++ b/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergedResource.java @@ -70,7 +70,7 @@ public class CRUDMergedResource extends MergedResource { @SuppressWarnings("unchecked") public <AdapterType> AdapterType adaptTo(final Class<AdapterType> type) { if (type == ModifiableValueMap.class) { - final Iterator<Resource> iter = this.picker.pickResources(this.getResourceResolver(), this.relativePath); + final Iterator<Resource> iter = this.picker.pickResources(this.getResourceResolver(), this.relativePath).iterator(); Resource highestRsrc = null; while ( iter.hasNext() ) { highestRsrc = iter.next(); diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java b/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java index 6dcab25..3446dc0 100644 --- a/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java +++ b/src/main/java/org/apache/sling/resourcemerger/impl/CRUDMergingResourceProvider.java @@ -57,7 +57,7 @@ public class CRUDMergingResourceProvider holder.count = 0; // Loop over resources - final Iterator<Resource> iter = this.picker.pickResources(resolver, relativePath); + final Iterator<Resource> iter = this.picker.pickResources(resolver, relativePath).iterator(); while ( iter.hasNext() ) { final Resource rsrc = iter.next(); holder.count++; diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java b/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java index 66df03e..917dd67 100644 --- a/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java +++ b/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java @@ -166,7 +166,7 @@ class MergingResourceProvider implements ResourceProvider { if (relativePath != null) { final ResourceHolder holder = new ResourceHolder(ResourceUtil.getName(path)); - final Iterator<Resource> resources = picker.pickResources(resolver, relativePath); + final Iterator<Resource> resources = picker.pickResources(resolver, relativePath).iterator(); if (!resources.hasNext()) { return null; @@ -201,7 +201,7 @@ class MergingResourceProvider implements ResourceProvider { if (relativePath != null) { final List<ResourceHolder> candidates = new ArrayList<ResourceHolder>(); - final Iterator<Resource> resources = picker.pickResources(resolver, relativePath); + final Iterator<Resource> resources = picker.pickResources(resolver, relativePath).iterator(); while (resources.hasNext()) { Resource parentResource = resources.next(); diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/picker/MergingResourcePicker.java b/src/main/java/org/apache/sling/resourcemerger/impl/picker/MergingResourcePicker.java index aed4d94..1fcc48d 100644 --- a/src/main/java/org/apache/sling/resourcemerger/impl/picker/MergingResourcePicker.java +++ b/src/main/java/org/apache/sling/resourcemerger/impl/picker/MergingResourcePicker.java @@ -19,7 +19,6 @@ package org.apache.sling.resourcemerger.impl.picker; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -61,7 +60,7 @@ public class MergingResourcePicker implements MergedResourcePicker, ResourceMerg private String mergeRootPath; - public Iterator<Resource> pickResources(final ResourceResolver resolver, final String relativePath) { + public List<Resource> pickResources(final ResourceResolver resolver, final String relativePath) { final List<Resource> resources = new ArrayList<Resource>(); final String[] searchPaths = resolver.getSearchPath(); for (int i = searchPaths.length - 1; i >= 0; i--) { @@ -74,7 +73,7 @@ public class MergingResourcePicker implements MergedResourcePicker, ResourceMerg resources.add(new NonExistingResource(resolver, fullPath)); } } - return resources.iterator(); + return resources; } /** diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java b/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java index 62c3cca..a545d25 100644 --- a/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java +++ b/src/main/java/org/apache/sling/resourcemerger/impl/picker/OverridingResourcePicker.java @@ -20,7 +20,6 @@ package org.apache.sling.resourcemerger.impl.picker; import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.List; import org.apache.felix.scr.annotations.Component; @@ -39,10 +38,10 @@ import org.apache.sling.resourcemerger.spi.MergedResourcePicker; @Property(name = MergedResourcePicker.MERGE_ROOT, value = OverridingResourcePicker.DEFAULT_ROOT, label = "Root", description = "Root path at which merged resources will be available.") public class OverridingResourcePicker implements MergedResourcePicker { - + public static final String DEFAULT_ROOT = "/mnt/override"; - public Iterator<Resource> pickResources(ResourceResolver resolver, String relativePath) { + public List<Resource> pickResources(ResourceResolver resolver, String relativePath) { String absPath = "/" + relativePath; final List<Resource> resources = new ArrayList<Resource>(); @@ -77,7 +76,7 @@ public class OverridingResourcePicker implements MergedResourcePicker { Collections.reverse(resources); } - return resources.iterator(); + return resources; } private Resource findInheritanceRoot(Resource target) { diff --git a/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker.java b/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker.java index 871f62e..f5619ab 100644 --- a/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker.java +++ b/src/main/java/org/apache/sling/resourcemerger/spi/MergedResourcePicker.java @@ -18,7 +18,7 @@ */ package org.apache.sling.resourcemerger.spi; -import java.util.Iterator; +import java.util.List; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceProviderFactory; @@ -57,8 +57,7 @@ public interface MergedResourcePicker { * * @param resolver the ResourceResolver * @param relativePath the path relative to the merge root - * @return an iterator of Resource objects + * @return a List of Resource objects */ - Iterator<Resource> pickResources(ResourceResolver resolver, String relativePath); - + List<Resource> pickResources(ResourceResolver resolver, String relativePath); } diff --git a/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java b/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java index 8a36995..9980c41 100644 --- a/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java +++ b/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java @@ -52,7 +52,7 @@ public class MergedResourceProviderTest { final MockResourceResolverFactoryOptions options = new MockResourceResolverFactoryOptions(); options.setSearchPaths(new String[] {"/apps/", "/libs/"}); final ResourceResolverFactory factory = new MockResourceResolverFactory(options); - this.resolver = factory.getAdministrativeResourceResolver(null); + this.resolver = factory.getResourceResolver(null); MockHelper.create(this.resolver).resource("/apps") .resource("a").p(MergedResourceConstants.PN_HIDE_CHILDREN, new String[] {"Z", "x", "y"}) .resource("1").p("a", "1").p("b", "2") -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
