Merge branch 'master' into 2764-coerced-variables-refactor

# Conflicts: # src/main/java/graphql/ExecutionInput.java # src/main/java/graphql/execution/ValuesResolver.java # src/main/java/graphql/normalized/ExecutableNormalizedOperationFactory.java
bbakerman · May 24, 2022 · Apr 17, 2022 · Apr 17, 2022 · Apr 17, 2022 · Apr 17, 2022
commit 84ae2d3d04959ce12d201055477c8a69cbe5057e
diff --git a/src/main/java/graphql/ExecutionInput.java b/src/main/java/graphql/ExecutionInput.java
@@ -218,7 +218,7 @@ public static class Builder {
         private Object localContext;
         private Object root;
         private RawVariables rawVariables = RawVariables.emptyVariables();
-        public Map<String, Object> extensions = Collections.emptyMap();
+        public Map<String, Object> extensions = ImmutableKit.emptyMap();
         //
         // this is important - it allows code to later known if we never really set a dataloader and hence it can optimize
         // dataloader field tracking away.

diff --git a/src/main/java/graphql/normalized/ExecutableNormalizedOperationFactory.java b/src/main/java/graphql/normalized/ExecutableNormalizedOperationFactory.java
@@ -6,6 +6,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import graphql.Internal;
+import graphql.collect.ImmutableKit;
 import graphql.execution.CoercedVariables;
 import graphql.execution.ConditionalNodes;
 import graphql.execution.MergedField;