Skip to content

Commit 83b6a7d

Browse files
committed
chore: changed to use UnifiedJedis instead of Jedis
Signed-off-by: Maximillian Arruda <[email protected]>
1 parent 84e80b7 commit 83b6a7d

File tree

9 files changed

+34
-38
lines changed

9 files changed

+34
-38
lines changed

jnosql-redis/src/main/java/org/eclipse/jnosql/databases/redis/communication/DefaultCounter.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
package org.eclipse.jnosql.databases.redis.communication;
1616

17-
import redis.clients.jedis.Jedis;
17+
import redis.clients.jedis.UnifiedJedis;
1818

1919
import java.time.Duration;
2020
import java.util.Objects;
@@ -32,14 +32,13 @@ class DefaultCounter implements Counter {
3232

3333
private final String key;
3434

35-
private Jedis jedis;
35+
private final UnifiedJedis jedis;
3636

37-
DefaultCounter(String key, Jedis jedis) {
37+
DefaultCounter(String key, UnifiedJedis jedis) {
3838
this.key = key;
3939
this.jedis = jedis;
4040
}
4141

42-
4342
@Override
4443
public Number get() {
4544
return Optional.ofNullable(jedis.get(key))

jnosql-redis/src/main/java/org/eclipse/jnosql/databases/redis/communication/DefaultRedisBucketManagerFactory.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import jakarta.json.bind.Jsonb;
1818
import org.eclipse.jnosql.communication.driver.JsonbSupplier;
19-
import redis.clients.jedis.JedisPool;
19+
import redis.clients.jedis.UnifiedJedis;
2020

2121
import java.util.List;
2222
import java.util.Map;
@@ -29,70 +29,70 @@ class DefaultRedisBucketManagerFactory implements RedisBucketManagerFactory {
2929

3030
private static final Jsonb JSON = JsonbSupplier.getInstance().get();
3131

32-
private final JedisPool jedisPool;
32+
private final UnifiedJedis jedis;
3333

34-
DefaultRedisBucketManagerFactory(JedisPool jedisPool) {
35-
this.jedisPool = jedisPool;
34+
DefaultRedisBucketManagerFactory(UnifiedJedis jedis) {
35+
this.jedis = jedis;
3636
}
3737

3838

3939
@Override
4040
public RedisBucketManager apply(String bucketName) {
4141
requireNonNull(bucketName, "bucket name is required");
4242

43-
return new RedisBucketManager(bucketName, JSON, jedisPool.getResource());
43+
return new RedisBucketManager(bucketName, JSON, jedis);
4444
}
4545

4646
@Override
4747
public <T> List<T> getList(String bucketName, Class<T> clazz) {
4848
requireNonNull(bucketName, "bucket name is required");
4949
requireNonNull(clazz, "Class type is required");
50-
return new RedisList<>(jedisPool.getResource(), clazz, bucketName);
50+
return new RedisList<>(jedis, clazz, bucketName);
5151
}
5252

5353
@Override
5454
public <T> Set<T> getSet(String bucketName, Class<T> clazz) {
5555
requireNonNull(bucketName, "bucket name is required");
5656
requireNonNull(clazz, "Class type is required");
57-
return new RedisSet<>(jedisPool.getResource(), clazz, bucketName);
57+
return new RedisSet<>(jedis, clazz, bucketName);
5858
}
5959

6060
@Override
6161
public <T> Queue<T> getQueue(String bucketName, Class<T> clazz) {
6262
requireNonNull(bucketName, "bucket name is required");
6363
requireNonNull(clazz, "Class type is required");
64-
return new RedisQueue<>(jedisPool.getResource(), clazz, bucketName);
64+
return new RedisQueue<>(jedis, clazz, bucketName);
6565
}
6666

6767
@Override
6868
public <K, V> Map<K, V> getMap(String bucketName, Class<K> keyValue, Class<V> valueValue) {
6969
requireNonNull(bucketName, "bucket name is required");
7070
requireNonNull(valueValue, "Class type is required");
71-
return new RedisMap<>(jedisPool.getResource(), keyValue, valueValue, bucketName);
71+
return new RedisMap<>(jedis, keyValue, valueValue, bucketName);
7272
}
7373

7474
@Override
7575
public SortedSet getSortedSet(String key) throws NullPointerException {
7676
requireNonNull(key, "key is required");
77-
return new DefaultSortedSet(jedisPool.getResource(), key);
77+
return new DefaultSortedSet(jedis, key);
7878
}
7979

8080
@Override
8181
public Counter getCounter(String key) throws NullPointerException {
8282
requireNonNull(key, "key is required");
83-
return new DefaultCounter(key, jedisPool.getResource());
83+
return new DefaultCounter(key, jedis);
8484
}
8585

8686

8787
@Override
8888
public void close() {
89-
jedisPool.close();
89+
jedis.close();
9090
}
9191

9292
@Override
9393
public String toString() {
9494
final StringBuilder sb = new StringBuilder("RedisBucketManagerFactory{");
95-
sb.append("jedisPool=").append(jedisPool);
95+
sb.append("jedisPool=").append(jedis);
9696
sb.append('}');
9797
return sb.toString();
9898
}

jnosql-redis/src/main/java/org/eclipse/jnosql/databases/redis/communication/DefaultSortedSet.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.eclipse.jnosql.databases.redis.communication;
1717

1818

19-
import redis.clients.jedis.Jedis;
19+
import redis.clients.jedis.UnifiedJedis;
2020

2121
import java.time.Duration;
2222
import java.util.List;
@@ -33,9 +33,9 @@ class DefaultSortedSet implements SortedSet {
3333
private static final int LAST_ELEMENT = -1;
3434
private String key;
3535

36-
private Jedis jedis;
36+
private UnifiedJedis jedis;
3737

38-
DefaultSortedSet(Jedis jedis, String keyspace) {
38+
DefaultSortedSet(UnifiedJedis jedis, String keyspace) {
3939
Objects.requireNonNull(jedis, "jedis is required");
4040
Objects.requireNonNull(keyspace, "keyspace is required");
4141
this.key = keyspace;

jnosql-redis/src/main/java/org/eclipse/jnosql/databases/redis/communication/RedisBucketManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.eclipse.jnosql.communication.driver.ValueJSON;
2222
import org.eclipse.jnosql.communication.keyvalue.BucketManager;
2323
import org.eclipse.jnosql.communication.keyvalue.KeyValueEntity;
24-
import redis.clients.jedis.Jedis;
24+
import redis.clients.jedis.UnifiedJedis;
2525

2626
import java.time.Duration;
2727
import java.util.Objects;
@@ -38,9 +38,9 @@ public class RedisBucketManager implements BucketManager {
3838
private final String nameSpace;
3939
private final Jsonb jsonB;
4040

41-
private final Jedis jedis;
41+
private final UnifiedJedis jedis;
4242

43-
RedisBucketManager(String nameSpace, Jsonb provider, Jedis jedis) {
43+
RedisBucketManager(String nameSpace, Jsonb provider, UnifiedJedis jedis) {
4444
this.nameSpace = nameSpace;
4545
this.jsonB = provider;
4646
this.jedis = jedis;

jnosql-redis/src/main/java/org/eclipse/jnosql/databases/redis/communication/RedisCollection.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import jakarta.json.bind.Jsonb;
1919
import org.eclipse.jnosql.communication.driver.JsonbSupplier;
20-
import redis.clients.jedis.Jedis;
20+
import redis.clients.jedis.UnifiedJedis;
2121

2222
import java.util.ArrayList;
2323
import java.util.Collection;
@@ -33,13 +33,11 @@ abstract class RedisCollection<T> implements Collection<T> {
3333

3434
protected final String keyWithNameSpace;
3535

36-
protected final Jedis jedis;
36+
protected final UnifiedJedis jedis;
3737

3838
protected final boolean isString;
3939

40-
41-
42-
RedisCollection(Jedis jedis, Class<T> clazz, String keyWithNameSpace) {
40+
RedisCollection(UnifiedJedis jedis, Class<T> clazz, String keyWithNameSpace) {
4341
this.clazz = clazz;
4442
this.keyWithNameSpace = keyWithNameSpace;
4543
this.jedis = jedis;

jnosql-redis/src/main/java/org/eclipse/jnosql/databases/redis/communication/RedisList.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
package org.eclipse.jnosql.databases.redis.communication;
1717

18-
import redis.clients.jedis.Jedis;
18+
import redis.clients.jedis.UnifiedJedis;
1919
import redis.clients.jedis.args.ListPosition;
2020

2121
import java.util.ArrayList;
@@ -28,7 +28,7 @@
2828
class RedisList<T> extends RedisCollection<T> implements List<T> {
2929

3030

31-
RedisList(Jedis jedis, Class<T> clazz, String keyWithNameSpace) {
31+
RedisList(UnifiedJedis jedis, Class<T> clazz, String keyWithNameSpace) {
3232
super(jedis, clazz, keyWithNameSpace);
3333
}
3434

jnosql-redis/src/main/java/org/eclipse/jnosql/databases/redis/communication/RedisMap.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import jakarta.json.bind.Jsonb;
1919
import org.eclipse.jnosql.communication.driver.JsonbSupplier;
20-
import redis.clients.jedis.Jedis;
20+
import redis.clients.jedis.UnifiedJedis;
2121

2222
import java.util.Collection;
2323
import java.util.HashMap;
@@ -40,14 +40,13 @@ class RedisMap<K, V> implements Map<K, V> {
4040

4141
private final String nameSpace;
4242

43-
private final Jedis jedis;
43+
private final UnifiedJedis jedis;
4444

4545
private final boolean isKeyString;
4646

4747
private final boolean isValueString;
4848

49-
50-
RedisMap(Jedis jedis, Class<K> keyValue, Class<V> valueClass, String keyWithNameSpace) {
49+
RedisMap(UnifiedJedis jedis, Class<K> keyValue, Class<V> valueClass, String keyWithNameSpace) {
5150
this.keyClass = keyValue;
5251
this.valueClass = valueClass;
5352
this.nameSpace = keyWithNameSpace;

jnosql-redis/src/main/java/org/eclipse/jnosql/databases/redis/communication/RedisQueue.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515

1616
package org.eclipse.jnosql.databases.redis.communication;
1717

18-
import redis.clients.jedis.Jedis;
18+
import redis.clients.jedis.UnifiedJedis;
1919

2020
import java.util.NoSuchElementException;
2121
import java.util.Objects;
2222
import java.util.Queue;
2323

2424
class RedisQueue<T> extends RedisCollection<T> implements Queue<T> {
2525

26-
RedisQueue(Jedis jedis, Class<T> clazz, String keyWithNameSpace) {
26+
RedisQueue(UnifiedJedis jedis, Class<T> clazz, String keyWithNameSpace) {
2727
super(jedis, clazz, keyWithNameSpace);
2828
}
2929

jnosql-redis/src/main/java/org/eclipse/jnosql/databases/redis/communication/RedisSet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
package org.eclipse.jnosql.databases.redis.communication;
1717

18-
import redis.clients.jedis.Jedis;
18+
import redis.clients.jedis.UnifiedJedis;
1919

2020
import java.util.ArrayList;
2121
import java.util.List;
@@ -24,7 +24,7 @@
2424

2525
class RedisSet<T> extends RedisCollection<T> implements Set<T> {
2626

27-
RedisSet(Jedis jedis, Class<T> clazz, String keyWithNameSpace) {
27+
RedisSet(UnifiedJedis jedis, Class<T> clazz, String keyWithNameSpace) {
2828
super(jedis, clazz, keyWithNameSpace);
2929
}
3030

0 commit comments

Comments
 (0)