Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import graphql.language.InputObjectTypeExtensionDefinition
import graphql.language.IntValue
import graphql.language.InterfaceTypeDefinition
import graphql.language.NonNullType
import graphql.language.NullValue
import graphql.language.ObjectTypeDefinition
import graphql.language.ObjectTypeExtensionDefinition
import graphql.language.ObjectValue
Expand Down Expand Up @@ -316,6 +317,7 @@ class InputTypeGenerator(
}
}

is NullValue -> CodeBlock.of("null")
else -> CodeBlock.of("\$L", value)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ fun generateKotlinCode(
)
}

is NullValue -> CodeBlock.of("null")
else -> CodeBlock.of("%L", value)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2189,6 +2189,33 @@ class CodeGenTest {
assertCompilesJava(dataTypes + enumTypes)
}

@Test
fun generateInputWithDefaultNullValue() {
val schema =
"""
input QuantityRuleInput {
maximum: Int = null
minimum: Int!
}
""".trimIndent()

val (dataTypes) = CodeGen(CodeGenConfig(schemas = setOf(schema), packageName = BASE_PACKAGE_NAME)).generate()
assertThat(dataTypes).hasSize(1)

val data = dataTypes[0]
assertThat(data.packageName()).isEqualTo(TYPES_PACKAGE_NAME)

val type = data.typeSpec()
assertThat(type.name()).isEqualTo("QuantityRuleInput")

val fields = type.fieldSpecs()
val maximumField = fields.find { it.name() == "maximum" }
assertThat(maximumField).isNotNull
assertThat(maximumField!!.initializer().toString()).isEqualTo("null")

assertCompilesJava(dataTypes)
}

@Test
fun generateExtendedInputTypes() {
val schema =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1759,6 +1759,48 @@ class KotlinCodeGenTest {
assertCompilesKotlin(dataTypes.plus(enums))
}

@Test
fun generateInputWithDefaultNullValue() {
val schema =
"""
input QuantityRuleInput {
maximum: Int = null
minimum: Int!
}
""".trimIndent()

val codeGenResult =
CodeGen(
CodeGenConfig(
schemas = setOf(schema),
packageName = BASE_PACKAGE_NAME,
language = Language.KOTLIN,
),
).generate()
val dataTypes = codeGenResult.kotlinDataTypes
assertThat(dataTypes).hasSize(1)

val data = dataTypes[0]
assertThat(data.packageName).isEqualTo(TYPES_PACKAGE_NAME)

val members = data.members
assertThat(members).hasSize(1)

val type = members[0] as TypeSpec
assertThat(type.name).isEqualTo("QuantityRuleInput")

val ctorSpec = type.primaryConstructor
assertThat(ctorSpec).isNotNull
assertThat(ctorSpec!!.parameters).hasSize(2)

val maximumParam = ctorSpec.parameters.find { it.name == "maximum" }
assertThat(maximumParam).isNotNull
assertThat(maximumParam!!.defaultValue).isNotNull
assertThat(maximumParam.defaultValue.toString()).isEqualTo("null")

assertCompilesKotlin(dataTypes)
}

@Test
fun generateInputWithEmptyDefaultValueForArray() {
val schema =
Expand Down
Loading