diff --git a/pom.xml b/pom.xml index 27fe719..c56e550 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ common-utils org.warp - 1.0.8 + 1.0.9 UTF-8 @@ -41,7 +41,7 @@ org.junit.jupiter junit-jupiter-api - RELEASE + 5.7.0 test @@ -50,11 +50,6 @@ - - org.jetbrains - annotations - 19.0.0 - com.google.guava guava @@ -76,6 +71,12 @@ commons-lang3 3.9 + + org.jetbrains + annotations + 20.1.0 + compile + diff --git a/src/main/java/org/warp/commonutils/concurrency/executor/BlockingOnFullQueueExecutorServiceDecorator.java b/src/main/java/org/warp/commonutils/concurrency/executor/BlockingOnFullQueueExecutorServiceDecorator.java index fe1d8d2..7b50eeb 100644 --- a/src/main/java/org/warp/commonutils/concurrency/executor/BlockingOnFullQueueExecutorServiceDecorator.java +++ b/src/main/java/org/warp/commonutils/concurrency/executor/BlockingOnFullQueueExecutorServiceDecorator.java @@ -10,7 +10,6 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import java.util.function.Supplier; -import javax.annotation.Nonnull; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -18,17 +17,17 @@ public class BlockingOnFullQueueExecutorServiceDecorator extends ExecutorService private volatile boolean ignoreTaskLimit; - @Nonnull + @NotNull private final Duration timeout; private final int maximumTaskNumber; - @Nonnull + @NotNull private final Supplier queueSizeSupplier; private final @Nullable BiConsumer queueSizeStatus; - public BlockingOnFullQueueExecutorServiceDecorator(@Nonnull final ExecutorService executor, final int maximumTaskNumber, @Nonnull final Duration maximumTimeout, @Nonnull Supplier queueSizeSupplier, @Nullable BiConsumer queueSizeStatus) { + public BlockingOnFullQueueExecutorServiceDecorator(@NotNull final ExecutorService executor, final int maximumTaskNumber, @NotNull final Duration maximumTimeout, @NotNull Supplier queueSizeSupplier, @Nullable BiConsumer queueSizeStatus) { super(executor); if (maximumTaskNumber < 0) { throw new IllegalArgumentException(String.format("At least zero tasks must be permitted, not '%d'", maximumTaskNumber)); @@ -44,7 +43,7 @@ public class BlockingOnFullQueueExecutorServiceDecorator extends ExecutorService this.queueSizeStatus = queueSizeStatus; } - public BlockingOnFullQueueExecutorServiceDecorator(@Nonnull final ExecutorService executor, final int maximumTaskNumber, @Nonnull final Duration maximumTimeout, @Nonnull Supplier queueSizeSupplier) { + public BlockingOnFullQueueExecutorServiceDecorator(@NotNull final ExecutorService executor, final int maximumTaskNumber, @NotNull final Duration maximumTimeout, @NotNull Supplier queueSizeSupplier) { this(executor, maximumTaskNumber, maximumTimeout, queueSizeSupplier, null); }