From 5728d9614e21493d2f772854c8131e39b97acc98 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 17 Nov 2017 09:14:45 +0100 Subject: [PATCH] Use a List rather than an array for consistency Closes gh-11029 --- .../boot/autoconfigure/data/redis/RedisProperties.java | 8 ++++---- .../main/asciidoc/appendix-application-properties.adoc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java index bf56d058a5..fe1e76304e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java @@ -266,9 +266,9 @@ public class RedisProperties { private String master; /** - * Nodes as host:port pairs. + * Comma-separated list of "host:port" pairs. */ - private String[] nodes; + private List nodes; public String getMaster() { return this.master; @@ -278,11 +278,11 @@ public class RedisProperties { this.master = master; } - public String[] getNodes() { + public List getNodes() { return this.nodes; } - public void setNodes(String[] nodes) { + public void setNodes(List nodes) { this.nodes = nodes; } diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index d95e1e85bb..cfd89ae4ef 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -869,7 +869,7 @@ content into your application; rather pick only the properties that you need. spring.redis.password= # Login password of the redis server. spring.redis.port=6379 # Redis server port. spring.redis.sentinel.master= # Name of Redis server. - spring.redis.sentinel.nodes= # Comma-separated list of host:port pairs. + spring.redis.sentinel.nodes= # Comma-separated list of "host:port" pairs. spring.redis.ssl=false # Enable SSL support. spring.redis.timeout=0 # Connection timeout in milliseconds.