Merge pull request #24151 from evanchooly/main

Explicitly request a serializer in writeTo()
quarkusio · Mar 8, 2022 · b98c54c · b98c54c
2 parents 5a9db9d + a011e92
commit b98c54c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 37 deletions.
diff --git a/...e/src/main/kotlin/io/quarkus/kotlin/serialization/KotlinSerializationMessageBodyWriter.kt b/...e/src/main/kotlin/io/quarkus/kotlin/serialization/KotlinSerializationMessageBodyWriter.kt
@@ -27,7 +27,7 @@ class KotlinSerializationMessageBodyWriter(private val json: Json) : AllWriteabl
         if (o is String) { // YUK: done in order to avoid adding extra quotes...
             entityStream.write(o.toByteArray(StandardCharsets.UTF_8))
         } else {
-            json.encodeToStream(o, entityStream)
+            json.encodeToStream(serializer(o.javaClass) , o, entityStream)
         }
     }
 

diff --git a/...ation-tests/kotlin-serialization/src/main/kotlin/io/quarkus/it/kotser/GreetingResource.kt b/...ation-tests/kotlin-serialization/src/main/kotlin/io/quarkus/it/kotser/GreetingResource.kt
@@ -2,6 +2,7 @@ package io.quarkus.it.kotser
 
 import io.quarkus.it.kotser.model.Person
 import io.quarkus.runtime.annotations.RegisterForReflection
+import kotlinx.coroutines.flow.flowOf
 import java.lang.reflect.Method
 import javax.ws.rs.Consumes
 import javax.ws.rs.GET
@@ -15,6 +16,10 @@ import kotlin.reflect.jvm.javaMethod
 @Path("/")
 @RegisterForReflection
 class GreetingResource {
+    @Path("flow")
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    fun flowHello() = flowOf(Person("Jim Halpert"))
 
     @GET
     @Produces(MediaType.APPLICATION_JSON)

diff --git a/integration-tests/kotlin-serialization/src/main/resources/application.properties b/integration-tests/kotlin-serialization/src/main/resources/application.properties
@@ -1,3 +1 @@
-quarkus.kotlin-serialization.json.encode-defaults=true
-quarkus.kotlin-serialization.json.pretty-print=true
-quarkus.kotlin-serialization.json.pretty-print-indent=\ \ 
+quarkus.kotlin-serialization.json.encode-defaults=true
diff --git a/integration-tests/kotlin-serialization/src/test/kotlin/io/quarkus/it/kotser/ResourceTest.kt b/integration-tests/kotlin-serialization/src/test/kotlin/io/quarkus/it/kotser/ResourceTest.kt
@@ -12,20 +12,24 @@ import javax.ws.rs.core.MediaType
 
 @QuarkusTest
 open class ResourceTest {
+    @Test
+    fun testGetFlow() {
+        When {
+            get("/flow")
+        } Then {
+            statusCode(200)
+            body(`is`("""[{"name":"Jim Halpert","defaulted":"hi there!"}]"""))
+        }
+    }
+
     @Test
     fun testGet() {
-         When {
-             get("/")
-         } Then {
-             statusCode(200)
-             body(`is`(
-                 """
-                    {
-                      "name": "Jim Halpert",
-                      "defaulted": "hi there!"
-                    }""".trimIndent()
-             ))
-         }
+        When {
+            get("/")
+        } Then {
+            statusCode(200)
+            body(`is`("""{"name":"Jim Halpert","defaulted":"hi there!"}"""))
+        }
     }
 
     @Test
@@ -34,13 +38,7 @@ open class ResourceTest {
             get("/suspend")
         } Then {
             statusCode(200)
-            body(`is`(
-                """
-                    {
-                      "name": "Jim Halpert",
-                      "defaulted": "hi there!"
-                    }""".trimIndent()
-            ))
+            body(`is`("""{"name":"Jim Halpert","defaulted":"hi there!"}"""))
         }
     }
 
@@ -50,15 +48,7 @@ open class ResourceTest {
             get("/suspendList")
         } Then {
             statusCode(200)
-            body(`is`(
-                """
-[
-  {
-    "name": "Jim Halpert",
-    "defaulted": "hi there!"
-  }
-]
-""".trimIndent()))
+            body(`is`("""[{"name":"Jim Halpert","defaulted":"hi there!"}]"""))
         }
     }
 
@@ -71,11 +61,7 @@ open class ResourceTest {
             post("/")
         } Then {
             statusCode(200)
-            body(`is`("""
-                {
-                  "name": "Pam Halpert",
-                  "defaulted": "hi there!"
-                }""".trimIndent()))
+            body(`is`("""{"name":"Pam Halpert","defaulted":"hi there!"}"""))
         }
     }