Skip to content

Commit 0d24b5a

Browse files
christophstroblchristophstrobl
committed
DATAREDIS-524 - Polishing.
Some formatting changes. Original Pull Request: #204
1 parent ea33cd4 commit 0d24b5a

File tree

4 files changed

+55
-50
lines changed

4 files changed

+55
-50
lines changed

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -120,26 +120,18 @@ public void afterPropertiesSet() {
120120
*/
121121
private RedisURI getRedisURI() {
122122

123-
if (isRedisSentinelAware()) {
124-
RedisURI redisURI = LettuceConverters.sentinelConfigurationToRedisURI(sentinelConfiguration);
123+
RedisURI redisUri = isRedisSentinelAware()
124+
? LettuceConverters.sentinelConfigurationToRedisURI(sentinelConfiguration) : createSimpleHostRedisURI();
125125

126-
if (StringUtils.hasText(password)) {
127-
redisURI.setPassword(password);
128-
}
129-
130-
return redisURI;
126+
if (StringUtils.hasText(password)) {
127+
redisUri.setPassword(password);
131128
}
132129

133-
return createSimpleHostRedisURI();
130+
return redisUri;
134131
}
135132

136133
private RedisURI createSimpleHostRedisURI() {
137-
RedisURI.Builder builder = RedisURI.Builder.redis(hostName, port);
138-
if (password != null) {
139-
builder.withPassword(password);
140-
}
141-
builder.withTimeout(timeout, TimeUnit.MILLISECONDS);
142-
return builder.build();
134+
return RedisURI.Builder.redis(hostName, port).withTimeout(timeout, TimeUnit.MILLISECONDS).build();
143135
}
144136

145137
@SuppressWarnings("unchecked")

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
* @author Costin Leau
6969
* @author Jennifer Hickey
7070
* @author Thomas Darimont
71+
* @author Christoph Strobl
7172
* @author Mark Paluch
7273
* @author Balázs Németh
7374
*/
@@ -608,13 +609,13 @@ private AbstractRedisClient createRedisClient() {
608609

609610
private RedisURI getSentinelRedisURI() {
610611

611-
RedisURI redisURI = LettuceConverters.sentinelConfigurationToRedisURI(sentinelConfiguration);
612+
RedisURI redisUri = LettuceConverters.sentinelConfigurationToRedisURI(sentinelConfiguration);
612613

613614
if (StringUtils.hasText(password)) {
614-
redisURI.setPassword(password);
615+
redisUri.setPassword(password);
615616
}
616617

617-
return redisURI;
618+
return redisUri;
618619
}
619620

620621
/**
@@ -634,6 +635,7 @@ public boolean isClusterAware() {
634635

635636
@Override
636637
public RedisSentinelConnection getSentinelConnection() {
638+
637639
if (!(client instanceof RedisClient)) {
638640
throw new InvalidDataAccessResourceUsageException("Unable to connect to sentinels using " + client.getClass());
639641
}

‎src/test/java/org/springframework/data/redis/connection/lettuce/DefaultLettucePoolTests.java

Lines changed: 42 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.junit.Ignore;
2828
import org.junit.Test;
2929
import org.springframework.data.redis.SettingsUtils;
30-
import org.springframework.data.redis.connection.PoolConfig;
3130
import org.springframework.data.redis.connection.PoolException;
3231
import org.springframework.data.redis.connection.RedisSentinelConfiguration;
3332

@@ -49,20 +48,22 @@ public class DefaultLettucePoolTests {
4948

5049
@After
5150
public void tearDown() {
52-
if (this.pool != null) {
5351

54-
if (this.pool.getClient() != null) {
55-
this.pool.getClient().shutdown(0, 0, TimeUnit.MILLISECONDS);
52+
if (pool != null) {
53+
54+
if (pool.getClient() != null) {
55+
pool.getClient().shutdown(0, 0, TimeUnit.MILLISECONDS);
5656
}
5757

58-
this.pool.destroy();
58+
pool.destroy();
5959
}
6060
}
6161

6262
@Test
6363
public void testGetResource() {
64-
this.pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort());
65-
this.pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
64+
65+
pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort());
66+
pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
6667
pool.afterPropertiesSet();
6768
RedisAsyncConnection<byte[], byte[]> client = pool.getResource();
6869
assertNotNull(client);
@@ -72,11 +73,12 @@ public void testGetResource() {
7273

7374
@Test
7475
public void testGetResourcePoolExhausted() {
76+
7577
GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
7678
poolConfig.setMaxTotal(1);
7779
poolConfig.setMaxWaitMillis(1);
78-
this.pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort(), poolConfig);
79-
this.pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
80+
pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort(), poolConfig);
81+
pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
8082
pool.afterPropertiesSet();
8183
RedisAsyncConnection<byte[], byte[]> client = pool.getResource();
8284
assertNotNull(client);
@@ -90,10 +92,11 @@ public void testGetResourcePoolExhausted() {
9092

9193
@Test
9294
public void testGetResourceValidate() {
93-
PoolConfig poolConfig = new PoolConfig();
95+
96+
GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
9497
poolConfig.setTestOnBorrow(true);
95-
this.pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort(), poolConfig);
96-
this.pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
98+
pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort(), poolConfig);
99+
pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
97100
pool.afterPropertiesSet();
98101
RedisAsyncConnection<byte[], byte[]> client = pool.getResource();
99102
assertNotNull(client);
@@ -102,19 +105,21 @@ public void testGetResourceValidate() {
102105

103106
@Test(expected = PoolException.class)
104107
public void testGetResourceCreationUnsuccessful() throws Exception {
105-
this.pool = new DefaultLettucePool(SettingsUtils.getHost(), 3333);
106-
this.pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
108+
109+
pool = new DefaultLettucePool(SettingsUtils.getHost(), 3333);
110+
pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
107111
pool.afterPropertiesSet();
108112
pool.getResource();
109113
}
110114

111115
@Test
112116
public void testReturnResource() {
117+
113118
GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
114119
poolConfig.setMaxTotal(1);
115120
poolConfig.setMaxWaitMillis(1);
116-
this.pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort(), poolConfig);
117-
this.pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
121+
pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort(), poolConfig);
122+
pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
118123
pool.afterPropertiesSet();
119124
RedisAsyncConnection<byte[], byte[]> client = pool.getResource();
120125
assertNotNull(client);
@@ -125,11 +130,12 @@ public void testReturnResource() {
125130

126131
@Test
127132
public void testReturnBrokenResource() {
133+
128134
GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
129135
poolConfig.setMaxTotal(1);
130136
poolConfig.setMaxWaitMillis(1);
131-
this.pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort(), poolConfig);
132-
this.pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
137+
pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort(), poolConfig);
138+
pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
133139
pool.afterPropertiesSet();
134140
RedisAsyncConnection<byte[], byte[]> client = pool.getResource();
135141
assertNotNull(client);
@@ -147,26 +153,29 @@ public void testReturnBrokenResource() {
147153

148154
@Test
149155
public void testCreateWithDbIndex() {
150-
this.pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort());
151-
this.pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
156+
157+
pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort());
158+
pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
152159
pool.setDatabase(1);
153160
pool.afterPropertiesSet();
154161
assertNotNull(pool.getResource());
155162
}
156163

157164
@Test(expected = PoolException.class)
158165
public void testCreateWithDbIndexInvalid() {
159-
this.pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort());
160-
this.pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
166+
167+
pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort());
168+
pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
161169
pool.setDatabase(17);
162170
pool.afterPropertiesSet();
163171
pool.getResource();
164172
}
165173

166174
@Test(expected = PoolException.class)
167175
public void testCreateWithPasswordNoPassword() {
168-
this.pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort());
169-
this.pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
176+
177+
pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort());
178+
pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
170179
pool.setPassword("notthepassword");
171180
pool.afterPropertiesSet();
172181
pool.getResource();
@@ -175,8 +184,9 @@ public void testCreateWithPasswordNoPassword() {
175184
@Ignore("Redis must have requirepass set to run this test")
176185
@Test
177186
public void testCreatePassword() {
178-
this.pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort());
179-
this.pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
187+
188+
pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort());
189+
pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
180190
pool.setPassword("foo");
181191
pool.afterPropertiesSet();
182192
RedisAsyncConnection<byte[], byte[]> conn = pool.getResource();
@@ -187,8 +197,9 @@ public void testCreatePassword() {
187197
@Ignore("Redis must have requirepass set to run this test")
188198
@Test(expected = PoolException.class)
189199
public void testCreateInvalidPassword() {
190-
this.pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort());
191-
this.pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
200+
201+
pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort());
202+
pool.setClientResources(LettuceTestClientResources.getSharedClientResources());
192203
pool.setPassword("bad");
193204
pool.afterPropertiesSet();
194205
pool.getResource();
@@ -205,9 +216,9 @@ public void testCreateSentinelWithPassword() {
205216
pool.setPassword("foo");
206217
pool.afterPropertiesSet();
207218

208-
RedisURI redisURI = (RedisURI) getField(pool.getClient(), "redisURI");
219+
RedisURI redisUri = (RedisURI) getField(pool.getClient(), "redisURI");
209220

210-
assertThat(redisURI.getPassword(), is(equalTo(pool.getPassword().toCharArray())));
221+
assertThat(redisUri.getPassword(), is(equalTo(pool.getPassword().toCharArray())));
211222
}
212223

213224
/**
@@ -216,7 +227,7 @@ public void testCreateSentinelWithPassword() {
216227
@Test
217228
public void poolWorksWithoutClientResources() {
218229

219-
this.pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort());
230+
pool = new DefaultLettucePool(SettingsUtils.getHost(), SettingsUtils.getPort());
220231
pool.setDatabase(1);
221232
pool.afterPropertiesSet();
222233
assertNotNull(pool.getResource());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ public void passwordShouldBeSetCorrectlyOnSentinelClient() {
133133
AbstractRedisClient client = (AbstractRedisClient) getField(connectionFactory, "client");
134134
assertThat(client, instanceOf(RedisClient.class));
135135

136-
RedisURI redisURI = (RedisURI) getField(client, "redisURI");
136+
RedisURI redisUri = (RedisURI) getField(client, "redisURI");
137137

138-
assertThat(redisURI.getPassword(), is(equalTo(connectionFactory.getPassword().toCharArray())));
138+
assertThat(redisUri.getPassword(), is(equalTo(connectionFactory.getPassword().toCharArray())));
139139
}
140140

141141
/**

0 commit comments

Comments
 (0)