root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Polish PropertiesRedisConnectionDetails 

See gh-43825

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
This commit is contained in:
Yanming Zhou 2025-01-15 09:25:10 +08:00 committed by Andy Wilkinson
parent e2950639a7
commit a18c2f8f7e
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/PropertiesRedisConnectionDetails.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2024 the original author or authors. * Copyright 2012-2025 the original author or authors.
* *
* 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.
@ -39,7 +39,7 @@ class PropertiesRedisConnectionDetails implements RedisConnectionDetails {
@Override @Override
public String getUsername() { public String getUsername() {
if (this.properties.getUrl() != null) { if (this.properties.getUrl() != null) {
ConnectionInfo connectionInfo = connectionInfo(this.properties.getUrl()); ConnectionInfo connectionInfo = RedisConnectionConfiguration.parseUrl(this.properties.getUrl());
return connectionInfo.getUsername(); return connectionInfo.getUsername();
} }
return this.properties.getUsername(); return this.properties.getUsername();
@ -48,7 +48,7 @@ class PropertiesRedisConnectionDetails implements RedisConnectionDetails {
@Override @Override
public String getPassword() { public String getPassword() {
if (this.properties.getUrl() != null) { if (this.properties.getUrl() != null) {
ConnectionInfo connectionInfo = connectionInfo(this.properties.getUrl()); ConnectionInfo connectionInfo = RedisConnectionConfiguration.parseUrl(this.properties.getUrl());
return connectionInfo.getPassword(); return connectionInfo.getPassword();
} }
return this.properties.getPassword(); return this.properties.getPassword();
@ -57,17 +57,13 @@ class PropertiesRedisConnectionDetails implements RedisConnectionDetails {
@Override @Override
public Standalone getStandalone() { public Standalone getStandalone() {
if (this.properties.getUrl() != null) { if (this.properties.getUrl() != null) {
ConnectionInfo connectionInfo = connectionInfo(this.properties.getUrl()); ConnectionInfo connectionInfo = RedisConnectionConfiguration.parseUrl(this.properties.getUrl());
return Standalone.of(connectionInfo.getUri().getHost(), connectionInfo.getUri().getPort(), return Standalone.of(connectionInfo.getUri().getHost(), connectionInfo.getUri().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 ConnectionInfo connectionInfo(String url) {
return (url != null) ? RedisConnectionConfiguration.parseUrl(url) : null;
}
@Override @Override
public Sentinel getSentinel() { public Sentinel getSentinel() {
org.springframework.boot.autoconfigure.data.redis.RedisProperties.Sentinel sentinel = this.properties org.springframework.boot.autoconfigure.data.redis.RedisProperties.Sentinel sentinel = this.properties