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

oliemansm · web-flow · commit bc6dedbdb28b · 2019-09-25T17:00:54.000+02:00
294 handle optional parameters fix tests
diff --git a/src/test/kotlin/com/coxautodev/graphql/tools/EndToEndSpecHelper.kt b/src/test/kotlin/com/coxautodev/graphql/tools/EndToEndSpecHelper.kt
@@ -259,7 +259,7 @@ class Query : GraphQLQueryResolver, ListListResolver<String>() {
     }
 
     fun itemsWithOptionalInput(input: ItemSearchInput?) = if (input == null) items else items(input)
-    fun itemsWithOptionalInputExplicit(input: Optional<ItemSearchInput>) = if (input.isPresent) items(input.get()) else items
+    fun itemsWithOptionalInputExplicit(input: Optional<ItemSearchInput>?) = if (input?.isPresent == true) items(input.get()) else items
     fun enumInputType(type: Type) = type
     fun customScalarMapInputType(customScalarMap: Map<String, Any>) = customScalarMap
     fun itemWithGenericProperties() = ItemWithGenericProperties(listOf("A", "B"))

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ class Query : GraphQLQueryResolver, ListListResolver<String>() {`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`fun itemsWithOptionalInput(input: ItemSearchInput?) = if (input == null) items else items(input)`
`262`		`- fun itemsWithOptionalInputExplicit(input: Optional<ItemSearchInput>) = if (input.isPresent) items(input.get()) else items`
	`262`	`+ fun itemsWithOptionalInputExplicit(input: Optional<ItemSearchInput>?) = if (input?.isPresent == true) items(input.get()) else items`
`263`	`263`	`fun enumInputType(type: Type) = type`
`264`	`264`	`fun customScalarMapInputType(customScalarMap: Map<String, Any>) = customScalarMap`
`265`	`265`	`fun itemWithGenericProperties() = ItemWithGenericProperties(listOf("A", "B"))`