From 8ec25c497d5f9bb9031f749db0ba5b7801876144 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Thu, 13 Aug 2020 13:50:00 +0300
Subject: [PATCH] libs updated
---
redisson/pom.xml | 12 +++----
.../redisson/RedissonBlockingQueueTest.java | 36 +++++++++----------
.../org/redisson/RedissonMapCacheTest.java | 10 +++---
.../redisson/RedissonReadWriteLockTest.java | 4 +--
.../java/org/redisson/RedissonTopicTest.java | 12 +++----
.../executor/RedissonExecutorServiceTest.java | 4 +--
6 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/redisson/pom.xml b/redisson/pom.xml
index e646ef32c..eae480562 100644
--- a/redisson/pom.xml
+++ b/redisson/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
- <version>3.3.4.RELEASE</version>
+ <version>3.3.9.RELEASE</version>
</dependency>
<dependency>
<groupId>io.reactivex.rxjava2</groupId>
@@ -85,13 +85,13 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>3.15.0</version>
+ <version>3.16.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>3.1.6</version>
+ <version>4.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -257,12 +257,12 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.10.7</version>
+ <version>1.10.14</version>
</dependency>
<dependency>
<groupId>org.jodd</groupId>
<artifactId>jodd-bean</artifactId>
- <version>5.0.13</version>
+ <version>5.1.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -345,7 +345,7 @@
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs</artifactId>
- <version>4.0.0-beta4</version>
+ <version>4.1.1</version>
</dependency>
</dependencies>
</plugin>
diff --git a/redisson/src/test/java/org/redisson/RedissonBlockingQueueTest.java b/redisson/src/test/java/org/redisson/RedissonBlockingQueueTest.java
index ad5d7f458..4943b2a64 100644
--- a/redisson/src/test/java/org/redisson/RedissonBlockingQueueTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonBlockingQueueTest.java
@@ -1,17 +1,6 @@
package org.redisson;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Awaitility.await;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
import org.awaitility.Awaitility;
-import org.awaitility.Duration;
import org.junit.Assert;
import org.junit.Test;
import org.redisson.ClusterRunner.ClusterProcesses;
@@ -19,12 +8,23 @@ import org.redisson.RedisRunner.RedisProcess;
import org.redisson.api.RBlockingQueue;
import org.redisson.api.RFuture;
import org.redisson.api.RedissonClient;
-import org.redisson.api.redisnode.RedisClusterMaster;
-import org.redisson.api.redisnode.RedisNodes;
import org.redisson.config.Config;
import org.redisson.connection.balancer.RandomLoadBalancer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
public class RedissonBlockingQueueTest extends RedissonQueueTest {
@@ -354,7 +354,7 @@ public class RedissonBlockingQueueTest extends RedissonQueueTest {
t.join(1000);
t.interrupt();
- Awaitility.await().atMost(Duration.ONE_SECOND).untilTrue(interrupted);
+ Awaitility.await().atMost(Duration.ofSeconds(1)).untilTrue(interrupted);
RBlockingQueue<Integer> q = getQueue(redisson);
q.add(1);
@@ -381,7 +381,7 @@ public class RedissonBlockingQueueTest extends RedissonQueueTest {
t.join(1000);
t.interrupt();
- Awaitility.await().atMost(Duration.ONE_SECOND).untilTrue(interrupted);
+ Awaitility.await().atMost(Duration.ofSeconds(1)).untilTrue(interrupted);
}
@Test
@@ -675,7 +675,7 @@ public class RedissonBlockingQueueTest extends RedissonQueueTest {
q.add(i);
}
- Awaitility.await().atMost(Duration.ONE_SECOND).until(() -> {
+ Awaitility.await().atMost(Duration.ofSeconds(1)).until(() -> {
return values.size() == 10;
});
diff --git a/redisson/src/test/java/org/redisson/RedissonMapCacheTest.java b/redisson/src/test/java/org/redisson/RedissonMapCacheTest.java
index d04ca24f2..d53eb7f14 100644
--- a/redisson/src/test/java/org/redisson/RedissonMapCacheTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonMapCacheTest.java
@@ -3,6 +3,7 @@ package org.redisson;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
+import java.time.Duration;
import java.util.AbstractMap;
import java.util.Arrays;
import java.util.HashMap;
@@ -17,7 +18,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
import org.awaitility.Awaitility;
-import org.awaitility.Duration;
import org.joor.Reflect;
import org.junit.Assert;
import org.junit.Assume;
@@ -892,7 +892,7 @@ public class RedissonMapCacheTest extends BaseMapTest {
});
runnable.run();
- await().atMost(Duration.ONE_SECOND).untilTrue(ref);
+ await().atMost(Duration.ofSeconds(1)).untilTrue(ref);
map.removeListener(createListener1);
map.destroy();
}
@@ -953,7 +953,7 @@ public class RedissonMapCacheTest extends BaseMapTest {
});
runnable.run();
- await().atMost(Duration.ONE_MINUTE).untilTrue(ref);
+ await().atMost(Duration.ofMinutes(1)).untilTrue(ref);
map.removeListener(createListener1);
}
@@ -976,7 +976,7 @@ public class RedissonMapCacheTest extends BaseMapTest {
});
runnable.run();
- await().atMost(Duration.ONE_SECOND).untilTrue(ref);
+ await().atMost(Duration.ofSeconds(1)).untilTrue(ref);
map.removeListener(createListener1);
}
@@ -1012,7 +1012,7 @@ public class RedissonMapCacheTest extends BaseMapTest {
});
runnable.run();
- await().atMost(Duration.ONE_SECOND).untilTrue(ref);
+ await().atMost(Duration.ofSeconds(1)).untilTrue(ref);
map.removeListener(createListener1);
}
diff --git a/redisson/src/test/java/org/redisson/RedissonReadWriteLockTest.java b/redisson/src/test/java/org/redisson/RedissonReadWriteLockTest.java
index c455b8b32..8780e49d5 100644
--- a/redisson/src/test/java/org/redisson/RedissonReadWriteLockTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonReadWriteLockTest.java
@@ -5,6 +5,7 @@ import static org.assertj.core.api.Assertions.assertThatCode;
import static org.awaitility.Awaitility.await;
import java.security.SecureRandom;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@@ -21,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import org.awaitility.Awaitility;
-import org.awaitility.Duration;
import org.junit.Assert;
import org.junit.Test;
import org.redisson.ClusterRunner.ClusterProcesses;
@@ -144,7 +144,7 @@ public class RedissonReadWriteLockTest extends BaseConcurrentTest {
RLock l2 = rw1.writeLock();
assertThat(l2.tryLock(1000, 1000, TimeUnit.MILLISECONDS)).isTrue();
- await().atMost(Duration.TEN_SECONDS).until(() -> {
+ await().atMost(Duration.ofSeconds(10)).until(() -> {
RReadWriteLock rw2 = redisson.getReadWriteLock("test2s3");
try {
return !rw2.writeLock().tryLock(3000, 1000, TimeUnit.MILLISECONDS);
diff --git a/redisson/src/test/java/org/redisson/RedissonTopicTest.java b/redisson/src/test/java/org/redisson/RedissonTopicTest.java
index 62ddbd62f..ec4a74fcc 100644
--- a/redisson/src/test/java/org/redisson/RedissonTopicTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonTopicTest.java
@@ -5,6 +5,7 @@ import static org.awaitility.Awaitility.await;
import java.io.IOException;
import java.io.Serializable;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList;
@@ -23,7 +24,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import org.awaitility.Awaitility;
-import org.awaitility.Duration;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -245,7 +245,7 @@ public class RedissonTopicTest {
});
topic1.publish(123L);
- await().atMost(Duration.ONE_SECOND).untilTrue(stringMessageReceived);
+ await().atMost(Duration.ofSeconds(1)).untilTrue(stringMessageReceived);
redisson1.shutdown();
}
@@ -275,7 +275,7 @@ public class RedissonTopicTest {
stringTopic.publish("testmsg");
- await().atMost(Duration.ONE_SECOND).until(() -> stringMessageReceived.get() == 2);
+ await().atMost(Duration.ofSeconds(1)).until(() -> stringMessageReceived.get() == 2);
stringTopic.removeListener(listenerId);
patternTopic.removeListener(patternListenerId);
@@ -311,8 +311,8 @@ public class RedissonTopicTest {
});
longTopic.publish(1L);
- await().atMost(Duration.ONE_SECOND).untilTrue(stringMessageReceived);
- await().atMost(Duration.ONE_SECOND).untilTrue(longMessageReceived);
+ await().atMost(Duration.ofSeconds(1)).untilTrue(stringMessageReceived);
+ await().atMost(Duration.ofSeconds(1)).untilTrue(longMessageReceived);
}
@Test
@@ -1175,7 +1175,7 @@ public class RedissonTopicTest {
topic.publish(i);
}
- Awaitility.await().atMost(Duration.FIVE_SECONDS).until(() -> counter.get() == 10);
+ Awaitility.await().atMost(Duration.ofSeconds(5)).until(() -> counter.get() == 10);
redisson.shutdown();
process.shutdown();
diff --git a/redisson/src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java b/redisson/src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java
index 9ee818c01..252f434fd 100644
--- a/redisson/src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java
+++ b/redisson/src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java
@@ -5,13 +5,13 @@ import static org.awaitility.Awaitility.await;
import java.io.IOException;
import java.io.Serializable;
+import java.time.Duration;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
-import org.awaitility.Duration;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -291,7 +291,7 @@ public class RedissonExecutorServiceTest extends BaseTest {
e.execute(new IncrementRunnableTask("myCounter"), new IncrementRunnableTask("myCounter"),
new IncrementRunnableTask("myCounter"), new IncrementRunnableTask("myCounter"));
- await().atMost(Duration.FIVE_SECONDS).until(() -> redisson.getAtomicLong("myCounter").get() == 4);
+ await().atMost(Duration.ofSeconds(5)).until(() -> redisson.getAtomicLong("myCounter").get() == 4);
redisson.getKeys().delete("myCounter");
assertThat(redisson.getKeys().count()).isZero();
}