[hueemulation] Fixes HueEmulation DiscoveryIp not used (openhab#7411)

* Fixes HueEmulation DiscoveryIp not used Signed-off-by: Thomas Felix <thomas.felix@tfelix.de>
J-N-K · Jul 14, 2020 · 712c446 · 712c446
1 parent ea25825
commit 712c446
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/bundles/org.openhab.io.hueemulation/README.md b/bundles/org.openhab.io.hueemulation/README.md
@@ -114,7 +114,7 @@ This option allows you to override what addresses are used for the announcement.
 You can have multiple comma separated entries.
 
 ```
-org.openhab.hueemulation:discoveryIps=192.168.1.100,::FFFF:A9DB:0D85
+org.openhab.hueemulation:discoveryIp=192.168.1.100,::FFFF:A9DB:0D85
 ```
 
 The hue emulation service supports three types of emulated bulbs.

diff --git a/...enhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/ConfigStore.java b/...enhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/ConfigStore.java
@@ -193,8 +193,8 @@ public void modified(Map<String, Object> properties) {
         InetAddress configuredAddress = null;
         int networkPrefixLength = 24; // Default for most networks: 255.255.255.0
 
-        if (config.discoveryIps != null) {
-            discoveryIps = Collections.unmodifiableSet(Stream.of(config.discoveryIps.split(",")).map(String::trim)
+        if (config.discoveryIp != null) {
+            discoveryIps = Collections.unmodifiableSet(Stream.of(config.discoveryIp.split(",")).map(String::trim)
                     .map(this::byName).filter(e -> e != null).collect(Collectors.toSet()));
         } else {
             discoveryIps = new LinkedHashSet<>();

diff --git a/...o.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/HueEmulationConfig.java b/...o.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/HueEmulationConfig.java
@@ -38,7 +38,11 @@ public class HueEmulationConfig {
 
     /** Pairing timeout in seconds */
     public int pairingTimeout = 60;
-    public @Nullable String discoveryIps;
+    /**
+     * The field discoveryIps was named discoveryIp in the frontend for some time and thus user probably
+     * have it in their local config saved under the non plural version.
+     */
+    public @Nullable String discoveryIp;
     public int discoveryHttpPort = 0;
     /** Comma separated list of tags */
     public String restrictToTagsSwitches = "Switchable";

diff --git a/bundles/org.openhab.io.hueemulation/src/main/resources/ESH-INF/config/config.xml b/bundles/org.openhab.io.hueemulation/src/main/resources/ESH-INF/config/config.xml
@@ -53,7 +53,7 @@
 		</parameter>
 		<parameter name="discoveryIp" type="text" required="false">
 			<label>Optional Discovery Address</label>
-			<description>If your host has multiple IP addresses you may specify the IP you would like to advertise in the UPNP discovery process. You may safely leave this empty on most systems.</description>
+			<description>If your host has multiple IP addresses you may specify the IP(s) you would like to advertise in the UPNP discovery process. You may safely leave this empty on most systems. Use commas to separate multiple entries.</description>
 		</parameter>
 		<parameter name="discoveryHttpPort" type="integer" required="false">
 			<label>Optional Discovery Web Port</label>