Skip to content

Commit f0de8f4

Browse files
tishuntishun
authored
Change from using a Mono to a Supplier (#3169) (#3170)
1 parent e2f4e5b commit f0de8f4

19 files changed

+61
-50
lines changed

‎src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@
4848
import io.lettuce.core.protocol.CommandType;
4949
import io.lettuce.core.protocol.ProtocolKeyword;
5050
import io.lettuce.core.protocol.RedisCommand;
51-
import reactor.core.publisher.Mono;
5251

5352
import java.time.Duration;
5453
import java.time.Instant;
5554
import java.util.Date;
5655
import java.util.List;
5756
import java.util.Map;
5857
import java.util.Set;
58+
import java.util.function.Supplier;
5959

6060
import static io.lettuce.core.ClientOptions.DEFAULT_JSON_PARSER;
6161
import static io.lettuce.core.protocol.CommandType.EXEC;
@@ -87,7 +87,7 @@ public abstract class AbstractRedisAsyncCommands<K, V> implements RedisAclAsyncC
8787

8888
private final RedisJsonCommandBuilder<K, V> jsonCommandBuilder;
8989

90-
private final Mono<JsonParser> parser;
90+
private final Supplier<JsonParser> parser;
9191

9292
/**
9393
* Initialize a new instance.
@@ -96,7 +96,8 @@ public abstract class AbstractRedisAsyncCommands<K, V> implements RedisAclAsyncC
9696
* @param codec the codec for command encoding
9797
* @param parser the implementation of the {@link JsonParser} to use
9898
*/
99-
public AbstractRedisAsyncCommands(StatefulConnection<K, V> connection, RedisCodec<K, V> codec, Mono<JsonParser> parser) {
99+
public AbstractRedisAsyncCommands(StatefulConnection<K, V> connection, RedisCodec<K, V> codec,
100+
Supplier<JsonParser> parser) {
100101
this.parser = parser;
101102
this.connection = connection;
102103
this.commandBuilder = new RedisCommandBuilder<>(codec);
@@ -3391,7 +3392,7 @@ public RedisFuture<List<Map<String, Object>>> clusterLinks() {
33913392

33923393
@Override
33933394
public JsonParser getJsonParser() {
3394-
return this.parser.block();
3395+
return this.parser.get();
33953396
}
33963397

33973398
private byte[] encodeFunction(String functionCode) {

‎src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public abstract class AbstractRedisReactiveCommands<K, V>
9797

9898
private final RedisJsonCommandBuilder<K, V> jsonCommandBuilder;
9999

100-
private final Mono<JsonParser> parser;
100+
private final Supplier<JsonParser> parser;
101101

102102
private final ClientResources clientResources;
103103

@@ -112,7 +112,8 @@ public abstract class AbstractRedisReactiveCommands<K, V>
112112
* @param codec the codec for command encoding.
113113
* @param parser the implementation of the {@link JsonParser} to use
114114
*/
115-
public AbstractRedisReactiveCommands(StatefulConnection<K, V> connection, RedisCodec<K, V> codec, Mono<JsonParser> parser) {
115+
public AbstractRedisReactiveCommands(StatefulConnection<K, V> connection, RedisCodec<K, V> codec,
116+
Supplier<JsonParser> parser) {
116117
this.connection = connection;
117118
this.parser = parser;
118119
this.commandBuilder = new RedisCommandBuilder<>(codec);
@@ -149,7 +150,7 @@ private EventExecutorGroup getScheduler() {
149150

150151
@Override
151152
public JsonParser getJsonParser() {
152-
return parser.block();
153+
return parser.get();
153154
}
154155

155156
@Override

‎src/main/java/io/lettuce/core/ClientOptions.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.Iterator;
2626
import java.util.ServiceConfigurationError;
2727
import java.util.ServiceLoader;
28+
import java.util.function.Supplier;
2829

2930
import io.lettuce.core.api.StatefulConnection;
3031
import io.lettuce.core.internal.LettuceAssert;
@@ -69,15 +70,15 @@ public class ClientOptions implements Serializable {
6970

7071
public static final SocketOptions DEFAULT_SOCKET_OPTIONS = SocketOptions.create();
7172

72-
public static final Mono<JsonParser> DEFAULT_JSON_PARSER = Mono.defer(() -> Mono.fromCallable(() -> {
73+
public static final Supplier<JsonParser> DEFAULT_JSON_PARSER = () -> {
7374
try {
7475
Iterator<JsonParser> services = ServiceLoader.load(JsonParser.class).iterator();
7576
return services.hasNext() ? services.next() : null;
7677
} catch (ServiceConfigurationError e) {
7778
throw new RedisJsonException("Could not load JsonParser, please consult the guide"
7879
+ "at https://redis.github.io/lettuce/user-guide/redis-json/", e);
7980
}
80-
}));
81+
};
8182

8283
public static final SslOptions DEFAULT_SSL_OPTIONS = SslOptions.create();
8384

@@ -105,7 +106,7 @@ public class ClientOptions implements Serializable {
105106

106107
private final Charset scriptCharset;
107108

108-
private final Mono<JsonParser> jsonParser;
109+
private final Supplier<JsonParser> jsonParser;
109110

110111
private final SocketOptions socketOptions;
111112

@@ -204,7 +205,7 @@ public static class Builder {
204205

205206
private Charset scriptCharset = DEFAULT_SCRIPT_CHARSET;
206207

207-
private Mono<JsonParser> jsonParser = DEFAULT_JSON_PARSER;
208+
private Supplier<JsonParser> jsonParser = DEFAULT_JSON_PARSER;
208209

209210
private SocketOptions socketOptions = DEFAULT_SOCKET_OPTIONS;
210211

@@ -399,7 +400,7 @@ public Builder scriptCharset(Charset scriptCharset) {
399400
* @see JsonParser
400401
* @since 6.5
401402
*/
402-
public Builder jsonParser(Mono<JsonParser> parser) {
403+
public Builder jsonParser(Supplier<JsonParser> parser) {
403404

404405
LettuceAssert.notNull(parser, "JsonParser must not be null");
405406
this.jsonParser = parser;
@@ -652,7 +653,7 @@ public Charset getScriptCharset() {
652653
* @return the implementation of the {@link JsonParser} to use.
653654
* @since 6.5
654655
*/
655-
public Mono<JsonParser> getJsonParser() {
656+
public Supplier<JsonParser> getJsonParser() {
656657
return jsonParser;
657658
}
658659

‎src/main/java/io/lettuce/core/RedisAsyncCommandsImpl.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
66
import io.lettuce.core.codec.RedisCodec;
77
import io.lettuce.core.json.JsonParser;
8-
import reactor.core.publisher.Mono;
8+
import java.util.function.Supplier;
99

1010
/**
1111
* An asynchronous and thread-safe API for a Redis connection.
@@ -24,7 +24,8 @@ public class RedisAsyncCommandsImpl<K, V> extends AbstractRedisAsyncCommands<K,
2424
* @param codec the codec for command encoding
2525
* @param parser the implementation of the {@link JsonParser} to use
2626
*/
27-
public RedisAsyncCommandsImpl(StatefulRedisConnection<K, V> connection, RedisCodec<K, V> codec, Mono<JsonParser> parser) {
27+
public RedisAsyncCommandsImpl(StatefulRedisConnection<K, V> connection, RedisCodec<K, V> codec,
28+
Supplier<JsonParser> parser) {
2829
super(connection, codec, parser);
2930
}
3031

‎src/main/java/io/lettuce/core/RedisJsonCommandBuilder.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import io.lettuce.core.protocol.BaseRedisCommandBuilder;
2121
import io.lettuce.core.protocol.Command;
2222
import io.lettuce.core.protocol.CommandArgs;
23-
import reactor.core.publisher.Mono;
2423

2524
import java.util.List;
25+
import java.util.function.Supplier;
2626

2727
import static io.lettuce.core.protocol.CommandType.*;
2828

@@ -34,9 +34,9 @@
3434
*/
3535
class RedisJsonCommandBuilder<K, V> extends BaseRedisCommandBuilder<K, V> {
3636

37-
private final Mono<JsonParser> parser;
37+
private final Supplier<JsonParser> parser;
3838

39-
RedisJsonCommandBuilder(RedisCodec<K, V> codec, Mono<JsonParser> theParser) {
39+
RedisJsonCommandBuilder(RedisCodec<K, V> codec, Supplier<JsonParser> theParser) {
4040
super(codec);
4141
parser = theParser;
4242
}
@@ -118,7 +118,7 @@ Command<K, V, List<JsonValue>> jsonArrpop(K key, JsonPath jsonPath, int index) {
118118
}
119119
}
120120

121-
return createCommand(JSON_ARRPOP, new JsonValueListOutput<>(codec, parser.block()), args);
121+
return createCommand(JSON_ARRPOP, new JsonValueListOutput<>(codec, parser.get()), args);
122122
}
123123

124124
Command<K, V, List<Long>> jsonArrtrim(K key, JsonPath jsonPath, JsonRangeArgs range) {
@@ -167,7 +167,7 @@ Command<K, V, List<JsonValue>> jsonGet(K key, JsonGetArgs options, JsonPath... j
167167
}
168168
}
169169

170-
return createCommand(JSON_GET, new JsonValueListOutput<>(codec, parser.block()), args);
170+
return createCommand(JSON_GET, new JsonValueListOutput<>(codec, parser.get()), args);
171171
}
172172

173173
Command<K, V, String> jsonMerge(K key, JsonPath jsonPath, JsonValue value) {
@@ -194,7 +194,7 @@ Command<K, V, List<JsonValue>> jsonMGet(JsonPath jsonPath, K... keys) {
194194
args.add(jsonPath.toString());
195195
}
196196

197-
return createCommand(JSON_MGET, new JsonValueListOutput<>(codec, parser.block()), args);
197+
return createCommand(JSON_MGET, new JsonValueListOutput<>(codec, parser.get()), args);
198198
}
199199

200200
Command<K, V, String> jsonMSet(List<JsonMsetArgs<K, V>> arguments) {

‎src/main/java/io/lettuce/core/RedisReactiveCommandsImpl.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import io.lettuce.core.json.JsonParser;
88
import reactor.core.publisher.Mono;
99

10+
import java.util.function.Supplier;
11+
1012
/**
1113
* A reactive and thread-safe API for a Redis Sentinel connection.
1214
*
@@ -25,7 +27,7 @@ public class RedisReactiveCommandsImpl<K, V> extends AbstractRedisReactiveComman
2527
* @param parser the implementation of the {@link JsonParser} to use
2628
*/
2729
public RedisReactiveCommandsImpl(StatefulRedisConnection<K, V> connection, RedisCodec<K, V> codec,
28-
Mono<JsonParser> parser) {
30+
Supplier<JsonParser> parser) {
2931
super(connection, codec, parser);
3032
}
3133

‎src/main/java/io/lettuce/core/StatefulRedisConnectionImpl.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.util.Collection;
2828
import java.util.List;
2929
import java.util.function.Consumer;
30+
import java.util.function.Supplier;
3031
import java.util.stream.Collectors;
3132

3233
import io.lettuce.core.api.StatefulRedisConnection;
@@ -67,7 +68,7 @@ public class StatefulRedisConnectionImpl<K, V> extends RedisChannelHandler<K, V>
6768

6869
private final PushHandler pushHandler;
6970

70-
private final Mono<JsonParser> parser;
71+
private final Supplier<JsonParser> parser;
7172

7273
protected MultiOutput<K, V> multi;
7374

@@ -94,7 +95,7 @@ public StatefulRedisConnectionImpl(RedisChannelWriter writer, PushHandler pushHa
9495
* @param parser the parser to use for JSON commands.
9596
*/
9697
public StatefulRedisConnectionImpl(RedisChannelWriter writer, PushHandler pushHandler, RedisCodec<K, V> codec,
97-
Duration timeout, Mono<JsonParser> parser) {
98+
Duration timeout, Supplier<JsonParser> parser) {
9899

99100
super(writer, timeout);
100101

‎src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
import java.util.HashMap;
3030
import java.util.List;
3131
import java.util.Map;
32-
import java.util.Set;
3332
import java.util.concurrent.CompletableFuture;
3433
import java.util.concurrent.CompletionStage;
3534
import java.util.concurrent.ThreadLocalRandom;
3635
import java.util.function.BiFunction;
3736
import java.util.function.Function;
3837
import java.util.function.Predicate;
38+
import java.util.function.Supplier;
3939
import java.util.stream.Collectors;
4040

4141
import io.lettuce.core.*;
@@ -64,7 +64,6 @@
6464
import io.lettuce.core.protocol.Command;
6565
import io.lettuce.core.protocol.CommandType;
6666
import io.lettuce.core.protocol.ConnectionIntent;
67-
import reactor.core.publisher.Mono;
6867

6968
/**
7069
* An advanced asynchronous and thread-safe API for a Redis Cluster connection.
@@ -89,11 +88,11 @@ public class RedisAdvancedClusterAsyncCommandsImpl<K, V> extends AbstractRedisAs
8988
* @param codec Codec used to encode/decode keys and values.
9089
* @param parser the implementation of the {@link JsonParser} to use
9190
* @deprecated since 5.1, use
92-
* {@link #RedisAdvancedClusterAsyncCommandsImpl(StatefulRedisClusterConnection, RedisCodec, Mono)}.
91+
* {@link #RedisAdvancedClusterAsyncCommandsImpl(StatefulRedisClusterConnection, RedisCodec, Supplier)}.
9392
*/
9493
@Deprecated
9594
public RedisAdvancedClusterAsyncCommandsImpl(StatefulRedisClusterConnectionImpl<K, V> connection, RedisCodec<K, V> codec,
96-
Mono<JsonParser> parser) {
95+
Supplier<JsonParser> parser) {
9796
super(connection, codec, parser);
9897
this.codec = codec;
9998
}
@@ -104,7 +103,7 @@ public RedisAdvancedClusterAsyncCommandsImpl(StatefulRedisClusterConnectionImpl<
104103
* @param connection the stateful connection
105104
* @param codec Codec used to encode/decode keys and values.
106105
* @deprecated since 5.1, use
107-
* {@link #RedisAdvancedClusterAsyncCommandsImpl(StatefulRedisClusterConnection, RedisCodec, Mono)}.
106+
* {@link #RedisAdvancedClusterAsyncCommandsImpl(StatefulRedisClusterConnection, RedisCodec, Supplier)}.
108107
*/
109108
@Deprecated
110109
public RedisAdvancedClusterAsyncCommandsImpl(StatefulRedisClusterConnectionImpl<K, V> connection, RedisCodec<K, V> codec) {
@@ -120,7 +119,7 @@ public RedisAdvancedClusterAsyncCommandsImpl(StatefulRedisClusterConnectionImpl<
120119
* @param parser the implementation of the {@link JsonParser} to use
121120
*/
122121
public RedisAdvancedClusterAsyncCommandsImpl(StatefulRedisClusterConnection<K, V> connection, RedisCodec<K, V> codec,
123-
Mono<JsonParser> parser) {
122+
Supplier<JsonParser> parser) {
124123
super(connection, codec, parser);
125124
this.codec = codec;
126125
}

‎src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterReactiveCommandsImpl.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.util.function.BiFunction;
3333
import java.util.function.Function;
3434
import java.util.function.Predicate;
35+
import java.util.function.Supplier;
3536
import java.util.stream.Collectors;
3637

3738
import io.lettuce.core.json.JsonParser;
@@ -78,11 +79,11 @@ public class RedisAdvancedClusterReactiveCommandsImpl<K, V> extends AbstractRedi
7879
* @param codec Codec used to encode/decode keys and values.
7980
* @param parser the implementation of the {@link JsonParser} to use
8081
* @deprecated since 5.2, use
81-
* {@link #RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnection, RedisCodec, Mono)}.
82+
* {@link #RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnection, RedisCodec, Supplier)}.
8283
*/
8384
@Deprecated
8485
public RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnectionImpl<K, V> connection, RedisCodec<K, V> codec,
85-
Mono<JsonParser> parser) {
86+
Supplier<JsonParser> parser) {
8687
super(connection, codec, parser);
8788
this.codec = codec;
8889
}
@@ -93,7 +94,7 @@ public RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnectionIm
9394
* @param connection the stateful connection.
9495
* @param codec Codec used to encode/decode keys and values.
9596
* @deprecated since 5.2, use
96-
* {@link #RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnection, RedisCodec, Mono)}.
97+
* {@link #RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnection, RedisCodec, Supplier)}.
9798
*/
9899
@Deprecated
99100
public RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnectionImpl<K, V> connection,
@@ -110,7 +111,7 @@ public RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnectionIm
110111
* @param parser the implementation of the {@link JsonParser} to use
111112
*/
112113
public RedisAdvancedClusterReactiveCommandsImpl(StatefulRedisClusterConnection<K, V> connection, RedisCodec<K, V> codec,
113-
Mono<JsonParser> parser) {
114+
Supplier<JsonParser> parser) {
114115
super(connection, codec, parser);
115116
this.codec = codec;
116117
}

‎src/main/java/io/lettuce/core/cluster/RedisClusterClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectToNodeAsync(RedisC
582582
* @return new instance of StatefulRedisConnectionImpl
583583
*/
584584
protected <K, V> StatefulRedisConnectionImpl<K, V> newStatefulRedisConnection(RedisChannelWriter channelWriter,
585-
PushHandler pushHandler, RedisCodec<K, V> codec, Duration timeout, Mono<JsonParser> parser) {
585+
PushHandler pushHandler, RedisCodec<K, V> codec, Duration timeout, Supplier<JsonParser> parser) {
586586
return new StatefulRedisConnectionImpl<>(channelWriter, pushHandler, codec, timeout, parser);
587587
}
588588

@@ -726,7 +726,7 @@ private <K, V> CompletableFuture<StatefulRedisClusterConnection<K, V>> connectCl
726726
*/
727727
protected <V, K> StatefulRedisClusterConnectionImpl<K, V> newStatefulRedisClusterConnection(
728728
RedisChannelWriter channelWriter, ClusterPushHandler pushHandler, RedisCodec<K, V> codec, Duration timeout,
729-
Mono<JsonParser> parser) {
729+
Supplier<JsonParser> parser) {
730730
return new StatefulRedisClusterConnectionImpl(channelWriter, pushHandler, codec, timeout, parser);
731731
}
732732

0 commit comments

Comments
 (0)