Merge pull request #4135 from AlexandreCarlton/memoize-result-path-level

andimarek · web-flow · commit 7f39f56d028b · 2025-10-12T06:42:21.000+10:00
diff --git a/src/main/java/graphql/execution/ResultPath.java b/src/main/java/graphql/execution/ResultPath.java
@@ -39,23 +39,27 @@ public static ResultPath rootPath() {
     // hash is effective immutable but lazily initialized similar to the hash code of java.lang.String
     private int hash;
     private final String toStringValue;
+    private final int level;
 
     private ResultPath() {
         parent = null;
         segment = null;
         this.toStringValue = initString();
+        this.level = 0;
     }
 
     private ResultPath(ResultPath parent, String segment) {
         this.parent = assertNotNull(parent, () -> "Must provide a parent path");
         this.segment = assertNotNull(segment, () -> "Must provide a sub path");
         this.toStringValue = initString();
+        this.level = parent.level + 1;
     }
 
     private ResultPath(ResultPath parent, int segment) {
         this.parent = assertNotNull(parent, () -> "Must provide a parent path");
         this.segment = segment;
         this.toStringValue = initString();
+        this.level = parent.level;
     }
 
     private String initString() {
@@ -71,15 +75,7 @@ private String initString() {
     }
 
     public int getLevel() {
-        int counter = 0;
-        ResultPath currentPath = this;
-        while (currentPath != null) {
-            if (currentPath.segment instanceof String) {
-                counter++;
-            }
-            currentPath = currentPath.parent;
-        }
-        return counter;
+        return level;
     }
 
     public ResultPath getPathWithoutListEnd() {
diff --git a/src/test/groovy/graphql/execution/ResultPathTest.groovy b/src/test/groovy/graphql/execution/ResultPathTest.groovy
@@ -32,7 +32,7 @@ class ResultPathTest extends Specification {
         actual.toString() == expected
 
         where:
-        actual                                                        || expected
+        actual                                                     || expected
         ResultPath.rootPath()                                      || ""
         ResultPath.rootPath().segment("A")                         || "/A"
         ResultPath.rootPath().segment("A").segment(1).segment("B") || "/A[1]/B"
@@ -46,12 +46,27 @@ class ResultPathTest extends Specification {
         actual.toList() == expected
 
         where:
-        actual                                                                     || expected
+        actual                                                                  || expected
         ResultPath.rootPath()                                                   || []
         ResultPath.rootPath().segment("A").sibling("B")                         || ["B"]
         ResultPath.rootPath().segment("A").segment(1).segment("B").sibling("C") || ["A", 1, "C"]
     }
 
+    @Unroll
+    "unit test getLevel works as expected : #actual"() {
+
+        expect:
+        actual.getLevel() == expected
+
+        where:
+        actual                                                     || expected
+        ResultPath.rootPath()                                      || 0
+        ResultPath.rootPath().segment("A")                         || 1
+        ResultPath.rootPath().segment("A").segment("B")            || 2
+        ResultPath.rootPath().segment("A").segment(1).segment("B") || 2
+        ResultPath.rootPath().segment("A").segment("B").segment(1) || 2
+    }
+
 
     def "full integration test of path support"() {
         when:
