Merge pull request #44919 from stephan-strate/kotlin-empty-set-regres…

…sion Register Kotlin's empty set for reflection
quarkusio · Dec 4, 2024 · 3fb393d · 3fb393d
2 parents eab567b + c9b8046
commit 3fb393d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/extensions/kotlin/deployment/src/main/java/io/quarkus/kotlin/deployment/KotlinProcessor.java b/extensions/kotlin/deployment/src/main/java/io/quarkus/kotlin/deployment/KotlinProcessor.java
@@ -62,7 +62,9 @@ void registerKotlinReflection(final BuildProducer<ReflectiveClassBuildItem> refl
         reflectiveClass.produce(ReflectiveClassBuildItem.builder("kotlin.KotlinVersion$Companion[]").constructors(false)
                 .build());
         reflectiveClass.produce(
-                ReflectiveClassBuildItem.builder("kotlin.collections.EmptyList", "kotlin.collections.EmptyMap").build());
+                ReflectiveClassBuildItem
+                        .builder("kotlin.collections.EmptyList", "kotlin.collections.EmptyMap", "kotlin.collections.EmptySet")
+                        .build());
 
         nativeResourcePatterns.produce(builder().includePatterns(
                 "META-INF/.*.kotlin_module$",

diff --git a/integration-tests/kotlin/src/main/kotlin/io/quarkus/it/kotser/GreetingResource.kt b/integration-tests/kotlin/src/main/kotlin/io/quarkus/it/kotser/GreetingResource.kt
@@ -85,5 +85,11 @@ class GreetingResource {
         return emptyMap<String, String>()
     }
 
+    @GET
+    @Path("emptySet")
+    fun emptySet(): Set<String> {
+        return emptySet<String>()
+    }
+
     fun reflect() = "hello, world"
 }
diff --git a/integration-tests/kotlin/src/test/kotlin/io/quarkus/it/kotser/ResourceTest.kt b/integration-tests/kotlin/src/test/kotlin/io/quarkus/it/kotser/ResourceTest.kt
@@ -134,4 +134,9 @@ open class ResourceTest {
     fun testEmptyMap() {
         When { get("/emptyList") } Then { statusCode(200) }
     }
+
+    @Test
+    fun testEmptySet() {
+        When { get("/emptySet") } Then { statusCode(200) }
+    }
 }