demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-25 11:45:49 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Filter out blank lines and comments in a multi-line transformations (#4357)

Browse Source 
Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
This commit is contained in:
jimtng 2024-09-07 14:59:22 +10:00 committed by GitHub
parent 1145613cba
commit 5cf91cde1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/ChannelTransformation.java
View File

@ -56,8 +56,13 @@ public class ChannelTransformation {
public ChannelTransformation(@Nullable List<String> transformationStrings) { public ChannelTransformation(@Nullable List<String> transformationStrings) {
if (transformationStrings != null) { if (transformationStrings != null) {
try { try {
transformationSteps = transformationStrings.stream() transformationSteps = transformationStrings.stream() //
.flatMap(ChannelTransformation::splitTransformationString).map(TransformationStep::new) .map(String::trim) //
.filter(line -> !line.isBlank()) //
.filter(line -> !line.startsWith("#")) //
.filter(line -> !line.startsWith("//")) //
.flatMap(ChannelTransformation::splitTransformationString) //
.map(TransformationStep::new) //
.toList(); .toList();
return; return;
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {

11
bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/generic/ChannelTransformationTest.java
View File

@ -349,4 +349,15 @@ public class ChannelTransformationTest {
assertFalse(ChannelTransformation.isValidTransformation("FOO∩BAZ:BAR")); assertFalse(ChannelTransformation.isValidTransformation("FOO∩BAZ:BAR"));
assertFalse(ChannelTransformation.isValidTransformation("FOO∩BAZ(BAR)")); assertFalse(ChannelTransformation.isValidTransformation("FOO∩BAZ(BAR)"));
} }
@Test
public void testBlanksAndCommentsAreDiscarded() {
List<String> pattern = List.of("#hash comment", "//double slashes", " # preceded by spaces",
" // ditto for slashes", " ", "\t", "\t\t\t", "\t# preceded by a tab",
"\t // preceded by tab and space");
ChannelTransformation transformation = new ChannelTransformation(pattern);
assertTrue(transformation.isEmpty());
}
} }