Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit f97bd87

Browse files
committed
Upgrade to Jedis 5.0.2.
Closes #2763
1 parent 37ecdc5 commit f97bd87

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<xstream>1.4.20</xstream>
2626
<pool>2.11.1</pool>
2727
<lettuce>6.3.0.BUILD-SNAPSHOT</lettuce>
28-
<jedis>5.0.1</jedis>
28+
<jedis>5.0.2</jedis>
2929
<multithreadedtc>1.01</multithreadedtc>
3030
<netty>4.1.100.Final</netty>
3131
<java-module-name>spring.data.redis</java-module-name>

‎src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterStreamCommands.java‎

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

1818
import static org.springframework.data.redis.connection.jedis.StreamConverters.*;
1919

20-
import org.springframework.util.StringUtils;
2120
import redis.clients.jedis.BuilderFactory;
2221
import redis.clients.jedis.params.XAddParams;
2322
import redis.clients.jedis.params.XClaimParams;
@@ -45,6 +44,7 @@
4544
import org.springframework.data.redis.connection.stream.StreamOffset;
4645
import org.springframework.data.redis.connection.stream.StreamReadOptions;
4746
import org.springframework.util.Assert;
47+
import org.springframework.util.StringUtils;
4848

4949
/**
5050
* @author Dengliming
@@ -319,7 +319,7 @@ public List<ByteRecord> xRead(StreamReadOptions readOptions, StreamOffset<byte[]
319319

320320
try {
321321

322-
List<byte[]> xread = connection.getCluster().xread(xReadParams, toStreamOffsets(streams));
322+
List<?> xread = connection.getCluster().xread(xReadParams, toStreamOffsets(streams));
323323

324324
if (xread == null) {
325325
return Collections.emptyList();
@@ -343,7 +343,7 @@ public List<ByteRecord> xReadGroup(Consumer consumer, StreamReadOptions readOpti
343343

344344
try {
345345

346-
List<byte[]> xread = connection.getCluster().xreadGroup(JedisConverters.toBytes(consumer.getGroup()),
346+
List<?> xread = connection.getCluster().xreadGroup(JedisConverters.toBytes(consumer.getGroup()),
347347
JedisConverters.toBytes(consumer.getName()), xReadParams, toStreamOffsets(streams));
348348

349349
if (xread == null) {

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /