You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2016/11/07 09:59:24 UTC
svn commit: r1768471 - in
/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi:
CollectionInheritanceDecider.java ConfigurationResourceResolvingStrategy.java
Author: cziegeler
Date: Mon Nov 7 09:59:23 2016
New Revision: 1768471
URL: http://svn.apache.org/viewvc?rev=1768471&view=rev
Log:
SLING-6244 : Provide an SPI for influencing the collection inheritance
Modified:
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/CollectionInheritanceDecider.java
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java
Modified: sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/CollectionInheritanceDecider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/CollectionInheritanceDecider.java?rev=1768471&r1=1768470&r2=1768471&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/CollectionInheritanceDecider.java (original)
+++ sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/CollectionInheritanceDecider.java Mon Nov 7 09:59:23 2016
@@ -36,10 +36,11 @@ public interface CollectionInheritanceDe
/**
* 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);
Modified: sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java?rev=1768471&r1=1768470&r2=1768471&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java (original)
+++ sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/ConfigurationResourceResolvingStrategy.java Mon Nov 7 09:59:23 2016
@@ -31,8 +31,10 @@ import org.osgi.annotation.versioning.Co
* 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 {