]> git.basschouten.com Git - openhab-addons.git/commitdiff
[tr064] log warning if config invalid (#9529)
authorJ-N-K <J-N-K@users.noreply.github.com>
Wed, 30 Dec 2020 14:57:50 +0000 (15:57 +0100)
committerGitHub <noreply@github.com>
Wed, 30 Dec 2020 14:57:50 +0000 (15:57 +0100)
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/config/Tr064SubConfiguration.java
bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/util/Util.java

index 41e40b728d7469b12c5dcbf0427ac24b641343e0..5b8967f7ec8d51499c5a8098b2db74ee2cc4530c 100644 (file)
@@ -12,7 +12,6 @@
  */
 package org.openhab.binding.tr064.internal.config;
 
-import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -27,7 +26,7 @@ public class Tr064SubConfiguration extends Tr064BaseThingConfiguration {
     public String uuid = "";
 
     // Lan Device
-    public List<String> macOnline = Collections.emptyList();
+    public List<String> macOnline = List.of();
 
     public boolean isValid() {
         return !uuid.isEmpty();
index 7b5b81ba6d35e2dc9bddee81d577899743b10456..dea7e2eb676d6d07f929e390923c09ce78bcf7d7 100644 (file)
@@ -259,7 +259,15 @@ public class Util {
             // validate parameter against pattern
             String parameterPattern = parameter.getPattern();
             if (parameterPattern != null) {
-                parameters.removeIf(param -> !param.matches(parameterPattern));
+                parameters.removeIf(param -> {
+                    if (!param.matches(parameterPattern)) {
+                        LOGGER.warn("Removing {} while processing {}, does not match pattern {}, check config.", param,
+                                channelId, parameterPattern);
+                        return true;
+                    } else {
+                        return false;
+                    }
+                });
             }
 
             // validate parameter against SCPD (if not internal only)