wip

Author: simbo1905

json-java21-jtd/src/main/java/json/java21/jtd/Jtd.java

@@ -20,7 +20,12 @@ public class Jtd {
   private final Map<String, JtdSchema> compiledDefinitions = new java.util.HashMap<>();
 
   /// Stack frame for iterative validation with path and offset tracking
-  record Frame(JtdSchema schema, JsonValue instance, String ptr, Crumbs crumbs) {}
+  record Frame(JtdSchema schema, JsonValue instance, String ptr, Crumbs crumbs, String discriminatorKey) {
+    /// Constructor for normal validation without discriminator context
+    Frame(JtdSchema schema, JsonValue instance, String ptr, Crumbs crumbs) {
+      this(schema, instance, ptr, crumbs, null);
+    }
+  }
 
   /// Lightweight breadcrumb trail for human-readable error paths
   record Crumbs(String value) {
@@ -145,7 +150,8 @@ void validatePropertiesSchema(Frame frame, JtdSchema.PropertiesSchema propsSchem
     }
 
     // Check for additional properties if not allowed
-    if (!propsSchema.additionalProperties()) {
+    // RFC 8927 §2.2.8: In discriminator context, variant schemas ignore additionalProperties enforcement
+    if (!propsSchema.additionalProperties() && frame.discriminatorKey() == null) {
       for (String key : obj.members().keySet()) {
         if (!propsSchema.properties().containsKey(key) && !propsSchema.optionalProperties().containsKey(key)) {
           JsonValue value = obj.members().get(key);
@@ -232,10 +238,10 @@ void pushChildFrames(Frame frame, java.util.Deque<Frame> stack) {
             String discriminatorValueStr = discStr.value();
             JtdSchema variantSchema = discSchema.mapping().get(discriminatorValueStr);
             if (variantSchema != null) {
-              // Push variant schema for validation
-              Frame variantFrame = new Frame(variantSchema, instance, frame.ptr, frame.crumbs);
+              // Push variant schema for validation with discriminator key context
+              Frame variantFrame = new Frame(variantSchema, instance, frame.ptr, frame.crumbs, discSchema.discriminator());
               stack.push(variantFrame);
-              LOG.finer(() -> "Pushed discriminator variant frame for " + discriminatorValueStr);
+              LOG.finer(() -> "Pushed discriminator variant frame for " + discriminatorValueStr + " with discriminator key: " + discSchema.discriminator());
             }
           }
         }

json-java21-jtd/src/main/java/json/java21/jtd/JtdSchema.java

@@ -83,8 +83,8 @@ public Jtd.Result validate(JsonValue instance) {
 
     @Override
     public boolean validateWithFrame(Jtd.Frame frame, java.util.List<String> errors, boolean verboseErrors) {
-      // Create new frame with the resolved schema but same instance, path, and crumbs
-      Jtd.Frame resolvedFrame = new Jtd.Frame(resolvedSchema, frame.instance(), frame.ptr(), frame.crumbs());
+      // Create new frame with the resolved schema but preserve all context including discriminator key
+      Jtd.Frame resolvedFrame = new Jtd.Frame(resolvedSchema, frame.instance(), frame.ptr(), frame.crumbs(), frame.discriminatorKey());
       return resolvedSchema.validateWithFrame(resolvedFrame, errors, verboseErrors);
     }
   }

json-java21-jtd/src/test/java/json/java21/jtd/TestRfc8927Compliance.java

@@ -9,7 +9,7 @@
 /// RFC 8927 compliance tests for failing JTD specification cases
 /// These are the exact test cases that were failing in JtdSpecIT
 /// with explicit multiline strings for schema and JSON documents
-public class TestRfc8927Compliance extends JtdTestBase {
+  public class TestRfc8927Compliance extends JtdTestBase {
 
   /// Test ref schema with nested definitions
   /// "ref schema - nested ref" from JTD specification test suite
@@ -290,4 +290,4 @@ public void testStrictMixedPropertiesBadAdditionalProperty() throws Exception {
       .isNotEmpty()
       .anySatisfy(error -> assertThat(error).contains("baz"));
   }
-}
+}