Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tr064] improve channel parameter processing #110

Merged
merged 2 commits into from
May 23, 2021
Merged

[tr064] improve channel parameter processing #110

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
439eaae
improve channel parameter processing
J-N-K May 22, 2021
933fba6
address review comments
J-N-K May 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...arthomej.binding.tr064/src/main/java/org/smarthomej/binding/tr064/internal/util/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,12 @@ private static Set<String> getAndCheckParameters(String channelId, ActionType ac
String parameterPattern = parameter.getPattern();
if (parameterPattern != null) {
parameters.removeIf(param -> {
if (!param.matches(parameterPattern)) {
LOGGER.warn("Removing {} while processing {}, does not match pattern {}, check config.", param,
channelId, parameterPattern);
if (param.trim().isEmpty()) {
J-N-K marked this conversation as resolved.
Show resolved Hide resolved
LOGGER.debug("Removing empty parameter while processing '{}'.", channelId);
return true;
} else if (!param.matches(parameterPattern)) {
LOGGER.warn("Removing '{}' while processing '{}', does not match pattern '{}', check config.",
param, channelId, parameterPattern);
return true;
} else {
return false;
Expand Down