From c1a8a2396191054fe2ba41808905d91a029024b4 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Fri, 16 Oct 2020 19:50:30 +0200 Subject: [PATCH] Reverted back, modules are unusable --- pom.xml | 15 +++++++-------- .../PermitReleasingCallableDecorator.java | 8 ++++---- .../PermitReleasingRunnableDecorator.java | 8 ++++---- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index c56e550..46f5111 100644 --- a/pom.xml +++ b/pom.xml @@ -50,21 +50,15 @@ - - com.google.guava - guava - 28.2-jre - compile - it.unimi.dsi fastutil - 8.3.0 + 8.3.1 it.cavallium concurrent-locks - 1.0.5 + 1.0.8 org.apache.commons @@ -77,6 +71,11 @@ 20.1.0 compile + + com.google.guava + guava + 29.0-jre + diff --git a/src/main/java/org/warp/commonutils/concurrency/executor/PermitReleasingCallableDecorator.java b/src/main/java/org/warp/commonutils/concurrency/executor/PermitReleasingCallableDecorator.java index 90c7055..67ceedd 100644 --- a/src/main/java/org/warp/commonutils/concurrency/executor/PermitReleasingCallableDecorator.java +++ b/src/main/java/org/warp/commonutils/concurrency/executor/PermitReleasingCallableDecorator.java @@ -1,15 +1,15 @@ package org.warp.commonutils.concurrency.executor; import java.util.concurrent.Callable; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; public final class PermitReleasingCallableDecorator extends CallableDecorator { - @Nonnull + @NotNull private final QueueSizeUpdater queueSizeUpdater; - PermitReleasingCallableDecorator(@Nonnull final Callable task, - @Nonnull final QueueSizeUpdater queueSizeUpdater) { + PermitReleasingCallableDecorator(@NotNull final Callable task, + @NotNull final QueueSizeUpdater queueSizeUpdater) { super(task); this.queueSizeUpdater = queueSizeUpdater; } diff --git a/src/main/java/org/warp/commonutils/concurrency/executor/PermitReleasingRunnableDecorator.java b/src/main/java/org/warp/commonutils/concurrency/executor/PermitReleasingRunnableDecorator.java index 349b21f..8efaa74 100644 --- a/src/main/java/org/warp/commonutils/concurrency/executor/PermitReleasingRunnableDecorator.java +++ b/src/main/java/org/warp/commonutils/concurrency/executor/PermitReleasingRunnableDecorator.java @@ -1,13 +1,13 @@ package org.warp.commonutils.concurrency.executor; -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; public final class PermitReleasingRunnableDecorator extends RunnableDecorator { - @Nonnull + @NotNull private final QueueSizeUpdater queueSizeUpdater; - PermitReleasingRunnableDecorator(@Nonnull final Runnable task, - @Nonnull final QueueSizeUpdater queueSizeUpdater) { + PermitReleasingRunnableDecorator(@NotNull final Runnable task, + @NotNull final QueueSizeUpdater queueSizeUpdater) { super(task); this.queueSizeUpdater = queueSizeUpdater; }