[json-node] Fix NULL value bug with JsonObject

Also fix DecimalAdapter
avaje · Dec 16, 2024 · 295c877 · 295c877
1 parent ab3cc87
commit 295c877
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/json-node/src/main/java/io/avaje/json/node/adapter/DecimalAdapter.java b/json-node/src/main/java/io/avaje/json/node/adapter/DecimalAdapter.java
@@ -3,17 +3,17 @@
 import io.avaje.json.JsonAdapter;
 import io.avaje.json.JsonReader;
 import io.avaje.json.JsonWriter;
-import io.avaje.json.node.JsonLong;
+import io.avaje.json.node.JsonDecimal;
 
-final class DecimalAdapter implements JsonAdapter<JsonLong> {
+final class DecimalAdapter implements JsonAdapter<JsonDecimal> {
 
   @Override
-  public void toJson(JsonWriter writer, JsonLong value) {
-    writer.value(value.longValue());
+  public void toJson(JsonWriter writer, JsonDecimal value) {
+    writer.value(value.decimalValue());
   }
 
   @Override
-  public JsonLong fromJson(JsonReader reader) {
-    return JsonLong.of(reader.readLong());
+  public JsonDecimal fromJson(JsonReader reader) {
+    return JsonDecimal.of(reader.readDecimal());
   }
 }
diff --git a/json-node/src/main/java/io/avaje/json/node/adapter/NodeAdapter.java b/json-node/src/main/java/io/avaje/json/node/adapter/NodeAdapter.java
@@ -33,6 +33,7 @@ ObjectAdapter objectAdapter() {
   public JsonNode fromJson(JsonReader reader) {
     switch (reader.currentToken()) {
       case NULL:
+        reader.isNullValue();
         return null;
       case BEGIN_ARRAY:
         return arrayAdapter.fromJson(reader);
@@ -55,8 +56,7 @@ public void toJson(JsonWriter writer, JsonNode value) {
       writer.nullValue();
       return;
     }
-    JsonNode.Type type = value.type();
-    switch (type) {
+    switch (value.type()) {
       case NULL:
         writer.nullValue();
         break;

diff --git a/json-node/src/test/java/io/avaje/json/node/JsonObjectTest.java b/json-node/src/test/java/io/avaje/json/node/JsonObjectTest.java
@@ -19,7 +19,7 @@ class JsonObjectTest {
 
   @Test
   void of() {
-    Map<String,JsonNode> map = new LinkedHashMap<>();
+    Map<String, JsonNode> map = new LinkedHashMap<>();
     map.put("name", JsonString.of("foo"));
     map.put("other", JsonInteger.of(42));
 
@@ -190,4 +190,13 @@ void toPlain() {
     assertThat(plainMap.get("name")).isEqualTo("foo");
     assertThat(plainMap.get("other")).isEqualTo(Map.of("b", 42));
   }
+
+  @Test
+  void nullValuesInMap() {
+    String s = "{\"a\":1,\"b\":null,\"c\":null,\"d\":4}";
+    JsonNodeMapper mapper = JsonNodeMapper.builder().build();
+    JsonObject jsonObject = mapper.fromJsonObject(s);
+
+    assertThat(jsonObject.elements().keySet()).containsExactly("a", "b", "c", "d");
+  }
 }
diff --git a/json-node/src/test/java/io/avaje/json/node/adapter/JsonNodeAdaptersTest.java b/json-node/src/test/java/io/avaje/json/node/adapter/JsonNodeAdaptersTest.java
@@ -3,9 +3,11 @@
 import io.avaje.json.JsonAdapter;
 import io.avaje.json.JsonReader;
 import io.avaje.json.node.*;
+import io.avaje.json.simple.SimpleMapper;
 import io.avaje.json.stream.JsonStream;
 import org.junit.jupiter.api.Test;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.List;
 
@@ -67,9 +69,15 @@ void create_JsonDouble_expect_sameInstance() {
 
   @Test
   void create_JsonDecimal_expect_sameInstance() {
-    JsonAdapter<?> jsonAdapter = mapper.adapter(JsonDecimal.class);
+    JsonAdapter<JsonDecimal> jsonAdapter = mapper.adapter(JsonDecimal.class);
     JsonAdapter<JsonDecimal> adapter = mapper.adapter(JsonDecimal.class);
     assertThat(jsonAdapter).isSameAs(adapter);
+
+    SimpleMapper.Type<JsonDecimal> type = mapper.type(jsonAdapter);
+
+    String asJson1 = type.toJson(JsonDecimal.of(new BigDecimal("23.45")));
+    assertThat(asJson1).isEqualTo("23.45");
+    assertThat(type.fromJson(asJson1)).isEqualTo(JsonDecimal.of(new BigDecimal("23.45")));
   }
 
   @Test