Add special handling for on/off defaulting to noArg set list entries

Author: klassm

app/src/main/java/li/klass/fhem/domain/setlist/SetList.kt

@@ -24,6 +24,7 @@
 
 package li.klass.fhem.domain.setlist
 
+import li.klass.fhem.domain.setlist.typeEntry.NoArgSetListEntry
 import li.klass.fhem.domain.setlist.typeEntry.NotFoundSetListEntry
 import li.klass.fhem.domain.setlist.typeEntry.TextFieldSetListEntry
 import org.apache.commons.lang3.StringUtils
@@ -42,11 +43,11 @@ class SetList constructor(val entries: Map<String, SetListEntry>) : Serializable
 
     fun contains(vararg keys: String): Boolean = contains(keys.toList())
 
-    fun contains(keys: Iterable<String>): Boolean =
-            keys.any { entries.containsKey(it) }
+    fun contains(keys: Iterable<String>): Boolean = keys.any { entries.containsKey(it) }
 
-    fun existingStatesOf(toSearch: Set<String>): Set<String> =
-            entries.keys.filter { toSearch.contains(it) }.toSet()
+    fun existingStatesOf(toSearch: Set<String>): Set<String> = entries.keys.filter {
+        toSearch.contains(it)
+    }.toSet()
 
     fun size(): Int = entries.size
 
@@ -59,23 +60,26 @@ class SetList constructor(val entries: Map<String, SetListEntry>) : Serializable
                 .joinToString(separator = " ") { it.asText() }
     }
 
-    fun getFirstPresentStateOf(vararg states: String): String? =
-            states.asSequence().firstOrNull { contains(it) }
+    fun getFirstPresentStateOf(
+            vararg states: String): String? = states.asSequence().firstOrNull { contains(it) }
 
     companion object {
         fun parse(inputText: String): SetList {
             if (isEmpty(inputText)) return SetList(emptyMap())
 
-            val parts = inputText.trim()
-                    .split(" ".toRegex()).toTypedArray()
+            val parts = inputText.trim().split(" ".toRegex()).toTypedArray()
 
             return SetList(parts.mapNotNull { handlePart(it) }.toMap())
         }
 
         private fun handlePart(part: String): Pair<String, SetListEntry>? {
 
             if (!part.contains(":")) {
-                return Pair(part, TextFieldSetListEntry(part))
+                val entry = when (part) {
+                    "on", "off" -> NoArgSetListEntry(part)
+                    else        -> TextFieldSetListEntry(part)
+                }
+                return Pair(part, entry)
             }
 
             val keyValue = part.split(":".toRegex(), 2).toTypedArray()
@@ -101,10 +105,9 @@ class SetList constructor(val entries: Map<String, SetListEntry>) : Serializable
                     return type
                 }
             }
-            return if (parts.isEmpty() || parts.isNotEmpty() && "colorpicker".equals(parts[0], ignoreCase = true))
-                SetListItemType.NO_ARG
-            else
-                SetListItemType.GROUP
+            return if (parts.isEmpty() || parts.isNotEmpty() && "colorpicker".equals(parts[0],
+                                                                                     ignoreCase = true)) SetListItemType.NO_ARG
+            else SetListItemType.GROUP
         }
     }
 }

app/src/test/java/li/klass/fhem/domain/setlist/SetListTest.kt

@@ -65,21 +65,25 @@ class SetListTest {
                     TestCase(desc = "only colon",
                             setList = " : ",
                             expected = emptyMap()),
-                    TestCase(desc = "noArg",
-                            setList = "on:noArg",
-                            expected = mapOf("on" to NoArgSetListEntry("on"))),
-                    TestCase(desc = "no arg defaults to textField item type", setList = "on",
-                             expected = mapOf("on" to TextFieldSetListEntry("on"))),
+                    TestCase(desc = "noArg", setList = "bla:noArg",
+                             expected = mapOf("bla" to NoArgSetListEntry("bla"))),
+                    TestCase(desc = "noArg on", setList = "on:noArg",
+                             expected = mapOf("on" to NoArgSetListEntry("on"))),
+                    TestCase(desc = "no arg defaults to textField item type", setList = "bla",
+                             expected = mapOf("bla" to TextFieldSetListEntry("bla"))),
+                    TestCase(desc = "no arg defaults to noArg for on", setList = "on",
+                             expected = mapOf("on" to NoArgSetListEntry("on"))),
+                    TestCase(desc = "no arg defaults to noArg for off", setList = "off",
+                             expected = mapOf("off" to NoArgSetListEntry("off"))),
                     TestCase(desc = "empty :textField",
                             setList = "0:noArg 1:noArg :textField",
                             expected = mapOf("0" to NoArgSetListEntry("0"), "1" to NoArgSetListEntry("1"), "state" to TextFieldSetListEntry("state"))),
                     TestCase(desc = "empty set list",
                             setList = "",
                             expected = emptyMap()),
-                    TestCase(desc = "leading trailing whitepace",
-                             setList = " on off ",
-                             expected = mapOf("on" to TextFieldSetListEntry("on"),
-                                              "off" to TextFieldSetListEntry("off"))),
+                    TestCase(desc = "leading trailing whitepace", setList = " bla blub ",
+                             expected = mapOf("bla" to TextFieldSetListEntry("bla"),
+                                              "blub" to TextFieldSetListEntry("blub"))),
                     TestCase(desc = "colon without values leads to group",
                             setList = "internalState:",
                             expected = emptyMap()),

app/whatsnew-de.md

@@ -1,5 +1 @@
-* LightScene: Aktueller Zustand wird in Übersicht markiert
-* Wochenplan (von Heizungen) kann von einem anderen Gerät kopiert werden
-* SetList: Standardmäßig ist ein SetList-Attribut jetzt ein TextField (analog zu FHEMWEB)
-* Link zu Verbindungsverwaltung in DummyData-Benachrichtigung
-* Konfiguration für YeeLight
+* Behandle on/off immer als noArg set list Eintrag, sodass kein weiterer Parameter eingegeben werden muss

app/whatsnew-en.md

@@ -1,5 +1 @@
-* LightScene: Currently active scene will be marked within the overview
-* Add ability to copy a weekprofile from a different device
-* SetList: By default a SetList attribute is now a TextField (analogue to FHEMWEB)
-* Link to the connection management in the DummyData notification
-* Configuration for YeeLight
+* Treat on/off always as noArg set list entry requiring no additional field