From 17aad4f00c1a377e043843f489621c98333a2133 Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Sun, 12 Mar 2017 11:35:04 +0100 Subject: [PATCH] Improve `RedisSessionConfiguration` conditions Closes gh-8582 --- .../autoconfigure/session/RedisSessionConfiguration.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java index 2570868139..b55d285f57 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 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. @@ -23,6 +23,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; @@ -38,10 +39,12 @@ import org.springframework.session.data.redis.config.annotation.web.http.RedisHt * @author Tommy Ludwig * @author Eddú Meléndez * @author Stephane Nicoll + * @author Vedran Pavic */ @Configuration +@ConditionalOnClass(RedisTemplate.class) @ConditionalOnMissingBean(SessionRepository.class) -@ConditionalOnBean({ RedisTemplate.class, RedisConnectionFactory.class }) +@ConditionalOnBean(RedisConnectionFactory.class) @Conditional(SessionCondition.class) class RedisSessionConfiguration {