Skip to content

Commit cf2cce8

Browse files
denglimingmp911de
authored andcommitted
Use Jedis SetParams.KEEPTTL instead of injecting byte[] args.
Closes #1986.
1 parent 7cbeca1 commit cf2cce8

File tree

1 file changed

+3
-16
lines changed

1 file changed

+3
-16
lines changed

src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
* @author Mark Paluch
9191
* @author Ninad Divadkar
9292
* @author Guy Korland
93+
* @author dengliming
9394
*/
9495
public abstract class JedisConverters extends Converters {
9596

@@ -426,21 +427,7 @@ public static SetParams toSetCommandExPxArgument(Expiration expiration, SetParam
426427
SetParams paramsToUse = params == null ? SetParams.setParams() : params;
427428

428429
if (expiration.isKeepTtl()) {
429-
430-
// TODO: remove once jedis supports KEEPTTL (https://github.com/xetorthio/jedis/issues/2248)
431-
return new SetParams() {
432-
433-
@Override
434-
public byte[][] getByteParams(byte[]... args) {
435-
436-
ArrayList<byte[]> byteParams = new ArrayList<>();
437-
for (byte[] arg : paramsToUse.getByteParams(args)) {
438-
byteParams.add(arg);
439-
}
440-
byteParams.add(SafeEncoder.encode("keepttl"));
441-
return byteParams.toArray(new byte[byteParams.size()][]);
442-
}
443-
};
430+
return paramsToUse.keepttl();
444431
}
445432

446433
if (!expiration.isPersistent()) {
@@ -739,7 +726,7 @@ public static GeoRadiusParam toGeoRadiusParam(GeoRadiusCommandArgs source) {
739726
/**
740727
* Convert given {@link BitFieldSubCommands} into argument array.
741728
*
742-
* @param bitfieldOperation
729+
* @param source
743730
* @return never {@literal null}.
744731
* @since 1.8
745732
*/

0 commit comments

Comments
 (0)