Skip to content

Commit 049baf7

Browse files
chayimchayim
authored
Merge branch 'master' into ck-example-CO
2 parents 5ac1902 + 93fa07e commit 049baf7

63 files changed

Lines changed: 6338 additions & 8970 deletions

File tree

Some content is hidden

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

‎.github/release-drafter-config.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name-template: '$NEXT_MINOR_VERSION'
22
tag-template: 'v$NEXT_MINOR_VERSION'
3+
filter-by-commitish: true
4+
commitish: master
35
autolabeler:
46
- label: 'maintenance'
57
files:
@@ -35,6 +37,8 @@ categories:
3537
labels:
3638
- 'maintenance'
3739
- 'dependencies'
40+
- 'documentation'
41+
- 'docs'
3842
- 'testing'
3943
change-template: '- $TITLE (#$NUMBER)'
4044
exclude-labels:

‎.github/workflows/integration.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ on:
1010
- '**/*.rst'
1111
branches:
1212
- master
13-
- '[0-9].[0-9]'
1413
- '[0-9].x'
14+
- '[0-9].[0-9].x'
1515
pull_request:
1616
branches:
1717
- master
18-
- '[0-9].[0-9]'
1918
- '[0-9].x'
19+
- '[0-9].[0-9].x'
2020
schedule:
2121
- cron: '0 1 * * *' # nightly build
22+
workflow_dispatch:
2223

2324
jobs:
2425

‎.github/workflows/snapshot.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ on:
66
push:
77
branches:
88
- master
9-
- '[0-9].[0-9]'
9+
- '[0-9].x'
10+
workflow_dispatch:
1011

1112
jobs:
1213

‎.github/workflows/version-and-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
run: |
1717
realversion="${GITHUB_REF/refs\/tags\//}"
1818
realversion="${realversion//v/}"
19-
echo "::set-output name=VERSION::$realversion"
19+
echo "VERSION=$realversion" >> $GITHUB_OUTPUT
2020
2121
- name: Set up publishing to maven central
2222
uses: actions/setup-java@v2
@@ -32,14 +32,14 @@ jobs:
3232

3333
- name: Install gpg key
3434
run: |
35-
cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import
35+
cat <(echo -e "${{ secrets.OSSH_GPG_SECRET_KEY }}") | gpg --batch --import
3636
gpg --list-secret-keys --keyid-format LONG
3737
3838
- name: Publish
3939
run: |
4040
mvn --no-transfer-progress \
4141
--batch-mode \
42-
-Dgpg.passphrase='${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}' \
42+
-Dgpg.passphrase='${{ secrets.OSSH_GPG_SECRET_KEY_PASSWORD }}' \
4343
-DskipTests deploy -P release
4444
env:
4545
MAVEN_USERNAME: ${{secrets.OSSH_USERNAME}}

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ daemonize yes
209209
protected-mode no
210210
requirepass cluster
211211
port 7379
212-
cluster-node-timeout 50
212+
cluster-node-timeout 15000
213213
pidfile /tmp/redis_cluster_node1.pid
214214
logfile /tmp/redis_cluster_node1.log
215215
save ""
@@ -223,7 +223,7 @@ daemonize yes
223223
protected-mode no
224224
requirepass cluster
225225
port 7380
226-
cluster-node-timeout 50
226+
cluster-node-timeout 15000
227227
pidfile /tmp/redis_cluster_node2.pid
228228
logfile /tmp/redis_cluster_node2.log
229229
save ""
@@ -237,7 +237,7 @@ daemonize yes
237237
protected-mode no
238238
requirepass cluster
239239
port 7381
240-
cluster-node-timeout 50
240+
cluster-node-timeout 15000
241241
pidfile /tmp/redis_cluster_node3.pid
242242
logfile /tmp/redis_cluster_node3.log
243243
save ""
@@ -251,7 +251,7 @@ daemonize yes
251251
protected-mode no
252252
requirepass cluster
253253
port 7382
254-
cluster-node-timeout 50
254+
cluster-node-timeout 15000
255255
pidfile /tmp/redis_cluster_node4.pid
256256
logfile /tmp/redis_cluster_node4.log
257257
save ""
@@ -265,7 +265,7 @@ daemonize yes
265265
protected-mode no
266266
requirepass cluster
267267
port 7383
268-
cluster-node-timeout 5000
268+
cluster-node-timeout 15000
269269
pidfile /tmp/redis_cluster_node5.pid
270270
logfile /tmp/redis_cluster_node5.log
271271
save ""

