Merge pull request #315 from vojtapol/294-handle-optional-parameters

oliemansm · web-flow · commit b24fc4c258c5 · 2019-09-25T15:54:22.000+02:00
294 handle optional parameters fix
diff --git a/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt b/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt
@@ -81,8 +81,12 @@ internal class MethodFieldResolver(field: FieldDefinition, search: FieldResolver
                     null
                 }
 
-                if (value == null && isOptional && environment.containsArgument(definition.name)) {
-                    return@add Optional.empty<Any>()
+                if (value == null && isOptional) {
+                    if (environment.containsArgument(definition.name)) {
+                        return@add Optional.empty<Any>()
+                    } else {
+                        return@add null;
+                    }
                 }
 
                 return@add mapper.convertValue(value, typeReference)

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,12 @@ internal class MethodFieldResolver(field: FieldDefinition, search: FieldResolver`
`81`	`81`	`null`
`82`	`82`	`}`
`83`	`83`
`84`		`- if (value == null && isOptional && environment.containsArgument(definition.name)) {`
`85`		`- return@add Optional.empty<Any>()`
	`84`	`+ if (value == null && isOptional) {`
	`85`	`+ if (environment.containsArgument(definition.name)) {`
	`86`	`+ return@add Optional.empty<Any>()`
	`87`	`+ } else {`
	`88`	`+ return@add null;`
	`89`	`+ }`
`86`	`90`	`}`
`87`	`91`
`88`	`92`	`return@add mapper.convertValue(value, typeReference)`