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

…4357) Signed-off-by: Jimmy Tanagra <[email protected]>
openhab · Sep 7, 2024 · 5cf91cd · 5cf91cd
1 parent 1145613
commit 5cf91cd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/...ore.thing/src/main/java/org/openhab/core/thing/binding/generic/ChannelTransformation.java b/...ore.thing/src/main/java/org/openhab/core/thing/binding/generic/ChannelTransformation.java
@@ -56,8 +56,13 @@ public ChannelTransformation(@Nullable String transformationString) {
     public ChannelTransformation(@Nullable List<String> transformationStrings) {
         if (transformationStrings != null) {
             try {
-                transformationSteps = transformationStrings.stream()
-                        .flatMap(ChannelTransformation::splitTransformationString).map(TransformationStep::new)
+                transformationSteps = transformationStrings.stream() //
+                        .map(String::trim) //
+                        .filter(line -> !line.isBlank()) //
+                        .filter(line -> !line.startsWith("#")) //
+                        .filter(line -> !line.startsWith("//")) //
+                        .flatMap(ChannelTransformation::splitTransformationString) //
+                        .map(TransformationStep::new) //
                         .toList();
                 return;
             } catch (IllegalArgumentException e) {

diff --git a/...thing/src/test/java/org/openhab/core/thing/binding/generic/ChannelTransformationTest.java b/...thing/src/test/java/org/openhab/core/thing/binding/generic/ChannelTransformationTest.java
@@ -349,4 +349,15 @@ public void testIsValidTransform() {
         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());
+    }
 }