public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[tr064] log warning if config invalid (#9529)

Browse Source 
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
This commit is contained in:
J-N-K 2020-12-30 15:57:50 +01:00 committed by GitHub
parent ee93229d3c
commit 883b251626
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/config/Tr064SubConfiguration.java
View File

@ -12,7 +12,6 @@
*/ */
package org.openhab.binding.tr064.internal.config; package org.openhab.binding.tr064.internal.config;
import java.util.Collections;
import java.util.List; import java.util.List;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
@ -27,7 +26,7 @@ public class Tr064SubConfiguration extends Tr064BaseThingConfiguration {
public String uuid = ""; public String uuid = "";
// Lan Device // Lan Device
public List<String> macOnline = Collections.emptyList(); public List<String> macOnline = List.of();
public boolean isValid() { public boolean isValid() {
return !uuid.isEmpty(); return !uuid.isEmpty();

10
bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/util/Util.java
View File

@ -259,7 +259,15 @@ public class Util {
// validate parameter against pattern // validate parameter against pattern
String parameterPattern = parameter.getPattern(); String parameterPattern = parameter.getPattern();
if (parameterPattern != null) { 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) // validate parameter against SCPD (if not internal only)