Remove deprecated usage of JsonNodeFactory.withExactBigDecimals(true)

eclipse-leshan · Jul 11, 2023 · 2a842d9 · 2a842d9
1 parent acf1fb6
commit 2a842d9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonArrayEntrySerDes.java b/leshan-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonArrayEntrySerDes.java
@@ -32,7 +32,7 @@ public class JsonArrayEntrySerDes extends JacksonJsonSerDes<JsonArrayEntry> {
 
     @Override
     public JsonNode jSerialize(JsonArrayEntry jae) throws JsonException {
-        ObjectNode o = JsonNodeFactory.withExactBigDecimals(true).objectNode();
+        ObjectNode o = JsonNodeFactory.instance.objectNode();
         if (jae.getName() != null)
             o.put("n", jae.getName());
         Type type = jae.getType();

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonRootObjectSerDes.java b/leshan-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonRootObjectSerDes.java
@@ -28,11 +28,11 @@
 
 public class JsonRootObjectSerDes extends JacksonJsonSerDes<JsonRootObject> {
 
-    private JsonArrayEntrySerDes serDes = new JsonArrayEntrySerDes();
+    private final JsonArrayEntrySerDes serDes = new JsonArrayEntrySerDes();
 
     @Override
     public JsonNode jSerialize(JsonRootObject jro) throws JsonException {
-        ObjectNode o = JsonNodeFactory.withExactBigDecimals(true).objectNode();
+        ObjectNode o = JsonNodeFactory.instance.objectNode();
 
         if (jro.getBaseName() != null)
             o.put("bn", jro.getBaseName());

diff --git a/...re/src/main/java/org/eclipse/leshan/core/json/jackson/LwM2mJsonJacksonEncoderDecoder.java b/...re/src/main/java/org/eclipse/leshan/core/json/jackson/LwM2mJsonJacksonEncoderDecoder.java
@@ -26,14 +26,16 @@
 import org.eclipse.leshan.core.util.json.JsonException;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.cfg.JsonNodeFeature;
 
 /**
  * Helper for encoding/decoding LWM2M JSON format using jackson
  */
 public class LwM2mJsonJacksonEncoderDecoder implements LwM2mJsonDecoder, LwM2mJsonEncoder {
 
     private static final JsonRootObjectSerDes serDes = new JsonRootObjectSerDes();
-    private static final ObjectMapper mapper = new ObjectMapper();
+    private static final ObjectMapper mapper = new ObjectMapper()
+            .configure(JsonNodeFeature.STRIP_TRAILING_BIGDECIMAL_ZEROES, false);
 
     @Override
     public String toJsonLwM2m(JsonRootObject jro) throws LwM2mJsonException {

diff --git a/...e/src/main/java/org/eclipse/leshan/senml/json/jackson/SenMLJsonJacksonEncoderDecoder.java b/...e/src/main/java/org/eclipse/leshan/senml/json/jackson/SenMLJsonJacksonEncoderDecoder.java
@@ -34,13 +34,15 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.cfg.JsonNodeFeature;
 
 /**
  * Helper for encoding/decoding SenML JSON using Jackson
  */
 public class SenMLJsonJacksonEncoderDecoder implements SenMLDecoder, SenMLEncoder {
     private final JacksonJsonSerDes<SenMLRecord> serDes;
-    private static final ObjectMapper mapper = new ObjectMapper();
+    private static final ObjectMapper mapper = new ObjectMapper()
+            .configure(JsonNodeFeature.STRIP_TRAILING_BIGDECIMAL_ZEROES, false);
 
     public SenMLJsonJacksonEncoderDecoder() {
         this(false);

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/senml/json/jackson/SenMLJsonRecordSerDes.java b/leshan-core/src/main/java/org/eclipse/leshan/senml/json/jackson/SenMLJsonRecordSerDes.java
@@ -53,7 +53,7 @@ public SenMLJsonRecordSerDes(boolean allowNoValue, Base64Decoder base64Decoder,
 
     @Override
     public JsonNode jSerialize(SenMLRecord record) throws JsonException {
-        ObjectNode jsonObj = JsonNodeFactory.withExactBigDecimals(true).objectNode();
+        ObjectNode jsonObj = JsonNodeFactory.instance.objectNode();
 
         if (record.getBaseName() != null && record.getBaseName().length() > 0) {
             jsonObj.put("bn", record.getBaseName());