Merge pull request #894 from Netflix/fix/interface-gen-setters

Fix regression bug in interface setter generation

Author: jiholee17

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

@@ -73,7 +73,8 @@ class InterfaceGenerator(
         val mergedFieldDefinitions = definition.fieldDefinitions + extensions.flatMap { it.fieldDefinitions }
 
         mergedFieldDefinitions.filterSkipped().forEach {
-            // Generate getters/setters for fields that are not interfaces, and only getters for fields that are interfaces.
+            // Generate getters/setters for fields that are not interfaces, and only getters for fields that are interfaces
+            // unless generateInterfaceMethodsForInterfaceFields && generateInterfaceSetters.
             // Skip generating interface methods with list types where the inner type is an interface as Java does not
             // support overriding them with more specific types (i.e. List<Dog> does not override List<Pet>).
             //
@@ -164,9 +165,7 @@ class InterfaceGenerator(
         }
         javaType.addMethod(getterBuilder.build())
 
-        // Only generate setters for non-interface-typed fields unless generateInterfaceMethodsForInterfaceFields is true
-        if (config.generateInterfaceMethodsForInterfaceFields ||
-            (config.generateInterfaceSetters && !isFieldAnInterface(fieldDefinition))
+        if (config.generateInterfaceSetters && (config.generateInterfaceMethodsForInterfaceFields || !isFieldAnInterface(fieldDefinition))
         ) {
             val setterBuilder =
                 MethodSpec

graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt

@@ -3810,6 +3810,99 @@ class CodeGenTest {
         assertCompilesJava(dataTypes + interfaces)
     }
 
+    @Test
+    fun generateInterfaceMethodsForInterfaceFieldsAndNoInterfaceSetters() {
+        val schema =
+            """
+            interface Person {
+                name: String
+                age: Int
+                parents: [Person]!
+                friend: Person
+            }
+
+            interface Employee implements Person {
+                name: String
+                age: Int
+                parents: [Person]!
+                friend: Person
+            }
+
+            type Manager implements Employee {
+                name: String
+                age: Int
+                parents: [Person]!
+                friend: Person
+            }
+            """.trimIndent()
+
+        val (dataTypes, interfaces) =
+            CodeGen(
+                CodeGenConfig(
+                    schemas = setOf(schema),
+                    packageName = BASE_PACKAGE_NAME,
+                    generateInterfaceMethodsForInterfaceFields = true,
+                    generateInterfaceSetters = false,
+                ),
+            ).generate()
+
+        assertThat(interfaces).hasSize(2)
+
+        val person = interfaces.find { it.typeSpec.name == "Person" }!!
+        assertThat(person.toString()).isEqualTo(
+            """
+            |package com.netflix.graphql.dgs.codegen.tests.generated.types;
+            |
+            |import java.lang.Integer;
+            |import java.lang.String;
+            |import java.util.List;
+            |
+            |public interface Person {
+            |  String getName();
+            |
+            |  Integer getAge();
+            |
+            |  List<Person> getParents();
+            |
+            |  Person getFriend();
+            |}
+            |
+            """.trimMargin(),
+        )
+
+        val employee = interfaces.find { it.typeSpec.name == "Employee" }!!
+        assertThat(employee.toString()).isEqualTo(
+            """
+            |package com.netflix.graphql.dgs.codegen.tests.generated.types;
+            |
+            |import com.fasterxml.jackson.annotation.JsonSubTypes;
+            |import com.fasterxml.jackson.annotation.JsonTypeInfo;
+            |import java.lang.Integer;
+            |import java.lang.String;
+            |import java.util.List;
+            |
+            |@JsonTypeInfo(
+            |    use = JsonTypeInfo.Id.NAME,
+            |    include = JsonTypeInfo.As.PROPERTY,
+            |    property = "__typename"
+            |)
+            |@JsonSubTypes(@JsonSubTypes.Type(value = Manager.class, name = "Manager"))
+            |public interface Employee extends Person {
+            |  String getName();
+            |
+            |  Integer getAge();
+            |
+            |  List<Person> getParents();
+            |
+            |  Person getFriend();
+            |}
+            |
+            """.trimMargin(),
+        )
+
+        assertCompilesJava(dataTypes + interfaces)
+    }
+
     @Test
     fun generateObjectTypeInterfaceWithInterfaceInheritance() {
         val schema =