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 2018/08/13 09:43:43 UTC
[sling-org-apache-sling-oak-restrictions] branch master updated:
SLING-7798 Switch from JSR-305 annotations to JetBrains Nullable/NotNull
annotations
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-oak-restrictions.git
The following commit(s) were added to refs/heads/master by this push:
new a51e709 SLING-7798 Switch from JSR-305 annotations to JetBrains Nullable/NotNull annotations
a51e709 is described below
commit a51e70957bb867b1dbd6e2a2adae61dd377958b3
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Mon Aug 13 11:43:36 2018 +0200
SLING-7798 Switch from JSR-305 annotations to JetBrains Nullable/NotNull annotations
---
pom.xml | 6 +++---
.../sling/oak/restrictions/impl/ResourceTypePattern.java | 13 ++++++-------
.../restrictions/impl/SlingRestrictionProviderImpl.java | 15 +++++++--------
3 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 78de1fc..1614995 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,9 +82,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>2.0.0</version>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <version>16.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/oak/restrictions/impl/ResourceTypePattern.java b/src/main/java/org/apache/sling/oak/restrictions/impl/ResourceTypePattern.java
index 1ab2ac2..e2dd109 100644
--- a/src/main/java/org/apache/sling/oak/restrictions/impl/ResourceTypePattern.java
+++ b/src/main/java/org/apache/sling/oak/restrictions/impl/ResourceTypePattern.java
@@ -22,14 +22,13 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern;
import org.apache.jackrabbit.oak.util.TreeUtil;
import org.apache.sling.api.SlingConstants;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,7 +49,7 @@ public class ResourceTypePattern implements RestrictionPattern {
private final Map<String,Set<String>> resourceTypesByPath;
- ResourceTypePattern(@Nonnull Iterable<String> resourceTypesRaw, String limitedToPath, boolean matchChildren) {
+ ResourceTypePattern(@NotNull Iterable<String> resourceTypesRaw, String limitedToPath, boolean matchChildren) {
this.limitedToPath = limitedToPath;
this.matchChildren = matchChildren;
@@ -89,7 +88,7 @@ public class ResourceTypePattern implements RestrictionPattern {
}
@Override
- public boolean matches(@Nonnull Tree tree, @Nullable PropertyState property) {
+ public boolean matches(@NotNull Tree tree, @Nullable PropertyState property) {
boolean isMatch = matchesAtTree(tree);
if(!isMatch && matchChildren) { // try parent hierarchy
Tree treeCursor = tree;
@@ -143,7 +142,7 @@ public class ResourceTypePattern implements RestrictionPattern {
@Override
- public boolean matches(@Nonnull String path) {
+ public boolean matches(@NotNull String path) {
return false;
}
@@ -196,4 +195,4 @@ public class ResourceTypePattern implements RestrictionPattern {
return true;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/oak/restrictions/impl/SlingRestrictionProviderImpl.java b/src/main/java/org/apache/sling/oak/restrictions/impl/SlingRestrictionProviderImpl.java
index b2867c9..fc05367 100644
--- a/src/main/java/org/apache/sling/oak/restrictions/impl/SlingRestrictionProviderImpl.java
+++ b/src/main/java/org/apache/sling/oak/restrictions/impl/SlingRestrictionProviderImpl.java
@@ -21,9 +21,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -35,6 +32,8 @@ import org.apache.jackrabbit.oak.spi.security.authorization.restriction.Restrict
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionDefinitionImpl;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,9 +70,9 @@ public class SlingRestrictionProviderImpl extends AbstractRestrictionProvider {
// ------------------------------------------------< RestrictionProvider >---
- @Nonnull
+ @NotNull
@Override
- public RestrictionPattern getPattern(String oakPath, @Nonnull Tree tree) {
+ public RestrictionPattern getPattern(String oakPath, @NotNull Tree tree) {
if (oakPath != null) {
PropertyState resourceTypes = tree.getProperty(SLING_RESOURCE_TYPES);
if (resourceTypes != null) {
@@ -91,9 +90,9 @@ public class SlingRestrictionProviderImpl extends AbstractRestrictionProvider {
return RestrictionPattern.EMPTY;
}
- @Nonnull
+ @NotNull
@Override
- public RestrictionPattern getPattern(@Nullable String oakPath, @Nonnull Set<Restriction> restrictions) {
+ public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Set<Restriction> restrictions) {
if (oakPath != null && !restrictions.isEmpty()) {
for (Restriction r : restrictions) {
@@ -117,4 +116,4 @@ public class SlingRestrictionProviderImpl extends AbstractRestrictionProvider {
return RestrictionPattern.EMPTY;
}
-}
\ No newline at end of file
+}