‎README.md‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,28 @@
66
[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.txt)
77
[![Integration](https://github.com/redis/jedis/actions/workflows/integration.yml/badge.svg?branch=master)](https://github.com/redis/jedis/actions/workflows/integration.yml)
88
[![codecov](https://codecov.io/gh/redis/jedis/branch/master/graph/badge.svg?token=pAstxAAjYo)](https://codecov.io/gh/redis/jedis)
9-
[![Discord](https://img.shields.io/discord/697882427875393627?style=flat-square)](https://discord.gg/qRhBuY8Z)
9+
[![Discord](https://img.shields.io/discord/697882427875393627?style=flat-square)](https://discord.gg/redis)
1010

1111
## What is Jedis?
1212

1313
Jedis is a Java client for [Redis](https://github.com/redis/redis "Redis") designed for performance and ease of use.
1414

1515
Are you looking for a high-level library to handle object mapping? See [redis-om-spring](https://github.com/redis/redis-om-spring)!
1616

17+
## How do I Redis?
18+
19+
[Learn for free at Redis University](https://university.redis.com/)
20+
21+
[Build faster with the Redis Launchpad](https://launchpad.redis.com/)
22+
23+
[Try the Redis Cloud](https://redis.com/try-free/)
24+
25+
[Dive in developer tutorials](https://developer.redis.com/)
26+
27+
[Join the Redis community](https://redis.com/community/)
28+
29+
[Work at Redis](https://redis.com/company/careers/jobs/)
30+
1731
## Supported Redis versions
1832

1933
The most recent version of this library supports redis version

‎pom.xml‎

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<packaging>jar</packaging>
1010
<groupId>redis.clients</groupId>
1111
<artifactId>jedis</artifactId>
12-
<version>5.1.0-SNAPSHOT</version>
12+
<version>5.2.0-SNAPSHOT</version>
1313
<name>Jedis</name>
1414
<description>Jedis is a blazingly small and sane Redis java client.</description>
1515
<url>https://github.com/redis/jedis</url>
@@ -46,9 +46,11 @@
4646

4747
<properties>
4848
<github.global.server>github</github.global.server>
49-
<slf4j.version>1.7.36</slf4j.version>
5049
<jedis.module.name>redis.clients.jedis</jedis.module.name>
50+
<slf4j.version>1.7.36</slf4j.version>
5151
<resilience4j.version>1.7.1</resilience4j.version>
52+
<jackson.version>2.16.0</jackson.version>
53+
<maven.surefire.version>3.2.3</maven.surefire.version>
5254
</properties>
5355

5456
<dependencies>
@@ -60,19 +62,35 @@
6062
<dependency>
6163
<groupId>org.apache.commons</groupId>
6264
<artifactId>commons-pool2</artifactId>
63-
<version>2.11.1</version>
65+
<version>2.12.0</version>
6466
</dependency>
6567
<dependency>
6668
<groupId>org.json</groupId>
6769
<artifactId>json</artifactId>
68-
<version>20230618</version>
70+
<version>20231013</version>
6971
</dependency>
7072
<dependency>
7173
<groupId>com.google.code.gson</groupId>
7274
<artifactId>gson</artifactId>
7375
<version>2.10.1</version>
7476
</dependency>
7577

78+
<!-- UNIX socket connection support -->
79+
<dependency>
80+
<groupId>com.kohlschutter.junixsocket</groupId>
81+
<artifactId>junixsocket-core</artifactId>
82+
<version>2.8.3</version>
83+
<type>pom</type>
84+
<scope>test</scope>
85+
</dependency>
86+
<!-- Well-known text representation of geometry in RediSearch support -->
87+
<dependency>
88+
<groupId>org.locationtech.jts</groupId>
89+
<artifactId>jts-core</artifactId>
90+
<version>1.19.0</version>
91+
<scope>test</scope>
92+
</dependency>
93+
<!-- test -->
7694
<dependency>
7795
<groupId>junit</groupId>
7896
<artifactId>junit</artifactId>
@@ -91,13 +109,6 @@
91109
<version>${slf4j.version}</version>
92110
<scope>test</scope>
93111
</dependency>
94-
<dependency>
95-
<groupId>com.kohlschutter.junixsocket</groupId>
96-
<artifactId>junixsocket-core</artifactId>
97-
<version>2.6.1</version>
98-
<type>pom</type>
99-
<scope>test</scope>
100-
</dependency>
101112
<dependency>
102113
<groupId>org.mockito</groupId>
103114
<artifactId>mockito-inline</artifactId>
@@ -107,15 +118,17 @@
107118
<dependency>
108119
<groupId>com.fasterxml.jackson.core</groupId>
109120
<artifactId>jackson-databind</artifactId>
110-
<version>2.14.2</version>
121+
<version>${jackson.version}</version>
111122
<scope>test</scope>
112123
</dependency>
113124
<dependency>
114125
<groupId>com.fasterxml.jackson.datatype</groupId>
115126
<artifactId>jackson-datatype-jsr310</artifactId>
116-
<version>2.14.2</version>
127+
<version>${jackson.version}</version>
117128
<scope>test</scope>
118129
</dependency>
130+
131+
<!-- circuit breaker / failover -->
119132
<dependency>
120133
<groupId>io.github.resilience4j</groupId>
121134
<artifactId>resilience4j-all</artifactId>
@@ -158,7 +171,7 @@
158171
<plugin>
159172
<groupId>org.jacoco</groupId>
160173
<artifactId>jacoco-maven-plugin</artifactId>
161-
<version>0.8.5</version>
174+
<version>0.8.11</version>
162175
<executions>
163176
<execution>
164177
<goals>
@@ -184,7 +197,7 @@
184197
</plugin>
185198
<plugin>
186199
<artifactId>maven-surefire-plugin</artifactId>
187-
<version>3.1.2</version>
200+
<version>${maven.surefire.version}</version>
188201
<configuration>
189202
<systemPropertyVariables>
190203
<redis-hosts>${redis-hosts}</redis-hosts>
@@ -212,7 +225,7 @@
212225
</plugin>
213226
<plugin>
214227
<artifactId>maven-javadoc-plugin</artifactId>
215-
<version>3.6.0</version>
228+
<version>3.6.3</version>
216229
<configuration>
217230
<source>8</source><!-- Until JDK 11+ -->
218231
<detectJavaApiLink>false</detectJavaApiLink><!-- Until JDK 11+ -->
@@ -313,7 +326,7 @@
313326
<plugins>
314327
<plugin>
315328
<artifactId>maven-surefire-plugin</artifactId>
316-
<version>3.1.2</version>
329+
<version>${maven.surefire.version}</version>
317330
<configuration>
318331
<test>**/examples/*Example.java</test>
319332
</configuration>

‎src/main/java/redis/clients/jedis/AbstractPipeline.java‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package redis.clients.jedis;
2+
3+
import java.io.Closeable;
4+
5+
public abstract class AbstractPipeline extends PipeliningBase implements Closeable {
6+
7+
protected AbstractPipeline(CommandObjects commandObjects) {
8+
super(commandObjects);
9+
}
10+
11+
@Override
12+
public abstract void close();
13+
14+
/**
15+
* Synchronize pipeline by reading all responses.
16+
*/
17+
public abstract void sync();
18+
19+
public Response<Long> publish(String channel, String message) {
20+
return appendCommand(commandObjects.publish(channel, message));
21+
}
22+
23+
public Response<Long> publish(byte[] channel, byte[] message) {
24+
return appendCommand(commandObjects.publish(channel, message));
25+
}
26+
}

‎src/main/java/redis/clients/jedis/AbstractTransaction.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package redis.clients.jedis;
2+
3+
import java.io.Closeable;
4+
import java.util.List;
5+
6+
public abstract class AbstractTransaction extends PipeliningBase implements Closeable {
7+
8+
protected AbstractTransaction() {
9+
super(new CommandObjects());
10+
}
11+
12+
public abstract void multi();
13+
14+
/**
15+
* Must be called before {@link AbstractTransaction#multi() MULTI}.
16+
*/
17+
public abstract String watch(final String... keys);
18+
19+
/**
20+
* Must be called before {@link AbstractTransaction#multi() MULTI}.
21+
*/
22+
public abstract String watch(final byte[]... keys);
23+
24+
public abstract String unwatch();
25+
26+
@Override public abstract void close();
27+
28+
public abstract List<Object> exec();
29+
30+
public abstract String discard();
31+
32+
public Response<Long> waitReplicas(int replicas, long timeout) {
33+
return appendCommand(commandObjects.waitReplicas(replicas, timeout));
34+
}
35+
}

0 commit comments

Comments
 (0)