You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2016/11/07 09:35:33 UTC
svn commit: r1768465 - in
/sling/trunk/contrib/extensions/contextaware-config:
impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/
spi/src/main/java/org/apache/sling/caconfig/resource/spi/
Author: sseifert
Date: Mon Nov 7 09:35:33 2016
New Revision: 1768465
URL: http://svn.apache.org/viewvc?rev=1768465&view=rev
Log:
SLING-6244 change method signature of CollectionInheritanceDecider to make it consistent with ConfigurationResourceResolvingStrategy
add @NotNull annotations
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/CollectionInheritanceDecider.java
Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java?rev=1768465&r1=1768464&r2=1768465&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java (original)
+++ sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java Mon Nov 7 09:35:33 2016
@@ -334,7 +334,7 @@ public class DefaultConfigurationResourc
final Set<String> blockedItems) {
boolean result = !blockedItems.contains(resource.getName());
if ( result && decider != null ) {
- final InheritanceDecision decision = decider.decide(bucketName, resource);
+ final InheritanceDecision decision = decider.decide(resource, bucketName);
if ( decision == InheritanceDecision.EXCLUDE ) {
result = false;
} else if ( decision == InheritanceDecision.BLOCK ) {
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=1768465&r1=1768464&r2=1768465&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:35:33 2016
@@ -21,6 +21,8 @@ package org.apache.sling.caconfig.resour
import org.apache.sling.api.resource.Resource;
import org.osgi.annotation.versioning.ConsumerType;
+import com.sun.istack.internal.NotNull;
+
/**
* The {@code CollectionInheritanceDecider} is an SPI which should be used by
* all {@link ConfigurationResourceResolvingStrategy} implementations if they
@@ -39,5 +41,6 @@ public interface CollectionInheritanceDe
* @param resource The resource
* @return The decision.
*/
- InheritanceDecision decide(String bucketName, Resource resource);
+ @NotNull InheritanceDecision decide(@NotNull Resource resource, @NotNull String bucketName);
+
}