From 88ee4fab36010332f2630d4741601096f34ea507 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Tue, 21 Dec 2021 10:33:10 +0100
Subject: [PATCH] Polish

See gh-29140
---
 .../metrics/graphql/GraphQlMetricsInstrumentationTests.java   | 1 +
 .../boot/autoconfigure/graphql/GraphQlTestDataFetchers.java   | 4 ++--
 .../security/GraphQlWebMvcSecurityAutoConfigurationTests.java | 1 +
 .../src/main/java/smoketest/graphql/SecurityConfig.java       | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/graphql/GraphQlMetricsInstrumentationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/graphql/GraphQlMetricsInstrumentationTests.java
index 7d5f6e63e3..a085a12ae9 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/graphql/GraphQlMetricsInstrumentationTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/graphql/GraphQlMetricsInstrumentationTests.java
@@ -53,6 +53,7 @@ import static org.mockito.Mockito.mock;
  *
  * @author Brian Clozel
  */
+@SuppressWarnings("unchecked")
 class GraphQlMetricsInstrumentationTests {
 
 	private final ExecutionInput input = ExecutionInput.newExecutionInput("{greeting}").build();
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlTestDataFetchers.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlTestDataFetchers.java
index c7dbc44238..036c759f0a 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlTestDataFetchers.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlTestDataFetchers.java
@@ -39,11 +39,11 @@ public final class GraphQlTestDataFetchers {
 
 	}
 
-	public static DataFetcher getBookByIdDataFetcher() {
+	public static DataFetcher<Book> getBookByIdDataFetcher() {
 		return (environment) -> getBookById(environment.getArgument("id"));
 	}
 
-	public static DataFetcher getBooksOnSaleDataFetcher() {
+	public static DataFetcher<Flux<Book>> getBooksOnSaleDataFetcher() {
 		return (environment) -> getBooksOnSale(environment.getArgument("minPages"));
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java
index ebdf9a7d40..cf876b091b 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java
@@ -155,6 +155,7 @@ class GraphQlWebMvcSecurityAutoConfigurationTests {
 	@Configuration(proxyBeanMethods = false)
 	@EnableWebSecurity
 	@EnableGlobalMethodSecurity(prePostEnabled = true)
+	@SuppressWarnings("deprecation")
 	static class SecurityConfig {
 
 		@Bean
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-graphql/src/main/java/smoketest/graphql/SecurityConfig.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-graphql/src/main/java/smoketest/graphql/SecurityConfig.java
index cfe1e0a203..fcbb5be480 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-graphql/src/main/java/smoketest/graphql/SecurityConfig.java
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-graphql/src/main/java/smoketest/graphql/SecurityConfig.java
@@ -42,6 +42,7 @@ public class SecurityConfig {
 	}
 
 	@Bean
+	@SuppressWarnings("deprecation")
 	public static InMemoryUserDetailsManager userDetailsService() {
 		User.UserBuilder userBuilder = User.withDefaultPasswordEncoder();
 		UserDetails rob = userBuilder.username("rob").password("rob").roles("USER").build();