From 883b25162650b1deb0ee9d591e1d8d636595a75c Mon Sep 17 00:00:00 2001 From: J-N-K Date: Wed, 30 Dec 2020 15:57:50 +0100 Subject: [PATCH] [tr064] log warning if config invalid (#9529) Signed-off-by: Jan N. Klug --- .../tr064/internal/config/Tr064SubConfiguration.java | 3 +-- .../org/openhab/binding/tr064/internal/util/Util.java | 10 +++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/config/Tr064SubConfiguration.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/config/Tr064SubConfiguration.java index 41e40b728..5b8967f7e 100644 --- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/config/Tr064SubConfiguration.java +++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/config/Tr064SubConfiguration.java @@ -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 macOnline = Collections.emptyList(); + public List macOnline = List.of(); public boolean isValid() { return !uuid.isEmpty(); diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/util/Util.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/util/Util.java index 7b5b81ba6..dea7e2eb6 100644 --- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/util/Util.java +++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/util/Util.java @@ -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)