Added transformed ES parameters

bbakerman · andimarek · commit 7e06f5780f88 · 2018-03-23T10:40:26.000+11:00
diff --git a/src/main/java/graphql/execution/ExecutionStrategy.java b/src/main/java/graphql/execution/ExecutionStrategy.java
@@ -318,15 +318,12 @@ protected CompletableFuture<ExecutionResult> completeField(ExecutionContext exec
 
         NonNullableFieldValidator nonNullableFieldValidator = new NonNullableFieldValidator(executionContext, fieldTypeInfo);
 
-        ExecutionStrategyParameters newParameters = ExecutionStrategyParameters.newParameters()
-                .typeInfo(fieldTypeInfo)
-                .field(parameters.getField())
-                .fields(parameters.getFields())
-                .arguments(argumentValues)
-                .source(fetchedValue)
-                .nonNullFieldValidator(nonNullableFieldValidator)
-                .path(parameters.getPath())
-                .build();
+        ExecutionStrategyParameters newParameters = parameters.transform(builder ->
+                builder.typeInfo(fieldTypeInfo)
+                        .arguments(argumentValues)
+                        .source(fetchedValue)
+                        .nonNullFieldValidator(nonNullableFieldValidator)
+        );
 
         log.debug("'{}' completing field '{}'...", executionContext.getExecutionId(), fieldTypeInfo.getPath());
 
@@ -436,14 +433,12 @@ protected CompletableFuture<ExecutionResult> completeValueForList(ExecutionConte
 
             NonNullableFieldValidator nonNullableFieldValidator = new NonNullableFieldValidator(executionContext, wrappedTypeInfo);
 
-            ExecutionStrategyParameters newParameters = ExecutionStrategyParameters.newParameters()
-                    .typeInfo(wrappedTypeInfo)
-                    .fields(parameters.getFields())
-                    .nonNullFieldValidator(nonNullableFieldValidator)
-                    .path(indexedPath)
-                    .field(parameters.getField())
-                    .source(item)
-                    .build();
+            ExecutionStrategyParameters newParameters = parameters.transform(builder ->
+                    builder.typeInfo(wrappedTypeInfo)
+                            .nonNullFieldValidator(nonNullableFieldValidator)
+                            .path(indexedPath)
+                            .source(item)
+            );
 
             return completeValue(executionContext, newParameters);
         });
@@ -542,12 +537,12 @@ protected CompletableFuture<ExecutionResult> completeValueForObject(ExecutionCon
         ExecutionTypeInfo newTypeInfo = typeInfo.treatAs(resolvedObjectType);
         NonNullableFieldValidator nonNullableFieldValidator = new NonNullableFieldValidator(executionContext, newTypeInfo);
 
-        ExecutionStrategyParameters newParameters = ExecutionStrategyParameters.newParameters()
-                .typeInfo(newTypeInfo)
-                .fields(subFields)
-                .nonNullFieldValidator(nonNullableFieldValidator)
-                .path(parameters.getPath())
-                .source(result).build();
+        ExecutionStrategyParameters newParameters = parameters.transform(builder ->
+                builder.typeInfo(newTypeInfo)
+                        .fields(subFields)
+                        .nonNullFieldValidator(nonNullableFieldValidator)
+                        .source(result)
+        );
 
         // Calling this from the executionContext to ensure we shift back from mutation strategy to the query strategy.
 
@@ -579,21 +574,21 @@ protected Object unboxPossibleOptional(Object result) {
                 return null;
             }
         } else if (result instanceof OptionalInt) {
-            OptionalInt optional = (OptionalInt)result;
+            OptionalInt optional = (OptionalInt) result;
             if (optional.isPresent()) {
                 return optional.getAsInt();
             } else {
                 return null;
             }
         } else if (result instanceof OptionalDouble) {
-            OptionalDouble optional = (OptionalDouble)result;
+            OptionalDouble optional = (OptionalDouble) result;
             if (optional.isPresent()) {
                 return optional.getAsDouble();
             } else {
                 return null;
             }
         } else if (result instanceof OptionalLong) {
-            OptionalLong optional = (OptionalLong)result;
+            OptionalLong optional = (OptionalLong) result;
             if (optional.isPresent()) {
                 return optional.getAsLong();
             } else {
diff --git a/src/main/java/graphql/execution/ExecutionStrategyParameters.java b/src/main/java/graphql/execution/ExecutionStrategyParameters.java
@@ -112,6 +112,8 @@ private Builder(ExecutionStrategyParameters oldParameters) {
             this.fields = oldParameters.fields;
             this.arguments = oldParameters.arguments;
             this.nonNullableFieldValidator = oldParameters.nonNullableFieldValidator;
+            this.path = oldParameters.path;
+            this.currentField = oldParameters.currentField;
         }
 
         public Builder typeInfo(ExecutionTypeInfo type) {

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,8 @@ private Builder(ExecutionStrategyParameters oldParameters) {`
`112`	`112`	`this.fields = oldParameters.fields;`
`113`	`113`	`this.arguments = oldParameters.arguments;`
`114`	`114`	`this.nonNullableFieldValidator = oldParameters.nonNullableFieldValidator;`
	`115`	`+ this.path = oldParameters.path;`
	`116`	`+ this.currentField = oldParameters.currentField;`
`115`	`117`	`}`
`116`	`118`
`117`	`119`	`public Builder typeInfo(ExecutionTypeInfo type) {`