Fix JSON decoding to parameterized types in HttpSyncGraphQlClient

This commit ensures that the most complete type information is provided
to the codec when deserializing parameterized types using
`HttpMessageConverters` with the sync client.

Fixes gh-1383

Author: bclozel

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

@@ -44,6 +44,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.GenericHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.SmartHttpMessageConverter;
 import org.springframework.util.MimeType;
 
 
@@ -112,7 +113,10 @@ public DataBuffer encodeValue(
 
 			HttpOutputMessageAdapter messageAdapter = new HttpOutputMessageAdapter();
 			try {
-				if (this.converter instanceof GenericHttpMessageConverter<Object> genericConverter) {
+				if (this.converter instanceof SmartHttpMessageConverter<Object> smartConverter) {
+					smartConverter.write(value, valueType, toMediaType(mimeType), messageAdapter, hints);
+				}
+				else if (this.converter instanceof GenericHttpMessageConverter<Object> genericConverter) {
 					genericConverter.write(value, valueType.getType(), toMediaType(mimeType), messageAdapter);
 				}
 				else {
@@ -166,7 +170,10 @@ public Object decode(DataBuffer buffer, ResolvableType targetType,
 
 			try {
 				HttpInputMessageAdapter messageAdapter = new HttpInputMessageAdapter(buffer);
-				if (this.converter instanceof GenericHttpMessageConverter<Object> genericConverter) {
+				if (this.converter instanceof SmartHttpMessageConverter<Object> smartConverter) {
+					return smartConverter.read(targetType, messageAdapter, hints);
+				}
+				else if (this.converter instanceof GenericHttpMessageConverter<Object> genericConverter) {
 					return genericConverter.read(targetType.getType(), null, messageAdapter);
 				}
 				else {

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

@@ -43,7 +43,7 @@
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
 /**
- * Tests for {@link GraphQlClient} that check whether it supports
+ * Tests for {@link HttpGraphQlClient} that check whether it supports
  * the GraphQL over HTTP specification.
  *
  * @see <a href="https://graphql.github.io/graphql-over-http/draft/#sec-application-graphql-response-json">GraphQL over HTTP specification</a>

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

@@ -0,0 +1,109 @@
+/*
+ * Copyright 2020-present 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.graphql.client;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Stream;
+
+import mockwebserver3.MockResponse;
+import mockwebserver3.MockWebServer;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import org.springframework.graphql.Book;
+import org.springframework.graphql.MediaTypes;
+import org.springframework.http.MediaType;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Named.named;
+import static org.junit.jupiter.params.provider.Arguments.arguments;
+
+/**
+ * Integration tests for {@link HttpGraphQlClient}.
+ */
+class HttpGraphQlClientTests {
+
+	private MockWebServer server;
+
+	@BeforeEach
+	void setup() throws IOException {
+		this.server = new MockWebServer();
+		this.server.start();
+	}
+
+	@AfterEach
+	void tearDown() throws IOException {
+		this.server.close();
+	}
+
+	static Stream<Arguments> graphQlClientTypes() {
+		return Stream.of(
+				arguments(named("HttpGraphQlClient", ClientType.ASYNC)),
+				arguments(named("HttpSyncGraphQlClient", ClientType.SYNC))
+		);
+	}
+
+	@ParameterizedTest
+	@MethodSource("graphQlClientTypes")
+	void toEntityListSync(ClientType clientType) {
+		prepareOkResponse("""
+				{
+					"data": {
+						"favoriteBooks": [
+							{"id":"42","name":"Hitchhiker's Guide to the Galaxy"},
+							{"id":"53","name":"Breaking Bad"}
+						]
+					}
+				}
+				""");
+		List<Book> favoriteBooks = createClient(clientType).document("{ favoriteBooks() { id name } }")
+				.retrieveSync("favoriteBooks")
+				.toEntityList(Book.class);
+
+		assertThat(favoriteBooks).hasSize(2);
+		assertThat(favoriteBooks.get(0)).isInstanceOf(Book.class);
+		assertThat(favoriteBooks).extracting("id").contains(42L, 53L);
+	}
+
+	private GraphQlClient createClient(ClientType clientType) {
+		return switch (clientType) {
+			case ASYNC -> HttpGraphQlClient.builder().url(server.url("/").toString()).build();
+			case SYNC -> HttpSyncGraphQlClient.builder().url(server.url("/").toString()).build();
+		};
+	}
+
+	void prepareOkResponse(String body) {
+		prepareResponse(200, MediaTypes.APPLICATION_GRAPHQL_RESPONSE, body);
+	}
+
+	private void prepareResponse(int status, MediaType contentType, String body) {
+		MockResponse mockResponse = new MockResponse.Builder().code(status)
+				.setHeader("Content-Type", contentType.toString())
+				.body(body)
+				.build();
+		this.server.enqueue(mockResponse);
+	}
+
+	enum ClientType {
+		ASYNC, SYNC
+	}
+
+}

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

@@ -19,12 +19,14 @@
 import java.io.IOException;
 import java.net.URI;
 import java.util.Collections;
+import java.util.Map;
 
 import graphql.ExecutionResultImpl;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 
+import org.springframework.core.ResolvableType;
 import org.springframework.graphql.execution.MockExecutionGraphQlService;
 import org.springframework.graphql.server.WebGraphQlHandler;
 import org.springframework.graphql.server.WebGraphQlInterceptor;
@@ -305,8 +307,8 @@ Object getLastValue() {
 		}
 
 		@Override
-		protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException {
-			this.lastValue = super.readInternal(clazz, inputMessage);
+		public Object read(ResolvableType type, HttpInputMessage inputMessage, @Nullable Map<String, Object> hints) throws IOException, HttpMessageNotReadableException {
+			this.lastValue = super.read(type, inputMessage, hints);
 			return this.lastValue;
 		}