commit 4ea14a6fca92771231d73b207cb25b07089da96d
author sseifert <sseifert@pro-vision.de> Mon Aug 13 11:41:20 2018 +0200
committer sseifert <sseifert@pro-vision.de> Mon Aug 13 11:41:20 2018 +0200
tree c7553f7a52c769cb2fd421e68302767b6fdd538c
parent cfdc9726cb488e15b4966a4ef6fdb942f2c94dd8

SLING-7798 Switch from JSR-305 annotations to JetBrains Nullable/NotNull annotations

pom.xml

diff --git a/pom.xml b/pom.xml
index 5253b71..2f494a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,8 +187,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>16.0.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/org/apache/sling/models/validation/impl/ModelValidationImpl.java

diff --git a/src/main/java/org/apache/sling/models/validation/impl/ModelValidationImpl.java b/src/main/java/org/apache/sling/models/validation/impl/ModelValidationImpl.java
index c7a2784..b5b980a 100644
--- a/src/main/java/org/apache/sling/models/validation/impl/ModelValidationImpl.java
+++ b/src/main/java/org/apache/sling/models/validation/impl/ModelValidationImpl.java
@@ -16,8 +16,6 @@
  */
 package org.apache.sling.models.validation.impl;
 
-import javax.annotation.Nonnull;
-
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.models.factory.InvalidModelException;
@@ -29,6 +27,7 @@
 import org.apache.sling.validation.ValidationResult;
 import org.apache.sling.validation.ValidationService;
 import org.apache.sling.validation.model.ValidationModel;
+import org.jetbrains.annotations.NotNull;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
@@ -84,7 +83,7 @@
         }
     }
     
-    private RuntimeException validate(@Nonnull Resource resource, boolean required) {
+    private RuntimeException validate(@NotNull Resource resource, boolean required) {
         try {
             ValidationModel validationModel = validation.getValidationModel(resource, true);
             if (validationModel == null) {