Skip to content

Commit 756829b

Browse files
committed
DATAREDIS-1066 - Polishing.
Tweak wording. Reflect pooling constraints also in JedisConnectionFactory. Add author tags. Original pull request: spring-projects#494.
1 parent b91d9dd commit 756829b

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
/**
3434
* Redis client configuration for jedis. This configuration provides optional configuration elements such as
3535
* {@link SSLSocketFactory} and {@link JedisPoolConfig} specific to jedis client features.
36-
* <p>
36+
* <p/>
3737
* Providing optional elements allows a more specific configuration of the client:
3838
* <ul>
3939
* <li>Whether to use SSL</li>
@@ -46,9 +46,11 @@
4646
* <li>Connect {@link Duration timeout}</li>
4747
* <li>Read {@link Duration timeout}</li>
4848
* </ul>
49+
* <p />
4950
*
5051
* @author Mark Paluch
5152
* @author Christoph Strobl
53+
* @author Chao Chang
5254
* @since 2.0
5355
* @see redis.clients.jedis.Jedis
5456
* @see org.springframework.data.redis.connection.RedisStandaloneConfiguration
@@ -78,10 +80,8 @@ public interface JedisClientConfiguration {
7880
Optional<HostnameVerifier> getHostnameVerifier();
7981

8082
/**
81-
* @return {@literal true} to use connection-pooling.
82-
* <p>
83-
* valid only for single node Redis, and Jedis Sentinel and Cluster will always use connection-pooling regardless of the setting here.
84-
* </p>
83+
* @return {@literal true} to use connection-pooling. Applies only to single node Redis. Sentinel and Cluster modes
84+
* use always connection-pooling regardless of the pooling setting.
8585
*/
8686
boolean isUsePooling();
8787

@@ -152,9 +152,10 @@ interface JedisClientConfigurationBuilder {
152152

153153
/**
154154
* Enable connection-pooling.
155-
* <p>
156-
* Apply only to single node Redis, and Jedis Sentinel and Cluster will always use connection-pooling.
157-
* </p>
155+
* <p />
156+
* Applies only to single node Redis. Sentinel and Cluster modes use always connection-pooling regardless of the
157+
* pooling setting.
158+
*
158159
* @return {@link JedisPoolingClientConfigurationBuilder}.
159160
*/
160161
JedisPoolingClientConfigurationBuilder usePooling();

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,9 @@ public void setTimeout(int timeout) {
649649

650650
/**
651651
* Indicates the use of a connection pool.
652+
* <p />
653+
* Applies only to single node Redis. Sentinel and Cluster modes use always connection-pooling regardless of the
654+
* pooling setting.
652655
*
653656
* @return the use of connection pooling.
654657
*/

0 commit comments

Comments
 (0)