Skip to content

Commit 40c354a

Browse files
committed
Upgrade to GraphQL Java 19.0
This new release makes the request `Locale` mandatory. Closes gh-444
1 parent ea14041 commit 40c354a

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
ext {
77
moduleProjects = [project(":spring-graphql"), project(":spring-graphql-test")]
8-
graphQlJavaVersion = "18.2"
8+
graphQlJavaVersion = "19.0"
99
bootVersion = "3.0.0-SNAPSHOT"
1010
}
1111

spring-graphql/src/main/java/org/springframework/graphql/support/DefaultExecutionGraphQlRequest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ public class DefaultExecutionGraphQlRequest extends DefaultGraphQlRequest implem
5050
@Nullable
5151
private ExecutionId executionId;
5252

53-
@Nullable
5453
private final Locale locale;
5554

5655
private final List<BiFunction<ExecutionInput, ExecutionInput.Builder, ExecutionInput>> executionInputConfigurers = new ArrayList<>();
@@ -73,7 +72,7 @@ public DefaultExecutionGraphQlRequest(
7372
super(document, operationName, variables, extensions);
7473
Assert.notNull(id, "'id' is required");
7574
this.id = id;
76-
this.locale = locale;
75+
this.locale = (locale != null) ? locale : Locale.getDefault();
7776
}
7877

7978

@@ -95,7 +94,6 @@ public ExecutionId getExecutionId() {
9594
}
9695

9796
@Override
98-
@Nullable
9997
public Locale getLocale() {
10098
return this.locale;
10199
}

spring-graphql/src/test/java/org/springframework/graphql/DefaultExecutionGraphQlRequestTests.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package org.springframework.graphql;
1818

19+
import java.util.Locale;
20+
1921
import graphql.execution.ExecutionId;
2022
import org.junit.jupiter.api.Test;
2123

@@ -46,4 +48,9 @@ void shouldUseExecutionId() {
4648
assertThat(this.request.toExecutionInput().getExecutionId()).isEqualTo(customId);
4749
}
4850

51+
@Test
52+
void shouldHaveDefaultLocale() {
53+
assertThat(this.request.getLocale()).isEqualTo(Locale.getDefault());
54+
}
55+
4956
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.Arrays;
2121
import java.util.Collections;
2222
import java.util.List;
23+
import java.util.Locale;
2324
import java.util.Optional;
2425
import java.util.function.Consumer;
2526
import java.util.stream.Collectors;
@@ -294,7 +295,7 @@ private static GraphQlSetup initGraphQlSetup(
294295

295296
private WebGraphQlRequest request(String query) {
296297
return new WebGraphQlRequest(
297-
URI.create("/"), new HttpHeaders(), Collections.singletonMap("query", query), "1", null);
298+
URI.create("/"), new HttpHeaders(), Collections.singletonMap("query", query), "1", Locale.ENGLISH);
298299
}
299300

300301

spring-graphql/src/testFixtures/java/org/springframework/graphql/TestExecutionRequest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.springframework.graphql;
1818

19+
import java.util.Locale;
1920
import java.util.concurrent.atomic.AtomicLong;
2021

2122
import org.springframework.graphql.support.DefaultExecutionGraphQlRequest;
@@ -32,7 +33,7 @@ public class TestExecutionRequest extends DefaultExecutionGraphQlRequest {
3233

3334

3435
private TestExecutionRequest(String document) {
35-
super(document, null, null, null, String.valueOf(idIndex.incrementAndGet()), null);
36+
super(document, null, null, null, String.valueOf(idIndex.incrementAndGet()), Locale.ENGLISH);
3637
}
3738

3839

0 commit comments

Comments
 (0)