[client] fix operation name in the GraphQL request (ExpediaGroup#757)

We were incorrectly specifying normalized operation name to be sent as part of the request instead of passing in the original one from the query. This lead to runtime failures when operation name was not starting with an upper case or was not specified at all.

Resolves: ExpediaGroup#756

Author: dariuszkuc

plugins/graphql-kotlin-plugin-core/src/main/kotlin/com/expediagroup/graphql/plugin/generator/GraphQLClientGenerator.kt

@@ -80,8 +80,7 @@ class GraphQLClientGenerator(
         val fileSpec = FileSpec.builder(packageName = config.packageName, fileName = queryFile.nameWithoutExtension.capitalize())
 
         operationDefinitions.forEach { operationDefinition ->
-            val operationName = operationDefinition.name ?: queryFile.nameWithoutExtension.capitalize()
-            val operationTypeName = operationName.capitalize()
+            val operationTypeName = operationDefinition.name?.capitalize() ?: queryFile.nameWithoutExtension.capitalize()
             val context = GraphQLClientGeneratorContext(
                 packageName = config.packageName,
                 graphQLSchema = graphQLSchema,
@@ -109,8 +108,13 @@ class GraphQLClientGenerator(
                 "null"
             }
 
-            val queryConstName = operationName.toUpperUnderscore()
-            funSpec.addStatement("return graphQLClient.execute($queryConstName, \"$operationTypeName\", $variableCode)")
+            val queryConstName = operationTypeName.toUpperUnderscore()
+            val operationName = if (operationDefinition.name != null) {
+                "\"${operationDefinition.name}\""
+            } else {
+                "null"
+            }
+            funSpec.addStatement("return graphQLClient.execute($queryConstName, $operationName, $variableCode)")
 
             val gqlCLientClassName = ClassName(LIBRARY_PACKAGE, "GraphQLClient").parameterizedBy(STAR)
             operationTypeSpec.primaryConstructor(FunSpec.constructorBuilder()

plugins/graphql-kotlin-plugin-core/src/test/kotlin/com/expediagroup/graphql/plugin/generator/types/GenerateGraphQLClientIT.kt

@@ -0,0 +1,130 @@
+/*
+ * Copyright 2020 Expedia, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.expediagroup.graphql.plugin.generator.types
+
+import com.expediagroup.graphql.plugin.generator.GraphQLClientGenerator
+import com.expediagroup.graphql.plugin.generator.GraphQLClientGeneratorConfig
+import com.expediagroup.graphql.plugin.generator.testSchema
+import com.expediagroup.graphql.plugin.generator.verifyGeneratedFileSpecContents
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import java.io.File
+import java.nio.file.Path
+import kotlin.test.assertEquals
+
+class GenerateGraphQLClientIT {
+
+    @Test
+    fun `verify generated client does not change the operation name`() {
+        val expectedQueryFileSpec = """
+            package com.expediagroup.graphql.plugin.generator.integration
+
+            import com.expediagroup.graphql.client.GraphQLClient
+            import com.expediagroup.graphql.types.GraphQLResponse
+            import kotlin.String
+
+            const val MI_XE_DCA_SE_QUERY: String = "query miXEDcaSEQuery {\n  scalarQuery {\n    name\n  }\n}"
+
+            class MiXEDcaSEQuery(
+              private val graphQLClient: GraphQLClient<*>
+            ) {
+              suspend fun execute(): GraphQLResponse<MiXEDcaSEQuery.Result> =
+                  graphQLClient.execute(MI_XE_DCA_SE_QUERY, "miXEDcaSEQuery", null)
+
+              /**
+               * Wrapper that holds all supported scalar types
+               */
+              data class ScalarWrapper(
+                /**
+                 * UTF-8 character sequence
+                 */
+                val name: String
+              )
+
+              data class Result(
+                /**
+                 * Query that returns wrapper object with all supported scalar types
+                 */
+                val scalarQuery: MiXEDcaSEQuery.ScalarWrapper
+              )
+            }
+        """.trimIndent()
+
+        val query = """
+            query miXEDcaSEQuery {
+              scalarQuery {
+                name
+              }
+            }
+        """.trimIndent()
+        verifyGeneratedFileSpecContents(query, expectedQueryFileSpec)
+    }
+
+    @Test
+    fun `verify generated client does not require operation name`(@TempDir tempDir: Path) {
+        val expectedQueryFileSpec = """
+            package com.expediagroup.graphql.plugin.generator.integration
+
+            import com.expediagroup.graphql.client.GraphQLClient
+            import com.expediagroup.graphql.types.GraphQLResponse
+            import kotlin.String
+
+            const val ANONYMOUS_TEST_QUERY: String = "query {\n  scalarQuery {\n    name\n  }\n}"
+
+            class AnonymousTestQuery(
+              private val graphQLClient: GraphQLClient<*>
+            ) {
+              suspend fun execute(): GraphQLResponse<AnonymousTestQuery.Result> =
+                  graphQLClient.execute(ANONYMOUS_TEST_QUERY, null, null)
+
+              /**
+               * Wrapper that holds all supported scalar types
+               */
+              data class ScalarWrapper(
+                /**
+                 * UTF-8 character sequence
+                 */
+                val name: String
+              )
+
+              data class Result(
+                /**
+                 * Query that returns wrapper object with all supported scalar types
+                 */
+                val scalarQuery: AnonymousTestQuery.ScalarWrapper
+              )
+            }
+        """.trimIndent()
+
+        val query = """
+            query {
+              scalarQuery {
+                name
+              }
+            }
+        """.trimIndent()
+        val testDirectory = tempDir.toFile()
+        val queryFile = File(testDirectory, "anonymousTestQuery.graphql")
+        queryFile.deleteOnExit()
+        queryFile.writeText(query)
+
+        val generator = GraphQLClientGenerator(testSchema(), GraphQLClientGeneratorConfig(packageName = "com.expediagroup.graphql.plugin.generator.integration"))
+        val fileSpecs = generator.generate(listOf(queryFile))
+        assertEquals(1, fileSpecs.size)
+        assertEquals(expectedQueryFileSpec, fileSpecs[0].toString().trim())
+    }
+}