Apply Nullability changes

This commit removes the new deprecated
`org.springframework.lang.Nullable` annotations and replaces them with
JSpecify equivalents.

Note, because those new annotations are applied on type usage, this
commit not only renames imports, but also moves annotations close to the
nullable usage types.

Closes gh-1132

Author: bclozel

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/AbstractGraphQlTesterBuilder.java

@@ -27,6 +27,7 @@
 import com.jayway.jsonpath.spi.json.JacksonJsonProvider;
 import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
 import com.jayway.jsonpath.spi.mapper.MappingProvider;
+import org.jspecify.annotations.Nullable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -40,7 +41,6 @@
 import org.springframework.graphql.client.GraphQlTransport;
 import org.springframework.graphql.support.DocumentSource;
 import org.springframework.graphql.support.ResourceDocumentSource;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
@@ -66,8 +66,7 @@ public abstract class AbstractGraphQlTesterBuilder<B extends AbstractGraphQlTest
 	private static final Duration DEFAULT_RESPONSE_DURATION = Duration.ofSeconds(5);
 
 
-	@Nullable
-	private Predicate<ResponseError> errorFilter;
+	private @Nullable Predicate<ResponseError> errorFilter;
 
 	private DocumentSource documentSource;
 

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultExecutionGraphQlServiceTesterBuilder.java

@@ -24,11 +24,11 @@
 import java.util.function.Consumer;
 
 import graphql.ExecutionInput;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.core.codec.Decoder;
 import org.springframework.core.codec.Encoder;
 import org.springframework.graphql.ExecutionGraphQlService;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 
@@ -46,11 +46,9 @@ final class DefaultExecutionGraphQlServiceTesterBuilder
 
 	private final List<BiFunction<ExecutionInput, ExecutionInput.Builder, ExecutionInput>> executionInputConfigurers;
 
-	@Nullable
-	private Encoder<?> encoder;
+	private @Nullable Encoder<?> encoder;
 
