From 94e55d7125d98114b1486bdad5b4df7021254f15 Mon Sep 17 00:00:00 2001
From: Kavitha Srinivasan <ksrinivasan@netflix.com>
Date: Wed, 21 Apr 2021 20:09:09 -0700
Subject: [PATCH] Undo accidental commit
 6d03d655d74efb311d6b3fad5651078312b71f82

---
 .../generators/java/InterfaceGenerator.kt     |  3 +-
 .../graphql/dgs/codegen/CodeGenTest.kt        | 56 +------------------
 2 files changed, 3 insertions(+), 56 deletions(-)

diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/InterfaceGenerator.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/InterfaceGenerator.kt
index 47e83da7c..16ab21221 100644
--- a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/InterfaceGenerator.kt
+++ b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/InterfaceGenerator.kt
@@ -31,7 +31,6 @@ class InterfaceGenerator(config: CodeGenConfig, private val document: Document)
 
     private val packageName = config.packageNameTypes
     private val typeUtils = TypeUtils(packageName, config, document)
-    private val useInterfaceType = config.generateInterfaces
 
     fun generate(definition: InterfaceTypeDefinition): CodeGenResult {
         val javaType = TypeSpec.interfaceBuilder(definition.name)
@@ -82,7 +81,7 @@ class InterfaceGenerator(config: CodeGenConfig, private val document: Document)
 
     private fun addInterfaceMethod(fieldDefinition: FieldDefinition, javaType: TypeSpec.Builder) {
 
-        val returnType = typeUtils.findReturnType(fieldDefinition.type, useInterfaceType)
+        val returnType = typeUtils.findReturnType(fieldDefinition.type)
 
         val fieldName = fieldDefinition.name
         javaType.addMethod(
diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt
index 219252ca7..eced869d4 100644
--- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt
+++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt
@@ -22,10 +22,7 @@ import com.google.common.jimfs.Configuration
 import com.google.common.jimfs.Jimfs
 import com.google.common.truth.Truth
 import com.netflix.graphql.dgs.codegen.generators.java.disableJsonTypeInfoAnnotation
-import com.squareup.javapoet.ClassName
-import com.squareup.javapoet.JavaFile
-import com.squareup.javapoet.ParameterizedTypeName
-import com.squareup.javapoet.WildcardTypeName
+import com.squareup.javapoet.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
@@ -492,7 +489,7 @@ class CodeGenTest {
         val (dataTypes, interfaces) = CodeGen(
             CodeGenConfig(
                 schemas = setOf(schema),
-                packageName = basePackageName
+                packageName = basePackageName,
             )
         ).generate() as CodeGenResult
 
@@ -1874,55 +1871,6 @@ class CodeGenTest {
             .isEqualTo("""{mandatoryString:"a",mandatoryInt:1,mandatoryList:["x"]}""")
     }
 
-    @Test
-    fun generateObjectTypeInterfaceWithInterface() {
-        val schema = """
-        type Team {
-            name: String
-        }
-
-        type Player {
-            name: String
-        }
-
-        interface Standing {
-            position: Int!
-            team: Team!
-        }
-        """.trimIndent()
-
-        val result = CodeGen(
-            CodeGenConfig(
-                schemas = setOf(schema),
-                packageName = basePackageName,
-                generateInterfaces = true
-            )
-        ).generate() as CodeGenResult
-
-        val interfaces = result.interfaces
-        val dataTypes = result.dataTypes
-
-        assertThat(interfaces).hasSize(3) // IPlayer, ITeam, Standing
-
-        val team = interfaces[0]
-        assertThat(team.typeSpec.name).isEqualTo("ITeam")
-        assertThat(team.typeSpec.methodSpecs).extracting("name").containsExactly("getName")
-        assertThat(team.typeSpec.methodSpecs[0].returnType).extracting("simpleName").containsExactly("String")
-
-        val player = interfaces[1]
-        assertThat(player.typeSpec.name).isEqualTo("IPlayer")
-        assertThat(player.typeSpec.methodSpecs).extracting("name").containsExactly("getName")
-        assertThat(player.typeSpec.methodSpecs[0].returnType).extracting("simpleName").containsExactly("String")
-
-        val standing = interfaces[2]
-        assertThat(standing.typeSpec.name).isEqualTo("Standing")
-        assertThat(standing.typeSpec.methodSpecs).extracting("name").containsExactly("getPosition", "getTeam")
-        assertThat(standing.typeSpec.methodSpecs[0].returnType.toString()).contains("int")
-        assertThat(standing.typeSpec.methodSpecs[1].returnType).extracting("simpleName").containsExactly("ITeam")
-
-        assertCompilesJava(dataTypes.plus(interfaces))
-    }
-
     @Test
     fun generateObjectTypeInterface() {
         val schema = """