Polish redis connection timeout support

Closes gh-3142

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/redis/RedisProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 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.
@@ -48,14 +48,22 @@ public class RedisProperties {
 	 */
 	private int port = 6379;
 
+	/**
+	 * Connection timeout in milliseconds.
+	 */
+	private int timeout;
+
 	private Pool pool;
 
 	private Sentinel sentinel;
 
-	/**
+	public int getDatabase() {
-	 * Timeout to set in milliseconds.
+		return this.database;
-	 */
+	}
-	private int timeout;
+
+	public void setDatabase(int database) {
+		this.database = database;
+	}
 
 	public String getHost() {
 		return this.host;
@@ -65,14 +73,6 @@ public class RedisProperties {
 		this.host = host;
 	}
 
-	public int getPort() {
-		return this.port;
-	}
-
-	public void setPort(int port) {
-		this.port = port;
-	}
-
 	public String getPassword() {
 		return this.password;
 	}
@@ -81,36 +81,36 @@ public class RedisProperties {
 		this.password = password;
 	}
 
-	public Pool getPool() {
+	public int getPort() {
-		return this.pool;
+		return this.port;
 	}
 
-	public void setPool(Pool pool) {
+	public void setPort(int port) {
-		this.pool = pool;
+		this.port = port;
 	}
 
-	public int getDatabase() {
+	public void setTimeout(int timeout) {
-		return this.database;
+		this.timeout = timeout;
 	}
 
-	public void setDatabase(int database) {
+	public int getTimeout() {
-		this.database = database;
+		return this.timeout;
 	}
 
 	public Sentinel getSentinel() {
 		return this.sentinel;
 	}
 
-	public void setTimeout(int timeout) {
+	public void setSentinel(Sentinel sentinel) {
-		this.timeout = timeout;
+		this.sentinel = sentinel;
 	}
 
-	public int getTimeout() {
+	public Pool getPool() {
-		return this.timeout;
+		return this.pool;
 	}
 
-	public void setSentinel(Sentinel sentinel) {
+	public void setPool(Pool pool) {
-		this.sentinel = sentinel;
+		this.pool = pool;
 	}
 
 	/**

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/redis/RedisAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 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.

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -455,6 +455,7 @@ content into your application; rather pick only the properties that you need.
 	spring.redis.pool.max-wait=-1
 	spring.redis.sentinel.master= # name of Redis server
 	spring.redis.sentinel.nodes= # comma-separated list of host:port pairs
+	spring.redis.timeout= # connection timeout in milliseconds
 
 	# ACTIVEMQ ({sc-spring-boot-autoconfigure}/jms/activemq/ActiveMQProperties.{sc-ext}[ActiveMQProperties])
 	spring.activemq.broker-url=tcp://localhost:61616 # connection URL