Added check on empty String and fixed test

eclipse-kura · Nov 14, 2024 · 3621d50 · 3621d50
1 parent 41e55f7
commit 3621d50
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...ovider/src/main/java/org/eclipse/kura/internal/asset/provider/BaseAssetConfiguration.java b/...ovider/src/main/java/org/eclipse/kura/internal/asset/provider/BaseAssetConfiguration.java
@@ -342,7 +342,7 @@ private static ScaleOffsetType getScaleOffsetType(final Map<String, Object> prop
         private static Number getValueScale(final Map<String, Object> properties) {
             final String valueScale = (String) properties.get(VALUE_SCALE.value());
 
-            if (valueScale == null) {
+            if (valueScale == null || valueScale.isEmpty()) {
                 return 1.0d;
             }
             return parseScaleOffsetTypedValue(getScaleOffsetType(properties), valueScale);
@@ -351,7 +351,7 @@ private static Number getValueScale(final Map<String, Object> properties) {
         private static Number getValueOffset(final Map<String, Object> properties) {
             final String valueOffset = (String) properties.get(VALUE_OFFSET.value());
 
-            if (valueOffset == null) {
+            if (valueOffset == null || valueOffset.isEmpty()) {
                 return 0.0d;
             }
             return parseScaleOffsetTypedValue(getScaleOffsetType(properties), valueOffset);

diff --git a/...t.wire.provider.test/src/main/java/org/eclipse/kura/rest/wire/provider/test/Snippets.java b/...t.wire.provider.test/src/main/java/org/eclipse/kura/rest/wire/provider/test/Snippets.java
@@ -120,17 +120,17 @@ public class Snippets {
             + "        },\n" //
             + "        {\n" //
             + "            \"name\": \"scale\",\n" //
-            + "            \"description\": \"Scale to be applied to the numeric value of the channel\",\n" //
+            + "            \"description\": \"Scale to be applied to the numeric value of the channel.\",\n" //
             + "            \"id\": \"+scale\",\n" //
-            + "            \"type\": \"DOUBLE\",\n" //
+            + "            \"type\": \"STRING\",\n" //
             + "            \"cardinality\": 0,\n" //
             + "            \"isRequired\": false\n" //
             + "        },\n" //
             + "        {\n" //
             + "            \"name\": \"offset\",\n" //
             + "            \"description\": \"Offset to be applied to the numeric value of the channel\",\n" //
             + "            \"id\": \"+offset\",\n" //
-            + "            \"type\": \"DOUBLE\",\n" //
+            + "            \"type\": \"STRING\",\n" //
             + "            \"cardinality\": 0,\n" //
             + "            \"isRequired\": false\n" //
             + "        },\n" //