Fix build warnings

Author: bclozel

spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/GraphQlTesterBuilderTests.java

@@ -22,6 +22,7 @@
 import graphql.ExecutionResultImpl;
 import graphql.GraphqlErrorBuilder;
 import graphql.execution.ExecutionId;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 
@@ -33,7 +34,6 @@
 import org.springframework.graphql.support.DocumentSource;
 import org.springframework.http.codec.json.JacksonJsonDecoder;
 import org.springframework.http.codec.json.JacksonJsonEncoder;
-import org.springframework.lang.Nullable;
 import org.springframework.util.MimeType;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -140,11 +140,10 @@ void errorsFilteredGlobally() {
 
 	private static class TestJacksonJsonDecoder extends JacksonJsonDecoder {
 
-		@Nullable
-		private Object lastValue;
+		private @Nullable Object lastValue;
 
-		@Nullable
-		Object getLastValue() {
+
+		@Nullable Object getLastValue() {
 			return this.lastValue;
 		}
 

spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/WebGraphQlTesterBuilderTests.java

@@ -24,6 +24,7 @@
 
 import graphql.ExecutionResult;
 import graphql.ExecutionResultImpl;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -43,7 +44,6 @@
 import org.springframework.graphql.support.DocumentSource;
 import org.springframework.http.codec.ClientCodecConfigurer;
 import org.springframework.http.codec.json.JacksonJsonDecoder;
-import org.springframework.lang.Nullable;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.util.Assert;
 import org.springframework.util.MimeType;
@@ -206,8 +206,7 @@ private interface TesterBuilderSetup {
 
 	private static class WebBuilderSetup implements TesterBuilderSetup {
 
-		@Nullable
-		private WebGraphQlRequest request;
+		private @Nullable WebGraphQlRequest request;
 
 		private final MockExecutionGraphQlService graphQlService = new MockExecutionGraphQlService();
 

spring-graphql/src/test/java/org/springframework/graphql/ResponseHelper.java

@@ -30,13 +30,13 @@
 import graphql.execution.ResultPath;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.ResolvableType;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
@@ -110,8 +110,7 @@ public <T> List<T> toList(String path, ParameterizedTypeReference<T> elementType
 		return this.documentContext.read(jsonPath(path), new TypeRefAdapter<>(List.class, elementType));
 	}
 
-	@Nullable
-	public <T> T rawValue(String path) {
+	public <T> @Nullable T rawValue(String path) {
 		assertNoErrors();
 		return this.documentContext.read(jsonPath(path));
 	}

spring-graphql/src/test/java/org/springframework/graphql/data/GraphQlArgumentBinderTests.java

@@ -31,6 +31,7 @@
 
 import graphql.schema.DataFetchingEnvironment;
 import graphql.schema.DataFetchingEnvironmentImpl;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 import tools.jackson.databind.ObjectMapper;
 
@@ -39,7 +40,6 @@
 import org.springframework.format.support.DefaultFormattingConversionService;
 import org.springframework.graphql.Book;
 import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.lang.Nullable;
 import org.springframework.validation.BindException;
 import org.springframework.validation.FieldError;
 
@@ -451,14 +451,12 @@ void primaryConstructorWithEnumGenericType() throws Exception {
 		assertThat(input.enums()).hasSize(2).containsExactly(FancyEnum.ONE, FancyEnum.TWO);
 	}
 
-	@Nullable
-	private Object bind(String json, ResolvableType targetType) throws Exception {
+	private @Nullable Object bind(String json, ResolvableType targetType) throws Exception {
 		return bind(this.binder, json, targetType);
 	}
 
 	@SuppressWarnings("unchecked")
-	@Nullable
-	private Object bind(GraphQlArgumentBinder binder, String json, ResolvableType targetType) throws Exception {
+	private @Nullable Object bind(GraphQlArgumentBinder binder, String json, ResolvableType targetType) throws Exception {
 		DataFetchingEnvironment environment =
 				DataFetchingEnvironmentImpl.newDataFetchingEnvironment()
 						.arguments(this.mapper.readValue("{\"key\":" + json + "}", Map.class))

spring-graphql/src/test/java/org/springframework/graphql/data/federation/EntityMappingInvocationTests.java

@@ -25,6 +25,7 @@
 import graphql.GraphqlErrorBuilder;
 import graphql.schema.DataFetchingEnvironment;
 import org.dataloader.DataLoader;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -51,7 +52,6 @@
 import org.springframework.graphql.execution.BatchLoaderRegistry;
 import org.springframework.graphql.execution.DefaultBatchLoaderRegistry;
 import org.springframework.graphql.execution.ErrorType;
-import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Controller;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -246,9 +246,8 @@ private static TestExecutionGraphQlService graphQlService(Class<?> controllerCla
 	@Controller
 	private static class BookController {
 
-		@Nullable
 		@EntityMapping("Media")
-		public Book book(@Argument int id, Map<String, Object> map) {
+		public @Nullable Book book(@Argument int id, Map<String, Object> map) {
 
 			assertThat(map).hasSize(2)
 					.containsEntry("__typename", Book.class.getSimpleName())

spring-graphql/src/test/java/org/springframework/graphql/data/method/annotation/support/AnnotatedControllerExceptionResolverTests.java

@@ -23,6 +23,7 @@
 import graphql.GraphQLError;
 import graphql.schema.DataFetchingEnvironment;
 import graphql.schema.DataFetchingEnvironmentImpl;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -36,7 +37,6 @@
 import org.springframework.core.annotation.Order;
 import org.springframework.graphql.data.method.HandlerMethodArgumentResolverComposite;
 import org.springframework.graphql.data.method.annotation.GraphQlExceptionHandler;
-import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -247,9 +247,8 @@ Object handleToObject(ClassCastException ex) {
 		public void handleToVoid() {
 		}
 
-		@Nullable
 		@GraphQlExceptionHandler
-		GraphQLError handleAndLeaveNotHandled(ClassNotFoundException ex) {
+		@Nullable GraphQLError handleAndLeaveNotHandled(ClassNotFoundException ex) {
 			return null;
 		}
 

spring-graphql/src/test/java/org/springframework/graphql/data/method/annotation/support/AuthenticationPrincipalArgumentResolverTests.java

@@ -21,6 +21,7 @@
 import java.lang.reflect.Method;
 import java.util.function.Function;
 
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.reactivestreams.Publisher;
@@ -33,7 +34,6 @@
 import org.springframework.core.annotation.SynthesizingMethodParameter;
 import org.springframework.graphql.data.method.annotation.Argument;
 import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.lang.Nullable;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;

spring-graphql/src/test/java/org/springframework/graphql/data/method/annotation/support/BatchMappingPrincipalMethodArgumentResolverTests.java

@@ -25,6 +25,7 @@
 import java.util.stream.Stream;
 
 import io.micrometer.context.ContextSnapshotFactory;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -35,7 +36,6 @@
 import org.springframework.graphql.ExecutionGraphQlResponse;
 import org.springframework.graphql.ResponseHelper;
 import org.springframework.graphql.data.method.annotation.BatchMapping;
-import org.springframework.lang.Nullable;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
@@ -112,11 +112,9 @@ private void testBatchLoading(PrincipalCourseController controller, Function<Con
 	@SuppressWarnings("unused")
 	private static class PrincipalCourseController extends CourseController {
 
-		@Nullable
-		protected Principal principal;
+		protected @Nullable Principal principal;
 
-		@Nullable
-		public Principal principal() {
+		public @Nullable Principal principal() {
 			return this.principal;
 		}
 

spring-graphql/src/test/java/org/springframework/graphql/data/method/annotation/support/BatchMappingTestSupport.java

@@ -27,6 +27,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
@@ -35,7 +36,6 @@
 import org.springframework.graphql.data.method.annotation.QueryMapping;
 import org.springframework.graphql.execution.BatchLoaderRegistry;
 import org.springframework.graphql.execution.DefaultBatchLoaderRegistry;
-import org.springframework.lang.Nullable;
 
 /**
  * Support class for {@code @BatchMapping}, and other batch loading tests, that
@@ -64,21 +64,22 @@ public class BatchMappingTestSupport {
 		Person.save(45L, "Benjamin", "Brown");
 	}
 
-	static final String schema = "" +
-			"type Query {" +
-			"    courses: [Course]" +
-			"}" +
-			"type Course {" +
-			"    id: ID" +
-			"    name: String" +
-			"    instructor: Person" +
-			"    students: [Person]" +
-			"}" +
-			"type Person {" +
-			"    id: ID" +
-			"    firstName: String" +
-			"    lastName: String" +
-			"}";
+	static final String schema = """
+			type Query {
+			    courses: [Course]
+			}
+			type Course {
+			    id: ID
+			    name: String
+			    instructor: Person
+			    students: [Person]
+			}
+			type Person {
+			    id: ID
+			    firstName: String
+			    lastName: String
+			}
+			""";
 
 
 	protected TestExecutionGraphQlService createGraphQlService(CourseController controller) {

spring-graphql/src/test/java/org/springframework/graphql/data/method/annotation/support/ContextValueMethodArgumentResolverTests.java

@@ -27,6 +27,7 @@
 import graphql.schema.DataFetchingEnvironment;
 import graphql.schema.DataFetchingEnvironmentImpl;
 import org.dataloader.BatchLoaderEnvironment;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -41,7 +42,6 @@
 import org.springframework.graphql.data.method.HandlerMethodArgumentResolverComposite;
 import org.springframework.graphql.data.method.annotation.ContextValue;
 import org.springframework.graphql.data.method.annotation.LocalContextValue;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -162,8 +162,7 @@ void resolveFromParameterNameWithBatchMapping() throws Exception {
 		assertThat(controller.savedId).isEqualTo(context.get("id"));
 	}
 
-	@Nullable
-	private Object resolveValue(
+	private @Nullable Object resolveValue(
 			@Nullable GraphQLContext localContext, @Nullable GraphQLContext graphQLContext, int index) {
 
 		DataFetchingEnvironment environment = DataFetchingEnvironmentImpl.newDataFetchingEnvironment()
@@ -196,8 +195,7 @@ private static class TestController {
 
 		private Long savedId;
 
-		@Nullable
-		public String handleMono(@ContextValue Mono<String> stringMono) {
+		public @Nullable String handleMono(@ContextValue Mono<String> stringMono) {
 			return stringMono.block(Duration.ofSeconds(1));
 		}