Merge branch '3.4.x'

Closes gh-45687

Author: snicoll

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlTestDataFetchers.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -22,8 +22,6 @@
 import graphql.schema.DataFetcher;
 import reactor.core.publisher.Flux;
 
-import org.springframework.lang.Nullable;
-
 /**
  * Test utility class holding {@link DataFetcher} implementations.
  *
@@ -48,7 +46,6 @@ public static DataFetcher<Flux<Book>> getBooksOnSaleDataFetcher() {
 		return (environment) -> getBooksOnSale(environment.getArgument("minPages"));
 	}
 
-	@Nullable
 	public static Book getBookById(String id) {
 		return books.stream().filter((book) -> book.getId().equals(id)).findFirst().orElse(null);
 	}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebFluxSecurityAutoConfigurationTests.java

@@ -41,7 +41,6 @@
 import org.springframework.graphql.execution.ReactiveSecurityDataFetcherExceptionResolver;
 import org.springframework.graphql.execution.RuntimeWiringConfigurer;
 import org.springframework.http.MediaType;
-import org.springframework.lang.Nullable;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
@@ -168,7 +167,6 @@ BookService bookService() {
 	static class BookService {
 
 		@PreAuthorize("hasRole('USER')")
-		@Nullable
 		Mono<Book> getBookdById(String id) {
 			return Mono.justOrEmpty(GraphQlTestDataFetchers.getBookById(id));
 		}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java

@@ -38,7 +38,6 @@
 import org.springframework.graphql.execution.RuntimeWiringConfigurer;
 import org.springframework.graphql.execution.SecurityDataFetcherExceptionResolver;
 import org.springframework.http.MediaType;
-import org.springframework.lang.Nullable;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -157,7 +156,6 @@ BookService bookService() {
 	static class BookService {
 
 		@PreAuthorize("hasRole('USER')")
-		@Nullable
 		Book getBookdById(String id) {
 			return GraphQlTestDataFetchers.getBookById(id);
 		}