Fix escaping of reserved words in kotlin2 generated data types (#623)

* Fix escaping of reserved words in kotlin2 generated data types

* Add distribution to CI build

.github/workflows/nebula-snapshot.yml

@@ -18,6 +18,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: 8
+          distribution: zulu
       - uses: actions/cache@v3.3.2
         id: gradle-cache
         with:

graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt

@@ -14,7 +14,6 @@ public class Person() {
   @JsonIgnoreProperties("__typename")
   public class Builder {
     public fun build(): Person = Person(
-
     )
   }
 }

graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsClient.kt

@@ -0,0 +1,3 @@
+package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected
+
+public object DgsClient

graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsConstants.kt

@@ -0,0 +1,11 @@
+package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected
+
+import kotlin.String
+
+public object DgsConstants {
+  public object SAMPLETYPE {
+    public const val TYPE_NAME: String = "SampleType"
+
+    public const val Return: String = "return"
+  }
+}

graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/SampleTypeProjection.kt

@@ -0,0 +1,11 @@
+package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.client
+
+import com.netflix.graphql.dgs.codegen.GraphQLProjection
+
+public class SampleTypeProjection : GraphQLProjection() {
+  public val `return`: SampleTypeProjection
+    get() {
+      field("return")
+      return this
+    }
+}

graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt

@@ -0,0 +1,43 @@
+package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.types
+
+import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties
+import com.fasterxml.jackson.`annotation`.JsonProperty
+import com.fasterxml.jackson.`annotation`.JsonTypeInfo
+import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize
+import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder
+import java.lang.IllegalStateException
+import kotlin.String
+import kotlin.jvm.JvmName
+
+@JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
+@JsonDeserialize(builder = SampleType.Builder::class)
+public class SampleType(
+  `return`: () -> String = returnDefault,
+) {
+  private val _return: () -> String = `return`
+
+  @get:JvmName("getReturn")
+  public val `return`: String
+    get() = _return.invoke()
+
+  public companion object {
+    private val returnDefault: () -> String = 
+        { throw IllegalStateException("Field `return` was not requested") }
+
+  }
+
+  @JsonPOJOBuilder
+  @JsonIgnoreProperties("__typename")
+  public class Builder {
+    private var `return`: () -> String = returnDefault
+
+    @JsonProperty("return")
+    public fun withReturn(`return`: String): Builder = this.apply {
+      this.`return` = { `return` }
+    }
+
+    public fun build(): SampleType = SampleType(
+      `return` = `return`,
+    )
+  }
+}

graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/schema.graphql

@@ -0,0 +1,3 @@
+type SampleType {
+  return: String!
+}

graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin2/GenerateKotlin2DataTypes.kt

@@ -37,6 +37,7 @@ import com.netflix.graphql.dgs.codegen.generators.shared.SchemaExtensionsUtils.f
 import com.netflix.graphql.dgs.codegen.generators.shared.excludeSchemaTypeExtension
 import com.netflix.graphql.dgs.codegen.shouldSkip
 import com.squareup.kotlinpoet.ClassName
+import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.KModifier
@@ -143,7 +144,7 @@ fun generateKotlin2DataTypes(
                             .addAnnotation(jsonPropertyAnnotation(field.name))
                             .addParameter(field.name, type(field))
                             .addControlFlow("return this.apply") {
-                                addStatement("this.${field.name} = { ${field.name} }")
+                                addStatement("this.%N = { %N }", field.name, field.name)
                             }
                             .returns(builderClassName)
                             .build()
@@ -153,7 +154,13 @@ fun generateKotlin2DataTypes(
                 .addFunction(
                     FunSpec.builder("build")
                         .returns(typeDefinition.name.toKtTypeName())
-                        .addStatement("return ${typeDefinition.name}(\n${fields.joinToString("\n") { "  ${it.name} = ${it.name}," }}\n)")
+                        .addCode(
+                            fields.let { fs ->
+                                val builder = CodeBlock.builder().add("return %T(\n", ClassName(config.packageNameTypes, typeDefinition.name))
+                                fs.forEach { f -> builder.add("  %N = %N,\n", f.name, f.name) }
+                                builder.add(")").build()
+                            }
+                        )
                         .build()
                 )
                 .build()
@@ -210,7 +217,7 @@ fun generateKotlin2DataTypes(
                             type = LambdaTypeName.get(returnType = type(field))
                         )
                             .addModifiers(KModifier.PRIVATE)
-                            .initializer(field.name)
+                            .initializer("%N", field.name)
                             .build()
                     }
                 )