-	@Nullable
-	private Decoder<?> decoder;
+	private @Nullable Decoder<?> decoder;
 
 
 	DefaultExecutionGraphQlServiceTesterBuilder(ExecutionGraphQlService service) {

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlTester.java

@@ -31,6 +31,7 @@
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.TypeRef;
+import org.jspecify.annotations.Nullable;
 import org.skyscreamer.jsonassert.JSONAssert;
 
 import org.springframework.core.ParameterizedTypeReference;
@@ -41,7 +42,6 @@
 import org.springframework.graphql.client.GraphQlTransport;
 import org.springframework.graphql.support.DefaultGraphQlRequest;
 import org.springframework.graphql.support.DocumentSource;
-import org.springframework.lang.Nullable;
 import org.springframework.test.util.AssertionErrors;
 import org.springframework.test.util.JsonPathExpectationsHelper;
 import org.springframework.util.Assert;
@@ -61,8 +61,7 @@ final class DefaultGraphQlTester implements GraphQlTester {
 
 	private final GraphQlTransport transport;
 
-	@Nullable
-	private final Predicate<ResponseError> errorFilter;
+	private final @Nullable Predicate<ResponseError> errorFilter;
 
 	private final Configuration jsonPathConfig;
 
@@ -120,8 +119,7 @@ private final class DefaultRequest implements Request<DefaultRequest> {
 
 		private final String document;
 
-		@Nullable
-		private String operationName;
+		private @Nullable String operationName;
 
 		List<String> fragments = new ArrayList<>();
 
@@ -173,7 +171,7 @@ public DefaultRequest extension(String name, @Nullable Object value) {
 			return this;
 		}
 
-		@SuppressWarnings("ConstantConditions")
+		@SuppressWarnings({"ConstantConditions", "NullAway"})
 		@Override
 		public Response execute() {
 			return DefaultGraphQlTester.this.transport.execute(request())
@@ -374,8 +372,7 @@ public Traversable satisfy(Consumer<List<ResponseError>> consumer) {
 	 */
 	private static final class DefaultPath implements Path {
 
-		@Nullable
-		private final String basePath;
+		private final @Nullable String basePath;
 
 		private final String path;
 

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/EncoderDecoderMappingProvider.java

@@ -25,6 +25,7 @@
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.TypeRef;
 import com.jayway.jsonpath.spi.mapper.MappingProvider;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.core.ResolvableType;
 import org.springframework.core.codec.Decoder;
@@ -36,7 +37,6 @@
 import org.springframework.http.codec.CodecConfigurer;
 import org.springframework.http.codec.DecoderHttpMessageReader;
 import org.springframework.http.codec.EncoderHttpMessageWriter;
-import org.springframework.lang.Nullable;
 import org.springframework.util.MimeType;
 import org.springframework.util.MimeTypeUtils;
 
@@ -107,21 +107,18 @@ private static Decoder<?> findJsonDecoder(Stream<Decoder<?>> decoderStream) {
 	}
 
 
-	@Nullable
 	@Override
-	public <T> T map(Object source, Class<T> targetType, Configuration configuration) {
+	public @Nullable <T> T map(Object source, Class<T> targetType, Configuration configuration) {
 		return mapToTargetType(source, ResolvableType.forClass(targetType));
 	}
 
-	@Nullable
 	@Override
-	public <T> T map(Object source, TypeRef<T> targetType, Configuration configuration) {
+	public @Nullable <T> T map(Object source, TypeRef<T> targetType, Configuration configuration) {
 		return mapToTargetType(source, ResolvableType.forType(targetType.getType()));
 	}
 
 	@SuppressWarnings("unchecked")
-	@Nullable
-	private <T> T mapToTargetType(Object source, ResolvableType targetType) {
+	private @Nullable <T> T mapToTargetType(Object source, ResolvableType targetType) {
 
 		DataBufferFactory bufferFactory = DefaultDataBufferFactory.sharedInstance;
 		MimeType mimeType = MimeTypeUtils.APPLICATION_JSON;

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/GraphQlTester.java

@@ -22,6 +22,7 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
+import org.jspecify.annotations.Nullable;
 import reactor.core.publisher.Flux;
 
 import org.springframework.core.ParameterizedTypeReference;
@@ -30,7 +31,6 @@
 import org.springframework.graphql.client.GraphQlTransport;
 import org.springframework.graphql.support.DocumentSource;
 import org.springframework.graphql.support.ResourceDocumentSource;
-import org.springframework.lang.Nullable;
 
 /**
  * Define a workflow to test GraphQL requests that is independent of the

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/WebGraphQlHandlerGraphQlTransport.java

@@ -20,6 +20,7 @@
 import java.net.URI;
 import java.util.Collections;
 
+import org.jspecify.annotations.Nullable;
 import reactor.core.publisher.Mono;
 
 import org.springframework.graphql.ExecutionGraphQlRequest;
@@ -28,7 +29,6 @@
 import org.springframework.graphql.server.WebGraphQlRequest;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.codec.CodecConfigurer;
-import org.springframework.lang.Nullable;
 
 
 /**

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2020 the original author or authors.
+ * Copyright 2020-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.
@@ -17,9 +17,7 @@
 /**
  * GraphQL client testing support.
  */
-@NonNullApi
-@NonNullFields
+@NullMarked
 package org.springframework.graphql.test.tester;
 
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
+import org.jspecify.annotations.NullMarked;

spring-graphql/src/main/java/org/springframework/graphql/ExecutionGraphQlRequest.java

@@ -21,8 +21,7 @@
 
 import graphql.ExecutionInput;
 import graphql.execution.ExecutionId;
-
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 
 /**
@@ -70,14 +69,12 @@ public interface ExecutionGraphQlRequest extends GraphQlRequest {
 	/**
 	 * Return the configured {@link #executionId(ExecutionId) executionId}.
 	 */
-	@Nullable
-	ExecutionId getExecutionId();
+	@Nullable ExecutionId getExecutionId();
 
 	/**
 	 * Return the transport assigned locale value, if any.
 	 */
-	@Nullable
-	Locale getLocale();
+	@Nullable Locale getLocale();
 
 	/**
 	 * Provide a {@code BiFunction} to help initialize the {@link ExecutionInput}

spring-graphql/src/main/java/org/springframework/graphql/GraphQlRequest.java

@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 
 /**
@@ -45,11 +45,10 @@ public interface GraphQlRequest {
 	 * Return the name of the operation in the {@link #getDocument() document}
 	 * to execute, if the document contains multiple operations.
 	 */
-	@Nullable
-	String getOperationName();
+	@Nullable String getOperationName();
 
 	/**
-	 * Return values for variable defined by the operation.
+	 * Return values for variables defined by the operation.
 	 */
 	Map<String, Object> getVariables();
 

spring-graphql/src/main/java/org/springframework/graphql/GraphQlResponse.java

@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Represents a GraphQL response with the result of executing a request operation.
@@ -51,8 +51,7 @@ public interface GraphQlResponse {
 	 * is not {@link #isValid() valid}.
 	 * @param <T> a map or a list
 	 */
-	@Nullable
-	<T> T getData();
+	@Nullable <T> T getData();
 
 	/**
 	 * Return errors included in the response.

spring-graphql/src/main/java/org/springframework/graphql/ResponseError.java

@@ -21,8 +21,7 @@
 
 import graphql.ErrorClassification;
 import graphql.language.SourceLocation;
-
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Represents a GraphQL response error.
@@ -36,8 +35,7 @@ public interface ResponseError {
 	 * Return the message with a description of the error intended for the
 	 * developer as a guide to understand and correct the error.
 	 */
-	@Nullable
-	String getMessage();
+	@Nullable String getMessage();
 
 	/**
 	 * Return a classification for the error that is specific to GraphQL Java.

spring-graphql/src/main/java/org/springframework/graphql/ResponseField.java

@@ -18,8 +18,9 @@
 
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.graphql.client.ClientGraphQlResponse;
-import org.springframework.lang.Nullable;
 
 
 /**
@@ -49,8 +50,7 @@ public interface ResponseField {
 	 * @param <T> the expected value type to cast to
 	 * @return the value
 	 */
-	@Nullable
-	<T> T getValue();
+	@Nullable <T> T getValue();
 
 	/**
 	 * Return all errors that have a path, and it is at above, or below the field path.

spring-graphql/src/main/java/org/springframework/graphql/client/AbstractGraphQlClientBuilder.java

@@ -23,6 +23,8 @@
 import java.util.List;
 import java.util.function.Consumer;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.core.codec.Decoder;
 import org.springframework.core.codec.Encoder;
 import org.springframework.core.io.ClassPathResource;
@@ -33,7 +35,6 @@
 import org.springframework.graphql.support.ResourceDocumentSource;
 import org.springframework.http.codec.json.Jackson2JsonDecoder;
 import org.springframework.http.codec.json.Jackson2JsonEncoder;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
@@ -62,14 +63,11 @@ public abstract class AbstractGraphQlClientBuilder<B extends AbstractGraphQlClie
 
 	private DocumentSource documentSource;
 
-	@Nullable
-	private Encoder<?> jsonEncoder;
+	private @Nullable Encoder<?> jsonEncoder;
 
-	@Nullable
-	private Decoder<?> jsonDecoder;
+	private @Nullable Decoder<?> jsonDecoder;
 
-	@Nullable
-	private Duration blockingTimeout;
+	private @Nullable Duration blockingTimeout;
 
 
 	/**

spring-graphql/src/main/java/org/springframework/graphql/client/AbstractGraphQlClientSyncBuilder.java

@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.function.Consumer;
 
+import org.jspecify.annotations.Nullable;
 import reactor.core.scheduler.Scheduler;
 import reactor.core.scheduler.Schedulers;
 
@@ -35,7 +36,6 @@
 import org.springframework.graphql.support.ResourceDocumentSource;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
@@ -65,13 +65,11 @@ public abstract class AbstractGraphQlClientSyncBuilder<B extends AbstractGraphQl
 
 	private DocumentSource documentSource;
 
-	@Nullable
-	private HttpMessageConverter<Object> jsonConverter;
+	private @Nullable HttpMessageConverter<Object> jsonConverter;
 
 	private Scheduler scheduler = Schedulers.boundedElastic();
 
-	@Nullable
-	private Duration blockingTimeout;
+	private @Nullable Duration blockingTimeout;
 
 	/**
 	 * Default constructor for use from subclasses.