SLING-7798 : Switch from JSR-305 annotations to Jetbrains Nullable/NotNull Annotations
diff --git a/pom.xml b/pom.xml
index 22320a6..7b1d5d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,8 +132,10 @@
<artifactId>slf4j-api</artifactId>
</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>
<groupId>org.apache.sling</groupId>
diff --git a/src/main/java/org/apache/sling/installer/api/info/Resource.java b/src/main/java/org/apache/sling/installer/api/info/Resource.java
index 4626cbf..6c522b9 100644
--- a/src/main/java/org/apache/sling/installer/api/info/Resource.java
+++ b/src/main/java/org/apache/sling/installer/api/info/Resource.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.installer.api.info;
-import javax.annotation.CheckForNull;
+import org.jetbrains.annotations.Nullable;
import org.apache.sling.installer.api.tasks.InstallTask;
import org.apache.sling.installer.api.tasks.RegisteredResource;
@@ -48,14 +48,14 @@
*
* @return an error string or {@code null}
*/
- @CheckForNull
+ @Nullable
String getError();
/**
* Return the version of the artifact.
* @return The version of the artifact or <code>null</code>
*/
- @CheckForNull
+ @Nullable
Version getVersion();
/**
@@ -72,6 +72,6 @@
* @param key The name of the attribute
* @return The value of the attribute or <code>null</code>
*/
- @CheckForNull
+ @Nullable
Object getAttribute(String key);
}
diff --git a/src/main/java/org/apache/sling/installer/api/info/package-info.java b/src/main/java/org/apache/sling/installer/api/info/package-info.java
index e1959ac..0e80a50 100644
--- a/src/main/java/org/apache/sling/installer/api/info/package-info.java
+++ b/src/main/java/org/apache/sling/installer/api/info/package-info.java
@@ -17,5 +17,5 @@
* under the License.
*/
-@org.osgi.annotation.versioning.Version("1.1.0")
+@org.osgi.annotation.versioning.Version("1.1.1")
package org.apache.sling.installer.api.info;
diff --git a/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java b/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java
index 78eaae4..163754d 100644
--- a/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java
+++ b/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.installer.api.tasks;
-import javax.annotation.CheckForNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
import org.osgi.framework.Version;
@@ -53,7 +53,7 @@
* @param key The name of the attribute
* @return The value of the attribute or <code>null</code>
*/
- @CheckForNull
+ @Nullable
Object getAttribute(String key);
/**
@@ -74,7 +74,7 @@
*
* @return an error string or {@code null}
*/
- @CheckForNull
+ @Nullable
String getError();
/**
@@ -82,7 +82,7 @@
* @param key The name of the attribute
* @return The value of the attribute or <code>null</code>
*/
- @CheckForNull
+ @Nullable
Object getTemporaryAttribute(String key);
/**
@@ -97,6 +97,6 @@
* @return The version of the artifact or <code>null</code>
* @since 1.2
*/
- @CheckForNull
+ @Nullable
Version getVersion();
}
diff --git a/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java b/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java
index 3b25734..9c8f6c0 100644
--- a/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java
+++ b/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.installer.api.tasks;
-import javax.annotation.CheckForNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
@@ -83,6 +83,6 @@
* @return The alias or {@code null}.
* @since 1.1
*/
- @CheckForNull
+ @Nullable
String getAlias();
}
diff --git a/src/main/java/org/apache/sling/installer/api/tasks/package-info.java b/src/main/java/org/apache/sling/installer/api/tasks/package-info.java
index 59d05dc..a75bffd 100644
--- a/src/main/java/org/apache/sling/installer/api/tasks/package-info.java
+++ b/src/main/java/org/apache/sling/installer/api/tasks/package-info.java
@@ -17,5 +17,5 @@
* under the License.
*/
-@org.osgi.annotation.versioning.Version("1.4.0")
+@org.osgi.annotation.versioning.Version("1.4.1")
package org.apache.sling.installer.api.tasks;
diff --git a/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java b/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
index 019cafe..f54a1de 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
@@ -39,7 +39,7 @@
import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicLong;
-import javax.annotation.CheckForNull;
+import org.jetbrains.annotations.Nullable;
import org.apache.sling.commons.osgi.PropertiesUtil;
import org.apache.sling.installer.api.InstallableResource;
@@ -1479,7 +1479,7 @@
}
@Override
- @CheckForNull
+ @Nullable
public String getError() {
return tr.getError();
}
diff --git a/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java b/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
index 59d980d..3c482e9 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
@@ -31,7 +31,7 @@
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.CheckForNull;
+import org.jetbrains.annotations.Nullable;
import org.apache.sling.installer.api.InstallableResource;
import org.apache.sling.installer.api.tasks.ResourceState;
@@ -679,7 +679,7 @@
}
@Override
- @CheckForNull
+ @Nullable
public String getError() {
return error;
}
diff --git a/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java b/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java
index eac644c..b22be05 100644
--- a/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java
+++ b/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java
@@ -25,7 +25,7 @@
import java.util.Hashtable;
import java.util.Map;
-import javax.annotation.CheckForNull;
+import org.jetbrains.annotations.Nullable;
import org.apache.sling.installer.api.InstallableResource;
import org.apache.sling.installer.api.tasks.ResourceState;
@@ -152,7 +152,7 @@
}
@Override
- @CheckForNull
+ @Nullable
public String getError() {
return null;
}
