[sling-org-apache-sling-resourcemerger] branch master updated: SLING-10168 make all resource picker references take 0..n references

[kwin]

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git


The following commit(s) were added to refs/heads/master by this push:
     new 718f863  SLING-10168 make all resource picker references take 0..n 
references
718f863 is described below

commit 718f8635afd79566b5488fafbdaeb06dba56bfba
Author: Konrad Windszus <k...@apache.org>
AuthorDate: Wed Mar 10 10:02:11 2021 +0100

    SLING-10168 make all resource picker references take 0..n references
---
 .../sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
 
b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
index 5ebd617..275ec9e 100644
--- 
a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
+++ 
b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
@@ -37,6 +37,7 @@ import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
 import org.osgi.service.component.annotations.ReferencePolicy;
 
 /**
@@ -62,7 +63,7 @@ public class MergedResourcePickerWhiteboard {
         }
     }
 
-    @Reference(policy = ReferencePolicy.DYNAMIC)
+    @Reference(policy = ReferencePolicy.DYNAMIC, cardinality = 
ReferenceCardinality.MULTIPLE)
     public void bindMergedResourcePicker(MergedResourcePicker resourcePicker, 
Map<String, Object> properties) {
         registerMergingResourceProvider((resolver, relativePath, 
relatedResource) -> resourcePicker.pickResources(resolver, relativePath), 
properties);
     }
@@ -71,7 +72,7 @@ public class MergedResourcePickerWhiteboard {
         unregisterMergingResourceProvider(properties);
     }
 
-    @Reference(policy = ReferencePolicy.DYNAMIC)
+    @Reference(policy = ReferencePolicy.DYNAMIC, cardinality = 
ReferenceCardinality.MULTIPLE)
     public void bindMergedResourcePicker2(MergedResourcePicker2 
resourcePicker, Map<String, Object> properties) {
         registerMergingResourceProvider(resourcePicker, properties);
     }