From 4cef72b79832e6612f57aa732a3e0d38d0fd7255 Mon Sep 17 00:00:00 2001
From: Bart Sopers <15631208+bartsopers@users.noreply.github.com>
Date: Fri, 3 Apr 2026 14:25:00 +0200
Subject: [PATCH] Add support for configuring a custom SessionTimeout bean

This commit allows a user-defined SessionTimeout bean to take control
over the auto-configuration of the timeout.

See gh-49883

Signed-off-by: Bart Sopers <15631208+bartsopers@users.noreply.github.com>
---
 .../boot/session/autoconfigure/SessionAutoConfiguration.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/SessionAutoConfiguration.java b/module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/SessionAutoConfiguration.java
index 3f76fcf6f80..00681a82f2e 100644
--- a/module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/SessionAutoConfiguration.java
+++ b/module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/SessionAutoConfiguration.java
@@ -97,6 +97,7 @@ public final class SessionAutoConfiguration {
 		static class EmbeddedWebServerConfiguration {
 
 			@Bean
+			@ConditionalOnMissingBean
 			SessionTimeout embeddedWebServerSessionTimeout(SessionProperties sessionProperties,
 					ServerProperties serverProperties) {
 				return () -> determineTimeout(sessionProperties,
@@ -137,6 +138,7 @@ public final class SessionAutoConfiguration {
 			}
 
 			@Bean
+			@ConditionalOnMissingBean
 			SessionTimeout warDeplomentSessionTimeout(SessionProperties sessionProperties) {
 				return sessionProperties::getTimeout;
 			}
@@ -172,6 +174,7 @@ public final class SessionAutoConfiguration {
 	static class ReactiveSessionConfiguration {
 
 		@Bean
+		@ConditionalOnMissingBean
 		SessionTimeout embeddedWebServerSessionTimeout(SessionProperties sessionProperties,
 				ServerProperties serverProperties) {
 			return () -> determineTimeout(sessionProperties, serverProperties.getReactive().getSession()::getTimeout);