Fix compiler "deprecation" warnings

Author: rstoyanchev

spring-graphql/src/main/java/org/springframework/graphql/server/WebGraphQlRequest.java

@@ -76,16 +76,17 @@ public class WebGraphQlRequest extends DefaultExecutionGraphQlRequest implements
 	 * @param locale the locale from the HTTP request, if any
 	 * @since 1.3.0
 	 */
-	public WebGraphQlRequest(URI uri, HttpHeaders headers, @Nullable MultiValueMap<String, HttpCookie> cookies,
-							@Nullable InetSocketAddress remoteAddress, Map<String, Object> attributes,
-							GraphQlRequest body, String id, @Nullable Locale locale) {
+	public WebGraphQlRequest(
+			URI uri, HttpHeaders headers, @Nullable MultiValueMap<String, HttpCookie> cookies,
+			@Nullable InetSocketAddress remoteAddress, Map<String, Object> attributes,
+			GraphQlRequest body, String id, @Nullable Locale locale) {
+
 		this(uri, headers, cookies, remoteAddress, attributes, body.getDocument(),
 				body.getOperationName(), body.getVariables(), body.getExtensions(), id, locale);
 	}
 
 	/**
-	 * Variant of {@link #WebGraphQlRequest(URI, HttpHeaders, MultiValueMap, Map, GraphQlRequest, String, Locale)}
-	 * with a Map for the request body.
+	 * Constructor variant with a Map for the request body.
 	 * @param uri the URL for the HTTP request or WebSocket handshake
 	 * @param headers the HTTP request headers
 	 * @param cookies the HTTP request cookies
@@ -127,8 +128,7 @@ public WebGraphQlRequest(
 	}
 
 	/**
-	 * Variant of {@link #WebGraphQlRequest(URI, HttpHeaders, MultiValueMap, Map, GraphQlRequest, String, Locale)}
-	 * with a Map for the request body.
+	 * Create an instance.
 	 * @param uri the URL for the HTTP request or WebSocket handshake
 	 * @param headers the HTTP request headers
 	 * @param cookies the HTTP request cookies

spring-graphql/src/main/java/org/springframework/graphql/server/WebSocketGraphQlRequest.java

@@ -46,44 +46,44 @@ public class WebSocketGraphQlRequest extends WebGraphQlRequest {
 	 * @param uri the URL for the HTTP request or WebSocket handshake
 	 * @param headers the HTTP request headers
 	 * @param cookies the HTTP request cookies
+	 * @param remoteAddress the client remote address
 	 * @param attributes session attributes
 	 * @param body the deserialized content of the GraphQL request
 	 * @param id the id from the GraphQL over WebSocket {@code "subscribe"} message
 	 * @param locale the locale from the HTTP request, if any
 	 * @param sessionInfo the WebSocket session id
-	 * @since 1.1.3
-	 * @deprecated in favor of {@link #WebSocketGraphQlRequest(URI, HttpHeaders, MultiValueMap, InetSocketAddress, Map, Map, String, Locale, WebSocketSessionInfo)}
+	 * @since 1.3.0
 	 */
-	@Deprecated(since = "1.3.0", forRemoval = true)
 	public WebSocketGraphQlRequest(
 			URI uri, HttpHeaders headers, @Nullable MultiValueMap<String, HttpCookie> cookies,
-			Map<String, Object> attributes, Map<String, Object> body, String id, @Nullable Locale locale,
-			WebSocketSessionInfo sessionInfo) {
+			@Nullable InetSocketAddress remoteAddress, Map<String, Object> attributes, Map<String, Object> body,
+			String id, @Nullable Locale locale, WebSocketSessionInfo sessionInfo) {
 
-		this(uri, headers, cookies, null, attributes, body, id, locale, sessionInfo);
+		super(uri, headers, cookies, remoteAddress, attributes, body, id, locale);
+		Assert.notNull(sessionInfo, "WebSocketSessionInfo is required");
+		this.sessionInfo = sessionInfo;
 	}
 
 	/**
 	 * Create an instance.
 	 * @param uri the URL for the HTTP request or WebSocket handshake
 	 * @param headers the HTTP request headers
 	 * @param cookies the HTTP request cookies
-	 * @param remoteAddress the client remote address
 	 * @param attributes session attributes
 	 * @param body the deserialized content of the GraphQL request
 	 * @param id the id from the GraphQL over WebSocket {@code "subscribe"} message
 	 * @param locale the locale from the HTTP request, if any
 	 * @param sessionInfo the WebSocket session id
-	 * @since 1.3.0
+	 * @since 1.1.3
+	 * @deprecated in favor of {@link #WebSocketGraphQlRequest(URI, HttpHeaders, MultiValueMap, InetSocketAddress, Map, Map, String, Locale, WebSocketSessionInfo)}
 	 */
+	@Deprecated(since = "1.3.0", forRemoval = true)
 	public WebSocketGraphQlRequest(
 			URI uri, HttpHeaders headers, @Nullable MultiValueMap<String, HttpCookie> cookies,
-			@Nullable InetSocketAddress remoteAddress, Map<String, Object> attributes, Map<String, Object> body,
-			String id, @Nullable Locale locale, WebSocketSessionInfo sessionInfo) {
+			Map<String, Object> attributes, Map<String, Object> body, String id, @Nullable Locale locale,
+			WebSocketSessionInfo sessionInfo) {
 
-		super(uri, headers, cookies, remoteAddress, attributes, body, id, locale);
-		Assert.notNull(sessionInfo, "WebSocketSessionInfo is required");
-		this.sessionInfo = sessionInfo;
+		this(uri, headers, cookies, null, attributes, body, id, locale, sessionInfo);
 	}
 
 

spring-graphql/src/test/java/org/springframework/graphql/data/query/QuerydslDataFetcherTests.java

@@ -376,7 +376,7 @@ private static RuntimeWiringConfigurer createRuntimeWiringConfigurer(
 
 	private WebGraphQlRequest request(String query) {
 		return new WebGraphQlRequest(
-				URI.create("/"), new HttpHeaders(), null, Collections.emptyMap(),
+				URI.create("/"), new HttpHeaders(), null, null, Collections.emptyMap(),
 				new DefaultGraphQlRequest(query), "1", Locale.ENGLISH);
 	}
 

spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/QueryByExampleDataFetcherJpaTests.java

@@ -262,7 +262,7 @@ private static RuntimeWiringConfigurer createRuntimeWiringConfigurer(QueryByExam
 
 	private WebGraphQlRequest request(String query) {
 		return new WebGraphQlRequest(
-				URI.create("/"), new HttpHeaders(), null, Collections.emptyMap(),
+				URI.create("/"), new HttpHeaders(), null, null, Collections.emptyMap(),
 				new DefaultGraphQlRequest(query), "1", null);
 	}
 

spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherMongoDbTests.java

@@ -240,7 +240,7 @@ private static RuntimeWiringConfigurer createRuntimeWiringConfigurer(QueryByExam
 
 	private WebGraphQlRequest request(String query) {
 		return new WebGraphQlRequest(
-				URI.create("/"), new HttpHeaders(), null, Collections.emptyMap(),
+				URI.create("/"), new HttpHeaders(), null, null, Collections.emptyMap(),
 				new DefaultGraphQlRequest(query), "1", null);
 	}
 

spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherReactiveMongoDbTests.java

@@ -213,7 +213,7 @@ private static RuntimeWiringConfigurer createRuntimeWiringConfigurer(ReactiveQue
 
 	private WebGraphQlRequest request(String query) {
 		return new WebGraphQlRequest(
-				URI.create("/"), new HttpHeaders(), null, Collections.emptyMap(),
+				URI.create("/"), new HttpHeaders(), null, null, Collections.emptyMap(),
 				new DefaultGraphQlRequest(query), "1", null);
 	}
 

spring-graphql/src/test/java/org/springframework/graphql/data/query/neo4j/QueryByExampleDataFetcherNeo4jTests.java

@@ -242,7 +242,7 @@ private static RuntimeWiringConfigurer createRuntimeWiringConfigurer(QueryByExam
 
 	private WebGraphQlRequest request(String query) {
 		return new WebGraphQlRequest(
-				URI.create("/"), new HttpHeaders(), null, Collections.emptyMap(),
+				URI.create("/"), new HttpHeaders(), null, null, Collections.emptyMap(),
 				new DefaultGraphQlRequest(query), "1", null);
 	}
 

spring-graphql/src/test/java/org/springframework/graphql/data/query/neo4j/QueryByExampleDataFetcherReactiveNeo4jDbTests.java

@@ -226,7 +226,7 @@ private static RuntimeWiringConfigurer createRuntimeWiringConfigurer(ReactiveQue
 
 	private WebGraphQlRequest request(String query) {
 		return new WebGraphQlRequest(
-				URI.create("/"), new HttpHeaders(), null, Collections.emptyMap(),
+				URI.create("/"), new HttpHeaders(), null, null, Collections.emptyMap(),
 				new DefaultGraphQlRequest(query), "1", null);
 	}
 

spring-graphql/src/test/java/org/springframework/graphql/server/WebGraphQlHandlerTests.java

@@ -46,7 +46,7 @@
 public class WebGraphQlHandlerTests {
 
 	private static final WebGraphQlRequest webInput = new WebGraphQlRequest(
-			URI.create("https://abc.org"), new HttpHeaders(), null, Collections.emptyMap(),
+			URI.create("https://abc.org"), new HttpHeaders(), null, null, Collections.emptyMap(),
 			new DefaultGraphQlRequest("{ greeting }"), "1", null);
 
 

spring-graphql/src/test/java/org/springframework/graphql/server/WebGraphQlInterceptorTests.java

@@ -41,7 +41,7 @@
 public class WebGraphQlInterceptorTests {
 
 	private static final WebGraphQlRequest webRequest = new WebGraphQlRequest(
-			URI.create("http://abc.org"), new HttpHeaders(), null, Collections.emptyMap(),
+			URI.create("http://abc.org"), new HttpHeaders(), null, null, Collections.emptyMap(),
 			new DefaultGraphQlRequest("{ notUsed }"), "1", null);
 
 	@Test