Merge branch '3.0.x' into 3.1.x

Closes gh-36492
spring-projects · Jul 21, 2023 · c38bca0 · c38bca0
2 parents 1bef422 + 6a2a3e2
commit c38bca0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...gure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java b/...gure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java
@@ -42,7 +42,7 @@ public class RedisProperties {
 	private int database = 0;
 
 	/**
-	 * Connection URL. Overrides host, port, and password. User is ignored. Example:
+	 * Connection URL. Overrides host, port, username, and password. Example:
 	 * redis://user:password@example.com:6379
 	 */
 	private String url;

diff --git a/...t/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java b/...t/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java
@@ -143,9 +143,9 @@ void testRedisUrlConfiguration() {
 	@Test
 	void testOverrideUrlRedisConfiguration() {
 		this.contextRunner
-			.withPropertyValues("spring.data.redis.host:foo", "spring.data.redis.password:xyz",
-					"spring.data.redis.port:1000", "spring.data.redis.ssl.enabled:false",
-					"spring.data.redis.url:rediss://user:password@example:33")
+			.withPropertyValues("spring.data.redis.host:foo", "spring.redis.data.user:alice",
+					"spring.data.redis.password:xyz", "spring.data.redis.port:1000",
+					"spring.data.redis.ssl.enabled:false", "spring.data.redis.url:rediss://user:password@example:33")
 			.run((context) -> {
 				LettuceConnectionFactory cf = context.getBean(LettuceConnectionFactory.class);
 				assertThat(cf.getHostName()).isEqualTo("example");