Skip to content

Commit bc4d28c

Browse files
committed
Updates from code review
- fix formatting - package protect new methods - rename factory method
1 parent a81b49a commit bc4d28c

File tree

2 files changed

+19
-35
lines changed

2 files changed

+19
-35
lines changed

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java

+16-32
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,7 @@
1515
*/
1616
package org.springframework.data.redis.connection.lettuce;
1717

18-
import java.nio.ByteBuffer;
19-
import java.time.Duration;
20-
import java.util.ArrayList;
21-
import java.util.List;
22-
import java.util.Optional;
23-
import java.util.concurrent.CompletableFuture;
24-
import java.util.concurrent.CompletionStage;
25-
import java.util.concurrent.TimeUnit;
26-
import java.util.function.Consumer;
27-
import java.util.stream.Collectors;
18+
import static org.springframework.data.redis.connection.lettuce.LettuceConnection.*;
2819

2920
import io.lettuce.core.AbstractRedisClient;
3021
import io.lettuce.core.ClientOptions;
@@ -39,6 +30,18 @@
3930
import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
4031
import io.lettuce.core.codec.RedisCodec;
4132
import io.lettuce.core.resource.ClientResources;
33+
34+
import java.nio.ByteBuffer;
35+
import java.time.Duration;
36+
import java.util.ArrayList;
37+
import java.util.List;
38+
import java.util.Optional;
39+
import java.util.concurrent.CompletableFuture;
40+
import java.util.concurrent.CompletionStage;
41+
import java.util.concurrent.TimeUnit;
42+
import java.util.function.Consumer;
43+
import java.util.stream.Collectors;
44+
4245
import org.apache.commons.logging.Log;
4346
import org.apache.commons.logging.LogFactory;
4447

@@ -49,37 +52,18 @@
4952
import org.springframework.data.redis.ExceptionTranslationStrategy;
5053
import org.springframework.data.redis.PassThroughExceptionTranslationStrategy;
5154
import org.springframework.data.redis.RedisConnectionFailureException;
52-
import org.springframework.data.redis.connection.ClusterCommandExecutor;
53-
import org.springframework.data.redis.connection.ClusterTopologyProvider;
54-
import org.springframework.data.redis.connection.Pool;
55-
import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
56-
import org.springframework.data.redis.connection.RedisClusterConfiguration;
57-
import org.springframework.data.redis.connection.RedisClusterConnection;
58-
import org.springframework.data.redis.connection.RedisConfiguration;
55+
import org.springframework.data.redis.connection.*;
5956
import org.springframework.data.redis.connection.RedisConfiguration.ClusterConfiguration;
6057
import org.springframework.data.redis.connection.RedisConfiguration.DomainSocketConfiguration;
6158
import org.springframework.data.redis.connection.RedisConfiguration.WithDatabaseIndex;
6259
import org.springframework.data.redis.connection.RedisConfiguration.WithPassword;
63-
import org.springframework.data.redis.connection.RedisConnection;
64-
import org.springframework.data.redis.connection.RedisConnectionFactory;
65-
import org.springframework.data.redis.connection.RedisNode;
66-
import org.springframework.data.redis.connection.RedisPassword;
67-
import org.springframework.data.redis.connection.RedisSentinelConfiguration;
68-
import org.springframework.data.redis.connection.RedisSentinelConnection;
69-
import org.springframework.data.redis.connection.RedisSocketConfiguration;
70-
import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
71-
import org.springframework.data.redis.connection.RedisStaticMasterReplicaConfiguration;
7260
import org.springframework.data.util.Optionals;
7361
import org.springframework.lang.Nullable;
7462
import org.springframework.util.Assert;
7563
import org.springframework.util.ClassUtils;
7664
import org.springframework.util.ObjectUtils;
7765
import org.springframework.util.StringUtils;
7866

79-
import static org.springframework.data.redis.connection.lettuce.LettuceConnection.CODEC;
80-
import static org.springframework.data.redis.connection.lettuce.LettuceConnection.LettucePoolConnectionProvider;
81-
import static org.springframework.data.redis.connection.lettuce.LettuceConnection.PipeliningFlushPolicy;
82-
8367
/**
8468
* Connection factory creating <a href="https://github.com/mp911de/lettuce">Lettuce</a>-based connections.
8569
* <p>
@@ -298,7 +282,7 @@ public LettuceConnectionFactory(RedisClusterConfiguration clusterConfiguration,
298282
}
299283

300284
/**
301-
* Converts a {@link RedisURI} into its corresponding {@link RedisConfiguration} according to the following:
285+
* Creates a {@link RedisConfiguration} based on a {@link RedisURI} according to the following:
302286
* <ul>
303287
* <li>If {@code redisURI} has sentinel info a {@link RedisSentinelConfiguration} is returned</li>
304288
* <li>If {@code redisURI} has socket info a {@link RedisSocketConfiguration} is returned</li>
@@ -308,7 +292,7 @@ public LettuceConnectionFactory(RedisClusterConfiguration clusterConfiguration,
308292
* @param redisURI the connection info in the format of a RedisURI
309293
* @return an appropriate {@link RedisConfiguration} instance representing the Redis URI.
310294
*/
311-
public static RedisConfiguration redisConfigurationFromRedisUri(RedisURI redisURI) {
295+
public static RedisConfiguration createRedisConfiguration(RedisURI redisURI) {
312296

313297
Assert.notNull(redisURI, "RedisURI must not be null");
314298

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ public static RedisURI sentinelConfigurationToRedisURI(RedisSentinelConfiguratio
573573
* @return a {@link RedisSentinelConfiguration} representing the Redis Sentinel information in the Redis URI.
574574
* @since 2.6
575575
*/
576-
public static RedisSentinelConfiguration redisUriToSentinelConfiguration(RedisURI redisURI) {
576+
static RedisSentinelConfiguration redisUriToSentinelConfiguration(RedisURI redisURI) {
577577

578578
Assert.notNull(redisURI, "RedisURI is required");
579579
Assert.hasText(redisURI.getSentinelMasterId(), "RedisURI must have sentinelMasterId param set");
@@ -602,7 +602,7 @@ public static RedisSentinelConfiguration redisUriToSentinelConfiguration(RedisUR
602602
* @return a {@link RedisSocketConfiguration} representing the connection information in the Redis URI.
603603
* @since 2.6
604604
*/
605-
public static RedisSocketConfiguration redisUriToSocketConfiguration(RedisURI redisURI) {
605+
static RedisSocketConfiguration redisUriToSocketConfiguration(RedisURI redisURI) {
606606

607607
Assert.notNull(redisURI, "RedisURI is required");
608608
Assert.hasText(redisURI.getSocket(), "RedisURI must have socket path set");
@@ -623,7 +623,7 @@ public static RedisSocketConfiguration redisUriToSocketConfiguration(RedisURI re
623623
* @return a {@link RedisStandaloneConfiguration} representing the connection information in the Redis URI.
624624
* @since 2.6
625625
*/
626-
public static RedisStandaloneConfiguration redisUriToStandaloneConfiguration(RedisURI redisURI) {
626+
static RedisStandaloneConfiguration redisUriToStandaloneConfiguration(RedisURI redisURI) {
627627

628628
Assert.notNull(redisURI, "RedisURI is required");
629629

0 commit comments

Comments
 (0)