mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge pull request #36477 from izeye
* gh-36477: Polish "Correct description of overrides for spring.redis.url" Correct description of overrides for spring.redis.url Closes gh-36477
This commit is contained in:
commit
0d77347eba
@ -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");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -41,7 +41,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;
|
||||
|
@ -139,8 +139,9 @@ class RedisAutoConfigurationTests {
|
||||
@Test
|
||||
void testOverrideUrlRedisConfiguration() {
|
||||
this.contextRunner
|
||||
.withPropertyValues("spring.redis.host:foo", "spring.redis.password:xyz", "spring.redis.port:1000",
|
||||
"spring.redis.ssl:false", "spring.redis.url:rediss://user:password@example:33")
|
||||
.withPropertyValues("spring.redis.host:foo", "spring.redis.user:alice", "spring.redis.password:xyz",
|
||||
"spring.redis.port:1000", "spring.redis.ssl:false",
|
||||
"spring.redis.url:rediss://user:password@example:33")
|
||||
.run((context) -> {
|
||||
LettuceConnectionFactory cf = context.getBean(LettuceConnectionFactory.class);
|
||||
assertThat(cf.getHostName()).isEqualTo("example");
|
||||
|
Loading…
Reference in New Issue
Block a user