Fixed Sets of Enums #181

sksamuel · Dec 1, 2020 · 61a3824 · 61a3824
1 parent 2cdaa8c
commit 61a3824
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/hoplite-core/src/main/kotlin/com/sksamuel/hoplite/decoder/SetDecoder.kt b/hoplite-core/src/main/kotlin/com/sksamuel/hoplite/decoder/SetDecoder.kt
@@ -27,7 +27,7 @@ class SetDecoder : NullHandlingDecoder<Set<*>> {
     val t = type.arguments[0].type!!
 
     fun <T> decode(node: ArrayNode, decoder: Decoder<T>): ConfigResult<Set<T>> {
-      return node.elements.map { decoder.decode(it, type, context) }.sequence()
+      return node.elements.map { decoder.decode(it, t, context) }.sequence()
         .mapInvalid { ConfigFailure.CollectionElementErrors(node, it) }
         .map { it.toSet() }
     }
@@ -36,7 +36,7 @@ class SetDecoder : NullHandlingDecoder<Set<*>> {
       val tokens = node.value.split(",").map {
         StringNode(it.trim(), node.pos)
       }
-      return tokens.map { decoder.decode(it, type, context) }.sequence()
+      return tokens.map { decoder.decode(it, t, context) }.sequence()
         .mapInvalid { ConfigFailure.CollectionElementErrors(node, it) }
         .map { it.toSet() }
     }

diff --git a/hoplite-yaml/src/test/kotlin/com/sksamuel/hoplite/yaml/SetDecoderTest.kt b/hoplite-yaml/src/test/kotlin/com/sksamuel/hoplite/yaml/SetDecoderTest.kt
@@ -6,6 +6,7 @@ import io.kotest.matchers.shouldBe
 import io.kotest.core.spec.style.StringSpec
 
 class SetDecoderTest : StringSpec({
+
   "Set decoded from yml file" {
     data class Test(val a: Set<Long>, val b: Set<String>)
 

diff --git a/hoplite-yaml/src/test/resources/set_objects.yml b/hoplite-yaml/src/test/resources/set_objects.yml
@@ -0,0 +1,8 @@
+a: 1,2,3,3,3
+b:
+  - 1
+  - 2
+  - 1
+  - 2
+  - 1
+  - 2
diff --git a/hoplite-yaml/src/test/resources/sets.yml b/hoplite-yaml/src/test/resources/sets.yml
@@ -5,4 +5,4 @@ b:
   - 1
   - 2
   - 1
-  - 2
+  - 2
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,4 @@ b: @@
       - 1
       - 2
       - 1
-      - 2
+      - 2