Merge pull request #671 from ctasada/ctasada/fix-kotlinx-collection

(fix) Kotlin serializer for Collection
springwolf · Mar 29, 2024 · a492b53 · a492b53
2 parents 71ae935 + 6f091b5
commit a492b53
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/...ons/kotlinx_serialization_model_converter/converter/KotlinxSerializationModelConverter.kt b/...ons/kotlinx_serialization_model_converter/converter/KotlinxSerializationModelConverter.kt
@@ -65,17 +65,14 @@ class KotlinxSerializationModelConverter(private val useFqn: Boolean = false) :
         val propertyType = property.returnType.jvmErasure
 
         when {
-            propertyType.isSubclassOf(List::class) -> {
+            propertyType.isSubclassOf(Collection::class) -> {
                 propertySchema = ArraySchema()
                 val value = (property.returnType.javaType as ParameterizedType).actualTypeArguments[0]
                 propertySchema.items = resolveRefSchema(value, context)
-            }
 
-            propertyType.isSubclassOf(Set::class) -> {
-                propertySchema = ArraySchema()
-                val value = (property.returnType.javaType as ParameterizedType).actualTypeArguments[0]
-                propertySchema.items = resolveRefSchema(value, context)
-                propertySchema.uniqueItems = true
+                if (propertyType.isSubclassOf(Set::class)) {
+                    propertySchema.uniqueItems = true
+                }
             }
 
             propertyType.isSubclassOf(Map::class) -> {

diff --git a/...otlinx_serialization_model_converter/converter/KotlinxSerializationTypeConverterTest.java b/...otlinx_serialization_model_converter/converter/KotlinxSerializationTypeConverterTest.java
@@ -68,6 +68,19 @@ void testClassWithListProperty() {
             assertThat(listField.getItems()).isNotNull();
             assertThat(listField.getItems().getType()).isEqualTo("string");
         }
+
+        @Test
+        void testClassWithCollectionProperty() {
+            var result = modelConverters.readAll(new AnnotatedType(ClassWithCollectionProperty.class));
+            Schema<?> schema = result.get(ClassWithCollectionProperty.class.getSimpleName());
+
+            final Schema<?> listField = (Schema<?>) schema.getProperties().get("collection_field");
+            assertThat(listField).isNotNull();
+            assertThat(listField.getType()).isEqualTo("array");
+            assertThat(listField.getNullable()).isFalse();
+            assertThat(listField.getItems()).isNotNull();
+            assertThat(listField.getItems().getType()).isEqualTo("string");
+        }
     }
 
     @Nested

diff --git a/...o.github.springwolf.addons.kotlinx_serialization_model_converter.converter/SampleEvent.kt b/...o.github.springwolf.addons.kotlinx_serialization_model_converter.converter/SampleEvent.kt
@@ -66,6 +66,12 @@ data class ClassWithSetProperty(
     val setField: Set<String>,
 )
 
+@Serializable
+data class ClassWithCollectionProperty(
+    @SerialName("collection_field")
+    val setField: Collection<String>,
+)
+
 @Serializable
 data class ClassWithEnumProperty(
     @SerialName("enum_field")