Skip to content

Commit 069954e

Browse files
committed
DATAREDIS-476 - Polishing.
Add author and getter method for SSL property. Apply formatting. Create test to validate SSL setting is set correctly in the lettuce driver. Original pull request: #177.
1 parent a9d8a6b commit 069954e

File tree

2 files changed

+36
-2
lines changed

2 files changed

+36
-2
lines changed

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
* @author Jennifer Hickey
7070
* @author Thomas Darimont
7171
* @author Mark Paluch
72+
* @author Balázs Németh
7273
*/
7374
public class LettuceConnectionFactory implements InitializingBean, DisposableBean, RedisConnectionFactory {
7475

@@ -143,7 +144,6 @@ public LettuceConnectionFactory(LettucePool pool) {
143144
*/
144145
public void afterPropertiesSet() {
145146
this.client = createRedisClient();
146-
147147
}
148148

149149
/*
@@ -311,11 +311,22 @@ public void setTimeout(long timeout) {
311311

312312
/**
313313
* Sets to use SSL connection
314+
*
315+
* @param useSsl {@literal true} to use SSL.
314316
*/
315-
public void setUseSsl(boolean useSsl){
317+
public void setUseSsl(boolean useSsl) {
316318
this.useSsl = useSsl;
317319
}
318320

321+
/**
322+
* Returns whether to use SSL.
323+
*
324+
* @return
325+
*/
326+
public boolean isUseSsl() {
327+
return useSsl;
328+
}
329+
319330
/**
320331
* Indicates if validation of the native Lettuce connection is enabled
321332
*

src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.springframework.data.redis.connection.RedisClusterConfiguration;
3131

3232
import com.lambdaworks.redis.AbstractRedisClient;
33+
import com.lambdaworks.redis.RedisClient;
3334
import com.lambdaworks.redis.RedisURI;
3435
import com.lambdaworks.redis.cluster.RedisClusterClient;
3536

@@ -127,4 +128,26 @@ public void clusterClientShouldInitializeWithoutClientResources() {
127128
AbstractRedisClient client = (AbstractRedisClient) getField(connectionFactory, "client");
128129
assertThat(client, instanceOf(RedisClusterClient.class));
129130
}
131+
132+
/**
133+
* @see DATAREDIS-476
134+
*/
135+
@Test
136+
public void sslShouldBeSetCorrectlyOnClient() {
137+
138+
LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory();
139+
connectionFactory.setClientResources(LettuceTestClientResources.getSharedClientResources());
140+
connectionFactory.setUseSsl(true);
141+
connectionFactory.afterPropertiesSet();
142+
ConnectionFactoryTracker.add(connectionFactory);
143+
144+
AbstractRedisClient client = (AbstractRedisClient) getField(connectionFactory, "client");
145+
assertThat(client, instanceOf(RedisClient.class));
146+
147+
RedisURI redisUri = (RedisURI) getField(client, "redisURI");
148+
149+
assertThat(redisUri.isSsl(), is(true));
150+
assertThat(connectionFactory.isUseSsl(), is(true));
151+
}
152+
130153
}

0 commit comments

Comments
 (0)