[sling-org-apache-sling-caconfig-spi] 08/14: SLING-6244 : Provide an SPI for influencing the collection inheritance

[ro...@apache.org]

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

rombert pushed a commit to annotated tag org.apache.sling.caconfig.spi-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-spi.git

commit 4eff84b3a4d54aaa5eee2fe5a876ba355ed18db2
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Nov 7 09:59:23 2016 +0000

    SLING-6244 : Provide an SPI for influencing the collection inheritance
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/contextaware-config/spi@1768471 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sling/caconfig/resource/spi/CollectionInheritanceDecider.java   | 3 ++-
 .../resource/spi/ConfigurationResourceResolvingStrategy.java        | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/sling/caconfig/resource/spi/CollectionInheritanceDecider.java b/src/main/java/org/apache/sling/caconfig/resource/spi/CollectionInheritanceDecider.java
index aac9479..1713f0a 100644
--- a/src/main/java/org/apache/sling/caconfig/resource/spi/CollectionInheritanceDecider.java
+++ b/src/main/java/org/apache/sling/caconfig/resource/spi/CollectionInheritanceDecider.java
@@ -36,10 +36,11 @@ public interface CollectionInheritanceDecider {
     /**
      * Decide whether the provided resource should be included in the collection.
      * The provided resource can either be included, excluded or blocked.
+     * If the decider can't decide it must return {@code null}.
      *
      * @param bucketName The bucket name
      * @param resource The resource
-     * @return The decision.
+     * @return The decision or {@code null}
      */
     @Nonnull InheritanceDecision decide(@Nonnull Resource resource, @Nonnull String bucketName);
 
diff --git a/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java b/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java
index 1618d3c..b639d3c 100644
--- a/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java
+++ b/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java
@@ -31,8 +31,10 @@ import org.osgi.annotation.versioning.ConsumerType;
  * This SPI allows application to define their own configuration storage and inheritance strategies.
  *
  * If this strategy supports inheritance for collections, it should use the optional
- * {@link CollectionInheritanceDecider} SPI interface. If such a service is available, it should
- * be called.
+ * {@link CollectionInheritanceDecider} SPI interface. If such services are available,
+ * they should be called in order of there service ranking, starting with the highest
+ * ranking. The first decider service providing a non null return value is used
+ * for the decision.
  */
 @ConsumerType
 public interface ConfigurationResourceResolvingStrategy {

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.