tidy

Author: simbo1905

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

@@ -17,6 +17,13 @@ public class Jtd {
 
   private static final Logger LOG = Logger.getLogger(Jtd.class.getName());
 
+  /// RFC 8927 §2.2.3: Valid primitive types for type schema validation
+  private static final Set<String> VALID_TYPES = Set.of(
+    "boolean", "string", "timestamp",
+    "int8", "uint8", "int16", "uint16", "int32", "uint32",
+    "float32", "float64"
+  );
+  
   /// Top-level definitions map for ref resolution
   private final Map<String, JtdSchema> definitions = new java.util.HashMap<>();
 
@@ -497,13 +504,7 @@ JtdSchema compileTypeSchema(JsonObject obj) {
     String typeStr = str.value();
 
     // RFC 8927 §2.2.3: Validate that type is one of the supported primitive types
-    Set<String> validTypes = Set.of(
-      "boolean", "string", "timestamp",
-      "int8", "uint8", "int16", "uint16", "int32", "uint32",
-      "float32", "float64"
-    );
-    
-    if (!validTypes.contains(typeStr)) {
+    if (!VALID_TYPES.contains(typeStr)) {
       throw new IllegalArgumentException("unknown type: '" + typeStr + 
           "', expected one of: boolean, string, timestamp, int8, uint8, int16, uint16, int32, uint32, float32, float64");
     }
@@ -662,16 +663,16 @@ JtdSchema compileDiscriminatorSchema(JsonObject obj, boolean isRoot) {
   void validateDiscriminatorMapping(String mappingKey, JtdSchema variantSchema, String discriminatorKey) {
     // Check if this is a nullable schema and unwrap it
     JtdSchema unwrappedSchema = variantSchema;
-    boolean isNullable = false;
+    boolean wasNullableWrapper = false;
 
     if (variantSchema instanceof JtdSchema.NullableSchema nullableSchema) {
-      isNullable = true;
+      wasNullableWrapper = true;
       unwrappedSchema = nullableSchema.wrapped();
     }
 
     // RFC 8927 §2.2.8: Mapping values must be PropertiesSchema
     if (!(unwrappedSchema instanceof JtdSchema.PropertiesSchema)) {
-      String schemaType = isNullable ? "nullable " + unwrappedSchema.getClass().getSimpleName() : 
+      String schemaType = wasNullableWrapper ? "nullable " + unwrappedSchema.getClass().getSimpleName() : 
                           unwrappedSchema.getClass().getSimpleName();
       throw new IllegalArgumentException(
         "Discriminator mapping '" + mappingKey + "' must be a properties schema, found: " + schemaType);
@@ -680,7 +681,7 @@ void validateDiscriminatorMapping(String mappingKey, JtdSchema variantSchema, St
     JtdSchema.PropertiesSchema propsSchema = (JtdSchema.PropertiesSchema) unwrappedSchema;
 
     // RFC 8927 §2.2.8: Mapped schemas cannot have nullable: true
-    if (isNullable) {
+    if (wasNullableWrapper) {
       throw new IllegalArgumentException(
         "Discriminator mapping '" + mappingKey + "' cannot be nullable");
     }

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

@@ -264,11 +264,7 @@ private static Arbitrary<JtdTestSchema> enumSchemaArbitrary() {
     // Ensure no duplicates by using distinct values
     return Arbitraries.of(ENUM_VALUES).list().ofMinSize(1).ofMaxSize(4).map(values -> {
       // Remove duplicates to ensure valid enum schema per RFC 8927
-      List<String> distinctValues = values.stream().distinct().collect(Collectors.toList());
-      // Ensure we still have at least one value after deduplication
-      if (distinctValues.isEmpty()) {
-        distinctValues = List.of(ENUM_VALUES.get(0)); // Use first value as fallback
-      }
+      List<String> distinctValues = values.stream().distinct().toList();
       return new EnumSchema(new ArrayList<>(distinctValues));
     });
   }
@@ -463,12 +459,15 @@ void exhaustiveJtdValidation(@ForAll("jtdSchemas") JtdPropertyTest.JtdTestSchema
     final var validationResult = validator.validate(schemaJson, compliantDocument);
 
     if (!validationResult.isValid()) {
-      LOG.severe(() -> String.format("ERROR: Compliant document failed validation!%nSchema JSON: %s%nDocument JSON: %s%nValidation Errors: %s%nSchema Description: %s%nFull Schema Object: %s", 
-                                     Json.toDisplayString(schemaJson, 2), 
-                                     Json.toDisplayString(compliantDocument, 2), 
-                                     validationResult.errors(), 
-                                     schemaDescription, 
-                                     schema));
+      String errorMessage = String.format(
+        "ERROR: Compliant document failed validation!%nSchema JSON: %s%nDocument JSON: %s%nValidation Errors: %s%nSchema Description: %s%nFull Schema Object: %s",
+        Json.toDisplayString(schemaJson, 2),
+        Json.toDisplayString(compliantDocument, 2),
+        validationResult.errors(),
+        schemaDescription,
+        schema
+      );
+      LOG.severe(() -> errorMessage);
     }
 
     assertThat(validationResult.isValid()).as("Compliant JTD document should validate for schema %s", schemaDescription).isTrue();