Merge branch '2.1.x'

Closes gh-16809

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/JedisConnectionConfiguration.java

@@ -113,6 +113,10 @@ private JedisPoolConfig jedisPoolConfig(RedisProperties.Pool pool) {
 		config.setMaxTotal(pool.getMaxActive());
 		config.setMaxIdle(pool.getMaxIdle());
 		config.setMinIdle(pool.getMinIdle());
+		if (pool.getTimeBetweenEvictionRuns() != null) {
+			config.setTimeBetweenEvictionRunsMillis(
+					pool.getTimeBetweenEvictionRuns().toMillis());
+		}
 		if (pool.getMaxWait() != null) {
 			config.setMaxWaitMillis(pool.getMaxWait().toMillis());
 		}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java

@@ -146,6 +146,10 @@ private GenericObjectPoolConfig<?> getPoolConfig(Pool properties) {
 			config.setMaxTotal(properties.getMaxActive());
 			config.setMaxIdle(properties.getMaxIdle());
 			config.setMinIdle(properties.getMinIdle());
+			if (properties.getTimeBetweenEvictionRuns() != null) {
+				config.setTimeBetweenEvictionRunsMillis(
+						properties.getTimeBetweenEvictionRuns().toMillis());
+			}
 			if (properties.getMaxWait() != null) {
 				config.setMaxWaitMillis(properties.getMaxWait().toMillis());
 			}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -171,7 +171,8 @@ public static class Pool {
 
 		/**
 		 * Target for the minimum number of idle connections to maintain in the pool. This
-		 * setting only has an effect if it is positive.
+		 * setting only has an effect if both it and time between eviction runs are
+		 * positive.
 		 */
 		private int minIdle = 0;
 
@@ -188,6 +189,12 @@ public static class Pool {
 		 */
 		private Duration maxWait = Duration.ofMillis(-1);
 
+		/**
+		 * Time between runs of the idle object evictor thread. When positive, the idle
+		 * object evictor thread starts, otherwise no idle object eviction is performed.
+		 */
+		private Duration timeBetweenEvictionRuns;
+
 		public int getMaxIdle() {
 			return this.maxIdle;
 		}
@@ -220,6 +227,14 @@ public void setMaxWait(Duration maxWait) {
 			this.maxWait = maxWait;
 		}
 
+		public Duration getTimeBetweenEvictionRuns() {
+			return this.timeBetweenEvictionRuns;
+		}
+
+		public void setTimeBetweenEvictionRuns(Duration timeBetweenEvictionRuns) {
+			this.timeBetweenEvictionRuns = timeBetweenEvictionRuns;
+		}
+
 	}
 
 	/**

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java

@@ -134,18 +134,23 @@ public void testPasswordInUrlStartsWithColon() {
 
 	@Test
 	public void testRedisConfigurationWithPool() {
-		this.contextRunner.withPropertyValues("spring.redis.host:foo",
-				"spring.redis.jedis.pool.min-idle:1",
-				"spring.redis.jedis.pool.max-idle:4",
-				"spring.redis.jedis.pool.max-active:16",
-				"spring.redis.jedis.pool.max-wait:2000").run((context) -> {
+		this.contextRunner
+				.withPropertyValues("spring.redis.host:foo",
+						"spring.redis.jedis.pool.min-idle:1",
+						"spring.redis.jedis.pool.max-idle:4",
+						"spring.redis.jedis.pool.max-active:16",
+						"spring.redis.jedis.pool.max-wait:2000",
+						"spring.redis.jedis.pool.time-between-eviction-runs:30000")
+				.run((context) -> {
 					JedisConnectionFactory cf = context
 							.getBean(JedisConnectionFactory.class);
 					assertThat(cf.getHostName()).isEqualTo("foo");
 					assertThat(cf.getPoolConfig().getMinIdle()).isEqualTo(1);
 					assertThat(cf.getPoolConfig().getMaxIdle()).isEqualTo(4);
 					assertThat(cf.getPoolConfig().getMaxTotal()).isEqualTo(16);
 					assertThat(cf.getPoolConfig().getMaxWaitMillis()).isEqualTo(2000);
+					assertThat(cf.getPoolConfig().getTimeBetweenEvictionRunsMillis())
+							.isEqualTo(30000);
 				});
 	}
 

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

@@ -155,6 +155,7 @@ public void testRedisConfigurationWithPool() {
 				"spring.redis.lettuce.pool.max-idle:4",
 				"spring.redis.lettuce.pool.max-active:16",
 				"spring.redis.lettuce.pool.max-wait:2000",
+				"spring.redis.lettuce.pool.time-between-eviction-runs:30000",
 				"spring.redis.lettuce.shutdown-timeout:1000").run((context) -> {
 					LettuceConnectionFactory cf = context
 							.getBean(LettuceConnectionFactory.class);
@@ -165,6 +166,8 @@ public void testRedisConfigurationWithPool() {
 					assertThat(poolConfig.getMaxIdle()).isEqualTo(4);
 					assertThat(poolConfig.getMaxTotal()).isEqualTo(16);
 					assertThat(poolConfig.getMaxWaitMillis()).isEqualTo(2000);
+					assertThat(poolConfig.getTimeBetweenEvictionRunsMillis())
+							.isEqualTo(30000);
 					assertThat(cf.getShutdownTimeout()).isEqualTo(1000);
 				});
 	}