SLING-7798 Switch from JSR-305 annotations to JetBrains Nullable/NotNull annotations
diff --git a/pom.xml b/pom.xml
index 9fbea7a..d1dde0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,9 +94,10 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>2.0.1</version>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <version>16.0.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/src/main/java/org/apache/sling/jobs/it/services/AsyncJobConsumer.java b/src/main/java/org/apache/sling/jobs/it/services/AsyncJobConsumer.java
index f714bc0..d510150 100644
--- a/src/main/java/org/apache/sling/jobs/it/services/AsyncJobConsumer.java
+++ b/src/main/java/org/apache/sling/jobs/it/services/AsyncJobConsumer.java
@@ -26,8 +26,6 @@
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@@ -39,6 +37,7 @@
import org.apache.sling.jobs.JobConsumer;
import org.apache.sling.jobs.JobUpdate;
import org.apache.sling.jobs.JobUpdateListener;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -121,9 +120,9 @@
executor.shutdown();
}
- @Nonnull
+ @NotNull
@Override
- public void execute(@Nonnull final Job initialState, @Nonnull final JobUpdateListener listener, @Nonnull final JobCallback callback) {
+ public void execute(@NotNull final Job initialState, @NotNull final JobUpdateListener listener, @NotNull final JobCallback callback) {
LOGGER.info("Got request to start job {} ", initialState);
initialState.setState(Job.JobState.QUEUED);
listener.update(initialState.newJobUpdateBuilder().command(JobUpdate.JobUpdateCommand.UPDATE_JOB).put("processing", "step1").build());
diff --git a/src/main/java/org/apache/sling/jobs/it/services/FullySyncJob.java b/src/main/java/org/apache/sling/jobs/it/services/FullySyncJob.java
index 2addd4c..ed92d22 100644
--- a/src/main/java/org/apache/sling/jobs/it/services/FullySyncJob.java
+++ b/src/main/java/org/apache/sling/jobs/it/services/FullySyncJob.java
@@ -19,8 +19,6 @@
package org.apache.sling.jobs.it.services;
-import javax.annotation.Nonnull;
-
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
@@ -30,6 +28,7 @@
import org.apache.sling.jobs.JobConsumer;
import org.apache.sling.jobs.JobUpdate;
import org.apache.sling.jobs.JobUpdateListener;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,9 +47,9 @@
public static final String JOB_TYPE = "treadding/inthreadoperation";
private static final Logger LOGGER = LoggerFactory.getLogger(FullySyncJob.class);
- @Nonnull
+ @NotNull
@Override
- public void execute(@Nonnull Job initialState, @Nonnull JobUpdateListener listener, @Nonnull JobCallback callback) {
+ public void execute(@NotNull Job initialState, @NotNull JobUpdateListener listener, @NotNull JobCallback callback) {
LOGGER.info("Got request to start job {} ", initialState);
initialState.setState(Job.JobState.ACTIVE);
listener.update(initialState.newJobUpdateBuilder().command(JobUpdate.JobUpdateCommand.UPDATE_JOB).put("processing", "step1").build());
