github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

checkstyle errors fixed

Browse Source
pull/6137/head
Nikita Koksharov 5 months ago
parent abcc4646d3
commit d2ea043aae
3 changed files with 103 additions and 97 deletions
Show Stats Download Patch File Download Diff File

190
redisson-spring-boot-starter/src/main/java/org/redisson/spring/starter/PropertiesRedisConnectionDetails.java
Unescape Escape View File

@ -1,12 +1,12 @@
/**
* Copyright (c) 2013-2024 Nikita Koksharov
*
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -48,94 +48,98 @@ import java.util.stream.Collectors;
*/
public class PropertiesRedisConnectionDetails implements RedisConnectionDetails {
private final RedisProperties properties;
PropertiesRedisConnectionDetails(RedisProperties properties) {
this.properties = properties;
}
@Override
public String getUsername() {
if (this.properties.getUrl() != null) {
RedisURI uri = parseURL();
return uri.getUsername();
}
return this.properties.getUsername();
}
@Override
public String getPassword() {
if (this.properties.getUrl() != null) {
RedisURI uri = parseURL();
return uri.getPassword();
}
return this.properties.getPassword();
}
@Override
public Standalone getStandalone() {
if (this.properties.getUrl() != null) {
RedisURI uri = parseURL();
return Standalone.of(uri.getHost(), uri.getPort(),
this.properties.getDatabase());
}
return Standalone.of(this.properties.getHost(), this.properties.getPort(), this.properties.getDatabase());
}
private RedisURI parseURL() {
if (this.properties.getUrl() != null) {
return new RedisURI(this.properties.getUrl());
}
return null;
}
@Override
public Sentinel getSentinel() {
RedisProperties.Sentinel sentinel = this.properties
.getSentinel();
if (sentinel == null) {
return null;
}
return new Sentinel() {
@Override
public int getDatabase() {
return PropertiesRedisConnectionDetails.this.properties.getDatabase();
}
@Override
public String getMaster() {
return sentinel.getMaster();
}
@Override
public List<Node> getNodes() {
return sentinel.getNodes().stream().map(PropertiesRedisConnectionDetails.this::asNode).collect(Collectors.toList());
}
@Override
public String getUsername() {
return sentinel.getUsername();
}
@Override
public String getPassword() {
return sentinel.getPassword();
}
};
}
@Override
public Cluster getCluster() {
RedisProperties.Cluster cluster = this.properties.getCluster();
List<Node> nodes = (cluster != null) ? cluster.getNodes().stream().map(this::asNode).collect(Collectors.toList()) : null;
return (nodes != null) ? () -> nodes : null;
}
private Node asNode(String node) {
String[] components = node.split(":");
return new Node(components[0], Integer.parseInt(components[1]));
}
private final RedisProperties properties;
PropertiesRedisConnectionDetails(RedisProperties properties) {
this.properties = properties;
}
@Override
public String getUsername() {
if (this.properties.getUrl() != null) {
RedisURI uri = parseURL();
return uri.getUsername();
}
return this.properties.getUsername();
}
@Override
public String getPassword() {
if (this.properties.getUrl() != null) {
RedisURI uri = parseURL();
return uri.getPassword();
}
return this.properties.getPassword();
}
@Override
public Standalone getStandalone() {
if (this.properties.getUrl() != null) {
RedisURI uri = parseURL();
return Standalone.of(uri.getHost(), uri.getPort(),
this.properties.getDatabase());
}
return Standalone.of(this.properties.getHost(), this.properties.getPort(), this.properties.getDatabase());
}
private RedisURI parseURL() {
if (this.properties.getUrl() != null) {
return new RedisURI(this.properties.getUrl());
}
return null;
}
@Override
public Sentinel getSentinel() {
RedisProperties.Sentinel sentinel = this.properties
.getSentinel();
if (sentinel == null) {
return null;
}
return new Sentinel() {
@Override
public int getDatabase() {
return PropertiesRedisConnectionDetails.this.properties.getDatabase();
}
@Override
public String getMaster() {
return sentinel.getMaster();
}
@Override
public List<Node> getNodes() {
return sentinel.getNodes().stream().map(PropertiesRedisConnectionDetails.this::asNode).collect(Collectors.toList());
}
@Override
public String getUsername() {
return sentinel.getUsername();
}
@Override
public String getPassword() {
return sentinel.getPassword();
}
};
}
@Override
public Cluster getCluster() {
RedisProperties.Cluster cluster = this.properties.getCluster();
if (cluster != null) {
return () -> cluster.getNodes().stream()
.map(this::asNode)
.collect(Collectors.toList());
}
return null;
}
private Node asNode(String node) {
String[] components = node.split(":");
return new Node(components[0], Integer.parseInt(components[1]));
}
}

7
redisson-spring-boot-starter/src/main/java/org/redisson/spring/starter/RedissonAutoConfiguration.java
Unescape Escape View File

@ -129,6 +129,7 @@ public class RedissonAutoConfiguration {
}
}
@SuppressWarnings("MethodLength")
@Bean(destroyMethod = "shutdown")
@ConditionalOnMissingBean(RedissonClient.class)
public RedissonClient redisson() throws IOException {
@ -167,7 +168,7 @@ public class RedissonAutoConfiguration {
if (timeoutValue instanceof Duration) {
timeout = (int) ((Duration) timeoutValue).toMillis();
} else if (timeoutValue != null){
timeout = (Integer)timeoutValue;
timeout = (Integer) timeoutValue;
}
Integer connectTimeout = null;
@ -222,9 +223,9 @@ public class RedissonAutoConfiguration {
Method nodesMethod = ReflectionUtils.findMethod(Sentinel.class, "getNodes");
Object nodesValue = ReflectionUtils.invokeMethod(nodesMethod, redisProperties.getSentinel());
if (nodesValue instanceof String) {
nodes = convert(prefix, Arrays.asList(((String)nodesValue).split(",")));
nodes = convert(prefix, Arrays.asList(((String) nodesValue).split(",")));
} else {
nodes = convert(prefix, (List<String>)nodesValue);
nodes = convert(prefix, (List<String>) nodesValue);
}
sentinelMaster = redisProperties.getSentinel().getMaster();
}

3
redisson-spring-boot-starter/src/main/java/org/redisson/spring/starter/RedissonAutoConfigurationCustomizer.java
Unescape Escape View File

@ -30,5 +30,6 @@ public interface RedissonAutoConfigurationCustomizer {
* Customize the RedissonClient configuration.
* @param configuration the {@link Config} to customize
*/
void customize(final Config configuration);
void customize(Config configuration);
}

Write Preview
Loading…
Cancel
Save