Rename JsonSchemaIdValidator to SchemaIdValidator

Author: justin-tay

src/main/java/com/networknt/schema/Schema.java

@@ -182,7 +182,7 @@ private static SchemaLocation resolve(SchemaLocation schemaLocation, JsonNode sc
                 resolve = id.substring(0, fragment);
             }
             SchemaLocation result = !"".equals(resolve) ? schemaLocation.resolve(resolve) : schemaLocation;
-            JsonSchemaIdValidator validator = schemaContext.getSchemaRegistryConfig().getSchemaIdValidator();
+            SchemaIdValidator validator = schemaContext.getSchemaRegistryConfig().getSchemaIdValidator();
             if (validator != null) {
                 if (!validator.validate(id, rootSchema, schemaLocation, result, schemaContext)) {
                     SchemaLocation idSchemaLocation = schemaLocation.append(schemaContext.getDialect().getIdKeyword());

src/main/java/com/networknt/schema/JsonSchemaIdValidator.java renamed to src/main/java/com/networknt/schema/SchemaIdValidator.java

@@ -21,7 +21,7 @@
 /**
  * Validator for validating the correctness of $id.
  */
-public interface JsonSchemaIdValidator {
+public interface SchemaIdValidator {
     /**
      * Validates if the $id value is valid.
      * 
@@ -36,10 +36,10 @@ public interface JsonSchemaIdValidator {
     boolean validate(String id, boolean rootSchema, SchemaLocation schemaLocation,
             SchemaLocation resolvedSchemaLocation, SchemaContext schemaContext);
 
-    JsonSchemaIdValidator DEFAULT = new DefaultJsonSchemaIdValidator();
+    SchemaIdValidator DEFAULT = new DefaultSchemaIdValidator();
 
     /**
-     * Implementation of {@link JsonSchemaIdValidator}.
+     * Implementation of {@link SchemaIdValidator}.
      * <p>
      * Note that this does not strictly follow the specification.
      * <p>
@@ -48,7 +48,7 @@ boolean validate(String id, boolean rootSchema, SchemaLocation schemaLocation,
      * <p>
      * This also allows non-empty fragments.
      */
-    class DefaultJsonSchemaIdValidator implements JsonSchemaIdValidator {
+    class DefaultSchemaIdValidator implements SchemaIdValidator {
         @Override
         public boolean validate(String id, boolean rootSchema, SchemaLocation schemaLocation,
                 SchemaLocation resolvedSchemaLocation, SchemaContext schemaContext) {

src/main/java/com/networknt/schema/SchemaRegistryConfig.java

@@ -118,7 +118,7 @@ public static SchemaRegistryConfig getInstance() {
     /**
      * Used to validate the acceptable $id values.
      */
-    private final JsonSchemaIdValidator schemaIdValidator;
+    private final SchemaIdValidator schemaIdValidator;
 
     /**
      * Contains a mapping of how strict a keyword's validators should be.
@@ -142,7 +142,7 @@ protected SchemaRegistryConfig(boolean cacheRefs,
             Locale locale, boolean losslessNarrowing,
             MessageSource messageSource, PathType pathType,
             boolean preloadJsonSchema, int preloadJsonSchemaRefMaxNestingDepth,
-            RegularExpressionFactory regularExpressionFactory, JsonSchemaIdValidator schemaIdValidator,
+            RegularExpressionFactory regularExpressionFactory, SchemaIdValidator schemaIdValidator,
             Map<String, Boolean> strictness, boolean typeLoose) {
         super();
         this.cacheRefs = cacheRefs;
@@ -246,7 +246,7 @@ public RegularExpressionFactory getRegularExpressionFactory() {
      * 
      * @return the validator
      */
-    public JsonSchemaIdValidator getSchemaIdValidator() {
+    public SchemaIdValidator getSchemaIdValidator() {
         return schemaIdValidator;
     }
 
@@ -386,7 +386,7 @@ public static abstract class BuilderSupport<T> {
         protected boolean preloadJsonSchema = true;
         protected int preloadJsonSchemaRefMaxNestingDepth = DEFAULT_PRELOAD_JSON_SCHEMA_REF_MAX_NESTING_DEPTH;
         protected RegularExpressionFactory regularExpressionFactory = JDKRegularExpressionFactory.getInstance();
-        protected JsonSchemaIdValidator schemaIdValidator = JsonSchemaIdValidator.DEFAULT;
+        protected SchemaIdValidator schemaIdValidator = SchemaIdValidator.DEFAULT;
         protected Map<String, Boolean> strictness = new HashMap<>(0);
         protected boolean typeLoose = false;
 
@@ -550,12 +550,12 @@ public T regularExpressionFactory(RegularExpressionFactory regularExpressionFact
         /**
          * Sets the schema id validator to use.
          * <p>
-         * Defaults to {@link JsonSchemaIdValidator#DEFAULT}.
+         * Defaults to {@link SchemaIdValidator#DEFAULT}.
          *
          * @param schemaIdValidator the builder
          * @return the builder
          */
-        public T schemaIdValidator(JsonSchemaIdValidator schemaIdValidator) {
+        public T schemaIdValidator(SchemaIdValidator schemaIdValidator) {
             this.schemaIdValidator = schemaIdValidator;
             return self();
         }

src/test/java/com/networknt/schema/DefaultJsonSchemaIdValidatorTest.java

@@ -32,7 +32,7 @@ void givenRelativeIdShouldThrowInvalidSchemaException() {
         String schema = "{\r\n" + "  \"$id\": \"0\",\r\n"
                 + "  \"$schema\": \"https://json-schema.org/draft/2020-12/schema\"\r\n" + "}";
         SchemaRegistryConfig config = SchemaRegistryConfig.builder()
-                .schemaIdValidator(JsonSchemaIdValidator.DEFAULT)
+                .schemaIdValidator(SchemaIdValidator.DEFAULT)
                 .build();
         assertThrowsExactly(InvalidSchemaException.class,
                 () -> SchemaRegistry.withDefaultDialect(Version.DRAFT_2020_12, builder -> builder.schemaRegistryConfig(config)).getSchema(schema));
@@ -48,7 +48,7 @@ void givenFragmentWithNoContextShouldNotThrowInvalidSchemaException() {
         String schema = "{\r\n" + "  \"$id\": \"#0\",\r\n"
                 + "  \"$schema\": \"https://json-schema.org/draft/2020-12/schema\"\r\n" + "}";
         SchemaRegistryConfig config = SchemaRegistryConfig.builder()
-                .schemaIdValidator(JsonSchemaIdValidator.DEFAULT)
+                .schemaIdValidator(SchemaIdValidator.DEFAULT)
                 .build();
         assertDoesNotThrow(() -> SchemaRegistry.withDefaultDialect(Version.DRAFT_2020_12, builder -> builder.schemaRegistryConfig(config)).getSchema(schema));
     }
@@ -58,15 +58,15 @@ void givenSlashWithNoContextShouldNotThrowInvalidSchemaException() {
         String schema = "{\r\n" + "  \"$id\": \"/base\",\r\n"
                 + "  \"$schema\": \"https://json-schema.org/draft/2020-12/schema\"\r\n" + "}";
         SchemaRegistryConfig config = SchemaRegistryConfig.builder()
-                .schemaIdValidator(JsonSchemaIdValidator.DEFAULT)
+                .schemaIdValidator(SchemaIdValidator.DEFAULT)
                 .build();
         assertDoesNotThrow(() -> SchemaRegistry.withDefaultDialect(Version.DRAFT_2020_12, builder -> builder.schemaRegistryConfig(config)).getSchema(schema));
     }
 
     @Test
     void givenRelativeIdWithClasspathBaseShouldNotThrowInvalidSchemaException() {
         SchemaRegistryConfig config = SchemaRegistryConfig.builder()
-                .schemaIdValidator(JsonSchemaIdValidator.DEFAULT)
+                .schemaIdValidator(SchemaIdValidator.DEFAULT)
                 .build();
         assertDoesNotThrow(() -> SchemaRegistry.withDefaultDialect(Version.DRAFT_2020_12, builder -> builder.schemaRegistryConfig(config))
                 .getSchema(SchemaLocation.of("classpath:schema/id-relative.json")));

src/test/java/com/networknt/schema/Issue936Test.java

@@ -28,7 +28,7 @@ void shouldThrowInvalidSchemaException() {
         String schema = "{\r\n" + "  \"$id\": \"0\",\r\n"
                 + "  \"$schema\": \"https://json-schema.org/draft/2020-12/schema\"\r\n" + "}";
         SchemaRegistryConfig config = SchemaRegistryConfig.builder()
-                .schemaIdValidator(JsonSchemaIdValidator.DEFAULT)
+                .schemaIdValidator(SchemaIdValidator.DEFAULT)
                 .build();
         assertThrowsExactly(InvalidSchemaException.class,
                 () -> SchemaRegistry.withDefaultDialect(Version.DRAFT_2020_12, builder -> builder.schemaRegistryConfig(config)).getSchema(schema));