Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x

Browse Source 
Closes gh-36491
This commit is contained in:
Andy Wilkinson
2023-07-21 15:06:34 +01:00
parent 4d11f3bf92 0d77347eba
commit 6a2a3e2b26
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2022 the original author or authors. * Copyright 2012-2023 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.
@@ -41,7 +41,7 @@ public class RedisProperties {
private int database = 0; 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 * redis://user:password@example.com:6379
*/ */
private String url; private String url;

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java
View File

@@ -138,8 +138,8 @@ class RedisAutoConfigurationTests {
@Test @Test
void testOverrideUrlRedisConfiguration() { void testOverrideUrlRedisConfiguration() {
this.contextRunner this.contextRunner
.withPropertyValues("spring.data.redis.host:foo", "spring.data.redis.password:xyz", .withPropertyValues("spring.data.redis.host:foo", "spring.redis.data.user:alice",
"spring.data.redis.port:1000", "spring.data.redis.ssl:false", "spring.data.redis.password:xyz", "spring.data.redis.port:1000", "spring.data.redis.ssl:false",
"spring.data.redis.url:rediss://user:password@example:33") "spring.data.redis.url:rediss://user:password@example:33")
.run((context) -> { .run((context) -> {
LettuceConnectionFactory cf = context.getBean(LettuceConnectionFactory.class); LettuceConnectionFactory cf = context.getBean(LettuceConnectionFactory.class);