Validate required properties on empty object, re #48

jsonx-org · Oct 6, 2023 · 57859d1 · 57859d1
1 parent 3cf765d
commit 57859d1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/binding/src/main/java/org/jsonx/ObjectCodec.java b/binding/src/main/java/org/jsonx/ObjectCodec.java
@@ -146,10 +146,16 @@ else if (codec instanceof ArrayCodec) {
       }
 
       // If this {...} contained properties, ensure that no properties are missing (i.e. use=required).
-      if (unvisitedCodecs != null)
+      if (unvisitedCodecs != null) {
         for (final Codec unvisitedCodec : unvisitedCodecs) // [A]
           if (unvisitedCodec != null && unvisitedCodec.use == Use.REQUIRED)
             return abort(Error.PROPERTY_REQUIRED(unvisitedCodec.name, null), reader, index);
+      }
+      else {
+        for (final Codec unvisitedCodec : propertyToCodec.allCodecs) // [A]
+          if (unvisitedCodec.use == Use.REQUIRED)
+            return abort(Error.PROPERTY_REQUIRED(unvisitedCodec.name, null), reader, index);
+      }
 
       return object;
     }

diff --git a/binding/src/test/java/org/jsonx/LibraryTest.java b/binding/src/test/java/org/jsonx/LibraryTest.java
@@ -105,9 +105,21 @@ public void testAddressDecodeException() throws IOException {
     try {
       final String json = "{\"street\":\"Sukhumvit Soi 13\",\"city\":\"Salt Lake City\",\"postalCode\":\"19207\",\"locality\":\"Minnesota\",\"country\":\"Thailand\"}";
       JxDecoder.VALIDATING.parseObject(json, Address.class);
-      fail("Expected DecodeException due to missing \"number\"");
+      fail("Expected DecodeException");
+    }
+    catch (final DecodeException e) {
+      assertEquals("Property \"number\" is required: null", e.getMessage());
+    }
+  }
+
+  @Test
+  public void testAddressDecodeExceptionEmpty() throws IOException {
+    try {
+      JxDecoder.VALIDATING.parseObject("{}", Address.class);
+      fail("Expected DecodeException");
     }
     catch (final DecodeException e) {
+      assertEquals("Property \"number\" is required: null", e.getMessage());
     }
   }