SLING-7798 Switch from JSR-305 annotations to JetBrains Nullable/NotNull annotations
diff --git a/pom.xml b/pom.xml
index 0bbad6d..10a6656 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>33</version>
+ <version>34</version>
<relativePath/>
</parent>
@@ -71,8 +71,8 @@
</dependency>
<!-- JSR 305-->
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/src/main/java/org/apache/sling/commons/messaging/MessageService.java b/src/main/java/org/apache/sling/commons/messaging/MessageService.java
index 820005d..247b39c 100644
--- a/src/main/java/org/apache/sling/commons/messaging/MessageService.java
+++ b/src/main/java/org/apache/sling/commons/messaging/MessageService.java
@@ -21,8 +21,7 @@
import java.util.Map;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
@ProviderType
@@ -33,7 +32,7 @@
* @param recipient the recipient of the message
* @return result of sending the message
*/
- CompletableFuture<Result> send(@Nonnull final String message, @Nonnull final String recipient);
+ CompletableFuture<Result> send(@NotNull final String message, @NotNull final String recipient);
/**
* @param message the message to send
@@ -41,6 +40,6 @@
* @param data additional information (e.g. attachments) and/or parameters (e.g. sender) for the message
* @return result of sending the message
*/
- CompletableFuture<Result> send(@Nonnull final String message, @Nonnull final String recipient, @Nonnull final Map data);
+ CompletableFuture<Result> send(@NotNull final String message, @NotNull final String recipient, @NotNull final Map data);
}
diff --git a/src/main/java/org/apache/sling/commons/messaging/Result.java b/src/main/java/org/apache/sling/commons/messaging/Result.java
index 9abbcaa..7d9d547 100644
--- a/src/main/java/org/apache/sling/commons/messaging/Result.java
+++ b/src/main/java/org/apache/sling/commons/messaging/Result.java
@@ -18,8 +18,7 @@
*/
package org.apache.sling.commons.messaging;
-import javax.annotation.CheckForNull;
-
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
@ProviderType
@@ -28,6 +27,6 @@
/**
* @return serialized form of the sent message
*/
- @CheckForNull T getMessage();
+ @Nullable T getMessage();
}
