Skip to content

Commit 7cb53b3

Browse files
committed
Remove session store type in favor of defined order
Closes spring-projectsgh-27756
1 parent 6346f21 commit 7cb53b3

29 files changed

+206
-1106
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/AbstractSessionCondition.java

Lines changed: 0 additions & 69 deletions
This file was deleted.

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2727
import org.springframework.boot.autoconfigure.web.ServerProperties;
2828
import org.springframework.boot.context.properties.EnableConfigurationProperties;
29-
import org.springframework.context.annotation.Conditional;
3029
import org.springframework.context.annotation.Configuration;
3130
import org.springframework.session.SessionRepository;
3231
import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository;
@@ -44,7 +43,6 @@
4443
@ConditionalOnClass(HazelcastIndexedSessionRepository.class)
4544
@ConditionalOnMissingBean(SessionRepository.class)
4645
@ConditionalOnBean(HazelcastInstance.class)
47-
@Conditional(ServletSessionCondition.class)
4846
@EnableConfigurationProperties(HazelcastSessionProperties.class)
4947
class HazelcastSessionConfiguration {
5048

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
@ConditionalOnClass({ JdbcTemplate.class, JdbcIndexedSessionRepository.class })
5151
@ConditionalOnMissingBean(SessionRepository.class)
5252
@ConditionalOnBean(DataSource.class)
53-
@Conditional(ServletSessionCondition.class)
5453
@EnableConfigurationProperties(JdbcSessionProperties.class)
5554
@Import(DatabaseInitializationDependencyConfigurer.class)
5655
class JdbcSessionConfiguration {

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoReactiveSessionConfiguration.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2525
import org.springframework.boot.autoconfigure.web.ServerProperties;
2626
import org.springframework.boot.context.properties.EnableConfigurationProperties;
27-
import org.springframework.context.annotation.Conditional;
2827
import org.springframework.context.annotation.Configuration;
2928
import org.springframework.data.mongodb.core.ReactiveMongoOperations;
3029
import org.springframework.session.ReactiveSessionRepository;
@@ -41,7 +40,6 @@
4140
@ConditionalOnClass({ ReactiveMongoOperations.class, ReactiveMongoSessionRepository.class })
4241
@ConditionalOnMissingBean(ReactiveSessionRepository.class)
4342
@ConditionalOnBean(ReactiveMongoOperations.class)
44-
@Conditional(ReactiveSessionCondition.class)
4543
@EnableConfigurationProperties(MongoSessionProperties.class)
4644
class MongoReactiveSessionConfiguration {
4745

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoSessionConfiguration.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2525
import org.springframework.boot.autoconfigure.web.ServerProperties;
2626
import org.springframework.boot.context.properties.EnableConfigurationProperties;
27-
import org.springframework.context.annotation.Conditional;
2827
import org.springframework.context.annotation.Configuration;
2928
import org.springframework.data.mongodb.core.MongoOperations;
3029
import org.springframework.session.SessionRepository;
@@ -41,7 +40,6 @@
4140
@ConditionalOnClass({ MongoOperations.class, MongoIndexedSessionRepository.class })
4241
@ConditionalOnMissingBean(SessionRepository.class)
4342
@ConditionalOnBean(MongoOperations.class)
44-
@Conditional(ServletSessionCondition.class)
4543
@EnableConfigurationProperties(MongoSessionProperties.class)
4644
class MongoSessionConfiguration {
4745

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/NoOpReactiveSessionConfiguration.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/NoOpSessionConfiguration.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/NonUniqueSessionRepositoryException.java

Lines changed: 0 additions & 47 deletions
This file was deleted.

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/NonUniqueSessionRepositoryFailureAnalyzer.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/ReactiveSessionCondition.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2525
import org.springframework.boot.autoconfigure.web.ServerProperties;
2626
import org.springframework.boot.context.properties.EnableConfigurationProperties;
27-
import org.springframework.context.annotation.Conditional;
2827
import org.springframework.context.annotation.Configuration;
2928
import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
3029
import org.springframework.session.ReactiveSessionRepository;
@@ -41,7 +40,6 @@
4140
@ConditionalOnClass({ ReactiveRedisConnectionFactory.class, ReactiveRedisSessionRepository.class })
4241
@ConditionalOnMissingBean(ReactiveSessionRepository.class)
4342
@ConditionalOnBean(ReactiveRedisConnectionFactory.class)
44-
@Conditional(ReactiveSessionCondition.class)
4543
@EnableConfigurationProperties(RedisSessionProperties.class)
4644
class RedisReactiveSessionConfiguration {
4745

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.boot.autoconfigure.web.ServerProperties;
2626
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2727
import org.springframework.context.annotation.Bean;
28-
import org.springframework.context.annotation.Conditional;
2928
import org.springframework.context.annotation.Configuration;
3029
import org.springframework.data.redis.connection.RedisConnectionFactory;
3130
import org.springframework.data.redis.core.RedisTemplate;
@@ -48,7 +47,6 @@
4847
@ConditionalOnClass({ RedisTemplate.class, RedisIndexedSessionRepository.class })
4948
@ConditionalOnMissingBean(SessionRepository.class)
5049
@ConditionalOnBean(RedisConnectionFactory.class)
51-
@Conditional(ServletSessionCondition.class)
5250
@EnableConfigurationProperties(RedisSessionProperties.class)
5351
class RedisSessionConfiguration {
5452

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/ServletSessionCondition.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)