SLING-7798 Switch from JSR-305 annotations to JetBrains Nullable/NotNull annotations
diff --git a/pom.xml b/pom.xml
index 917f4c9..9f5a708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>34-SNAPSHOT</version>
+ <version>34</version>
<relativePath />
</parent>
@@ -150,10 +150,10 @@
<version>2.0.0</version>
<scope>test</scope>
</dependency>
- <!-- jsr305 -->
+ <!-- nullability -->
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
</dependency>
<!-- logging -->
<dependency>
diff --git a/src/main/java/org/apache/sling/commons/clam/ClamService.java b/src/main/java/org/apache/sling/commons/clam/ClamService.java
index a6788ea..1652a4d 100644
--- a/src/main/java/org/apache/sling/commons/clam/ClamService.java
+++ b/src/main/java/org/apache/sling/commons/clam/ClamService.java
@@ -20,14 +20,13 @@
import java.io.InputStream;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
@ProviderType
public interface ClamService {
- @Nonnull
- ScanResult scan(@Nonnull final InputStream data);
+ @NotNull
+ ScanResult scan(@NotNull final InputStream data);
}
diff --git a/src/main/java/org/apache/sling/commons/clam/ScanResult.java b/src/main/java/org/apache/sling/commons/clam/ScanResult.java
index fdcde5c..46e0a1b 100644
--- a/src/main/java/org/apache/sling/commons/clam/ScanResult.java
+++ b/src/main/java/org/apache/sling/commons/clam/ScanResult.java
@@ -18,6 +18,8 @@
*/
package org.apache.sling.commons.clam;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
@ProviderType
@@ -27,15 +29,17 @@
private final String message;
- public ScanResult(final Status status, final String message) {
+ public ScanResult(@NotNull final Status status, @NotNull final String message) {
this.status = status;
this.message = message;
}
+ @NotNull
public Status getStatus() {
return status;
}
+ @NotNull
public String getMessage() {
return message;
}
diff --git a/src/main/java/org/apache/sling/commons/clam/internal/ClamdService.java b/src/main/java/org/apache/sling/commons/clam/internal/ClamdService.java
index 661005a..b062336 100644
--- a/src/main/java/org/apache/sling/commons/clam/internal/ClamdService.java
+++ b/src/main/java/org/apache/sling/commons/clam/internal/ClamdService.java
@@ -25,12 +25,11 @@
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
-import javax.annotation.Nonnull;
-
import org.apache.commons.io.IOUtils;
import org.apache.sling.commons.clam.ClamService;
import org.apache.sling.commons.clam.ScanResult;
import org.apache.sling.commons.clam.ScanResult.Status;
+import org.jetbrains.annotations.NotNull;
import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -89,8 +88,8 @@
}
@Override
- @Nonnull
- public ScanResult scan(@Nonnull final InputStream inputStream) {
+ @NotNull
+ public ScanResult scan(@NotNull final InputStream inputStream) {
try {
final byte[] reply = doInstream(inputStream);
return parseClamdReply(reply);