Revert "feat(GraphQLQueryRequest): support alias in projections (#563)" (#569)

Cole Turner · web-flow · commit f8a67788f3b5 · 2023-06-01T13:58:47.000-07:00
This reverts commit de93775.
diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/ClientApiGenerator.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/ClientApiGenerator.kt
@@ -466,7 +466,7 @@ class ClientApiGenerator(private val config: CodeGenConfig, private val document
         val javaType = TypeSpec.classBuilder(clazzName)
             .addOptionalGeneratedAnnotation(config)
             .addModifiers(Modifier.PUBLIC)
-            .superclass(ParameterizedTypeName.get(className, ClassName.get(getPackageName(), clazzName), ClassName.get(getPackageName(), parent.name), ClassName.get(getPackageName(), root.name)))
+            .superclass(ParameterizedTypeName.get(className, ClassName.get(getPackageName(), parent.name), ClassName.get(getPackageName(), root.name)))
             .addMethod(
                 MethodSpec.constructorBuilder()
                     .addModifiers(Modifier.PUBLIC)
diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/ClientApiGeneratorv2.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/ClientApiGeneratorv2.kt
@@ -211,14 +211,14 @@ class ClientApiGeneratorv2(private val config: CodeGenConfig, private val docume
     private fun createRootProjection(type: TypeDefinition<*>, prefix: String): CodeGenResult {
         val clazzName = "${prefix}ProjectionRoot"
         val className = ClassName.get(BaseSubProjectionNode::class.java)
-        val parentJavaType = TypeVariableName.get("PARENT").withBounds(ParameterizedTypeName.get(className, TypeVariableName.get("?"), TypeVariableName.get("?"), TypeVariableName.get("?")))
-        val rootJavaType = TypeVariableName.get("ROOT").withBounds(ParameterizedTypeName.get(className, TypeVariableName.get("?"), TypeVariableName.get("?"), TypeVariableName.get("?")))
+        val parentJavaType = TypeVariableName.get("PARENT").withBounds(ParameterizedTypeName.get(className, TypeVariableName.get("?"), TypeVariableName.get("?")))
+        val rootJavaType = TypeVariableName.get("ROOT").withBounds(ParameterizedTypeName.get(className, TypeVariableName.get("?"), TypeVariableName.get("?")))
         val javaType = TypeSpec.classBuilder(clazzName)
             .addOptionalGeneratedAnnotation(config)
             .addTypeVariable(parentJavaType)
             .addTypeVariable(rootJavaType)
             .addModifiers(Modifier.PUBLIC)
-            .superclass(ParameterizedTypeName.get(className, ClassName.get(getPackageName(), clazzName), TypeVariableName.get("PARENT"), TypeVariableName.get("ROOT")))
+            .superclass(ParameterizedTypeName.get(className, TypeVariableName.get("PARENT"), TypeVariableName.get("ROOT")))
             .addMethod(
                 MethodSpec.constructorBuilder()
                     .addModifiers(Modifier.PUBLIC)
@@ -333,14 +333,14 @@ class ClientApiGeneratorv2(private val config: CodeGenConfig, private val docume
     private fun createEntitiesRootProjection(federatedTypes: List<ObjectTypeDefinition>): CodeGenResult {
         val clazzName = "EntitiesProjectionRoot"
         val className = ClassName.get(BaseSubProjectionNode::class.java)
-        val parentType = TypeVariableName.get("PARENT").withBounds(ParameterizedTypeName.get(className, TypeVariableName.get("?"), TypeVariableName.get("?"), TypeVariableName.get("?")))
-        val rootType = TypeVariableName.get("ROOT").withBounds(ParameterizedTypeName.get(className, TypeVariableName.get("?"), TypeVariableName.get("?"), TypeVariableName.get("?")))
+        val parentType = TypeVariableName.get("PARENT").withBounds(ParameterizedTypeName.get(className, TypeVariableName.get("?"), TypeVariableName.get("?")))
+        val rootType = TypeVariableName.get("ROOT").withBounds(ParameterizedTypeName.get(className, TypeVariableName.get("?"), TypeVariableName.get("?")))
         val javaType = TypeSpec.classBuilder(clazzName)
             .addOptionalGeneratedAnnotation(config)
             .addTypeVariable(parentType)
             .addTypeVariable(rootType)
             .addModifiers(Modifier.PUBLIC)
-            .superclass(ParameterizedTypeName.get(className, ClassName.get(getPackageName(), clazzName), TypeVariableName.get("PARENT"), TypeVariableName.get("ROOT")))
+            .superclass(ParameterizedTypeName.get(className, TypeVariableName.get("PARENT"), TypeVariableName.get("ROOT")))
             .addMethod(
                 MethodSpec.constructorBuilder()
                     .addModifiers(Modifier.PUBLIC)
@@ -480,14 +480,14 @@ class ClientApiGeneratorv2(private val config: CodeGenConfig, private val docume
         val clazzName = "${prefix}Projection"
         if (generatedClasses.contains(clazzName)) return null else generatedClasses.add(clazzName)
 
-        val parentJavaType = TypeVariableName.get("PARENT").withBounds(ParameterizedTypeName.get(className, TypeVariableName.get("?"), TypeVariableName.get("?"), TypeVariableName.get("?")))
-        val rootJavaType = TypeVariableName.get("ROOT").withBounds(ParameterizedTypeName.get(className, TypeVariableName.get("?"), TypeVariableName.get("?"), TypeVariableName.get("?")))
+        val parentJavaType = TypeVariableName.get("PARENT").withBounds(ParameterizedTypeName.get(className, TypeVariableName.get("?"), TypeVariableName.get("?")))
+        val rootJavaType = TypeVariableName.get("ROOT").withBounds(ParameterizedTypeName.get(className, TypeVariableName.get("?"), TypeVariableName.get("?")))
         val javaType = TypeSpec.classBuilder(clazzName)
             .addOptionalGeneratedAnnotation(config)
             .addTypeVariable(parentJavaType)
             .addTypeVariable(rootJavaType)
             .addModifiers(Modifier.PUBLIC)
-            .superclass(ParameterizedTypeName.get(className, ClassName.get(getPackageName(), clazzName), TypeVariableName.get("PARENT"), TypeVariableName.get("ROOT")))
+            .superclass(ParameterizedTypeName.get(className, TypeVariableName.get("PARENT"), TypeVariableName.get("ROOT")))
             .addMethod(
                 MethodSpec.constructorBuilder()
                     .addModifiers(Modifier.PUBLIC)
diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenFragmentTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenFragmentTest.kt
@@ -127,8 +127,7 @@ class ClientApiGenFragmentTest {
             .doesNotContain("duration")
 
         val superclass = codeGenResult.clientProjections[3].typeSpec.superclass as ParameterizedTypeName
-        assertThat(superclass.typeArguments[1]).extracting("simpleName").isEqualTo("Search_ShowProjection")
-        assertThat(superclass.typeArguments[2]).extracting("simpleName").isEqualTo("SearchProjectionRoot")
+        assertThat(superclass.typeArguments[1]).extracting("simpleName").isEqualTo("SearchProjectionRoot")
 
         assertCompilesJava(
             codeGenResult.clientProjections + codeGenResult.javaQueryTypes + codeGenResult.javaEnumTypes + codeGenResult.javaDataTypes + codeGenResult.javaInterfaces
@@ -226,8 +225,7 @@ class ClientApiGenFragmentTest {
         assertThat(codeGenResult.clientProjections[3].typeSpec.initializerBlock.isEmpty).isFalse
 
         val superclass = codeGenResult.clientProjections[3].typeSpec.superclass as ParameterizedTypeName
-        assertThat(superclass.typeArguments[1]).extracting("simpleName").isEqualTo("Search_ResultProjection")
-        assertThat(superclass.typeArguments[2]).extracting("simpleName").isEqualTo("SearchProjectionRoot")
+        assertThat(superclass.typeArguments[1]).extracting("simpleName").isEqualTo("SearchProjectionRoot")
 
         val searchResult = codeGenResult.javaInterfaces[0].typeSpec
 
diff --git a/graphql-dgs-codegen-shared-core/src/main/kotlin/com/netflix/graphql/dgs/client/codegen/BaseProjectionNode.kt b/graphql-dgs-codegen-shared-core/src/main/kotlin/com/netflix/graphql/dgs/client/codegen/BaseProjectionNode.kt
@@ -33,10 +33,8 @@ abstract class BaseProjectionNode(
 ) {
 
     val fields: MutableMap<String, Any?> = LinkedHashMap()
-    val aliases: MutableMap<String, FieldAlias> = LinkedHashMap()
     val fragments: MutableList<BaseProjectionNode> = LinkedList()
     val inputArguments: MutableMap<String, List<InputArgument>> = LinkedHashMap()
 
     data class InputArgument(val name: String, val value: Any?)
-    data class FieldAlias(val fieldName: String, val value: Any?)
 }
diff --git a/graphql-dgs-codegen-shared-core/src/main/kotlin/com/netflix/graphql/dgs/client/codegen/BaseSubProjectionNode.kt b/graphql-dgs-codegen-shared-core/src/main/kotlin/com/netflix/graphql/dgs/client/codegen/BaseSubProjectionNode.kt
@@ -18,60 +18,19 @@ package com.netflix.graphql.dgs.client.codegen
 
 import java.util.*
 
-abstract class BaseSubProjectionNode<S, T, R>(
+abstract class BaseSubProjectionNode<T, R>(
     val parent: T,
     val root: R,
     schemaType: Optional<String> = Optional.empty()
 ) : BaseProjectionNode(schemaType) {
 
     constructor(parent: T, root: R) : this(parent, root, schemaType = Optional.empty())
+
     fun parent(): T {
         return parent
     }
 
     fun root(): R {
         return root
     }
-
-    fun alias(alias: String, assigner: (node: S) -> Any): S {
-        // Avoid alias against existing field name
-        if (this.javaClass.kotlin.members.any { it.name.equals(alias, ignoreCase = true) }) {
-            throw AssertionError("Tried to specify alias $alias which already exists as field.")
-        }
-
-        // Stash our current set of fields
-        val currentFields = fields.toMap()
-        val currentInputArguments = inputArguments.toMap()
-        fields.clear()
-        inputArguments.clear()
-
-        // Track the aliased field
-        @Suppress("UNCHECKED_CAST")
-        assigner(this as S)
-
-        // Constraints on how aliases are assigned
-        if (fields.isEmpty()) {
-            throw AssertionError("Tried to initialize alias but did not call any fields.")
-        }
-
-        if (fields.size > 1) {
-            throw AssertionError("Tried to call multiple fields while initializing alias.")
-        }
-
-        val fieldName = fields.keys.first()
-        val fieldValue = fields.values.first()
-        val fieldArguments = mapOf(alias to inputArguments[fieldName]?.let { it }.orEmpty())
-
-        // Restore our fields stash
-        fields.clear()
-        fields.putAll(currentFields)
-        inputArguments.clear()
-        inputArguments.putAll(currentInputArguments)
-
-        // Layer in our new state
-        aliases[alias] = FieldAlias(fieldName = fieldName, value = fieldValue)
-        inputArguments.putAll(fieldArguments)
-
-        return this
-    }
 }
diff --git a/graphql-dgs-codegen-shared-core/src/main/kotlin/com/netflix/graphql/dgs/client/codegen/GraphQLMultiQueryRequest.kt b/graphql-dgs-codegen-shared-core/src/main/kotlin/com/netflix/graphql/dgs/client/codegen/GraphQLMultiQueryRequest.kt
@@ -57,7 +57,7 @@ class GraphQLMultiQueryRequest(
             }
 
             if (request.projection != null) {
-                val selectionSet = if (request.projection is BaseSubProjectionNode<*, *, *>) {
+                val selectionSet = if (request.projection is BaseSubProjectionNode<*, *>) {
                     request.projectionSerializer.toSelectionSet(request.projection.root() as BaseProjectionNode)
                 } else {
                     request.projectionSerializer.toSelectionSet(request.projection)
diff --git a/graphql-dgs-codegen-shared-core/src/main/kotlin/com/netflix/graphql/dgs/client/codegen/GraphQLQueryRequest.kt b/graphql-dgs-codegen-shared-core/src/main/kotlin/com/netflix/graphql/dgs/client/codegen/GraphQLQueryRequest.kt
@@ -69,7 +69,7 @@ class GraphQLQueryRequest @JvmOverloads constructor(
         }
 
         if (projection != null) {
-            val selectionSetFromProjection = if (projection is BaseSubProjectionNode<*, *, *> && projection.root() != null) {
+            val selectionSetFromProjection = if (projection is BaseSubProjectionNode<*, *> && projection.root() != null) {
                 projectionSerializer.toSelectionSet(projection.root() as BaseProjectionNode)
             } else {
                 projectionSerializer.toSelectionSet(projection)
diff --git a/graphql-dgs-codegen-shared-core/src/main/kotlin/com/netflix/graphql/dgs/client/codegen/ProjectionSerializer.kt b/graphql-dgs-codegen-shared-core/src/main/kotlin/com/netflix/graphql/dgs/client/codegen/ProjectionSerializer.kt
@@ -51,30 +51,6 @@ class ProjectionSerializer(private val inputValueSerializer: InputValueSerialize
             selectionSet.selection(fieldSelection.build())
         }
 
-        for ((fieldName, fieldAlias) in projection.aliases) {
-            val fieldSelection = Field.newField()
-                .name(fieldAlias.fieldName)
-                .alias(fieldName)
-                .arguments(
-                    projection.inputArguments[fieldName].orEmpty().map { (argName, values) ->
-                        Argument(argName, inputValueSerializer.toValue(values))
-                    }
-                )
-            if (fieldAlias.value is BaseProjectionNode) {
-                val fieldSelectionSet = toSelectionSet(fieldAlias.value)
-                if (fieldSelectionSet.selections.isNotEmpty()) {
-                    fieldSelection.selectionSet(fieldSelectionSet)
-                }
-            } else if (fieldAlias.value != null) {
-                fieldSelection.selectionSet(
-                    SelectionSet.newSelectionSet()
-                        .selection(Field.newField(fieldAlias.value.toString()).build())
-                        .build()
-                )
-            }
-            selectionSet.selection(fieldSelection.build())
-        }
-
         for (fragment in projection.fragments) {
             val typeCondition = fragment.schemaType.map { TypeName(it) }
                 .orElseGet {
diff --git a/graphql-dgs-codegen-shared-core/src/test/java/com/netflix/graphql/dgs/client/codegen/exampleprojection/ShowsProjectionRoot.java b/graphql-dgs-codegen-shared-core/src/test/java/com/netflix/graphql/dgs/client/codegen/exampleprojection/ShowsProjectionRoot.java
@@ -57,7 +57,7 @@ public ShowsProjectionRoot releaseYear() {
         return this;
     }
 
-    public static class Shows_ReviewsProjection extends BaseSubProjectionNode<Shows_ReviewsProjection, ShowsProjectionRoot, ShowsProjectionRoot> {
+    public static class Shows_ReviewsProjection extends BaseSubProjectionNode<ShowsProjectionRoot, ShowsProjectionRoot> {
       public Shows_ReviewsProjection(ShowsProjectionRoot parent, ShowsProjectionRoot root) {
         super(parent, root);
       }
diff --git a/graphql-dgs-codegen-shared-core/src/test/kotlin/com/netflix/graphql/dgs/client/codegen/ProjectionSerializerTest.kt b/graphql-dgs-codegen-shared-core/src/test/kotlin/com/netflix/graphql/dgs/client/codegen/ProjectionSerializerTest.kt
@@ -102,37 +102,4 @@ internal class ProjectionSerializerTest {
             """.trimMargin()
         )
     }
-
-    @Test
-    fun `Projection supports aliases`() {
-        // given
-        val root = EntitiesProjectionRoot()
-            .onMovie(Optional.empty())
-            .moveId().title().releaseYear()
-            .alias("colesReviews") { it.reviews("Cole", 10).username().score() }
-            .reviews(username = "Foo", score = 10).username().score()
-            .root()
-        // when
-        val serialized = ProjectionSerializer(InputValueSerializer()).serialize(root)
-        // then
-        assertThat(serialized).isEqualTo(
-            """{
-            |  ... on EntitiesMovieKey {
-            |    __typename
-            |    moveId
-            |    title
-            |    releaseYear
-            |    reviews(username: "Foo", score: 10) {
-            |      username
-            |      score
-            |    }
-            |    colesReviews: reviews(username: "Cole", score: 10) {
-            |      username
-            |      score
-            |    }
-            |  }
-            |}
-            """.trimMargin()
-        )
-    }
 }
diff --git a/graphql-dgs-codegen-shared-core/src/test/kotlin/com/netflix/graphql/dgs/client/codegen/exampleprojection/EntitiesMovieKeyProjection.kt b/graphql-dgs-codegen-shared-core/src/test/kotlin/com/netflix/graphql/dgs/client/codegen/exampleprojection/EntitiesMovieKeyProjection.kt
@@ -23,7 +23,7 @@ class EntitiesMovieKeyProjection(
     parent: EntitiesProjectionRoot,
     root: EntitiesProjectionRoot,
     schemaType: Optional<String>
-) : BaseSubProjectionNode<EntitiesMovieKeyProjection, EntitiesProjectionRoot, EntitiesProjectionRoot>(
+) : BaseSubProjectionNode<EntitiesProjectionRoot, EntitiesProjectionRoot>(
     parent,
     root,
     schemaType = schemaType
diff --git a/graphql-dgs-codegen-shared-core/src/test/kotlin/com/netflix/graphql/dgs/client/codegen/exampleprojection/Movies_ReviewsProjection.kt b/graphql-dgs-codegen-shared-core/src/test/kotlin/com/netflix/graphql/dgs/client/codegen/exampleprojection/Movies_ReviewsProjection.kt
@@ -21,7 +21,7 @@ package com.netflix.graphql.dgs.client.codegen.exampleprojection
 import com.netflix.graphql.dgs.client.codegen.BaseSubProjectionNode
 
 class Movies_ReviewsProjection(parent: EntitiesMovieKeyProjection, root: EntitiesProjectionRoot) :
-    BaseSubProjectionNode<Movies_ReviewsProjection, EntitiesMovieKeyProjection, EntitiesProjectionRoot>(parent, root) {
+    BaseSubProjectionNode<EntitiesMovieKeyProjection, EntitiesProjectionRoot>(parent, root) {
     fun username(): Movies_ReviewsProjection {
         fields["username"] = null
         return this

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,8 @@ abstract class BaseProjectionNode(`
`33`	`33`	`) {`
`34`	`34`
`35`	`35`	`val fields: MutableMap<String, Any?> = LinkedHashMap()`
`36`		`- val aliases: MutableMap<String, FieldAlias> = LinkedHashMap()`
`37`	`36`	`val fragments: MutableList<BaseProjectionNode> = LinkedList()`
`38`	`37`	`val inputArguments: MutableMap<String, List<InputArgument>> = LinkedHashMap()`
`39`	`38`
`40`	`39`	`data class InputArgument(val name: String, val value: Any?)`
`41`		`- data class FieldAlias(val fieldName: String, val value: Any?)`
`42`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class GraphQLMultiQueryRequest(`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if (request.projection != null) {`
`60`		`- val selectionSet = if (request.projection is BaseSubProjectionNode<, , *>) {`
	`60`	`+ val selectionSet = if (request.projection is BaseSubProjectionNode<, >) {`
`61`	`61`	`request.projectionSerializer.toSelectionSet(request.projection.root() as BaseProjectionNode)`
`62`	`62`	`} else {`
`63`	`63`	`request.projectionSerializer.toSelectionSet(request.projection)`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class GraphQLQueryRequest @JvmOverloads constructor(`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`if (projection != null) {`
`72`		`- val selectionSetFromProjection = if (projection is BaseSubProjectionNode<, , *> && projection.root() != null) {`
	`72`	`+ val selectionSetFromProjection = if (projection is BaseSubProjectionNode<, > && projection.root() != null) {`
`73`	`73`	`projectionSerializer.toSelectionSet(projection.root() as BaseProjectionNode)`
`74`	`74`	`} else {`
`75`	`75`	`projectionSerializer.toSelectionSet(projection)`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public ShowsProjectionRoot releaseYear() {`
`57`	`57`	`return this;`
`58`	`58`	`}`
`59`	`59`
`60`		`- public static class Shows_ReviewsProjection extends BaseSubProjectionNode<Shows_ReviewsProjection, ShowsProjectionRoot, ShowsProjectionRoot> {`
	`60`	`+ public static class Shows_ReviewsProjection extends BaseSubProjectionNode<ShowsProjectionRoot, ShowsProjectionRoot> {`
`61`	`61`	`public Shows_ReviewsProjection(ShowsProjectionRoot parent, ShowsProjectionRoot root) {`
`62`	`62`	`super(parent, root);`
`63`	`63`	`}`