Merge pull request #3995 from graphql-java/deterministic-source-location-backport-24

andimarek · web-flow · commit fcb48ba2e78a · 2025-05-30T14:27:43.000+10:00
Deterministic source location backport 24
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v3
+      - uses: gradle/actions/wrapper-validation@v4
       - name: Set up JDK 11
         uses: actions/setup-java@v4
         with:
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v3
+      - uses: gradle/actions/wrapper-validation@v4
       - name: Set up JDK 11
         uses: actions/setup-java@v4
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v3
+      - uses: gradle/actions/wrapper-validation@v4
       - name: Set up JDK 11
         uses: actions/setup-java@v4
         with:
diff --git a/src/main/java/graphql/GraphqlErrorHelper.java b/src/main/java/graphql/GraphqlErrorHelper.java
@@ -73,7 +73,10 @@ public static Object location(SourceLocation location) {
         if (line < 1 || column < 1) {
             return null;
         }
-        return Map.of("line", line, "column", column);
+        LinkedHashMap<String, Object> map = new LinkedHashMap<>(2);
+        map.put("line", line);
+        map.put("column", column);
+        return map;
     }
 
     static List<GraphQLError> fromSpecification(List<Map<String, Object>> specificationMaps) {
diff --git a/src/test/groovy/graphql/GraphqlErrorHelperTest.groovy b/src/test/groovy/graphql/GraphqlErrorHelperTest.groovy
@@ -3,6 +3,7 @@ package graphql
 import graphql.language.SourceLocation
 import graphql.validation.ValidationError
 import graphql.validation.ValidationErrorType
+import spock.lang.RepeatUntilFailure
 import spock.lang.Specification
 
 class GraphqlErrorHelperTest extends Specification {
@@ -154,4 +155,15 @@ class GraphqlErrorHelperTest extends Specification {
             assert gErr.getExtensions() == null
         }
     }
+
+    @RepeatUntilFailure(maxAttempts = 1_000)
+    def "can deterministically serialize SourceLocation"() {
+        when:
+        def specMap = GraphqlErrorHelper.toSpecification(new TestError())
+
+        then:
+        def location = specMap["locations"][0] as Map<String, Object>
+        def keys = location.keySet().toList()
+        keys == ["line", "column"]
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,10 @@ public static Object location(SourceLocation location) {`
`73`	`73`	`if (line < 1 \|\| column < 1) {`
`74`	`74`	`return null;`
`75`	`75`	`}`
`76`		`- return Map.of("line", line, "column", column);`
	`76`	`+ LinkedHashMap<String, Object> map = new LinkedHashMap<>(2);`
	`77`	`+ map.put("line", line);`
	`78`	`+ map.put("column", column);`
	`79`	`+ return map;`
`77`	`80`	`}`
`78`	`81`
`79`	`82`	`static List<GraphQLError> fromSpecification(List<Map<String, Object>> specificationMaps) {`