Reinstate GraphQL tests

Closes gh-45392

Author: snicoll

module/spring-boot-graphql/src/main/java/org/springframework/boot/graphql/autoconfigure/servlet/GraphQlWebMvcAutoConfiguration.java

@@ -60,7 +60,6 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.http.converter.GenericHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.util.Assert;
 import org.springframework.web.cors.CorsConfiguration;
@@ -190,12 +189,12 @@ GraphQlWebSocketHandler graphQlWebSocketHandler(WebGraphQlHandler webGraphQlHand
 					properties.getWebsocket().getConnectionInitTimeout(), properties.getWebsocket().getKeepAlive());
 		}
 
-		private GenericHttpMessageConverter<Object> getJsonConverter(HttpMessageConverters converters) {
+		private HttpMessageConverter<Object> getJsonConverter(HttpMessageConverters converters) {
 			return converters.getConverters()
 				.stream()
 				.filter(this::canReadJsonMap)
 				.findFirst()
-				.map(this::asGenericHttpMessageConverter)
+				.map(this::asObjectHttpMessageConverter)
 				.orElseThrow(() -> new IllegalStateException("No JSON converter"));
 		}
 
@@ -204,8 +203,8 @@ private boolean canReadJsonMap(HttpMessageConverter<?> candidate) {
 		}
 
 		@SuppressWarnings("unchecked")
-		private GenericHttpMessageConverter<Object> asGenericHttpMessageConverter(HttpMessageConverter<?> converter) {
-			return (GenericHttpMessageConverter<Object>) converter;
+		private HttpMessageConverter<Object> asObjectHttpMessageConverter(HttpMessageConverter<?> converter) {
+			return (HttpMessageConverter<Object>) converter;
 		}
 
 		@Bean

module/spring-boot-graphql/src/test/java/org/springframework/boot/graphql/autoconfigure/reactive/GraphQlWebFluxAutoConfigurationTests.java

@@ -22,7 +22,6 @@
 import java.util.function.Consumer;
 
 import graphql.schema.idl.TypeRuntimeWiring;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aot.hint.RuntimeHints;
@@ -79,7 +78,6 @@
 		    booksOnSale(minPages: Int) : Book!
 		}
 		""")
-@Disabled("Waiting on compatible release")
 class GraphQlWebFluxAutoConfigurationTests {
 
 	private static final String BASE_URL = "https://spring.example.org/";

module/spring-boot-graphql/src/test/java/org/springframework/boot/graphql/autoconfigure/security/GraphQlWebFluxSecurityAutoConfigurationTests.java

@@ -20,7 +20,6 @@
 import java.util.function.Consumer;
 
 import graphql.schema.idl.TypeRuntimeWiring;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 
@@ -80,7 +79,6 @@
 		    booksOnSale(minPages: Int) : Book!
 		}
 		""")
-@Disabled("Waiting on compatible release")
 class GraphQlWebFluxSecurityAutoConfigurationTests {
 
 	private static final String BASE_URL = "https://spring.example.org/graphql";

module/spring-boot-graphql/src/test/java/org/springframework/boot/graphql/autoconfigure/security/GraphQlWebMvcSecurityAutoConfigurationTests.java

@@ -18,7 +18,6 @@
 
 import graphql.schema.idl.TypeRuntimeWiring;
 import org.assertj.core.api.ThrowingConsumer;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -80,7 +79,6 @@
 		    booksOnSale(minPages: Int) : Book!
 		}
 		""")
-@Disabled("Waiting on compatible release")
 class GraphQlWebMvcSecurityAutoConfigurationTests {
 
 	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()

module/spring-boot-graphql/src/test/java/org/springframework/boot/graphql/autoconfigure/servlet/GraphQlWebMvcAutoConfigurationTests.java

@@ -21,7 +21,6 @@
 
 import graphql.schema.idl.TypeRuntimeWiring;
 import org.assertj.core.api.ThrowingConsumer;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aot.hint.RuntimeHints;
@@ -81,7 +80,6 @@
 		    booksOnSale(minPages: Int) : Book!
 		}
 		""")
-@Disabled("Waiting on compatible release")
 class GraphQlWebMvcAutoConfigurationTests {
 
 	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()

smoke-test/spring-boot-smoke-test-graphql/src/test/java/smoketest/graphql/GreetingControllerTests.java

@@ -16,7 +16,6 @@
 
 package smoketest.graphql;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +28,6 @@
 
 @SpringBootTest
 @AutoConfigureHttpGraphQlTester
-@Disabled("Waiting on compatible release")
 class GreetingControllerTests {
 
 	@Autowired