Skip to content

Commit 4e176ba

Browse files
oscar-besga-paneloscar-besga-panel
committed
amends to use valkey-java 5.4.0
1 parent 47c18d3 commit 4e176ba

File tree

54 files changed

+242
-82
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+242
-82
lines changed

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@ Also, you will find a little Groovy and a docker composer to setup a testing red
8383

8484
| Library version | valkey-java version | JDK Version |
8585
|-----------------|---------------------|-------------|
86+
| 6.5.0 | 5.4.X | JDK11 |
8687
| 6.3.0 | 5.3.X | JDK11 |
8788

89+
You can use Valkey
8890

8991
## Miscelanea
9092

‎gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@ mockitoVersion=2.28.2
2121
powermockVersion=2.0.9
2222

2323

24-
2524
gpr.user=
2625
gpr.key=

‎src/test/java/org/oba/jedis/extra/utils/cache/functional/FunctionalSimpleCacheIteratorTest.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.mockito.junit.MockitoJUnitRunner;
99
import org.oba.jedis.extra.utils.cache.SimpleCache;
1010
import org.oba.jedis.extra.utils.test.JedisTestFactory;
11+
import org.oba.jedis.extra.utils.test.WithJedisPoolDelete;
1112
import org.oba.jedis.extra.utils.utils.SimpleEntry;
1213
import io.valkey.JedisPool;
1314

