Upgrade to GraphQL Java 19.0

This new release makes the request `Locale` mandatory.

Closes gh-444
This commit is contained in:
Brian Clozel
2022-08-01 10:43:33 +02:00
parent ea140410bd
commit 40c354a84c
5 changed files with 13 additions and 6 deletions

View File

@@ -5,7 +5,7 @@ plugins {
ext {
moduleProjects = [project(":spring-graphql"), project(":spring-graphql-test")]
graphQlJavaVersion = "18.2"
graphQlJavaVersion = "19.0"
bootVersion = "3.0.0-SNAPSHOT"
}

View File

@@ -50,7 +50,6 @@ public class DefaultExecutionGraphQlRequest extends DefaultGraphQlRequest implem
@Nullable
private ExecutionId executionId;
@Nullable
private final Locale locale;
private final List<BiFunction<ExecutionInput, ExecutionInput.Builder, ExecutionInput>> executionInputConfigurers = new ArrayList<>();
@@ -73,7 +72,7 @@ public class DefaultExecutionGraphQlRequest extends DefaultGraphQlRequest implem
super(document, operationName, variables, extensions);
Assert.notNull(id, "'id' is required");
this.id = id;
this.locale = locale;
this.locale = (locale != null) ? locale : Locale.getDefault();
}
@@ -95,7 +94,6 @@ public class DefaultExecutionGraphQlRequest extends DefaultGraphQlRequest implem
}
@Override
@Nullable
public Locale getLocale() {
return this.locale;
}

View File

@@ -16,6 +16,8 @@
package org.springframework.graphql;
import java.util.Locale;
import graphql.execution.ExecutionId;
import org.junit.jupiter.api.Test;
@@ -46,4 +48,9 @@ class DefaultExecutionGraphQlRequestTests {
assertThat(this.request.toExecutionInput().getExecutionId()).isEqualTo(customId);
}
@Test
void shouldHaveDefaultLocale() {
assertThat(this.request.getLocale()).isEqualTo(Locale.getDefault());
}
}

View File

@@ -20,6 +20,7 @@ import java.net.URI;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Optional;
import java.util.function.Consumer;
import java.util.stream.Collectors;
@@ -294,7 +295,7 @@ class QuerydslDataFetcherTests {
private WebGraphQlRequest request(String query) {
return new WebGraphQlRequest(
URI.create("/"), new HttpHeaders(), Collections.singletonMap("query", query), "1", null);
URI.create("/"), new HttpHeaders(), Collections.singletonMap("query", query), "1", Locale.ENGLISH);
}

View File

@@ -16,6 +16,7 @@
package org.springframework.graphql;
import java.util.Locale;
import java.util.concurrent.atomic.AtomicLong;
import org.springframework.graphql.support.DefaultExecutionGraphQlRequest;
@@ -32,7 +33,7 @@ public class TestExecutionRequest extends DefaultExecutionGraphQlRequest {
private TestExecutionRequest(String document) {
super(document, null, null, null, String.valueOf(idIndex.incrementAndGet()), null);
super(document, null, null, null, String.valueOf(idIndex.incrementAndGet()), Locale.ENGLISH);
}