Fix bug regarding split lists in rest controllers

sknull · Apr 20, 2024 · ffbf527 · ffbf527
1 parent 965c974
commit ffbf527
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...lin/de/visualdigits/kotlin/klanglicht/rest/hybrid/controller/HybridStageRestController.kt b/...lin/de/visualdigits/kotlin/klanglicht/rest/hybrid/controller/HybridStageRestController.kt
@@ -17,15 +17,15 @@ class HybridStageRestController(
     fun hexColor(
         @RequestParam(value = "ids", required = false, defaultValue = "") ids: String,
         @RequestParam(value = "hexColors") hexColors: String,
-        @RequestParam(value = "gains", required = false, defaultValue = "") gains: String,
+        @RequestParam(value = "gains", required = false, defaultValue = "1.0") gains: String,
         @RequestParam(value = "transition", required = false) transition: Long?,
         @RequestParam(value = "turnOn", required = false, defaultValue = "true") turnOn: Boolean,
         @RequestParam(value = "store", required = false, defaultValue = "true") store: Boolean,
         @RequestParam(value = "storeName", required = false) storeName: String?
     ) {
         hybridStageService.hexColor(
-            ids = ids.split(",").map { it.trim() },
-            hexColors = hexColors.split(",").map { it.trim() },
+            ids = ids.split(",").map { it.trim() }.filter { it.isNotEmpty() },
+            hexColors = hexColors.split(",").map { it.trim() }.filter { it.isNotEmpty() },
             gains = gains.split(",").map { it.toDouble() },
             transition = transition,
             turnOn = turnOn,

diff --git a/...n/kotlin/de/visualdigits/kotlin/klanglicht/rest/scenes/controller/ScenesRestController.kt b/...n/kotlin/de/visualdigits/kotlin/klanglicht/rest/scenes/controller/ScenesRestController.kt
@@ -30,11 +30,11 @@ class ScenesRestController(
     fun hybrid(
         @RequestParam(value = "ids", required = false, defaultValue = "") ids: String,
         @RequestParam(value = "hexColors", required = false, defaultValue = "") hexColors: String,
-        @RequestParam(value = "gains", required = false, defaultValue = "") gains: String,
+        @RequestParam(value = "gains", required = false, defaultValue = "1.0") gains: String,
     ) {
         scenesService.hybrid(
-            ids = ids.split(",").map { it.trim() },
-            hexColors = hexColors.split(",").map { it.trim() },
+            ids = ids.split(",").map { it.trim() }.filter { it.isNotEmpty() },
+            hexColors = hexColors.split(",").map { it.trim() }.filter { it.isNotEmpty() },
             gains = gains.split(",").map { it.toDouble() })
     }
 

diff --git a/...n/kotlin/de/visualdigits/kotlin/klanglicht/rest/shelly/controller/ShellyRestController.kt b/...n/kotlin/de/visualdigits/kotlin/klanglicht/rest/shelly/controller/ShellyRestController.kt
@@ -59,15 +59,15 @@ class ShellyRestController(
     fun hexColor(
         @RequestParam(value = "ids", required = false, defaultValue = "") ids: String,
         @RequestParam(value = "hexColors") hexColors: String,
-        @RequestParam(value = "gains", required = false, defaultValue = "") gains: String,
+        @RequestParam(value = "gains", required = false, defaultValue = "1.0") gains: String,
         @RequestParam(value = "transition", required = false) transitionDuration: Long?,
         @RequestParam(value = "turnOn", required = false, defaultValue = "true") turnOn: Boolean,
         @RequestParam(value = "store", required = false, defaultValue = "true") store: Boolean,
         @RequestParam(value = "storeName", required = false) storeName: String?
     ) {
         hybridStageService.hexColor(
-            ids = ids.split(",").map { it.trim() },
-            hexColors = hexColors.split(",").map { it.trim() },
+            ids = ids.split(",").map { it.trim() }.filter { it.isNotEmpty() },
+            hexColors = hexColors.split(",").map { it.trim() }.filter { it.isNotEmpty() },
             gains = gains.split(",").map { it.toDouble() },
             transition = transitionDuration,
             turnOn = turnOn,