@@ -19,7 +20,7 @@
1920
@RunWith(MockitoJUnitRunner.Silent.class)
2021
public class FunctionalSimpleCacheIteratorTest {
2122

22-
23+
private static final List<String> listNameKeysToDelete = new ArrayList<>();
2324

2425
private final JedisTestFactory jtfTest = JedisTestFactory.get();
2526

@@ -36,12 +37,14 @@ public void setup() {
3637
@After
3738
public void tearDown() {
3839
if (jedisPool != null) {
40+
WithJedisPoolDelete.doDelete(jedisPool, listNameKeysToDelete);
3941
jedisPool.close();
4042
}
4143
}
4244

4345
SimpleCache createNewCache() {
4446
String name = "cache:" + this.getClass().getName() + ":" + System.currentTimeMillis();
47+
listNameKeysToDelete.add(name);
4548
return new SimpleCache(jedisPool, name, 3_600_000);
4649
}
4750

‎src/test/java/org/oba/jedis/extra/utils/cache/functional/FunctionalSimpleCacheKeyIteratorTest.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@
1010
import org.oba.jedis.extra.utils.cache.SimpleCache;
1111
import org.oba.jedis.extra.utils.test.JedisTestFactory;
1212
import io.valkey.JedisPool;
13+
import org.oba.jedis.extra.utils.test.WithJedisPoolDelete;
1314

15+
import java.util.ArrayList;
1416
import java.util.HashMap;
1517
import java.util.Iterator;
18+
import java.util.List;
1619
import java.util.Map;
1720
import java.util.NoSuchElementException;
1821
import java.util.concurrent.atomic.AtomicInteger;
@@ -22,6 +25,8 @@
2225
@RunWith(MockitoJUnitRunner.Silent.class)
2326
public class FunctionalSimpleCacheKeyIteratorTest {
2427

28+
private static final List<String> listNameKeysToDelete = new ArrayList<>();
29+
2530

2631
private final JedisTestFactory jtfTest = JedisTestFactory.get();
2732

@@ -38,12 +43,14 @@ public void setup() {
3843
@After
3944
public void tearDown() {
4045
if (jedisPool != null) {
46+
WithJedisPoolDelete.doDelete(jedisPool, listNameKeysToDelete);
4147
jedisPool.close();
4248
}
4349
}
4450

4551
SimpleCache createNewCache() {
4652
String name = "cache:" + this.getClass().getName() + ":" + System.currentTimeMillis();
53+
listNameKeysToDelete.add(name);
4754
return new SimpleCache(jedisPool, name, 3_600_000);
4855
}
4956

‎src/test/java/org/oba/jedis/extra/utils/cache/functional/FunctionalSimpleCacheLoaderTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.oba.jedis.extra.utils.cache.SimpleCache;
1010
import org.oba.jedis.extra.utils.test.JedisTestFactory;
1111
import io.valkey.JedisPool;
12+
import org.oba.jedis.extra.utils.test.WithJedisPoolDelete;
1213

1314
import java.util.*;
1415
import java.util.concurrent.ThreadLocalRandom;
@@ -20,6 +21,8 @@
2021
@RunWith(MockitoJUnitRunner.Silent.class)
2122
public class FunctionalSimpleCacheLoaderTest {
2223

24+
private static final List<String> listNameKeysToDelete = new ArrayList<>();
25+
2326

2427
private final JedisTestFactory jtfTest = JedisTestFactory.get();
2528

@@ -37,6 +40,7 @@ public void setup() {
3740
@After
3841
public void tearDown() {
3942
if (jedisPool != null) {
43+
WithJedisPoolDelete.doDelete(jedisPool, listNameKeysToDelete);
4044
jedisPool.close();
4145
}
4246
}
@@ -46,6 +50,7 @@ SimpleCache createNewCache() {
4650
}
4751
SimpleCache createNewCache(CacheLoader cacheLoader) {
4852
String name = "cache:" + this.getClass().getName() + ":" + System.currentTimeMillis();
53+
listNameKeysToDelete.add(name);
4954
return new SimpleCache(jedisPool, name, 3_600_000).
5055
withCacheLoader(cacheLoader);
5156
}

‎src/test/java/org/oba/jedis/extra/utils/cache/functional/FunctionalSimpleCacheTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.oba.jedis.extra.utils.utils.SimpleEntry;
1111
import io.valkey.Jedis;
1212
import io.valkey.JedisPool;
13+
import org.oba.jedis.extra.utils.test.WithJedisPoolDelete;
1314

1415
import java.util.*;
1516

@@ -18,6 +19,7 @@
1819
@RunWith(MockitoJUnitRunner.Silent.class)
1920
public class FunctionalSimpleCacheTest {
2021

22+
private static final List<String> listNameKeysToDelete = new ArrayList<>();
2123

2224

2325
private final JedisTestFactory jtfTest = JedisTestFactory.get();
@@ -34,6 +36,7 @@ public void setup() {
3436
@After
3537
public void tearDown() {
3638
if (jedisPool != null) {
39+
WithJedisPoolDelete.doDelete(jedisPool, listNameKeysToDelete);
3740
jedisPool.close();
3841
}
3942
}
@@ -44,6 +47,7 @@ SimpleCache createNewCache() {
4447

4548
SimpleCache createNewCache(long timeOut) {
4649
String name = "cache:" + this.getClass().getName() + ":" + System.currentTimeMillis();
50+
listNameKeysToDelete.add(name);
4751
return new SimpleCache(jedisPool, name, timeOut);
4852
}
4953

‎src/test/java/org/oba/jedis/extra/utils/cache/functional/FunctionalSimpleCacheWriterTest.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.oba.jedis.extra.utils.test.JedisTestFactory;
1111
import org.oba.jedis.extra.utils.utils.SimpleEntry;
1212
import io.valkey.JedisPool;
13+
import org.oba.jedis.extra.utils.test.WithJedisPoolDelete;
1314

1415
import java.util.*;
1516
import java.util.concurrent.ThreadLocalRandom;
@@ -21,7 +22,7 @@
2122
@RunWith(MockitoJUnitRunner.Silent.class)
2223
public class FunctionalSimpleCacheWriterTest {
2324

24-
25+
private static final List<String> listNameKeysToDelete = new ArrayList<>();
2526

2627

2728
private final JedisTestFactory jtfTest = JedisTestFactory.get();
@@ -40,6 +41,7 @@ public void setup() {
4041
@After
4142
public void tearDown() {
4243
if (jedisPool != null) {
44+
WithJedisPoolDelete.doDelete(jedisPool, listNameKeysToDelete);
4345
jedisPool.close();
4446
}
4547
}
@@ -50,6 +52,7 @@ SimpleCache createNewCache() {
5052

5153
SimpleCache createNewCache(CacheWriter cacheWriter) {
5254
String name = "cache:" + this.getClass().getName() + ":" + System.currentTimeMillis();
55+
listNameKeysToDelete.add(name);
5356
SimpleCache simpleCache = new SimpleCache(jedisPool, name, 3_600_000).
5457
withCacheWriter(testingCacheWriter);
5558
return simpleCache;

‎src/test/java/org/oba/jedis/extra/utils/collections/functional/FunctionalJedisListIteratorTest.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.junit.Test;
66
import org.oba.jedis.extra.utils.collections.JedisList;
77
import org.oba.jedis.extra.utils.test.JedisTestFactory;
8+
import org.oba.jedis.extra.utils.test.WithJedisPoolDelete;
89
import org.slf4j.Logger;
910
import org.slf4j.LoggerFactory;
1011
import io.valkey.JedisPool;
@@ -14,6 +15,7 @@
1415
import java.util.Iterator;
1516
import java.util.List;
1617
import java.util.ListIterator;
18+
import java.util.concurrent.atomic.AtomicInteger;
1719

1820
import static org.junit.Assert.assertEquals;
1921
import static org.junit.Assert.assertFalse;
@@ -24,6 +26,8 @@ public class FunctionalJedisListIteratorTest {
2426

2527
private static final Logger LOGGER = LoggerFactory.getLogger(FunctionalJedisListIteratorTest.class);
2628

29+
private static final AtomicInteger testNumber = new AtomicInteger(0);
30+
2731
private final JedisTestFactory jtfTest = JedisTestFactory.get();
2832

2933
private String listName;
@@ -33,13 +37,14 @@ public class FunctionalJedisListIteratorTest {
3337
public void before() {
3438
org.junit.Assume.assumeTrue(jtfTest.functionalTestEnabled());
3539
if (!jtfTest.functionalTestEnabled()) return;
36-
listName = "list:" + this.getClass().getName() + ":" + System.currentTimeMillis();
40+
listName = "list:" + this.getClass().getName() + ":" + testNumber.incrementAndGet() + "_" + System.currentTimeMillis();
3741
jedisPool = jtfTest.createJedisPool();
3842
}
3943

4044
@After
4145
public void after() {
4246
if (jedisPool != null) {
47+
WithJedisPoolDelete.doDelete(jedisPool, listName);
4348
jedisPool.close();
4449
}
4550
}

‎src/test/java/org/oba/jedis/extra/utils/collections/functional/FunctionalJedisListStreamTest.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
import org.junit.Test;
66
import org.oba.jedis.extra.utils.collections.JedisList;
77
import org.oba.jedis.extra.utils.test.JedisTestFactory;
8+
import org.oba.jedis.extra.utils.test.WithJedisPoolDelete;
89
import org.slf4j.Logger;
910
import org.slf4j.LoggerFactory;
1011
import io.valkey.JedisPool;
1112

1213
import java.util.Arrays;
14+
import java.util.concurrent.atomic.AtomicInteger;
1315

1416
import static org.junit.Assert.assertEquals;
1517
import static org.junit.Assert.assertTrue;
@@ -18,6 +20,8 @@ public class FunctionalJedisListStreamTest {
1820

1921
private static final Logger LOGGER = LoggerFactory.getLogger(FunctionalJedisListIteratorTest.class);
2022

23+
private static final AtomicInteger testNumber = new AtomicInteger(0);
24+
2125
private final JedisTestFactory jtfTest = JedisTestFactory.get();
2226

2327
private String listName;
@@ -27,13 +31,14 @@ public class FunctionalJedisListStreamTest {
2731
public void before() {
2832
org.junit.Assume.assumeTrue(jtfTest.functionalTestEnabled());
2933
if (!jtfTest.functionalTestEnabled()) return;
30-
listName = "list:" + this.getClass().getName() + ":" + System.currentTimeMillis();
34+
listName = "list:" + this.getClass().getName() + ":" + testNumber.incrementAndGet() + "_" + System.currentTimeMillis();
3135
jedisPool = jtfTest.createJedisPool();
3236
}
3337

3438
@After
3539
public void after() {
3640
if (jedisPool != null) {
41+
WithJedisPoolDelete.doDelete(jedisPool, listName);
3742
jedisPool.close();
3843
}
3944
}

‎src/test/java/org/oba/jedis/extra/utils/collections/functional/FunctionalJedisListTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.junit.Test;
66
import org.oba.jedis.extra.utils.collections.JedisList;
77
import org.oba.jedis.extra.utils.test.JedisTestFactory;
8+
import org.oba.jedis.extra.utils.test.WithJedisPoolDelete;
89
import org.slf4j.Logger;
910
import org.slf4j.LoggerFactory;
1011
import io.valkey.Jedis;
@@ -39,9 +40,7 @@ public void before() {
3940
@After
4041
public void after() {
4142
if (jedisPool != null) {
42-
try(Jedis jedis = jedisPool.getResource()) {
43-
jedis.del(listName);
44-
}
43+
WithJedisPoolDelete.doDelete(jedisPool, listName);
4544
jedisPool.close();
4645
}
4746
}

0 commit comments

Comments
 (0)