Support built-in ID type serialization in GraphQLServerRequest (#…

…1959) Backport of #1952 to v6 Co-authored-by: Tasuku Nakagawa <38446259+T45K@users.noreply.github.com>
ExpediaGroup · Apr 16, 2024 · 7f8ff39 · 7f8ff39
1 parent d5c312f
commit 7f8ff39
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/...c/main/kotlin/com/expediagroup/graphql/server/types/serializers/AnyNullableKSerializer.kt b/...c/main/kotlin/com/expediagroup/graphql/server/types/serializers/AnyNullableKSerializer.kt
@@ -1,5 +1,6 @@
 package com.expediagroup.graphql.server.types.serializers
 
+import com.expediagroup.graphql.generator.scalars.ID
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.buildClassSerialDescriptor
@@ -41,6 +42,7 @@ object AnyNullableKSerializer : KSerializer<Any?> {
             is Number -> JsonPrimitive(value)
             is Boolean -> JsonPrimitive(value)
             is String -> JsonPrimitive(value)
+            is ID -> JsonPrimitive(value.value)
             else -> JsonNull
         }
 

diff --git a/...-server/src/test/kotlin/com/expediagroup/graphql/server/types/GraphQLServerRequestTest.kt b/...-server/src/test/kotlin/com/expediagroup/graphql/server/types/GraphQLServerRequestTest.kt
@@ -16,6 +16,7 @@
 
 package com.expediagroup.graphql.server.types
 
+import com.expediagroup.graphql.generator.scalars.ID
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.junit.jupiter.api.Test
@@ -51,6 +52,20 @@ class GraphQLServerRequestTest {
         assertEquals(expectedJson, Json.encodeToString(request))
     }
 
+    @Test
+    fun `verify complete serialization including ID`() {
+        val request = GraphQLRequest(
+            query = "query FooQuery(\$input: ID) { foo(\$input) }",
+            operationName = "FooQuery",
+            variables = mapOf("input" to ID("1"))
+        )
+
+        val expectedJson =
+            """{"query":"query FooQuery(${'$'}input: ID) { foo(${'$'}input) }","operationName":"FooQuery","variables":{"input":"1"}}"""
+
+        assertEquals(expectedJson, Json.encodeToString(request))
+    }
+
     @Test
     fun `verify batch request serialization`() {
         val request = GraphQLBatchRequest(