Rename preloadJsonSchema in KeywordValidator to preloadSchema

Author: justin-tay

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

@@ -26,7 +26,7 @@
  * This doesn't extend off SchemaException as it is used for flow control
  * and is intended to be caught in a specific place.
  * <p>
- * This will be caught in the JsonSchema validate method to be passed to the
+ * This will be caught in the Schema validate method to be passed to the
  * output formatter.
  */
 public class FailFastAssertionException extends RuntimeException {

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

@@ -44,10 +44,10 @@
  * be cached for performance.
  * <p>
  * This is the core of json constraint implementation. It parses json constraint
- * file and generates JsonValidators. The class is thread safe, once it is
+ * file and generates KeywordValidators. The class is thread safe, once it is
  * constructed, it can be used to validate multiple json data concurrently.
  * <p>
- * JsonSchema instances are thread-safe provided its configuration is not
+ * Schema instances are thread-safe provided its configuration is not
  * modified.
  */
 public class Schema implements Validator {
@@ -1365,7 +1365,7 @@ public List<KeywordValidator> getValidators() {
     public void initializeValidators() {
         if (!this.validatorsLoaded) {
             for (final KeywordValidator validator : getValidators()) {
-                validator.preloadJsonSchema();
+                validator.preloadSchema();
             }
             /*
              * This is only set to true after the preload as it may throw an exception for

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

@@ -304,7 +304,7 @@ protected Schema newSchema(final SchemaLocation schemaUri, final JsonNode schema
      * @param config containing the configuration option
      */
     private void preload(Schema schema) {
-        if (this.getSchemaRegistryConfig().isPreloadJsonSchema()) {
+        if (this.getSchemaRegistryConfig().isPreloadSchema()) {
             try {
                 /*
                  * Attempt to preload and resolve $refs for performance.
@@ -358,7 +358,7 @@ private SchemaContext withDialect(SchemaContext schemaContext, JsonNode schemaNo
      * one with a null base IRI.
      * <p>
      * Note that the resolving of the $id or id in the schema node will take place
-     * in the JsonSchema constructor.
+     * in the Schema constructor.
      *
      * @param schemaLocation the schema retrieval uri
      * @return the schema location

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

@@ -281,7 +281,7 @@ public boolean isLosslessNarrowing() {
      * 
      * @return true if it should be preloaded
      */
-    public boolean isPreloadJsonSchema() {
+    public boolean isPreloadSchema() {
         return preloadSchema;
     }
 
@@ -511,11 +511,11 @@ public T pathType(PathType pathType) {
          * <p>
          * Defaults to true.
          *
-         * @param preloadJsonSchema true to preload
+         * @param preloadSchema true to preload
          * @return the builder
          */
-        public T preloadJsonSchema(boolean preloadJsonSchema) {
-            this.preloadSchema = preloadJsonSchema;
+        public T preloadSchema(boolean preloadSchema) {
+            this.preloadSchema = preloadSchema;
             return self();
         }
         /**

src/main/java/com/networknt/schema/keyword/AdditionalPropertiesValidator.java

@@ -192,7 +192,7 @@ private boolean hasUnevaluatedPropertiesValidator() {
     }
 
     @Override
-    public void preloadJsonSchema() {
+    public void preloadSchema() {
         if(additionalPropertiesSchema != null) {
             additionalPropertiesSchema.initializeValidators();
         }

src/main/java/com/networknt/schema/keyword/AllOfValidator.java

@@ -110,7 +110,7 @@ public void walk(ExecutionContext executionContext, JsonNode node, JsonNode root
    }
 
     @Override
-    public void preloadJsonSchema() {
-        preloadJsonSchemas(this.schemas);
+    public void preloadSchema() {
+        preloadSchemas(this.schemas);
     }
 }

src/main/java/com/networknt/schema/keyword/AnyOfValidator.java

@@ -216,8 +216,8 @@ protected boolean canShortCircuit() {
     }
 
     @Override
-    public void preloadJsonSchema() {
-        preloadJsonSchemas(this.schemas);
+    public void preloadSchema() {
+        preloadSchemas(this.schemas);
         canShortCircuit(); // cache flag
     }
 }

src/main/java/com/networknt/schema/keyword/BaseKeywordValidator.java

@@ -118,7 +118,7 @@ protected String getNodeFieldType() {
         return null;
     }
 
-    protected void preloadJsonSchemas(final Collection<Schema> schemas) {
+    protected void preloadSchemas(final Collection<Schema> schemas) {
         for (final Schema schema : schemas) {
             schema.initializeValidators();
         }

src/main/java/com/networknt/schema/keyword/ContainsValidator.java

@@ -179,7 +179,7 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
     }
 
     @Override
-    public void preloadJsonSchema() {
+    public void preloadSchema() {
         Optional.ofNullable(this.schema).ifPresent(Schema::initializeValidators);
         collectAnnotations(); // cache the flag
     }

src/main/java/com/networknt/schema/keyword/DependenciesValidator.java

@@ -85,7 +85,7 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
     }
 
     @Override
-    public void preloadJsonSchema() {
-        preloadJsonSchemas(schemaDeps.values());
+    public void preloadSchema() {
+        preloadSchemas(schemaDeps.values());
     }
 }