Add nullability annotations to module/spring-boot-session

See gh-46587

Author: mhalbritter

module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/SessionAutoConfiguration.java

@@ -79,12 +79,18 @@ DefaultCookieSerializer cookieSerializer(ServerProperties serverProperties,
 			map.from(cookie::getHttpOnly).to(cookieSerializer::setUseHttpOnlyCookie);
 			map.from(cookie::getSecure).to(cookieSerializer::setUseSecureCookie);
 			map.from(cookie::getMaxAge).asInt(Duration::getSeconds).to(cookieSerializer::setCookieMaxAge);
-			map.from(cookie::getSameSite).as(SameSite::attributeValue).to(cookieSerializer::setSameSite);
+			setSameSite(map, cookie, cookieSerializer);
 			map.from(cookie::getPartitioned).to(cookieSerializer::setPartitioned);
 			cookieSerializerCustomizers.orderedStream().forEach((customizer) -> customizer.customize(cookieSerializer));
 			return cookieSerializer;
 		}
 
+		@SuppressWarnings("NullAway") // Lambda isn't detected with the correct
+										// nullability
+		private void setSameSite(PropertyMapper map, Cookie cookie, DefaultCookieSerializer cookieSerializer) {
+			map.from(cookie::getSameSite).as(SameSite::attributeValue).to(cookieSerializer::setSameSite);
+		}
+
 		@Configuration(proxyBeanMethods = false)
 		@ConditionalOnClass(RememberMeServices.class)
 		static class RememberMeServicesConfiguration {

module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/SessionProperties.java

@@ -23,6 +23,8 @@
 import java.util.Set;
 import java.util.function.Supplier;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.convert.DurationUnit;
 import org.springframework.boot.web.servlet.DispatcherType;
@@ -43,15 +45,15 @@ public class SessionProperties {
 	 * Session timeout. If a duration suffix is not specified, seconds will be used.
 	 */
 	@DurationUnit(ChronoUnit.SECONDS)
-	private Duration timeout;
+	private @Nullable Duration timeout;
 
 	private Servlet servlet = new Servlet();
 
-	public Duration getTimeout() {
+	public @Nullable Duration getTimeout() {
 		return this.timeout;
 	}
 
-	public void setTimeout(Duration timeout) {
+	public void setTimeout(@Nullable Duration timeout) {
 		this.timeout = timeout;
 	}
 

module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/SessionRepositoryFilterConfiguration.java

@@ -20,6 +20,7 @@
 import java.util.stream.Collectors;
 
 import jakarta.servlet.DispatcherType;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -52,7 +53,7 @@ DelegatingFilterProxyRegistrationBean sessionRepositoryFilterRegistration(Sessio
 		return registration;
 	}
 
-	private EnumSet<DispatcherType> getDispatcherTypes(SessionProperties sessionProperties) {
+	private @Nullable EnumSet<DispatcherType> getDispatcherTypes(SessionProperties sessionProperties) {
 		SessionProperties.Servlet servletProperties = sessionProperties.getServlet();
 		if (servletProperties.getFilterDispatcherTypes() == null) {
 			return null;

module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/endpoint/package-info.java

@@ -17,4 +17,7 @@
 /**
  * Auto-configuration for Spring Session endpoint.
  */
+@NullMarked
 package org.springframework.boot.session.autoconfigure.endpoint;
+
+import org.jspecify.annotations.NullMarked;

module/spring-boot-session/src/main/java/org/springframework/boot/session/autoconfigure/package-info.java

@@ -17,4 +17,7 @@
 /**
  * Auto-configuration for Spring Session.
  */
+@NullMarked
 package org.springframework.boot.session.autoconfigure;
+
+import org.jspecify.annotations.NullMarked;

module/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/ReactiveSessionsEndpoint.java

@@ -16,6 +16,7 @@
 
 package org.springframework.boot.session.endpoint;
 
+import org.jspecify.annotations.Nullable;
 import reactor.core.publisher.Mono;
 
 import org.springframework.boot.actuate.endpoint.annotation.DeleteOperation;
@@ -41,15 +42,15 @@ public class ReactiveSessionsEndpoint {
 
 	private final ReactiveSessionRepository<? extends Session> sessionRepository;
 
-	private final ReactiveFindByIndexNameSessionRepository<? extends Session> indexedSessionRepository;
+	private final @Nullable ReactiveFindByIndexNameSessionRepository<? extends Session> indexedSessionRepository;
 
 	/**
 	 * Create a new {@link ReactiveSessionsEndpoint} instance.
 	 * @param sessionRepository the session repository
 	 * @param indexedSessionRepository the indexed session repository
 	 */
 	public ReactiveSessionsEndpoint(ReactiveSessionRepository<? extends Session> sessionRepository,
-			ReactiveFindByIndexNameSessionRepository<? extends Session> indexedSessionRepository) {
+			@Nullable ReactiveFindByIndexNameSessionRepository<? extends Session> indexedSessionRepository) {
 		Assert.notNull(sessionRepository, "'sessionRepository' must not be null");
 		this.sessionRepository = sessionRepository;
 		this.indexedSessionRepository = indexedSessionRepository;

module/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/SessionsEndpoint.java

@@ -18,6 +18,8 @@
 
 import java.util.Map;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.boot.actuate.endpoint.annotation.DeleteOperation;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
@@ -40,22 +42,22 @@ public class SessionsEndpoint {
 
 	private final SessionRepository<? extends Session> sessionRepository;
 
-	private final FindByIndexNameSessionRepository<? extends Session> indexedSessionRepository;
+	private final @Nullable FindByIndexNameSessionRepository<? extends Session> indexedSessionRepository;
 
 	/**
 	 * Create a new {@link SessionsEndpoint} instance.
 	 * @param sessionRepository the session repository
 	 * @param indexedSessionRepository the indexed session repository
 	 */
 	public SessionsEndpoint(SessionRepository<? extends Session> sessionRepository,
-			FindByIndexNameSessionRepository<? extends Session> indexedSessionRepository) {
+			@Nullable FindByIndexNameSessionRepository<? extends Session> indexedSessionRepository) {
 		Assert.notNull(sessionRepository, "'sessionRepository' must not be null");
 		this.sessionRepository = sessionRepository;
 		this.indexedSessionRepository = indexedSessionRepository;
 	}
 
 	@ReadOperation
-	public SessionsDescriptor sessionsForUsername(String username) {
+	public @Nullable SessionsDescriptor sessionsForUsername(String username) {
 		if (this.indexedSessionRepository == null) {
 			return null;
 		}
@@ -64,7 +66,7 @@ public SessionsDescriptor sessionsForUsername(String username) {
 	}
 
 	@ReadOperation
-	public SessionDescriptor getSession(@Selector String sessionId) {
+	public @Nullable SessionDescriptor getSession(@Selector String sessionId) {
 		Session session = this.sessionRepository.findById(sessionId);
 		if (session == null) {
 			return null;

module/spring-boot-session/src/main/java/org/springframework/boot/session/endpoint/package-info.java

@@ -17,4 +17,7 @@
 /**
  * Actuator endpoint for Spring Session.
  */
+@NullMarked
 package org.springframework.boot.session.endpoint;
+
+import org.jspecify.annotations.NullMarked;