feat(validate): Object validation with required/properties/additionalProperties

Author: thced

src/main/java/com/retailsvc/http/validate/DefaultValidator.java

@@ -1,6 +1,7 @@
 package com.retailsvc.http.validate;
 
 import com.retailsvc.http.ValidationException;
+import com.retailsvc.http.spec.schema.AdditionalProperties;
 import com.retailsvc.http.spec.schema.AllOfSchema;
 import com.retailsvc.http.spec.schema.AnyOfSchema;
 import com.retailsvc.http.spec.schema.ArraySchema;
@@ -19,6 +20,7 @@
 import com.retailsvc.http.spec.schema.TypeName;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
+import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
 import java.util.function.Function;
@@ -154,8 +156,43 @@ else if (value instanceof String str) {
       fail(pointer, "multipleOf", "not a multiple of " + s.multipleOf(), n);
   }
 
+  @SuppressWarnings("unchecked")
   private void validateObject(Object value, ObjectSchema s, String pointer) {
-    throw new UnsupportedOperationException("E4 implements object");
+    require(value instanceof Map, pointer, "type", "expected object");
+    Map<String, Object> map = (Map<String, Object>) value;
+
+    for (String required : s.required()) {
+      require(
+          map.containsKey(required),
+          pointer + "/" + required,
+          "required",
+          "required property missing");
+    }
+
+    if (s.minProperties() != null && map.size() < s.minProperties())
+      fail(pointer, "minProperties", "fewer than " + s.minProperties() + " properties", map.size());
+    if (s.maxProperties() != null && map.size() > s.maxProperties())
+      fail(pointer, "maxProperties", "more than " + s.maxProperties() + " properties", map.size());
+
+    for (var entry : map.entrySet()) {
+      String childPointer = pointer + "/" + entry.getKey();
+      Schema propSchema = s.properties().get(entry.getKey());
+      if (propSchema != null) {
+        validate(entry.getValue(), propSchema, childPointer);
+      } else {
+        switch (s.additionalProperties()) {
+          case AdditionalProperties.Allowed a -> {}
+          case AdditionalProperties.Forbidden f ->
+              fail(
+                  childPointer,
+                  "additionalProperties",
+                  "additional property not allowed",
+                  entry.getKey());
+          case AdditionalProperties.SchemaConstraint sc ->
+              validate(entry.getValue(), sc.schema(), childPointer);
+        }
+      }
+    }
   }
 
   private void validateArray(Object value, ArraySchema s, String pointer) {

src/test/java/com/retailsvc/http/validate/ObjectValidationTest.java

@@ -0,0 +1,75 @@
+package com.retailsvc.http.validate;
+
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import com.retailsvc.http.ValidationException;
+import com.retailsvc.http.spec.schema.AdditionalProperties;
+import com.retailsvc.http.spec.schema.ObjectSchema;
+import com.retailsvc.http.spec.schema.Schema;
+import com.retailsvc.http.spec.schema.StringSchema;
+import com.retailsvc.http.spec.schema.TypeName;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.junit.jupiter.api.Test;
+
+class ObjectValidationTest {
+  private final Validator v =
+      new DefaultValidator(
+          name -> {
+            throw new AssertionError();
+          });
+
+  private ObjectSchema obj(
+      Map<String, Schema> props, List<String> required, AdditionalProperties ap) {
+    return new ObjectSchema(Set.of(TypeName.OBJECT), props, required, ap, null, null);
+  }
+
+  @Test
+  void requiredFieldMissing() {
+    var s =
+        obj(
+            Map.of("name", new StringSchema(Set.of(TypeName.STRING), null, null, null, null, null)),
+            List.of("name"),
+            new AdditionalProperties.Allowed());
+    assertThatThrownBy(() -> v.validate(Map.of(), s, ""))
+        .isInstanceOf(ValidationException.class)
+        .extracting(t -> ((ValidationException) t).error().keyword())
+        .isEqualTo("required");
+  }
+
+  @Test
+  void propertyValidatedAtPointer() {
+    var s =
+        obj(
+            Map.of("name", new StringSchema(Set.of(TypeName.STRING), null, 3, null, null, null)),
+            List.of(),
+            new AdditionalProperties.Allowed());
+    assertThatThrownBy(() -> v.validate(Map.of("name", "ab"), s, ""))
+        .extracting(t -> ((ValidationException) t).error().pointer())
+        .isEqualTo("/name");
+  }
+
+  @Test
+  void additionalPropertiesAllowedByDefault() {
+    var s = obj(Map.of(), List.of(), new AdditionalProperties.Allowed());
+    assertThatCode(() -> v.validate(Map.of("extra", "x"), s, "")).doesNotThrowAnyException();
+  }
+
+  @Test
+  void additionalPropertiesForbidden() {
+    var s = obj(Map.of(), List.of(), new AdditionalProperties.Forbidden());
+    assertThatThrownBy(() -> v.validate(Map.of("extra", "x"), s, ""))
+        .extracting(t -> ((ValidationException) t).error().keyword())
+        .isEqualTo("additionalProperties");
+  }
+
+  @Test
+  void rejectsNonObject() {
+    var s = obj(Map.of(), List.of(), new AdditionalProperties.Allowed());
+    assertThatThrownBy(() -> v.validate("nope", s, "/v"))
+        .extracting(t -> ((ValidationException) t).error().keyword())
+        .isEqualTo("type");
+  }
+}