From 13aac8f7cd22d21f48535ca03d1f6f050735919c Mon Sep 17 00:00:00 2001
From: vojtapol <vojta.polivka@gmail.com>
Date: Wed, 25 Sep 2019 09:28:28 -0400
Subject: [PATCH] Fix mapping Optional input arguments

---
 .../com/coxautodev/graphql/tools/MethodFieldResolver.kt   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt b/src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt
index 545e2446..2b26e009 100644
--- 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)