Spring/spring-graphql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compiler "deprecation" warnings

Browse Source
This commit is contained in:
rstoyanchev
2024-05-20 16:33:46 +01:00
parent 4e53faf63b
commit 84dac20b7b
10 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 class WebGraphQlRequest extends DefaultExecutionGraphQlRequest implements
}
/**
* 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

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

@@ -41,28 +41,6 @@ public class WebSocketGraphQlRequest extends WebGraphQlRequest {
private final WebSocketSessionInfo 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 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)}
*/
@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) {
this(uri, headers, cookies, null, attributes, body, id, locale, sessionInfo);
}
/**
* Create an instance.
* @param uri the URL for the HTTP request or WebSocket handshake
@@ -86,6 +64,28 @@ public class WebSocketGraphQlRequest extends WebGraphQlRequest {
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 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)}
*/
@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) {
this(uri, headers, cookies, null, attributes, body, id, locale, sessionInfo);
}
/**
* Return information about the underlying WebSocket session.

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

@@ -376,7 +376,7 @@ class QuerydslDataFetcherTests {
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);
}

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

@@ -262,7 +262,7 @@ class QueryByExampleDataFetcherJpaTests {
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);
}

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

@@ -240,7 +240,7 @@ class QueryByExampleDataFetcherMongoDbTests {
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);
}

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

@@ -213,7 +213,7 @@ class QueryByExampleDataFetcherReactiveMongoDbTests {
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);
}

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

@@ -242,7 +242,7 @@ class QueryByExampleDataFetcherNeo4jTests {
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);
}

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

@@ -226,7 +226,7 @@ class QueryByExampleDataFetcherReactiveNeo4jDbTests {
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);
}

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

@@ -46,7 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat;
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);

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

@@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat;
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