diff --git a/pom.xml b/pom.xml index af253ec1..d6f307fb 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.swisspush redisques - 3.0.33-SNAPSHOT + 3.1.0-SNAPSHOT redisques A highly scalable redis-persistent queuing system for vertx @@ -53,7 +53,7 @@ io.vertx vertx-redis-client - ${vertx-redis-client.version} + ${vertx.version} commons-codec @@ -72,11 +72,17 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j ${slf4j.version} + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.1 + test + junit junit @@ -91,7 +97,7 @@ org.mockito - mockito-all + mockito-core ${mockito.version} test @@ -383,15 +389,14 @@ - 4.2.1 - 4.3.3 - 1.7.32 - 1.10.19 + 4.5.1 + 2.0.10 + 5.8.0 4.13.2 - 4.0.2 + 4.2.0 3.7.0 - 4.3.0 - 1.9 + 5.4.0 + 1.16.0 2.15.0 UTF8 diff --git a/src/test/java/org/swisspush/redisques/MaxWaitingHandlersTest.java b/src/test/java/org/swisspush/redisques/MaxWaitingHandlersTest.java index a8364871..1ecf04bc 100644 --- a/src/test/java/org/swisspush/redisques/MaxWaitingHandlersTest.java +++ b/src/test/java/org/swisspush/redisques/MaxWaitingHandlersTest.java @@ -63,7 +63,7 @@ public void testRedisQueueFull(TestContext should) { CompositeFuture.all(futures) .onFailure(f -> { - should.assertEquals("Redis waiting Queue is full", f.getMessage()); + should.assertEquals("Redis waiting queue is full", f.getMessage()); test.complete(); }) .onSuccess(r -> { diff --git a/src/test/java/org/swisspush/redisques/RedisQuesProcessorTest.java b/src/test/java/org/swisspush/redisques/RedisQuesProcessorTest.java index 45d7a708..ff78f88d 100644 --- a/src/test/java/org/swisspush/redisques/RedisQuesProcessorTest.java +++ b/src/test/java/org/swisspush/redisques/RedisQuesProcessorTest.java @@ -1,5 +1,6 @@ package org.swisspush.redisques; +import jakarta.xml.bind.DatatypeConverter; import org.awaitility.Awaitility; import io.vertx.core.AsyncResult; import io.vertx.core.DeploymentOptions; @@ -15,7 +16,6 @@ import org.swisspush.redisques.util.RedisquesConfiguration; import redis.clients.jedis.Jedis; -import javax.xml.bind.DatatypeConverter; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.time.Duration; diff --git a/src/test/java/org/swisspush/redisques/action/EnqueueActionTest.java b/src/test/java/org/swisspush/redisques/action/EnqueueActionTest.java index e4d3f554..a872e322 100644 --- a/src/test/java/org/swisspush/redisques/action/EnqueueActionTest.java +++ b/src/test/java/org/swisspush/redisques/action/EnqueueActionTest.java @@ -22,7 +22,7 @@ import java.util.Arrays; import java.util.Optional; -import static org.mockito.Matchers.anyList; +import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.*; /** @@ -68,7 +68,7 @@ public void testDontEnqueueWhenMemoryUsageLimitIsReached(TestContext context){ action.execute(message); verify(message, times(1)).reply(eq(new JsonObject(Buffer.buffer("{\"status\":\"error\",\"message\":\"memory usage limit reached\"}")))); - verifyZeroInteractions(redisAPI); + verifyNoInteractions(redisAPI); } @Test diff --git a/src/test/java/org/swisspush/redisques/handler/RedisquesHttpRequestHandlerTest.java b/src/test/java/org/swisspush/redisques/handler/RedisquesHttpRequestHandlerTest.java index 842d2579..4e2b77bb 100644 --- a/src/test/java/org/swisspush/redisques/handler/RedisquesHttpRequestHandlerTest.java +++ b/src/test/java/org/swisspush/redisques/handler/RedisquesHttpRequestHandlerTest.java @@ -3,8 +3,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.sun.istack.NotNull; -import com.sun.istack.Nullable; import io.restassured.RestAssured; import io.vertx.core.AsyncResult; import io.vertx.core.DeploymentOptions; @@ -2202,15 +2200,15 @@ public void getQueueSpeedMatchingPartlyFilter(TestContext context) { * position=element * @oaram filter The filter to be applied to the statistic queues request */ - private void assertQueueState(@NotNull TestContext context, - @Nullable String filter, - @Nullable Integer queuesSize, - @Nullable Integer element, - @Nullable String queueName, - @Nullable Integer queueSize, - @Nullable Integer queueFailures, - @Nullable Integer queueSlowdownTime, - @Nullable Integer queueBackpressureTime) { + private void assertQueueState(TestContext context, + String filter, + Integer queuesSize, + Integer element, + String queueName, + Integer queueSize, + Integer queueFailures, + Integer queueSlowdownTime, + Integer queueBackpressureTime) { long maxWaitTime = System.currentTimeMillis() + 5000; while (true) { StringBuilder failureState = new StringBuilder("Failures"); @@ -2295,8 +2293,7 @@ private void assertQueueState(@NotNull TestContext context, * @param speed The expected speed * @return true if the expectation was fulfilled within max 5 seconds, else false */ - private void assertQueueSpeed(@NotNull TestContext context, - @Nullable String filter, int speed) { + private void assertQueueSpeed(TestContext context, String filter, int speed) { String url = "/queuing/speed"; if (filter != null && !filter.isEmpty()) { url = url + "?filter=" + filter; diff --git a/src/test/java/org/swisspush/redisques/util/DefaultMemoryUsageProviderTest.java b/src/test/java/org/swisspush/redisques/util/DefaultMemoryUsageProviderTest.java index 5427af94..04e08788 100644 --- a/src/test/java/org/swisspush/redisques/util/DefaultMemoryUsageProviderTest.java +++ b/src/test/java/org/swisspush/redisques/util/DefaultMemoryUsageProviderTest.java @@ -18,7 +18,7 @@ import java.util.Optional; import static org.hamcrest.CoreMatchers.equalTo; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when;