tidy up

Author: simbo1905

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

@@ -18,8 +18,6 @@ public class Jtd {
   /// Top-level definitions map for ref resolution
   private final Map<String, JtdSchema> definitions = new java.util.HashMap<>();
 
-  // Removed: RFC 8927 strict mode - no context-aware compilation needed
-  
   /// Stack frame for iterative validation with path and offset tracking
   record Frame(JtdSchema schema, JsonValue instance, String ptr, Crumbs crumbs, String discriminatorKey) {
     /// Constructor for normal validation without discriminator context
@@ -165,7 +163,7 @@ void validatePropertiesSchema(Frame frame, JtdSchema.PropertiesSchema propsSchem
       for (String key : obj.members().keySet()) {
         if (!propsSchema.properties().containsKey(key) && !propsSchema.optionalProperties().containsKey(key)) {
           // Only exempt the discriminator field itself, not all additional properties
-          if (discriminatorKey != null && key.equals(discriminatorKey)) {
+          if (key.equals(discriminatorKey)) {
             continue; // Skip the discriminator field - it's exempt
           }
           JsonValue value = obj.members().get(key);
@@ -204,14 +202,11 @@ void pushChildFrames(Frame frame, java.util.Deque<Frame> stack) {
         if (instance instanceof JsonObject obj) {
           String discriminatorKey = frame.discriminatorKey();
 
-          // ================================= CHANGE 1: SKIP DISCRIMINATOR FIELD =================================
-          // ADDED: Skip the discriminator field when pushing required property validation frames
-          // Push required properties that are present (except discriminator field)
           for (var entry : propsSchema.properties().entrySet()) {
             String key = entry.getKey();
 
             // Skip the discriminator field - it was already validated by discriminator logic
-            if (discriminatorKey != null && key.equals(discriminatorKey)) {
+            if (key.equals(discriminatorKey)) {
               LOG.finer(() -> "Skipping discriminator field validation for: " + key);
               continue;
             }
@@ -227,13 +222,11 @@ void pushChildFrames(Frame frame, java.util.Deque<Frame> stack) {
             }
           }
 
-          // ADDED: Skip the discriminator field when pushing optional property validation frames
-          // Push optional properties that are present (except discriminator field)
           for (var entry : propsSchema.optionalProperties().entrySet()) {
             String key = entry.getKey();
 
             // Skip the discriminator field - it was already validated by discriminator logic
-            if (discriminatorKey != null && key.equals(discriminatorKey)) {
+            if (key.equals(discriminatorKey)) {
               LOG.finer(() -> "Skipping discriminator field validation for optional: " + key);
               continue;
             }
@@ -250,7 +243,6 @@ void pushChildFrames(Frame frame, java.util.Deque<Frame> stack) {
             }
           }
 
-          // ============================= END CHANGE 1: SKIP DISCRIMINATOR FIELD =============================
         }
       }
       case JtdSchema.ValuesSchema valuesSchema -> {
@@ -274,23 +266,9 @@ void pushChildFrames(Frame frame, java.util.Deque<Frame> stack) {
             JtdSchema variantSchema = discSchema.mapping().get(discriminatorValueStr);
             if (variantSchema != null) {
 
-              // ========================== CHANGE 2: REMOVE FAULTY OPTIMIZATION ==========================
-              // REMOVED: Special-case optimization that skipped validation for discriminator-only objects
-              // OLD CODE:
-              // if (obj.members().size() == 1 && obj.members().containsKey(discSchema.discriminator())) {
-              //   LOG.finer(() -> "Skipping variant schema push for discriminator-only object");
-              // } else {
-              //   Frame variantFrame = new Frame(variantSchema, instance, frame.ptr, frame.crumbs, discSchema.discriminator());
-              //   stack.push(variantFrame);
-              //   LOG.finer(() -> "Pushed discriminator variant frame for " + discriminatorValueStr + " with discriminator key: " + discSchema.discriminator());
-              // }
-
-              // NEW CODE: Always 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 + " with discriminator key: " + discSchema.discriminator());
-              // ======================== END CHANGE 2: REMOVE FAULTY OPTIMIZATION ========================
-
             }
           }
         }
@@ -500,11 +478,8 @@ JtdSchema compilePropertiesSchema(JsonObject obj) {
         throw new IllegalArgumentException("additionalProperties must be a boolean");
       }
       additionalProperties = bool.value();
-    } else if (properties.isEmpty() && optionalProperties.isEmpty()) {
-      // Empty schema with no properties defined rejects additional properties by default
-      additionalProperties = false;
-    }
-    
+    }  // Empty schema with no properties defined rejects additional properties by default
+
     return new JtdSchema.PropertiesSchema(properties, optionalProperties, additionalProperties);
   }
 

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

@@ -8,7 +8,7 @@
 
 /// JTD Schema interface - validates JSON instances against JTD schemas
 /// Following RFC 8927 specification with eight mutually-exclusive schema forms
-public sealed interface JtdSchema {
+sealed interface JtdSchema {
 
   /// Validates a JSON instance against this schema
   /// @param instance The JSON value to validate
@@ -210,12 +210,9 @@ static boolean isValidRfc3339Timestamp(String timestamp) {
 
         // Handle leap seconds: seconds = 60 is valid only if minutes = 59
         if (second == 60) {
-          if (minute != 59) {
-            return false;
-          }
+          return minute == 59;
           // For leap seconds, we accept the format but don't validate the specific date
           // This matches RFC 8927 behavior - format validation only
-          return true;
         }
 
         if (second < 0 || second > 59) {
@@ -364,7 +361,7 @@ public Jtd.Result validate(JsonValue instance, boolean verboseErrors) {
     public boolean validateWithFrame(Jtd.Frame frame, java.util.List<String> errors, boolean verboseErrors) {
       JsonValue instance = frame.instance();
 
-      if (!(instance instanceof JsonArray arr)) {
+      if (!(instance instanceof JsonArray)) {
         String error = verboseErrors
             ? Jtd.Error.EXPECTED_ARRAY.message(instance, instance.getClass().getSimpleName())
             : Jtd.Error.EXPECTED_ARRAY.message(instance.getClass().getSimpleName());

json-java21-jtd/src/test/java/json/java21/jdt/demo/VisibilityTest.java

@@ -0,0 +1,32 @@
+package json.java21.jdt.demo;
+
+import jdk.sandbox.java.util.json.Json;
+import jdk.sandbox.java.util.json.JsonValue;
+import json.java21.jtd.Jtd;
+import json.java21.jtd.JtdTestBase;
+import org.junit.jupiter.api.Test;
+
+import java.util.logging.Logger;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+public class VisibilityTest extends JtdTestBase {
+
+  static final Logger LOG = Logger.getLogger("json.java21.jtd");
+
+  /// Test ref schema resolution with valid definitions
+  /// RFC 8927 Section 3.3.2: Ref schemas must resolve against definitions
+  @Test
+  public void testRefSchemaValid() {
+    JsonValue schema = Json.parse("{\"ref\": \"address\", \"definitions\": {\"address\": {\"type\": \"string\"}}}");
+    JsonValue validData = Json.parse("\"123 Main St\"");
+
+    Jtd validator = new Jtd();
+    Jtd.Result result = validator.validate(schema, validData);
+
+    assertThat(result.isValid()).isTrue();
+    assertThat(result.errors()).isEmpty();
+    LOG.fine(() -> "Ref schema valid test - schema: " + schema + ", data: " + validData);
+  }
+}