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:39:56 UTC
svn commit: r1768468 -
/sling/trunk/contrib/extensions/contextaware-config/spi/src/main/java/org/apache/sling/caconfig/resource/spi/CollectionInheritanceDecider.java
Author: sseifert
Date: Mon Nov 7 09:39:56 2016
New Revision: 1768468
URL: http://svn.apache.org/viewvc?rev=1768468&view=rev
Log:
SLING-6244 picked wrong annotation, use @Nonnull instead
Modified:
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/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=1768468&r1=1768467&r2=1768468&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:39:56 2016
@@ -18,11 +18,11 @@
*/
package org.apache.sling.caconfig.resource.spi;
+import javax.annotation.Nonnull;
+
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
@@ -41,6 +41,6 @@ public interface CollectionInheritanceDe
* @param resource The resource
* @return The decision.
*/
- @NotNull InheritanceDecision decide(@NotNull Resource resource, @NotNull String bucketName);
+ @Nonnull InheritanceDecision decide(@Nonnull Resource resource, @Nonnull String bucketName);
}