Skip to content

Commit 86d0b4f

Browse files
mp911demp911de
committed
Polishing.
Update since tags. Move FlushOption converters to client-specific converters. Use method-references where possible. See #2187 Original pull request: #2190.
1 parent 3879a5a commit 86d0b4f

15 files changed

+96
-99
lines changed

‎src/main/java/org/springframework/data/redis/connection/ReactiveClusterServerCommands.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ public interface ReactiveClusterServerCommands extends ReactiveServerCommands {
9494
Mono<String> flushDb(RedisClusterNode node);
9595

9696
/**
97-
* Delete all keys of the currently selected database using the specified flush option.
97+
* Delete all keys of the currently selected database using the specified {@link FlushOption}.
9898
*
9999
* @param node must not be {@literal null}. {@link Mono} indicating command completion.
100100
* @param option
101101
* @throws IllegalArgumentException when {@code node} is {@literal null}.
102102
* @see RedisServerCommands#flushDb(FlushOption)
103-
* @since 2.6
103+
* @since 2.7
104104
*/
105105
Mono<String> flushDb(RedisClusterNode node, FlushOption option);
106106

@@ -115,14 +115,14 @@ public interface ReactiveClusterServerCommands extends ReactiveServerCommands {
115115
Mono<String> flushAll(RedisClusterNode node);
116116

117117
/**
118-
* Delete all <b>all keys</b> from <b>all databases</b> using the specified flush option.
118+
* Delete all <b>all keys</b> from <b>all databases</b> using the specified {@link FlushOption}.
119119
*
120120
* @param node must not be {@literal null}.
121121
* @param option
122122
* @return {@link Mono} indicating command completion.
123123
* @throws IllegalArgumentException when {@code node} is {@literal null}.
124124
* @see RedisServerCommands#flushAll(FlushOption)
125-
* @since 2.6
125+
* @since 2.7
126126
*/
127127
Mono<String> flushAll(RedisClusterNode node, FlushOption option);
128128

‎src/main/java/org/springframework/data/redis/connection/ReactiveServerCommands.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ public interface ReactiveServerCommands {
8484
Mono<String> flushDb();
8585

8686
/**
87-
* Delete all keys of the currently selected database using the specified flush option.
87+
* Delete all keys of the currently selected database using the specified {@link FlushOption}.
8888
*
8989
* @param option
9090
* @return {@link Mono} indicating command completion.
9191
* @see <a href="https://redis.io/commands/flushdb">Redis Documentation: FLUSHDB</a>
92-
* @since 2.6
92+
* @since 2.7
9393
*/
9494
Mono<String> flushDb(FlushOption option);
9595

@@ -102,12 +102,12 @@ public interface ReactiveServerCommands {
102102
Mono<String> flushAll();
103103

104104
/**
105-
* Delete all <b>all keys</b> from <b>all databases</b> using the specified flush option.
105+
* Delete all <b>all keys</b> from <b>all databases</b> using the specified {@link FlushOption}.
106106
*
107107
* @param option
108108
* @return {@link Mono} indicating command completion.
109109
* @see <a href="https://redis.io/commands/flushall">Redis Documentation: FLUSHALL</a>
110-
* @since 2.6
110+
* @since 2.7
111111
*/
112112
Mono<String> flushAll(FlushOption option);
113113

‎src/main/java/org/springframework/data/redis/connection/RedisClusterServerCommands.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public interface RedisClusterServerCommands extends RedisServerCommands {
7070
* @param node must not be {@literal null}.
7171
* @param option
7272
* @see RedisServerCommands#flushDb(FlushOption)
73-
* @since 2.6
73+
* @since 2.7
7474
*/
7575
void flushDb(RedisClusterNode node, FlushOption option);
7676

@@ -84,7 +84,7 @@ public interface RedisClusterServerCommands extends RedisServerCommands {
8484
* @param node must not be {@literal null}.
8585
* @param option
8686
* @see RedisServerCommands#flushAll(FlushOption)
87-
* @since 2.6
87+
* @since 2.7
8888
*/
8989
void flushAll(RedisClusterNode node, FlushOption option);
9090

‎src/main/java/org/springframework/data/redis/connection/RedisServerCommands.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ enum MigrateOption {
4545
}
4646

4747
/**
48-
* @since 2.6
48+
* @since 2.7
4949
*/
5050
enum FlushOption {
5151
SYNC, ASYNC
@@ -110,11 +110,11 @@ default void bgWriteAof() {
110110
void flushDb();
111111

112112
/**
113-
* Delete all keys of the currently selected database using the specified flush option.
113+
* Delete all keys of the currently selected database using the specified {@link FlushOption}.
114114
*
115115
* @param option
116116
* @see <a href="https://redis.io/commands/flushdb">Redis Documentation: FLUSHDB</a>
117-
* @since 2.6
117+
* @since 2.7
118118
*/
119119
void flushDb(FlushOption option);
120120

@@ -126,11 +126,11 @@ default void bgWriteAof() {
126126
void flushAll();
127127

128128
/**
129-
* Delete all <b>all keys</b> from <b>all databases</b> using the specified flush option.
129+
* Delete all <b>all keys</b> from <b>all databases</b> using the specified {@link FlushOption}.
130130
*
131131
* @param option
132132
* @see <a href="https://redis.io/commands/flushall">Redis Documentation: FLUSHALL</a>
133-
* @since 2.6
133+
* @since 2.7
134134
*/
135135
void flushAll(FlushOption option);
136136

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

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

1818
import redis.clients.jedis.BinaryJedis;
1919
import redis.clients.jedis.Jedis;
20-
import redis.clients.jedis.args.FlushMode;
2120

2221
import java.util.ArrayList;
2322
import java.util.Collection;
@@ -179,7 +178,7 @@ public void flushDb() {
179178
*/
180179
@Override
181180
public void flushDb(FlushOption option) {
182-
executeCommandOnAllNodes(it -> it.flushDB(toFlushMode(option)));
181+
executeCommandOnAllNodes(it -> it.flushDB(JedisConverters.toFlushMode(option)));
183182
}
184183

185184
/*
@@ -197,7 +196,7 @@ public void flushDb(RedisClusterNode node) {
197196
*/
198197
@Override
199198
public void flushDb(RedisClusterNode node, FlushOption option) {
200-
executeCommandOnSingleNode(it -> it.flushDB(toFlushMode(option)), node);
199+
executeCommandOnSingleNode(it -> it.flushDB(JedisConverters.toFlushMode(option)), node);
201200
}
202201

203202
/*
@@ -217,7 +216,8 @@ public void flushAll() {
217216
@Override
218217
public void flushAll(FlushOption option) {
219218
connection.getClusterCommandExecutor()
220-
.executeCommandOnAllNodes((JedisClusterCommandCallback<String>) it -> it.flushAll(toFlushMode(option)));
219+
.executeCommandOnAllNodes(
220+
(JedisClusterCommandCallback<String>) it -> it.flushAll(JedisConverters.toFlushMode(option)));
221221
}
222222

223223
/*
@@ -235,7 +235,7 @@ public void flushAll(RedisClusterNode node) {
235235
*/
236236
@Override
237237
public void flushAll(RedisClusterNode node, FlushOption option) {
238-
executeCommandOnSingleNode(it -> it.flushAll(toFlushMode(option)), node);
238+
executeCommandOnSingleNode(it -> it.flushAll(JedisConverters.toFlushMode(option)), node);
239239
}
240240

241241
/*
@@ -455,8 +455,9 @@ public void rewriteConfig(RedisClusterNode node) {
455455
@Override
456456
public Long time(TimeUnit timeUnit) {
457457

458-
return convertListOfStringToTime(connection.getClusterCommandExecutor()
459-
.executeCommandOnArbitraryNode((JedisClusterCommandCallback<List<String>>) BinaryJedis::time).getValue(),
458+
return convertListOfStringToTime(
459+
connection.getClusterCommandExecutor()
460+
.executeCommandOnArbitraryNode((JedisClusterCommandCallback<List<String>>) BinaryJedis::time).getValue(),
460461
timeUnit);
461462
}
462463

@@ -467,8 +468,9 @@ public Long time(TimeUnit timeUnit) {
467468
@Override
468469
public Long time(RedisClusterNode node, TimeUnit timeUnit) {
469470

470-
return convertListOfStringToTime(connection.getClusterCommandExecutor()
471-
.executeCommandOnSingleNode((JedisClusterCommandCallback<List<String>>) BinaryJedis::time, node).getValue(),
471+
return convertListOfStringToTime(
472+
connection.getClusterCommandExecutor()
473+
.executeCommandOnSingleNode((JedisClusterCommandCallback<List<String>>) BinaryJedis::time, node).getValue(),
472474
timeUnit);
473475
}
474476

@@ -595,18 +597,4 @@ private <T> MultiNodeResult<T> executeCommandOnAllNodes(JedisClusterCommandCallb
595597
return connection.getClusterCommandExecutor().executeCommandOnAllNodes(cmd);
596598
}
597599

598-
static FlushMode toFlushMode(@Nullable FlushOption option) {
599-
600-
if (option == null) {
601-
return FlushMode.SYNC;
602-
}
603-
604-
switch (option) {
605-
case ASYNC:
606-
return FlushMode.ASYNC;
607-
case SYNC:
608-
return FlushMode.SYNC;
609-
}
610-
throw new UnsupportedOperationException("Flush option " + option + " is not implemented.");
611-
}
612600
}

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

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import redis.clients.jedis.ListPosition;
2323
import redis.clients.jedis.ScanParams;
2424
import redis.clients.jedis.SortingParams;
25+
import redis.clients.jedis.args.FlushMode;
2526
import redis.clients.jedis.params.GeoRadiusParam;
2627
import redis.clients.jedis.params.GetExParams;
2728
import redis.clients.jedis.params.SetParams;
@@ -59,6 +60,7 @@
5960
import org.springframework.data.redis.connection.RedisGeoCommands.GeoRadiusCommandArgs.Flag;
6061
import org.springframework.data.redis.connection.RedisListCommands.Position;
6162
import org.springframework.data.redis.connection.RedisServer;
63+
import org.springframework.data.redis.connection.RedisServerCommands;
6264
import org.springframework.data.redis.connection.RedisStringCommands.BitOperation;
6365
import org.springframework.data.redis.connection.RedisStringCommands.SetOption;
6466
import org.springframework.data.redis.connection.RedisZSetCommands.Range.Boundary;
@@ -436,10 +438,12 @@ public static SetParams toSetCommandExPxArgument(Expiration expiration, SetParam
436438
}
437439

438440
if (expiration.getTimeUnit() == TimeUnit.MILLISECONDS) {
439-
return expiration.isUnixTimestamp() ? paramsToUse.pxAt(expiration.getExpirationTime()) : paramsToUse.px(expiration.getExpirationTime());
441+
return expiration.isUnixTimestamp() ? paramsToUse.pxAt(expiration.getExpirationTime())
442+
: paramsToUse.px(expiration.getExpirationTime());
440443
}
441444

442-
return expiration.isUnixTimestamp() ? paramsToUse.exAt(expiration.getConverted(TimeUnit.SECONDS)) : paramsToUse.ex(expiration.getConverted(TimeUnit.SECONDS));
445+
return expiration.isUnixTimestamp() ? paramsToUse.exAt(expiration.getConverted(TimeUnit.SECONDS))
446+
: paramsToUse.ex(expiration.getConverted(TimeUnit.SECONDS));
443447
}
444448

445449
/**
@@ -814,6 +818,22 @@ public static byte[][] toBitfieldCommandArguments(BitFieldSubCommands source) {
814818
return args.toArray(new byte[0][0]);
815819
}
816820

821+
static FlushMode toFlushMode(@Nullable RedisServerCommands.FlushOption option) {
822+
823+
if (option == null) {
824+
return FlushMode.SYNC;
825+
}
826+
827+
switch (option) {
828+
case ASYNC:
829+
return FlushMode.ASYNC;
830+
case SYNC:
831+
return FlushMode.SYNC;
832+
default:
833+
throw new IllegalArgumentException("Flush option " + option + " is not supported.");
834+
}
835+
}
836+
817837
/**
818838
* @author Christoph Strobl
819839
* @since 1.8

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import redis.clients.jedis.BinaryJedis;
1919
import redis.clients.jedis.Jedis;
2020
import redis.clients.jedis.MultiKeyPipelineBase;
21-
import redis.clients.jedis.args.FlushMode;
2221
import redis.clients.jedis.args.SaveMode;
2322

2423
import java.util.List;
@@ -39,8 +38,6 @@
3938
*/
4039
class JedisServerCommands implements RedisServerCommands {
4140

42-
private static final String SHUTDOWN_SCRIPT = "return redis.call('SHUTDOWN','%s')";
43-
4441
private final JedisConnection connection;
4542

4643
JedisServerCommands(JedisConnection connection) {
@@ -107,9 +104,8 @@ public void flushDb() {
107104
*/
108105
@Override
109106
public void flushDb(FlushOption option) {
110-
111-
FlushMode flushMode = JedisClusterServerCommands.toFlushMode(option);
112-
connection.invokeStatus().just(it -> it.flushDB(flushMode), it -> it.flushDB(flushMode));
107+
connection.invokeStatus().just(BinaryJedis::flushDB, MultiKeyPipelineBase::flushDB,
108+
JedisConverters.toFlushMode(option));
113109
}
114110

115111
/*
@@ -127,9 +123,8 @@ public void flushAll() {
127123
*/
128124
@Override
129125
public void flushAll(FlushOption option) {
130-
131-
FlushMode flushMode = JedisClusterServerCommands.toFlushMode(option);
132-
connection.invokeStatus().just(it -> it.flushAll(flushMode), it -> it.flushAll(flushMode));
126+
connection.invokeStatus().just(BinaryJedis::flushAll, MultiKeyPipelineBase::flushAll,
127+
JedisConverters.toFlushMode(option));
133128
}
134129

135130
/*

‎src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterServerCommands.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void flushDb() {
131131
*/
132132
@Override
133133
public void flushDb(FlushOption option) {
134-
executeCommandOnAllNodes(it -> it.flushdb(toFlushMode(option)));
134+
executeCommandOnAllNodes(it -> it.flushdb(LettuceConverters.toFlushMode(option)));
135135
}
136136

137137
/*
@@ -149,7 +149,7 @@ public void flushDb(RedisClusterNode node) {
149149
*/
150150
@Override
151151
public void flushDb(RedisClusterNode node, FlushOption option) {
152-
executeCommandOnSingleNode(it -> it.flushdb(toFlushMode(option)), node);
152+
executeCommandOnSingleNode(it -> it.flushdb(LettuceConverters.toFlushMode(option)), node);
153153
}
154154

155155
/*
@@ -167,7 +167,7 @@ public void flushAll() {
167167
*/
168168
@Override
169169
public void flushAll(FlushOption option) {
170-
executeCommandOnAllNodes(it -> it.flushall(toFlushMode(option)));
170+
executeCommandOnAllNodes(it -> it.flushall(LettuceConverters.toFlushMode(option)));
171171
}
172172

173173
/*
@@ -185,7 +185,7 @@ public void flushAll(RedisClusterNode node) {
185185
*/
186186
@Override
187187
public void flushAll(RedisClusterNode node, FlushOption option) {
188-
executeCommandOnSingleNode(it -> it.flushall(toFlushMode(option)), node);
188+
executeCommandOnSingleNode(it -> it.flushall(LettuceConverters.toFlushMode(option)), node);
189189
}
190190

191191
/*

‎src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConverters.java‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -896,10 +896,9 @@ public static GeoArgs toGeoArgs(GeoCommandArgs args) {
896896

897897
if (args.hasFlags()) {
898898
for (GeoCommandArgs.GeoCommandFlag flag : args.getFlags()) {
899-
if(flag.equals(GeoRadiusCommandArgs.Flag.WITHCOORD)) {
899+
if (flag.equals(GeoRadiusCommandArgs.Flag.WITHCOORD)) {
900900
geoArgs.withCoordinates();
901-
}
902-
else if(flag.equals(GeoRadiusCommandArgs.Flag.WITHDIST)) {
901+
} else if (flag.equals(GeoRadiusCommandArgs.Flag.WITHDIST)) {
903902
geoArgs.withDistance();
904903
}
905904
}
@@ -1171,6 +1170,22 @@ static <T> GeoSearch.GeoRef<T> toGeoRef(GeoReference<T> reference) {
11711170
throw new IllegalArgumentException(String.format("Cannot convert %s to Lettuce GeoRef", reference));
11721171
}
11731172

1173+
static FlushMode toFlushMode(@Nullable RedisServerCommands.FlushOption option) {
1174+
1175+
if (option == null) {
1176+
return FlushMode.SYNC;
1177+
}
1178+
1179+
switch (option) {
1180+
case ASYNC:
1181+
return FlushMode.ASYNC;
1182+
case SYNC:
1183+
return FlushMode.SYNC;
1184+
default:
1185+
throw new IllegalArgumentException("Flush option " + option + " is not supported.");
1186+
}
1187+
}
1188+
11741189
/**
11751190
* @author Christoph Strobl
11761191
* @since 1.8

‎src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterServerCommands.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public Mono<String> flushDb(RedisClusterNode node) {
137137
*/
138138
@Override
139139
public Mono<String> flushDb(RedisClusterNode node, FlushOption option) {
140-
return connection.execute(node, it -> it.flushdb(LettuceServerCommands.toFlushMode(option))).next();
140+
return connection.execute(node, it -> it.flushdb(LettuceConverters.toFlushMode(option))).next();
141141
}
142142

143143
/*
@@ -155,7 +155,7 @@ public Mono<String> flushAll(RedisClusterNode node) {
155155
*/
156156
@Override
157157
public Mono<String> flushAll(RedisClusterNode node, FlushOption option) {
158-
return connection.execute(node, it -> it.flushall(LettuceServerCommands.toFlushMode(option))).next();
158+
return connection.execute(node, it -> it.flushall(LettuceConverters.toFlushMode(option))).next();
159159
}
160160

161161
/*

0 commit comments

Comments
 (0)