Add Boolean fields to Data classes for supporting sparse update

.run/CodeGenCliKt.run.xml

@@ -12,4 +12,17 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
+  <configuration default="false" name="CodeGenCliKt" type="JetRunConfigurationType" nameIsGenerated="true">
+    <module name="graphql-dgs-codegen.graphql-dgs-codegen-core.main" />
+    <option name="VM_PARAMETERS" value="" />
+    <option name="PROGRAM_PARAMETERS" value="--package-name=tester.generated --include-query=acct_allCompanies --include-mutation=prdcl_importCrewContacts --output-dir=$PROJECT_DIR$/../generated-api-tester/src --generate-client --language=java --skip-entities --type-mapping=BigDecimal=java.math.BigDecimal --type-mapping=Currency=java.util.Currency --type-mapping=BGTAccountNumber=java.lang.String --type-mapping=Url=java.lang.String --type-mapping=CountryCode=java.lang.String --type-mapping=BGTRevisionNumber=java.lang.String composed-schema.graphqls" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <option name="MAIN_CLASS_NAME" value="com.netflix.graphql.dgs.codegen.CodeGenCliKt" />
+    <option name="WORKING_DIRECTORY" value="" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
 </component>

graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt

@@ -475,6 +475,7 @@ class CodeGenConfig(
     private val subPackageNameTypes: String = "types",
     private val subPackageNameDocs: String = "docs",
     var language: Language = Language.JAVA,
+    var generateFieldIsSet: Boolean = false,
     var generateBoxedTypes: Boolean = false,
     var generateIsGetterForPrimitiveBooleanFields: Boolean = false,
     var generateClientApi: Boolean = false,

graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGenCli.kt

@@ -46,7 +46,7 @@ class CodeGenCli : CliktCommand("Generate Java sources for SCHEMA file(s)") {
     )
     private val language by option("--language", "-l", help = "Output language").choice("java", "kotlin", ignoreCase = true)
         .default("java")
-    private val generateClient by option("--generate-client", "-c", help = "Genereate client api").flag(default = false)
+    private val generateClient by option("--generate-client", "-c", help = "Generate client api").flag(default = false)
     private val generateDataTypes by option(
         "--generate-data-types",
         help = "Generate data types. Not needed when only generating an API"
@@ -59,6 +59,8 @@ class CodeGenCli : CliktCommand("Generate Java sources for SCHEMA file(s)") {
     private val shortProjectionNames by option("--short-projection-names").flag()
     private val generateInterfaceSetters by option("--generate-interface-setters").flag()
     private val generateDocs by option("--generate-docs").flag()
+    // Generate an additional bitset field and supporting getters, setters, builder functions for data classes
+    private val generateFieldIsSet by option("--generate-field-is-set", help = "Generate an additional bitset field and supporting getters, setters, and builder functions for data classes").flag(default = false)
 
     override fun run() {
         val inputSchemas = if (schemas.isEmpty()) {
@@ -94,7 +96,8 @@ class CodeGenCli : CliktCommand("Generate Java sources for SCHEMA file(s)") {
                     generateDataTypes = generateDataTypes,
                     generateInterfaces = generateInterfaces,
                     generateInterfaceSetters = generateInterfaceSetters,
-                    generateDocs = generateDocs
+                    generateDocs = generateDocs,
+                    generateFieldIsSet = generateFieldIsSet
                 )
             } else {
                 CodeGenConfig(
@@ -115,7 +118,8 @@ class CodeGenCli : CliktCommand("Generate Java sources for SCHEMA file(s)") {
                     generateDataTypes = generateDataTypes,
                     generateInterfaces = generateInterfaces,
                     generateInterfaceSetters = generateInterfaceSetters,
-                    generateDocs = generateDocs
+                    generateDocs = generateDocs,
+                    generateFieldIsSet = generateFieldIsSet
                 )
             }
         ).generate()

graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/DataTypeGenerator.kt

@@ -19,6 +19,7 @@
 package com.netflix.graphql.dgs.codegen.generators.java
 
 import com.netflix.graphql.dgs.codegen.*
+import com.netflix.graphql.dgs.codegen.generators.shared.CodeGeneratorUtils.capitalized
 import com.netflix.graphql.dgs.codegen.generators.shared.SiteTarget
 import com.netflix.graphql.dgs.codegen.generators.shared.applyDirectivesJava
 import com.squareup.javapoet.*
@@ -223,6 +224,11 @@ abstract class BaseDataTypeGenerator(
             addParameterizedConstructor(fields, javaType)
         }
 
+        if(config.generateFieldIsSet) {
+            addBitsetField(javaType)
+            addBitSetEnum(fields, javaType)
+        }
+
         addToString(fields, javaType)
 
         addEquals(javaType)
@@ -362,6 +368,66 @@ abstract class BaseDataTypeGenerator(
         addFieldWithGetterAndSetter(fieldDefinition.type, fieldDefinition, javaType)
     }
 
+    private fun addBitsetField(javaType: TypeSpec.Builder) {
+        val fieldsPresent = Field("fieldsPresent", com.squareup.javapoet.TypeName.get(java.util.BitSet::class.java))
+        val fieldBuilder = FieldSpec
+            .builder(fieldsPresent.type, ReservedKeywordSanitizer.sanitize(fieldsPresent.name))
+            .addModifiers(Modifier.PRIVATE, Modifier.FINAL, Modifier.TRANSIENT)
+            .initializer("new BitSet()")
+        javaType.addField(fieldBuilder.build())
+        addBitsetFieldGetterAndSetter(javaType)
+    }
+
+    private fun addBitSetEnum(fields: List<Field>, javaType: TypeSpec.Builder) {
+        val enumBuilder = TypeSpec
+            .enumBuilder("Field")
+            .addModifiers(Modifier.PUBLIC)
+            .addField(FieldSpec.builder(com.squareup.javapoet.TypeName.INT, "ordinal").initializer("-1").build())
+            .addMethod(MethodSpec
+                .methodBuilder("getOrdinal")
+                .addModifiers(Modifier.PUBLIC)
+                .returns(ClassName.INT)
+                .addCode(
+                    """
+                    |return ordinal;
+                    """.trimMargin()
+                )
+                .build()
+            )
+            .addMethod(MethodSpec
+                .constructorBuilder()
+                .addCode(
+                    """
+                        |this.ordinal = ordinal;
+                    """.trimMargin()
+                )
+                .build()
+            )
+
+        fields.forEach {
+            enumBuilder.addEnumConstant(it.name.uppercase())
+        }
+
+        javaType.addType(enumBuilder.build())
+    }
+
+    private fun addBitsetFieldGetterAndSetter(javaType: TypeSpec.Builder) {
+        val setFieldSetter = MethodSpec.methodBuilder("setField")
+            .addModifiers(Modifier.PRIVATE)
+            .addParameter(ClassName.get("", "Field"), "field")
+            .addStatement("fieldsPresent.set(field.getOrdinal())")
+
+        val isSetGetter = MethodSpec.methodBuilder("isSet")
+            .addModifiers(Modifier.PRIVATE)
+            .returns(ClassName.BOOLEAN)
+            .addParameter(ClassName.get("", "Field"), "field")
+            .addStatement("return fieldsPresent.get(field.getOrdinal())")
+
+        javaType.addMethod(setFieldSetter.build())
+        javaType.addMethod(isSetGetter.build())
+    }
+
+
     private fun addFieldWithGetterAndSetter(returnType: com.squareup.javapoet.TypeName?, fieldDefinition: Field, javaType: TypeSpec.Builder) {
         val fieldBuilder = if (fieldDefinition.initialValue != null) {
             FieldSpec
@@ -398,6 +464,13 @@ abstract class BaseDataTypeGenerator(
                 ReservedKeywordSanitizer.sanitize(fieldDefinition.name)
             )
 
+        if(config.generateFieldIsSet) {
+            setterMethodBuilder.addStatement(
+                "setField(Field.\$N)",
+                ReservedKeywordSanitizer.sanitize(fieldDefinition.name.uppercase())
+            )
+        }
+
         if (fieldDefinition.directives.isNotEmpty()) {
             val (annotations, comments) = applyDirectivesJava(fieldDefinition.directives, config)
             if (!comments.isNullOrBlank()) {
@@ -433,13 +506,29 @@ abstract class BaseDataTypeGenerator(
 
     private fun addBuilder(javaType: TypeSpec.Builder) {
         val className = ClassName.get(packageName, javaType.build().name)
-        val buildMethod = MethodSpec.methodBuilder("build").returns(className).addStatement(
-            """
-            $className result = new $className();
-            ${javaType.build().fieldSpecs.joinToString("\n") { "result.${it.name} = this.${it.name};" }}
-            return result
+
+        val buildMethod = if(config.generateFieldIsSet) {
+                MethodSpec.methodBuilder("build").returns(className).addCode(
+                    """
+$className result = new $className();
+${javaType.build().fieldSpecs.filter{it.name!="fieldsPresent"}.joinToString("\n") { "result.${it.name} = this.${it.name};" }}
+for (Field field: Field.values()) {
+    if (this.isSet(field)) {
+        result.setField(field);
+    }
+}
+return result;
+            """.trimIndent()
+                )
+        } else {
+            MethodSpec.methodBuilder("build").returns(className).addCode(
+                """
+$className result = new $className();
+${javaType.build().fieldSpecs.joinToString("\n") { "result.${it.name} = this.${it.name};" }}
+return result;
             """.trimIndent()
-        ).addModifiers(Modifier.PUBLIC).build()
+            )
+        }.addModifiers(Modifier.PUBLIC).build()
 
         val builderClassName = ClassName.get(packageName, "$className.Builder")
         val newBuilderMethod =
@@ -452,19 +541,32 @@ abstract class BaseDataTypeGenerator(
 
         javaType.addMethod(newBuilderMethod)
 
+
+
         val builderType =
             TypeSpec
                 .classBuilder("Builder")
                 .addOptionalGeneratedAnnotation(config)
                 .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
                 .addMethod(buildMethod)
 
-        javaType.build().fieldSpecs.map {
-            MethodSpec.methodBuilder(it.name)
+        if(config.generateFieldIsSet) {
+            addBitsetFieldGetterAndSetter(builderType)
+        }
+
+        javaType.build().fieldSpecs.filter{it.name!="fieldsPresent"}.map {
+            var methodBuilder = MethodSpec.methodBuilder(it.name)
                 .addJavadoc(it.javadoc)
                 .returns(builderClassName)
                 .addStatement("this.${it.name} = ${it.name}")
-                .addStatement("return this")
+            if(config.generateFieldIsSet) {
+                methodBuilder.addStatement(
+                    "setField(Field.\$N)",
+                    ReservedKeywordSanitizer.sanitize(it.name.uppercase())
+                )
+            }
+
+            methodBuilder.addStatement("return this")
                 .addParameter(ParameterSpec.builder(it.type, it.name).build())
                 .addModifiers(Modifier.PUBLIC).build()
         }.forEach { builderType.addMethod(it) }