20.x Backport PR 3539 #3542

dondonz · 2024-03-24T23:43:21Z

Backport of PR #3539

This is a cherry pick of 3539 plus other changes to bring ConditionalNodes and related classes up to date with v21. I chose not to use the master versions of these files as they have references to defer, to be released in v22.

Note that introspection deliberately has 1 node less than v21+, because the new built-in directive @oneOf is added in version 21.

…v21 equivalent

dondonz · 2024-03-24T23:43:40Z

src/main/java/graphql/Assert.java

+        }
+        throwAssert(msgFmt, arg1);
+    }
+


Backport utils

dondonz · 2024-03-24T23:44:29Z

src/main/java/graphql/analysis/NodeVisitorWithTypeTracking.java

@@ -1,10 +1,10 @@
 package graphql.analysis;

 import graphql.GraphQLContext;


Update file to bring in line with v21 - it's because ConditionalNodes are referenced in the ExecutableNormalizedOperationFactory, and those changes are viral in a few other files

dondonz · 2024-03-24T23:44:50Z

src/main/java/graphql/analysis/QueryTransformer.java

@@ -1,5 +1,6 @@
 package graphql.analysis;


Update file to bring in line with v21 - it's because ConditionalNodes are referenced in the ExecutableNormalizedOperationFactory, and those changes are viral in a few other files

dondonz · 2024-03-24T23:44:55Z

src/main/java/graphql/analysis/QueryTraversalContext.java

@@ -1,5 +1,6 @@
 package graphql.analysis;


Update file to bring in line with v21 - it's because ConditionalNodes are referenced in the ExecutableNormalizedOperationFactory, and those changes are viral in a few other files

dondonz · 2024-03-24T23:45:01Z

src/main/java/graphql/analysis/QueryTraverser.java

        FragmentSpread fragmentSpread = (FragmentSpread) node;
        return singletonList(fragmentsByName.get(fragmentSpread.getName()));
    }



Update file to bring in line with v21 - it's because ConditionalNodes are referenced in the ExecutableNormalizedOperationFactory, and those changes are viral in a few other files

dondonz · 2024-03-24T23:45:26Z

src/main/java/graphql/execution/ConditionalNodes.java

@@ -1,43 +0,0 @@
-package graphql.execution;


File was moved into it's own directory

dondonz · 2024-03-24T23:45:35Z

src/main/java/graphql/execution/FieldCollector.java

@@ -1,7 +1,8 @@
 package graphql.execution;



Update file to bring in line with v21 - it's because ConditionalNodes are referenced in the ExecutableNormalizedOperationFactory, and those changes are viral in a few other files

dondonz · 2024-03-24T23:45:44Z

src/main/java/graphql/execution/FieldCollectorParameters.java

@@ -1,6 +1,7 @@
 package graphql.execution;


Update file to bring in line with v21 - it's because ConditionalNodes are referenced in the ExecutableNormalizedOperationFactory, and those changes are viral in a few other files

dondonz · 2024-03-24T23:45:57Z

src/main/java/graphql/execution/conditional/ConditionalNodeDecision.java

@@ -0,0 +1,22 @@
+package graphql.execution.conditional;


Bring in line with v21

dondonz · 2024-03-24T23:46:05Z

src/main/java/graphql/execution/conditional/ConditionalNodeDecisionEnvironment.java

@@ -0,0 +1,48 @@
+package graphql.execution.conditional;


Bring in line with v21

dondonz · 2024-03-24T23:46:20Z

src/main/java/graphql/execution/conditional/ConditionalNodes.java

@@ -0,0 +1,102 @@
+package graphql.execution.conditional;


Updated ConditionalNodes as it appears in v21

dondonz · 2024-03-24T23:47:58Z

src/test/groovy/graphql/normalized/ExecutableNormalizedOperationFactoryTest.groovy

+        then:
+        def e = thrown(AbortExecutionException)
+        // This line is different in version 21+, it is "Maximum field count exceeded. 189 > 188"
+        e.message == "Maximum field count exceeded. 188 > 187"


The way we count nodes is 1 less in v20 compared to v21 & master

Thanks Andi: the reason for this is @oneOf is introduced in v21, so v20 and prior will have 1 less node

dondonz · 2024-03-25T04:11:23Z

src/test/java/benchmark/BenchmarkUtils.java

+            byte[] bytes;
+            try (InputStream inputStream = resource.openStream()) {
+                // In GraphQL Java version 21 and above, this Guava helper is replaced with Java 9's readAllBytes()
+                bytes = ByteStreams.toByteArray(inputStream);


Fun one: readAllBytes is only in Java 9 onwards so here's the Guava equivalent. We selectively shade in Guava files (e.g. Immutable objects already in use) so we're alright to use Guava here.

… into 20.x-backport-enf-introspection

Cherry pick PR 3539 and update ConditionalNodes and related files to …

469caf6

…v21 equivalent

dondonz commented Mar 24, 2024

View reviewed changes

src/main/java/graphql/Assert.java

}

throwAssert(msgFmt, arg1);

}

Copy link

Member Author

dondonz Mar 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Backport utils

dondonz commented Mar 24, 2024

View reviewed changes

Add explainer note to v20 introspection node count being smaller by 1

1f5e70b

dondonz changed the title ~~Cherry pick PR 3539 and update ConditionalNodes and related files to …~~ 20.x Backport PR 3539 Mar 25, 2024

dondonz commented Mar 25, 2024

View reviewed changes

dondonz added this to the 20.9 milestone Mar 25, 2024

andimarek added 2 commits March 25, 2024 15:09

remove conditional node decision feature and cleanup

965ae5c

Merge remote-tracking branch 'origin/20.x-backport-enf-introspection'…

c3d5bb4

… into 20.x-backport-enf-introspection

bbakerman approved these changes Mar 26, 2024

View reviewed changes

Fix typo (backport PR #3544)

851bcd6

dondonz merged commit d3a8540 into 20.x Mar 26, 2024

dondonz deleted the 20.x-backport-enf-introspection branch March 26, 2024 05:07

		@@ -1,10 +1,10 @@
		package graphql.analysis;

		import graphql.GraphQLContext;

20.x Backport PR 3539 #3542

20.x Backport PR 3539 #3542

Uh oh!

Conversation

dondonz commented Mar 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

dondonz commented Mar 24, 2024 •

edited

Loading