Merge branch 'main' into 4.0.x

Author: snicoll

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

@@ -46,8 +46,6 @@ public static DataFetcher<Flux<Book>> getBooksOnSaleDataFetcher() {
 		return (environment) -> getBooksOnSale(environment.getArgument("minPages"));
 	}
 
-	@SuppressWarnings("deprecation")
-	@org.springframework.lang.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

@@ -169,8 +169,6 @@ BookService bookService() {
 	static class BookService {
 
 		@PreAuthorize("hasRole('USER')")
-		@org.springframework.lang.Nullable
-		@SuppressWarnings("deprecation")
 		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

@@ -158,8 +158,6 @@ BookService bookService() {
 	static class BookService {
 
 		@PreAuthorize("hasRole('USER')")
-		@org.springframework.lang.Nullable
-		@SuppressWarnings("deprecation")
 		Book getBookdById(String id) {
 			return GraphQlTestDataFetchers.getBookById(id);
 		}