[scale] fix NPE in transformation (openhab#8124)

Signed-off-by: Johannes DerOetzi Ott <[email protected]>t>
andrewfg · Aug 31, 2020 · 6dba438 · 6dba438
1 parent 4853606
commit 6dba438
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/bundles/org.openhab.transform.scale/conf/transform/scale/humidex.scale b/bundles/org.openhab.transform.scale/conf/transform/scale/humidex.scale
@@ -4,3 +4,4 @@
 [38..45]=avoid exertion
 [45..54]=dangerous
 [54..100]=heat stroke imminent
+NaN=unknown
diff --git a/....scale/src/main/java/org/openhab/transform/scale/internal/ScaleTransformationService.java b/....scale/src/main/java/org/openhab/transform/scale/internal/ScaleTransformationService.java
@@ -129,7 +129,7 @@ private String formatResult(Map<Range, String> data, String source, final BigDec
 
     private String getScaleResult(Map<Range, String> data, String source, final BigDecimal value)
             throws TransformationException {
-        return data.entrySet().stream().filter(entry -> entry.getKey().contains(value)).findFirst()
+        return data.entrySet().stream().filter(entry -> entry.getKey() != null && entry.getKey().contains(value)).findFirst()
                 .map(Map.Entry::getValue)
                 .orElseThrow(() -> new TransformationException("No matching range for '" + source + "'"));
     }

diff --git a/...m.scale/src/test/java/org/openhab/transform/scale/internal/ScaleTransformServiceTest.java b/...m.scale/src/test/java/org/openhab/transform/scale/internal/ScaleTransformServiceTest.java
@@ -146,4 +146,12 @@ public void testTransformAndFormat() throws TransformationException {
         String transformedResponse = processor.transform(existingscale, source);
         Assert.assertEquals("Correcte (992) !", transformedResponse);
     }
+
+    @Test
+    public void testValueExceedsRange() throws TransformationException {
+        String existingscale = "scale/humidex.scale";
+        String source = "200";
+        String transformedResponse = processor.transform(existingscale, source);
+        Assert.assertEquals("", transformedResponse);
+    }
 }