Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add feature generateInterfaces for Kotlin #384

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add feature generateInterfaces for Kotlin #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
253fef7
feat: support the generateInterfaces option for Kotlin
May 16, 2022
7159def
Merge branch 'Netflix:master' into master
crypter68 Jun 23, 2022
0d51014
chore: merge conflicts from Netflix base
Jul 7, 2022
4f056c1
fix: fix formatting of expected kotlin class code
May 16, 2022
ed23cc5
fix: fix test for trailing commas
Jul 10, 2022
d8a30d2
fix: fix linting
Jul 11, 2022
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
18 changes: 17 additions & 1 deletion graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,14 +394,30 @@ class CodeGen(private val config: CodeGenConfig) {
return CodeGenResult()
}

val interfaceCodeGen = if (config.generateInterfaces) {
definitions.asSequence()
.filterIsInstance<ObjectTypeDefinition>()
.excludeSchemaTypeExtension()
.filter { it.name != "Query" && it.name != "Mutation" && it.name != "RelayPageInfo" }
.map { definition ->
val interfaceGenerator = KotlinInterfaceTypeGenerator(config, document)
val interfaceTypeDefinition =
InterfaceTypeDefinition.newInterfaceTypeDefinition().name("I" + definition.name)
.definitions(definition.fieldDefinitions()).build()
interfaceGenerator.generate(interfaceTypeDefinition, emptyList())
}
.fold(CodeGenResult()) { t: CodeGenResult, u: CodeGenResult -> t.merge(u) }
}
else CodeGenResult()

return definitions.asSequence()
.filterIsInstance<InterfaceTypeDefinition>()
.excludeSchemaTypeExtension()
.map {
val extensions = findInterfaceExtensions(it.name, definitions)
KotlinInterfaceTypeGenerator(config, document).generate(it, extensions)
}
.fold(CodeGenResult()) { t: CodeGenResult, u: CodeGenResult -> t.merge(u) }
.fold(interfaceCodeGen) { t: CodeGenResult, u: CodeGenResult -> t.merge(u) }
}
}

Expand Down
8 changes: 6 additions & 2 deletions .../main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinDataTypeGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@ class KotlinDataTypeGenerator(config: CodeGenConfig, document: Document) :
extensions.flatMap { it.fieldDefinitions }
.filterSkipped()
.map { Field(it.name, typeUtils.findReturnType(it.type), typeUtils.isNullable(it.type), null, it.description) }
val interfaces = definition.implements
val interfaces = when (config.generateInterfaces) {
true -> definition.implements + TypeName.newTypeName("I" + definition.name).build()
else -> definition.implements
}

return generate(definition.name, fields, interfaces, document, definition.description)
}

Expand Down Expand Up @@ -211,7 +215,7 @@ abstract class AbstractKotlinDataTypeGenerator(
.map { it.name }
.toSet()

if (field.name in interfaceFields) {
if (field.name in interfaceFields || config.generateInterfaces) {
// Properties are the syntactical element that will allow us to override things, they are the spec on
// which we should add the override modifier.
propertySpecBuilder.addModifiers(KModifier.OVERRIDE)
Expand Down
Loading