Merge pull request #43825 from quaff

* gh-43825: Polish "Polish PropertiesRedisConnectionDetails" Polish PropertiesRedisConnectionDetails Closes gh-43825
spring-projects · Jan 15, 2025 · e1a7407 · e1a7407
2 parents e295063 + 0f94530
commit e1a7407
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 40 deletions.
diff --git a/...a/org/springframework/boot/autoconfigure/data/redis/PropertiesRedisConnectionDetails.java b/...a/org/springframework/boot/autoconfigure/data/redis/PropertiesRedisConnectionDetails.java
@@ -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");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ class PropertiesRedisConnectionDetails implements RedisConnectionDetails {
 	@Override
 	public String getUsername() {
 		if (this.properties.getUrl() != null) {
-			ConnectionInfo connectionInfo = connectionInfo(this.properties.getUrl());
+			ConnectionInfo connectionInfo = ConnectionInfo.of(this.properties.getUrl());
 			return connectionInfo.getUsername();
 		}
 		return this.properties.getUsername();
@@ -48,7 +48,7 @@ public String getUsername() {
 	@Override
 	public String getPassword() {
 		if (this.properties.getUrl() != null) {
-			ConnectionInfo connectionInfo = connectionInfo(this.properties.getUrl());
+			ConnectionInfo connectionInfo = ConnectionInfo.of(this.properties.getUrl());
 			return connectionInfo.getPassword();
 		}
 		return this.properties.getPassword();
@@ -57,17 +57,13 @@ public String getPassword() {
 	@Override
 	public Standalone getStandalone() {
 		if (this.properties.getUrl() != null) {
-			ConnectionInfo connectionInfo = connectionInfo(this.properties.getUrl());
+			ConnectionInfo connectionInfo = ConnectionInfo.of(this.properties.getUrl());
 			return Standalone.of(connectionInfo.getUri().getHost(), connectionInfo.getUri().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
 	public Sentinel getSentinel() {
 		org.springframework.boot.autoconfigure.data.redis.RedisProperties.Sentinel sentinel = this.properties

diff --git a/.../java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java b/.../java/org/springframework/boot/autoconfigure/data/redis/RedisConnectionConfiguration.java
@@ -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");
  * you may not use this file except in compliance with the License.
@@ -172,42 +172,14 @@ private List<RedisNode> createSentinels(Sentinel sentinel) {
 	}
 
 	protected final boolean urlUsesSsl() {
-		return parseUrl(this.properties.getUrl()).isUseSsl();
+		return ConnectionInfo.of(this.properties.getUrl()).isUseSsl();
 	}
 
 	protected final RedisConnectionDetails getConnectionDetails() {
 		return this.connectionDetails;
 	}
 
-	static ConnectionInfo parseUrl(String url) {
-		try {
-			URI uri = new URI(url);
-			String scheme = uri.getScheme();
-			if (!"redis".equals(scheme) && !"rediss".equals(scheme)) {
-				throw new RedisUrlSyntaxException(url);
-			}
-			boolean useSsl = ("rediss".equals(scheme));
-			String username = null;
-			String password = null;
-			if (uri.getUserInfo() != null) {
-				String candidate = uri.getUserInfo();
-				int index = candidate.indexOf(':');
-				if (index >= 0) {
-					username = candidate.substring(0, index);
-					password = candidate.substring(index + 1);
-				}
-				else {
-					password = candidate;
-				}
-			}
-			return new ConnectionInfo(uri, useSsl, username, password);
-		}
-		catch (URISyntaxException ex) {
-			throw new RedisUrlSyntaxException(url, ex);
-		}
-	}
-
-	static class ConnectionInfo {
+	static final class ConnectionInfo {
 
 		private final URI uri;
 
@@ -217,7 +189,7 @@ static class ConnectionInfo {
 
 		private final String password;
 
-		ConnectionInfo(URI uri, boolean useSsl, String username, String password) {
+		private ConnectionInfo(URI uri, boolean useSsl, String username, String password) {
 			this.uri = uri;
 			this.useSsl = useSsl;
 			this.username = username;
@@ -240,6 +212,34 @@ String getPassword() {
 			return this.password;
 		}
 
+		static ConnectionInfo of(String url) {
+			try {
+				URI uri = new URI(url);
+				String scheme = uri.getScheme();
+				if (!"redis".equals(scheme) && !"rediss".equals(scheme)) {
+					throw new RedisUrlSyntaxException(url);
+				}
+				boolean useSsl = ("rediss".equals(scheme));
+				String username = null;
+				String password = null;
+				if (uri.getUserInfo() != null) {
+					String candidate = uri.getUserInfo();
+					int index = candidate.indexOf(':');
+					if (index >= 0) {
+						username = candidate.substring(0, index);
+						password = candidate.substring(index + 1);
+					}
+					else {
+						password = candidate;
+					}
+				}
+				return new ConnectionInfo(uri, useSsl, username, password);
+			}
+			catch (URISyntaxException ex) {
+				throw new RedisUrlSyntaxException(url, ex);
+			}
+		}
+
 	}
 
 }