Upgrade to Spring Framework 7.0.0-M7

Closes gh-1266

Author: bclozel

build.gradle

@@ -6,7 +6,7 @@ description = "Spring for GraphQL"
 
 ext {
 	moduleProjects = [project(":spring-graphql"), project(":spring-graphql-test")]
-	springFrameworkVersion = "7.0.0-M6"
+	springFrameworkVersion = "7.0.0-M7"
 	graphQlJavaVersion = "24.1"
 	springBootVersion = "3.4.3"
 }

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

@@ -22,6 +22,7 @@
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.HttpMessageConverters;
 import org.springframework.util.Assert;
 import org.springframework.web.client.RestClient;
 import org.springframework.web.util.DefaultUriBuilderFactory;
@@ -90,18 +91,26 @@ public DefaultSyncHttpGraphQlClientBuilder headers(Consumer<HttpHeaders> headers
 	}
 
 	@Override
+	@SuppressWarnings("removal")
 	public DefaultSyncHttpGraphQlClientBuilder messageConverters(Consumer<List<HttpMessageConverter<?>>> configurer) {
 		this.restClientBuilder.messageConverters(configurer);
 		return this;
 	}
 
+	@Override
+	public DefaultSyncHttpGraphQlClientBuilder configureMessageConverters(Consumer<HttpMessageConverters.ClientBuilder> configurer) {
+		this.restClientBuilder.configureMessageConverters(configurer);
+		return this;
+	}
+
 	@Override
 	public DefaultSyncHttpGraphQlClientBuilder restClient(Consumer<RestClient.Builder> configurer) {
 		configurer.accept(this.restClientBuilder);
 		return this;
 	}
 
 	@Override
+	@SuppressWarnings("removal")
 	public HttpSyncGraphQlClient build() {
 
 		this.restClientBuilder.messageConverters((converters) -> {

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

@@ -62,11 +62,13 @@ private HttpMessageConverterDelegate() {
 	}
 
 	@SuppressWarnings("unchecked")
-	static HttpMessageConverter<Object> findJsonConverter(List<HttpMessageConverter<?>> converters) {
-		return (HttpMessageConverter<Object>) converters.stream()
-				.filter((converter) -> converter.canRead(Map.class, MediaType.APPLICATION_JSON))
-				.findFirst()
-				.orElseThrow(() -> new IllegalArgumentException("No JSON HttpMessageConverter"));
+	static HttpMessageConverter<Object> findJsonConverter(Iterable<HttpMessageConverter<?>> converters) {
+		for (HttpMessageConverter<?> converter : converters) {
+			if (converter.canRead(Map.class, MediaType.APPLICATION_JSON)) {
+				return (HttpMessageConverter<Object>) converter;
+			}
+		}
+		throw new IllegalArgumentException("No JSON HttpMessageConverter");
 	}
 
 	static HttpMessageConverterEncoder asEncoder(HttpMessageConverter<Object> converter) {

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

@@ -22,6 +22,7 @@
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.HttpMessageConverters;
 import org.springframework.web.client.RestClient;
 
 
@@ -112,17 +113,28 @@ interface Builder<B extends Builder<B>> extends GraphQlClient.SyncBuilder<B> {
 		 * data to higher level objects.
 		 * @param configurer the configurer to apply
 		 * @return this builder
+		 * @deprecated since 2.0 in favor of {@link #configureMessageConverters(Consumer)}.
 		 */
+		@Deprecated(since = "2.0.0", forRemoval = true)
 		B messageConverters(Consumer<List<HttpMessageConverter<?>>> configurer);
 
+		/**
+		 * Configure message converters for JSON for use in the
+		 * {@link org.springframework.graphql.GraphQlResponse} to convert response
+		 * data to higher level objects.
+		 * @param configurer the configurer to apply
+		 * @return this builder
+		 */
+		B configureMessageConverters(Consumer<HttpMessageConverters.ClientBuilder> configurer);
+
 		/**
 		 * Customize the underlying {@code RestClient}.
 		 * <p>Note that some properties of {@code RestClient.Builder} like the base URL,
 		 * headers, and message converters can be customized through this builder.
 		 * @param builderConsumer a consumer that customizes the {@code RestClient}.
 		 * @see #url(String)
 		 * @see #header(String, String...)
-		 * @see #messageConverters(Consumer)
+		 * @see #configureMessageConverters(Consumer)
 		 */
 		B restClient(Consumer<RestClient.Builder> builderConsumer);
 

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

@@ -62,6 +62,7 @@ private static MediaType initContentType(RestClient webClient) {
 
 
 	@Override
+	@SuppressWarnings("NullAway")
 	public GraphQlResponse execute(GraphQlRequest request) {
 
 		Map<String, Object> body = this.restClient.post()

spring-graphql/src/test/java/org/springframework/graphql/client/HttpSyncGraphQlClientBuilderTests.java

@@ -195,7 +195,7 @@ void codecConfigurerRegistersJsonPathMappingProvider() {
 		TestJacksonJsonConverter testConverter = new TestJacksonJsonConverter();
 
 		HttpSyncGraphQlClient.Builder<?> builder = this.setup.initBuilder();
-		builder.messageConverters(converters -> converters.add(0, testConverter));
+		builder.configureMessageConverters((configurer) -> configurer.jsonMessageConverter(testConverter));
 
 		String document = "{me {name}}";
 		MovieCharacter character = MovieCharacter.create("Luke Skywalker");