Polish "Rework Spring Session auto-configuration to use customizers"

See gh-32554

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

@@ -45,11 +45,8 @@ import org.springframework.session.hazelcast.config.annotation.web.http.Hazelcas
 @ConditionalOnMissingBean(SessionRepository.class)
 @ConditionalOnBean(HazelcastInstance.class)
 @EnableConfigurationProperties(HazelcastSessionProperties.class)
-class HazelcastSessionConfiguration {
-
-	@Configuration(proxyBeanMethods = false)
 @Import(HazelcastHttpSessionConfiguration.class)
-	static class SpringBootHazelcastHttpSessionConfiguration {
+class HazelcastSessionConfiguration {
 
 	@Bean
 	SessionRepositoryCustomizer<HazelcastIndexedSessionRepository> springBootSessionRepositoryCustomizer(
@@ -57,8 +54,7 @@ class HazelcastSessionConfiguration {
 			ServerProperties serverProperties) {
 		PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
 		return (sessionRepository) -> {
-				map.from(sessionProperties
+			map.from(sessionProperties.determineTimeout(() -> serverProperties.getServlet().getSession().getTimeout()))
-						.determineTimeout(() -> serverProperties.getServlet().getSession().getTimeout()))
 					.to((timeout) -> sessionRepository.setDefaultMaxInactiveInterval((int) timeout.getSeconds()));
 			map.from(hazelcastSessionProperties::getMapName).to(sessionRepository::setSessionMapName);
 			map.from(hazelcastSessionProperties::getFlushMode).to(sessionRepository::setFlushMode);
@@ -67,5 +63,3 @@ class HazelcastSessionConfiguration {
 	}
 
 }
-
-}

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

@@ -50,7 +50,7 @@ import org.springframework.session.jdbc.config.annotation.web.http.JdbcHttpSessi
 @ConditionalOnMissingBean(SessionRepository.class)
 @ConditionalOnBean(DataSource.class)
 @EnableConfigurationProperties(JdbcSessionProperties.class)
-@Import(DatabaseInitializationDependencyConfigurer.class)
+@Import({ DatabaseInitializationDependencyConfigurer.class, JdbcHttpSessionConfiguration.class })
 class JdbcSessionConfiguration {
 
 	@Bean
@@ -63,25 +63,19 @@ class JdbcSessionConfiguration {
 		return new JdbcSessionDataSourceScriptDatabaseInitializer(dataSourceToInitialize, properties);
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	@Import(JdbcHttpSessionConfiguration.class)
-	static class SpringBootJdbcHttpSessionConfiguration {
-
 	@Bean
 	SessionRepositoryCustomizer<JdbcIndexedSessionRepository> springBootSessionRepositoryCustomizer(
 			SessionProperties sessionProperties, JdbcSessionProperties jdbcSessionProperties,
 			ServerProperties serverProperties) {
 		PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
 		return (sessionRepository) -> {
-				map.from(sessionProperties
+			map.from(sessionProperties.determineTimeout(() -> serverProperties.getServlet().getSession().getTimeout()))
-						.determineTimeout(() -> serverProperties.getServlet().getSession().getTimeout()))
 					.to((timeout) -> sessionRepository.setDefaultMaxInactiveInterval((int) timeout.getSeconds()));
 			map.from(jdbcSessionProperties::getTableName).to(sessionRepository::setTableName);
 			map.from(jdbcSessionProperties::getFlushMode).to(sessionRepository::setFlushMode);
 			map.from(jdbcSessionProperties::getSaveMode).to(sessionRepository::setSaveMode);
 			map.from(jdbcSessionProperties::getCleanupCron).to(sessionRepository::setCleanupCron);
 		};
-		}
 
 	}
 

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

@@ -43,11 +43,8 @@ import org.springframework.session.data.mongo.config.annotation.web.reactive.Rea
 @ConditionalOnMissingBean(ReactiveSessionRepository.class)
 @ConditionalOnBean(ReactiveMongoOperations.class)
 @EnableConfigurationProperties(MongoSessionProperties.class)
-class MongoReactiveSessionConfiguration {
-
-	@Configuration(proxyBeanMethods = false)
 @Import(ReactiveMongoWebSessionConfiguration.class)
-	static class SpringBootMongoWebSessionConfiguration {
+class MongoReactiveSessionConfiguration {
 
 	@Bean
 	ReactiveSessionRepositoryCustomizer<ReactiveMongoSessionRepository> springBootSessionRepositoryCustomizer(
@@ -55,13 +52,10 @@ class MongoReactiveSessionConfiguration {
 			ServerProperties serverProperties) {
 		PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
 		return (sessionRepository) -> {
-				map.from(sessionProperties
+			map.from(sessionProperties.determineTimeout(() -> serverProperties.getReactive().getSession().getTimeout()))
-						.determineTimeout(() -> serverProperties.getReactive().getSession().getTimeout()))
 					.to((timeout) -> sessionRepository.setMaxInactiveIntervalInSeconds((int) timeout.getSeconds()));
 			map.from(mongoSessionProperties::getCollectionName).to(sessionRepository::setCollectionName);
 		};
 	}
 
 }
-
-}

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

@@ -43,11 +43,8 @@ import org.springframework.session.data.mongo.config.annotation.web.http.MongoHt
 @ConditionalOnMissingBean(SessionRepository.class)
 @ConditionalOnBean(MongoOperations.class)
 @EnableConfigurationProperties(MongoSessionProperties.class)
-class MongoSessionConfiguration {
-
-	@Configuration(proxyBeanMethods = false)
 @Import(MongoHttpSessionConfiguration.class)
-	static class SpringBootMongoHttpSessionConfiguration {
+class MongoSessionConfiguration {
 
 	@Bean
 	SessionRepositoryCustomizer<MongoIndexedSessionRepository> springBootSessionRepositoryCustomizer(
@@ -55,13 +52,10 @@ class MongoSessionConfiguration {
 			ServerProperties serverProperties) {
 		PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
 		return (sessionRepository) -> {
-				map.from(sessionProperties
+			map.from(sessionProperties.determineTimeout(() -> serverProperties.getServlet().getSession().getTimeout()))
-						.determineTimeout(() -> serverProperties.getServlet().getSession().getTimeout()))
 					.to((timeout) -> sessionRepository.setMaxInactiveIntervalInSeconds((int) timeout.getSeconds()));
 			map.from(mongoSessionProperties::getCollectionName).to(sessionRepository::setCollectionName);
 		};
 	}
 
 }
-
-}

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

@@ -43,11 +43,8 @@ import org.springframework.session.data.redis.config.annotation.web.server.Redis
 @ConditionalOnMissingBean(ReactiveSessionRepository.class)
 @ConditionalOnBean(ReactiveRedisConnectionFactory.class)
 @EnableConfigurationProperties(RedisSessionProperties.class)
-class RedisReactiveSessionConfiguration {
-
-	@Configuration(proxyBeanMethods = false)
 @Import(RedisWebSessionConfiguration.class)
-	static class SpringBootRedisWebSessionConfiguration {
+class RedisReactiveSessionConfiguration {
 
 	@Bean
 	ReactiveSessionRepositoryCustomizer<ReactiveRedisSessionRepository> springBootSessionRepositoryCustomizer(
@@ -55,8 +52,7 @@ class RedisReactiveSessionConfiguration {
 			ServerProperties serverProperties) {
 		PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
 		return (sessionRepository) -> {
-				map.from(sessionProperties
+			map.from(sessionProperties.determineTimeout(() -> serverProperties.getReactive().getSession().getTimeout()))
-						.determineTimeout(() -> serverProperties.getReactive().getSession().getTimeout()))
 					.to((timeout) -> sessionRepository.setDefaultMaxInactiveInterval((int) timeout.getSeconds()));
 			map.from(redisSessionProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace);
 			map.from(redisSessionProperties::getSaveMode).to(sessionRepository::setSaveMode);
@@ -64,5 +60,3 @@ class RedisReactiveSessionConfiguration {
 	}
 
 }
-
-}

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

@@ -57,11 +57,8 @@ class RedisSessionConfiguration {
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnProperty(prefix = "spring.session.redis", name = "repository-type", havingValue = "default",
 			matchIfMissing = true)
-	static class DefaultRedisSessionConfiguration {
-
-		@Configuration(proxyBeanMethods = false)
 	@Import(RedisHttpSessionConfiguration.class)
-		static class SpringBootRedisHttpSessionConfiguration {
+	static class DefaultRedisSessionConfiguration {
 
 		@Bean
 		SessionRepositoryCustomizer<RedisSessionRepository> springBootSessionRepositoryCustomizer(
@@ -69,8 +66,7 @@ class RedisSessionConfiguration {
 				ServerProperties serverProperties) {
 			String cleanupCron = redisSessionProperties.getCleanupCron();
 			if (cleanupCron != null) {
-					throw new InvalidConfigurationPropertyValueException("spring.session.redis.cleanup-cron",
+				throw new InvalidConfigurationPropertyValueException("spring.session.redis.cleanup-cron", cleanupCron,
-							cleanupCron,
 						"Cron-based cleanup is only supported when spring.session.redis.repository-type is set to "
 								+ "indexed.");
 			}
@@ -87,10 +83,9 @@ class RedisSessionConfiguration {
 
 	}
 
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnProperty(prefix = "spring.session.redis", name = "repository-type", havingValue = "indexed")
+	@Import(RedisIndexedHttpSessionConfiguration.class)
 	static class IndexedRedisSessionConfiguration {
 
 		@Bean
@@ -102,10 +97,6 @@ class RedisSessionConfiguration {
 			};
 		}
 
-		@Configuration(proxyBeanMethods = false)
-		@Import(RedisIndexedHttpSessionConfiguration.class)
-		static class SpringBootRedisIndexedHttpSessionConfiguration {
-
 		@Bean
 		SessionRepositoryCustomizer<RedisIndexedSessionRepository> springBootSessionRepositoryCustomizer(
 				SessionProperties sessionProperties, RedisSessionProperties redisSessionProperties,
@@ -114,8 +105,7 @@ class RedisSessionConfiguration {
 			return (sessionRepository) -> {
 				map.from(sessionProperties
 						.determineTimeout(() -> serverProperties.getServlet().getSession().getTimeout()))
-							.to((timeout) -> sessionRepository
+						.to((timeout) -> sessionRepository.setDefaultMaxInactiveInterval((int) timeout.getSeconds()));
-									.setDefaultMaxInactiveInterval((int) timeout.getSeconds()));
 				map.from(redisSessionProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace);
 				map.from(redisSessionProperties::getFlushMode).to(sessionRepository::setFlushMode);
 				map.from(redisSessionProperties::getSaveMode).to(sessionRepository::setSaveMode);
@@ -126,5 +116,3 @@ class RedisSessionConfiguration {
 	}
 
 }
-
-}