commit 9c80d910862b1e86da82085fdc337e7a8ebda73c
author sseifert <sseifert@pro-vision.de> Mon Aug 13 11:24:06 2018 +0200
committer sseifert <sseifert@pro-vision.de> Mon Aug 13 11:24:06 2018 +0200
tree f475c1b175caa7da14cee265607877cf31302f50
parent a649673863a5d4eb9763df2fdb7859a0031a976d

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

pom.xml

diff --git a/pom.xml b/pom.xml
index d85b96c..aabb22d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,9 +254,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>
         <!-- kryo -->

src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java

diff --git a/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java b/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java
index 2b7db1a..f8448a4 100644
--- a/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java
+++ b/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java
@@ -18,8 +18,6 @@
  */
 package org.apache.sling.distribution.serialization.impl.kryo;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,7 +25,6 @@
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
-
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.Serializer;
 import com.esotericsoftware.kryo.io.Input;
@@ -43,6 +40,8 @@
 import org.apache.sling.distribution.serialization.DistributionContentSerializer;
 import org.apache.sling.distribution.serialization.DistributionExportFilter;
 import org.apache.sling.distribution.serialization.DistributionExportOptions;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.objenesis.strategy.StdInstantiatorStrategy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -112,7 +111,7 @@
         return false;
     }
 
-    private void persistResource(@Nonnull ResourceResolver resourceResolver, Resource resource) throws PersistenceException {
+    private void persistResource(@NotNull ResourceResolver resourceResolver, Resource resource) throws PersistenceException {
         String path = resource.getPath().trim();
         String name = path.substring(path.lastIndexOf('/') + 1);
         String substring = path.substring(0, path.lastIndexOf('/'));