use memoizer correctly for normalized tree

andimarek · andimarek · commit c9d1333610b3 · 2021-01-26T18:06:02.000+11:00
diff --git a/src/main/java/graphql/execution/ExecutionContext.java b/src/main/java/graphql/execution/ExecutionContext.java
@@ -54,6 +54,7 @@ public class ExecutionContext {
     private final Locale locale;
     private final ValueUnboxer valueUnboxer;
     private final ExecutionInput executionInput;
+    private final Supplier<NormalizedQueryTree> queryTree;
 
     ExecutionContext(ExecutionContextBuilder builder) {
         this.graphQLSchema = builder.graphQLSchema;
@@ -76,6 +77,7 @@ public class ExecutionContext {
         this.errors.addAll(builder.errors);
         this.localContext = builder.localContext;
         this.executionInput = builder.executionInput;
+        queryTree = FpKit.interThreadMemoize(() -> NormalizedQueryTreeFactory.createNormalizedQuery(graphQLSchema, operationDefinition, fragmentsByName, variables));
     }
 
 
@@ -204,7 +206,7 @@ public ExecutionStrategy getSubscriptionStrategy() {
     }
 
     public Supplier<NormalizedQueryTree> getNormalizedQueryTree() {
-        return FpKit.interThreadMemoize(() -> NormalizedQueryTreeFactory.createNormalizedQuery(graphQLSchema, operationDefinition, fragmentsByName, variables));
+        return queryTree;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ public class ExecutionContext {`
`54`	`54`	`private final Locale locale;`
`55`	`55`	`private final ValueUnboxer valueUnboxer;`
`56`	`56`	`private final ExecutionInput executionInput;`
	`57`	`+ private final Supplier<NormalizedQueryTree> queryTree;`
`57`	`58`
`58`	`59`	`ExecutionContext(ExecutionContextBuilder builder) {`
`59`	`60`	`this.graphQLSchema = builder.graphQLSchema;`
`@@ -76,6 +77,7 @@ public class ExecutionContext {`
`76`	`77`	`this.errors.addAll(builder.errors);`
`77`	`78`	`this.localContext = builder.localContext;`
`78`	`79`	`this.executionInput = builder.executionInput;`
	`80`	`+ queryTree = FpKit.interThreadMemoize(() -> NormalizedQueryTreeFactory.createNormalizedQuery(graphQLSchema, operationDefinition, fragmentsByName, variables));`
`79`	`81`	`}`
`80`	`82`
`81`	`83`
`@@ -204,7 +206,7 @@ public ExecutionStrategy getSubscriptionStrategy() {`
`204`	`206`	`}`
`205`	`207`
`206`	`208`	`public Supplier<NormalizedQueryTree> getNormalizedQueryTree() {`
`207`		`- return FpKit.interThreadMemoize(() -> NormalizedQueryTreeFactory.createNormalizedQuery(graphQLSchema, operationDefinition, fragmentsByName, variables));`
	`209`	`+ return queryTree;`
`208`	`210`	`}`
`209`	`211`
`210`	`212`	`/**`