From 40c354a84c19aacc0cf9bdb3f825d0ed2b9e4558 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Mon, 1 Aug 2022 10:43:33 +0200 Subject: [PATCH] Upgrade to GraphQL Java 19.0 This new release makes the request `Locale` mandatory. Closes gh-444 --- build.gradle | 2 +- .../graphql/support/DefaultExecutionGraphQlRequest.java | 4 +--- .../graphql/DefaultExecutionGraphQlRequestTests.java | 7 +++++++ .../graphql/data/query/QuerydslDataFetcherTests.java | 3 ++- .../org/springframework/graphql/TestExecutionRequest.java | 3 ++- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index a388d4de..27250aa9 100644 --- a/build.gradle +++ b/build.gradle @@ -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" } diff --git a/spring-graphql/src/main/java/org/springframework/graphql/support/DefaultExecutionGraphQlRequest.java b/spring-graphql/src/main/java/org/springframework/graphql/support/DefaultExecutionGraphQlRequest.java index 415701e1..2f0a6c0d 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/support/DefaultExecutionGraphQlRequest.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/support/DefaultExecutionGraphQlRequest.java @@ -50,7 +50,6 @@ public class DefaultExecutionGraphQlRequest extends DefaultGraphQlRequest implem @Nullable private ExecutionId executionId; - @Nullable private final Locale locale; private final List> 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; } diff --git a/spring-graphql/src/test/java/org/springframework/graphql/DefaultExecutionGraphQlRequestTests.java b/spring-graphql/src/test/java/org/springframework/graphql/DefaultExecutionGraphQlRequestTests.java index 399f10a4..a8aa1891 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/DefaultExecutionGraphQlRequestTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/DefaultExecutionGraphQlRequestTests.java @@ -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()); + } + } \ No newline at end of file diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/query/QuerydslDataFetcherTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/QuerydslDataFetcherTests.java index de2ae71f..5be75273 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/query/QuerydslDataFetcherTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/QuerydslDataFetcherTests.java @@ -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); } diff --git a/spring-graphql/src/testFixtures/java/org/springframework/graphql/TestExecutionRequest.java b/spring-graphql/src/testFixtures/java/org/springframework/graphql/TestExecutionRequest.java index b4812ad6..7eaf455a 100644 --- a/spring-graphql/src/testFixtures/java/org/springframework/graphql/TestExecutionRequest.java +++ b/spring-graphql/src/testFixtures/java/org/springframework/graphql/TestExecutionRequest.java @@ -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); }