Json storage BigDecimal scaling (again)

This basically re-introduces the same fallback mechanism that was already implemented with eclipse-archived#2685 but got lost with fixes eclipse-archived#3774 Signed-off-by: Simon Kaufmann <[email protected]>
sjsf · Jun 30, 2017 · a210ecb · a210ecb
1 parent 1bada87
commit a210ecb
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/...rage.json.test/src/main/java/org/eclipse/smarthome/storage/json/test/JSonStorageTest.java b/...rage.json.test/src/main/java/org/eclipse/smarthome/storage/json/test/JSonStorageTest.java
@@ -38,7 +38,6 @@ public void setUp() throws IOException {
     @Test
     public void allInsertedNumbersAreLoadedAsBigDecimal() {
         objectStorage.put("DummyObject", new DummyObject());
-
         DummyObject dummy = (DummyObject) objectStorage.get("DummyObject");
 
         Assert.assertTrue(dummy.myMap.get("testShort") instanceof BigDecimal);
@@ -51,6 +50,25 @@ public void allInsertedNumbersAreLoadedAsBigDecimal() {
         Assert.assertTrue(dummy.myMap.get("testString") instanceof String);
     }
 
+    @Test
+    public void testIntegerScale() {
+        objectStorage.put("DummyObject", new DummyObject());
+        DummyObject dummy = (DummyObject) objectStorage.get("DummyObject");
+
+        Assert.assertEquals(((BigDecimal) dummy.myMap.get("testShort")).scale(), 0);
+        Assert.assertEquals(((BigDecimal) dummy.myMap.get("testInt")).scale(), 0);
+        Assert.assertEquals(((BigDecimal) dummy.myMap.get("testLong")).scale(), 0);
+        Assert.assertEquals(((BigDecimal) dummy.myMap.get("testBigDecimal")).scale(), 0);
+    }
+
+    @Test
+    public void testTrailingZeroIsOmmitted() {
+        objectStorage.put("DummyObject", new DummyObject());
+        DummyObject dummy = (DummyObject) objectStorage.get("DummyObject");
+
+        Assert.assertEquals(((BigDecimal) dummy.myMap.get("testBigDecimalWithTrailingZero")).scale(), 0);
+    }
+
     private class DummyObject {
 
         public Map<String, Object> myMap = new HashMap<String, Object>();
@@ -61,9 +79,10 @@ public DummyObject() {
             myMap.put("testLong", Long.valueOf("12"));
             myMap.put("testDouble", Double.valueOf("12.12"));
             myMap.put("testFloat", Float.valueOf("12.12"));
-            myMap.put("testBigDecimal", new BigDecimal(12));
+            myMap.put("testBigDecimal", new BigDecimal("12"));
             myMap.put("testBoolean", true);
             myMap.put("testString", "hello world");
+            myMap.put("testBigDecimalWithTrailingZero", new BigDecimal("12.0"));
         }
     }
 

diff --git a/...ge.json/src/main/java/org/eclipse/smarthome/storage/json/StringObjectMapDeserializer.java b/...ge.json/src/main/java/org/eclipse/smarthome/storage/json/StringObjectMapDeserializer.java
@@ -39,7 +39,11 @@ public Map<String, Object> deserialize(JsonElement json, Type typeOfT, JsonDeser
             JsonElement v = me.getValue();
 
             if (v.isJsonPrimitive() && ((JsonPrimitive) v).isNumber()) {
-                map.put(k, v.getAsBigDecimal());
+                if (v.getAsString().endsWith(".0")) {
+                    map.put(k, v.getAsBigDecimal().setScale(0));
+                } else {
+                    map.put(k, v.getAsBigDecimal());
+                }
             } else {
                 Object value = context.deserialize(v, Object.class);
                 map.put(k, value);