Skip to content

Commit c9be7b3

Browse files
bogdandinabogdandina
committed
feat(70552): spotless apply
1 parent bfbe562 commit c9be7b3

File tree

5 files changed

+29
-69
lines changed

5 files changed

+29
-69
lines changed

‎src/main/java/fi/hsl/common/pulsar/PulsarApplication.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -250,15 +250,9 @@ protected PulsarAdmin createAdmin(@NotNull String adminHost, int adminPort) thro
250250

251251
@NotNull
252252
protected RedisStore createRedisStore(@NotNull RedisClusterProperties properties) {
253-
var pool = new JedisSentinelPool(
254-
properties.masterName,
255-
properties.sentinels,
256-
properties.jedisPoolConfig(),
257-
(int) properties.connectionTimeout.toMillis(),
258-
(int) properties.socketTimeout.toMillis(),
259-
null,
260-
DEFAULT_DATABASE
261-
);
253+
var pool = new JedisSentinelPool(properties.masterName, properties.sentinels, properties.jedisPoolConfig(),
254+
(int) properties.connectionTimeout.toMillis(), (int) properties.socketTimeout.toMillis(), null,
255+
DEFAULT_DATABASE);
262256

263257
return new RedisStore(pool);
264258
}

‎src/main/java/fi/hsl/common/redis/RedisClusterProperties.java‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,10 @@ public class RedisClusterProperties {
3535
public final Duration connectionTimeout;
3636
public final Duration socketTimeout;
3737

38-
private RedisClusterProperties(String masterName,
39-
Set<String> sentinels,
40-
@Nullable Boolean healthCheck,
41-
@Nullable Duration idleConnectionTimeout,
42-
@Nullable Integer minIdleConnections,
43-
@Nullable Integer maxConnections,
44-
@Nullable Duration maxWait,
45-
@Nullable Duration connectionTimeout,
46-
@Nullable Duration socketTimeout) {
38+
private RedisClusterProperties(String masterName, Set<String> sentinels, @Nullable Boolean healthCheck,
39+
@Nullable Duration idleConnectionTimeout, @Nullable Integer minIdleConnections,
40+
@Nullable Integer maxConnections, @Nullable Duration maxWait, @Nullable Duration connectionTimeout,
41+
@Nullable Duration socketTimeout) {
4742
this.masterName = checkNotEmpty("masterName", masterName);
4843
this.sentinels = checkNotEmpty("sentinels", sentinels);
4944
this.healthCheck = ofNullable(healthCheck).orElse(false);
@@ -56,20 +51,16 @@ private RedisClusterProperties(String masterName,
5651
}
5752

5853
public static RedisClusterProperties redisClusterProperties(Config config) {
59-
return new RedisClusterProperties(
60-
getRequired(config, "redisCluster.masterName", config::getString),
61-
stream(getRequired(config, "redisCluster.sentinels", config::getString)
62-
.split(","))
63-
.filter(not(StringUtils::isBlank))
64-
.collect(toSet()),
54+
return new RedisClusterProperties(getRequired(config, "redisCluster.masterName", config::getString),
55+
stream(getRequired(config, "redisCluster.sentinels", config::getString).split(","))
56+
.filter(not(StringUtils::isBlank)).collect(toSet()),
6557
getNullable(config, "redisCluster.healthCheck", config::getBoolean),
6658
getNullable(config, "redisCluster.idleConnectionTimeout", config::getDuration),
6759
getNullable(config, "redisCluster.minIdleConnections", config::getInt),
6860
getNullable(config, "redisCluster.maxConnections", config::getInt),
6961
getNullable(config, "redisCluster.maxWait", config::getDuration),
7062
getNullable(config, "redisCluster.connectionTimeout", config::getDuration),
71-
getNullable(config, "redisCluster.socketTimeout", config::getDuration)
72-
);
63+
getNullable(config, "redisCluster.socketTimeout", config::getDuration));
7364
}
7465

7566
public JedisPoolConfig jedisPoolConfig() {

‎src/test/java/fi/hsl/common/redis/ChecksTest.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ void shouldThrowWhenValueIsNull() {
2929
String value = null;
3030

3131
// when / then
32-
assertThatThrownBy(() -> checkRequired("myParam", value))
33-
.isInstanceOf(IllegalArgumentException.class)
32+
assertThatThrownBy(() -> checkRequired("myParam", value)).isInstanceOf(IllegalArgumentException.class)
3433
.hasMessage("myParam is required");
3534
}
3635

@@ -52,8 +51,7 @@ void shouldThrowWhenCollectionIsNull() {
5251
List<String> collection = null;
5352

5453
// when / then
55-
assertThatThrownBy(() -> checkNotEmpty("param", collection))
56-
.isInstanceOf(IllegalArgumentException.class)
54+
assertThatThrownBy(() -> checkNotEmpty("param", collection)).isInstanceOf(IllegalArgumentException.class)
5755
.hasMessage("param must not be null");
5856
}
5957

@@ -63,8 +61,7 @@ void shouldThrowWhenCollectionIsEmpty() {
6361
var collection = List.of();
6462

6563
// when / then
66-
assertThatThrownBy(() -> checkNotEmpty("param", collection))
67-
.isInstanceOf(IllegalArgumentException.class)
64+
assertThatThrownBy(() -> checkNotEmpty("param", collection)).isInstanceOf(IllegalArgumentException.class)
6865
.hasMessage("param must not be empty");
6966
}
7067

@@ -86,8 +83,7 @@ void shouldThrowWhenStringIsNull() {
8683
String value = null;
8784

8885
// when / then
89-
assertThatThrownBy(() -> checkNotEmpty("param", value))
90-
.isInstanceOf(IllegalArgumentException.class)
86+
assertThatThrownBy(() -> checkNotEmpty("param", value)).isInstanceOf(IllegalArgumentException.class)
9187
.hasMessage("param must not be blank");
9288
}
9389

@@ -97,8 +93,7 @@ void shouldThrowWhenStringIsBlank() {
9793
var value = " ";
9894

9995
// when / then
100-
assertThatThrownBy(() -> checkNotEmpty("param", value))
101-
.isInstanceOf(IllegalArgumentException.class)
96+
assertThatThrownBy(() -> checkNotEmpty("param", value)).isInstanceOf(IllegalArgumentException.class)
10297
.hasMessage("param must not be blank");
10398
}
10499
}

‎src/test/java/fi/hsl/common/redis/RedisClusterPropertiesTest.java‎

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,11 @@ class RedisClusterPropertiesTest {
1515
@Test
1616
void shouldLoadAllPropertiesWhenPresent() {
1717
// given
18-
var config = parseMap(Map.of(
19-
"redisCluster.masterName", "mymaster",
20-
"redisCluster.sentinels", "host1:26379,host2:26379",
21-
"redisCluster.healthCheck", "true",
22-
"redisCluster.idleConnectionTimeout", "10s",
23-
"redisCluster.minIdleConnections", "5",
24-
"redisCluster.maxConnections", "20",
25-
"redisCluster.maxWait", "2s",
26-
"redisCluster.connectionTimeout", "15s",
27-
"redisCluster.socketTimeout", "30s"
28-
));
18+
var config = parseMap(Map.of("redisCluster.masterName", "mymaster", "redisCluster.sentinels",
19+
"host1:26379,host2:26379", "redisCluster.healthCheck", "true", "redisCluster.idleConnectionTimeout",
20+
"10s", "redisCluster.minIdleConnections", "5", "redisCluster.maxConnections", "20",
21+
"redisCluster.maxWait", "2s", "redisCluster.connectionTimeout", "15s", "redisCluster.socketTimeout",
22+
"30s"));
2923

3024
// when
3125
var props = redisClusterProperties(config);
@@ -45,10 +39,7 @@ void shouldLoadAllPropertiesWhenPresent() {
4539
@Test
4640
void shouldApplyDefaultsWhenOptionalPropertiesMissing() {
4741
// given
48-
var config = parseMap(Map.of(
49-
"redisCluster.masterName", "mymaster",
50-
"redisCluster.sentinels", "host1:26379"
51-
));
42+
var config = parseMap(Map.of("redisCluster.masterName", "mymaster", "redisCluster.sentinels", "host1:26379"));
5243

5344
// when
5445
var props = redisClusterProperties(config);
@@ -68,13 +59,10 @@ void shouldApplyDefaultsWhenOptionalPropertiesMissing() {
6859
@Test
6960
void shouldThrowWhenMasterNameMissing() {
7061
// given
71-
var config = parseMap(Map.of(
72-
"redisCluster.sentinels", "host1:26379"
73-
));
62+
var config = parseMap(Map.of("redisCluster.sentinels", "host1:26379"));
7463

7564
// when / then
76-
assertThatThrownBy(() -> redisClusterProperties(config))
77-
.isInstanceOf(IllegalArgumentException.class)
65+
assertThatThrownBy(() -> redisClusterProperties(config)).isInstanceOf(IllegalArgumentException.class)
7866
.hasMessageContaining("redisCluster.masterName is required");
7967
}
8068

@@ -84,22 +72,17 @@ void shouldThrowWhenSentinelsMissing() {
8472
var config = parseMap(Map.of("redisCluster.masterName", "mymaster"));
8573

8674
// when / then
87-
assertThatThrownBy(() -> redisClusterProperties(config))
88-
.isInstanceOf(IllegalArgumentException.class)
75+
assertThatThrownBy(() -> redisClusterProperties(config)).isInstanceOf(IllegalArgumentException.class)
8976
.hasMessageContaining("redisCluster.sentinels is required");
9077
}
9178

9279
@Test
9380
void shouldThrowWhenSentinelsEmpty() {
9481
// given
95-
var config = parseMap(Map.of(
96-
"redisCluster.masterName", "mymaster",
97-
"redisCluster.sentinels", ""
98-
));
82+
var config = parseMap(Map.of("redisCluster.masterName", "mymaster", "redisCluster.sentinels", ""));
9983

10084
// when / then
101-
assertThatThrownBy(() -> redisClusterProperties(config))
102-
.isInstanceOf(IllegalArgumentException.class)
85+
assertThatThrownBy(() -> redisClusterProperties(config)).isInstanceOf(IllegalArgumentException.class)
10386
.hasMessageContaining("sentinels must not be empty");
10487
}
10588
}

‎src/test/java/fi/hsl/common/redis/RedisStoreTest.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ void setUp() {
3232
jedis = mock(Jedis.class);
3333
redisStore = new RedisStore(jedisPool);
3434

35-
given(jedisPool.getResource())
36-
.willReturn(jedis);
35+
given(jedisPool.getResource()).willReturn(jedis);
3736
}
3837

3938
@Test
@@ -146,9 +145,7 @@ void shouldGetKeysUsingScan() {
146145
// given
147146
var firstScan = new ScanResult<>("1", List.of("k1", "k2"));
148147
var secondScan = new ScanResult<>("0", List.of("k3"));
149-
given(jedis.scan(anyString(), any(ScanParams.class)))
150-
.willReturn(firstScan)
151-
.willReturn(secondScan);
148+
given(jedis.scan(anyString(), any(ScanParams.class))).willReturn(firstScan).willReturn(secondScan);
152149

153150
// when
154151
var keys = redisStore.getKeys("prefix", 10);

0 commit comments

Comments
 (0)