checkstyle errors fixed

pull/6137/head
Nikita Koksharov 5 months ago
parent abcc4646d3
commit d2ea043aae

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

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

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

Loading…
Cancel
Save