Rename JsonSchema to Schema

Author: justin-tay

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

@@ -18,7 +18,7 @@ public class ErrorMessages {
      * @param keyword             the keyword
      * @return the custom error message
      */
-    public static Map<String, String> getErrorMessage(JsonSchema parentSchema, String errorMessageKeyword,
+    public static Map<String, String> getErrorMessage(Schema parentSchema, String errorMessageKeyword,
             String keyword) {
         final JsonNode message = getMessageNode(errorMessageKeyword, parentSchema.schemaNode, parentSchema, keyword);
         if (message != null) {
@@ -39,7 +39,7 @@ public static Map<String, String> getErrorMessage(JsonSchema parentSchema, Strin
         return Collections.emptyMap();
     }
 
-    protected static JsonNode getMessageNode(String errorMessageKeyword, JsonNode schemaNode, JsonSchema parentSchema,
+    protected static JsonNode getMessageNode(String errorMessageKeyword, JsonNode schemaNode, Schema parentSchema,
             String pname) {
         if (schemaNode.get(errorMessageKeyword) != null && schemaNode.get(errorMessageKeyword).get(pname) != null) {
             return schemaNode.get(errorMessageKeyword);

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

@@ -47,7 +47,7 @@
 import java.util.function.Consumer;
 
 /**
- * Factory for building {@link JsonSchema} instances. The factory should be
+ * Factory for building {@link Schema} instances. The factory should be
  * typically be created using {@link #getInstance(Version, Consumer)} and
  * should be cached for performance.
  * <p>
@@ -196,7 +196,7 @@ public JsonSchemaFactory build() {
     private final SchemaMappers.Builder schemaMappersBuilder;
     private final SchemaLoader schemaLoader;
     private final ConcurrentMap<String, Dialect> metaSchemas;
-    private final ConcurrentMap<SchemaLocation, JsonSchema> schemaCache = new ConcurrentHashMap<>();
+    private final ConcurrentMap<SchemaLocation, Schema> schemaCache = new ConcurrentHashMap<>();
     private final boolean enableSchemaCache;
     private final DialectRegistry metaSchemaFactory;
 
@@ -333,9 +333,9 @@ public static Builder builder(final JsonSchemaFactory blueprint) {
      * @param config the config to use
      * @return the schema
      */
-    protected JsonSchema newJsonSchema(final SchemaLocation schemaUri, final JsonNode schemaNode, final SchemaValidatorsConfig config) {
+    protected Schema newJsonSchema(final SchemaLocation schemaUri, final JsonNode schemaNode, final SchemaValidatorsConfig config) {
         final ValidationContext validationContext = createValidationContext(schemaNode, config);
-        JsonSchema jsonSchema = doCreate(validationContext, getSchemaLocation(schemaUri),
+        Schema jsonSchema = doCreate(validationContext, getSchemaLocation(schemaUri),
                 new JsonNodePath(validationContext.getConfig().getPathType()), schemaNode, null, false);
         preload(jsonSchema, config);
         return jsonSchema;
@@ -347,7 +347,7 @@ protected JsonSchema newJsonSchema(final SchemaLocation schemaUri, final JsonNod
      * @param jsonSchema the schema to preload
      * @param config containing the configuration option
      */
-    private void preload(JsonSchema jsonSchema, SchemaValidatorsConfig config) {
+    private void preload(Schema jsonSchema, SchemaValidatorsConfig config) {
         if (config.isPreloadJsonSchema()) {
             try {
                 /*
@@ -365,12 +365,12 @@ private void preload(JsonSchema jsonSchema, SchemaValidatorsConfig config) {
         }
     }
 
-    public JsonSchema create(ValidationContext validationContext, SchemaLocation schemaLocation, JsonNodePath evaluationPath, JsonNode schemaNode, JsonSchema parentSchema) {
+    public Schema create(ValidationContext validationContext, SchemaLocation schemaLocation, JsonNodePath evaluationPath, JsonNode schemaNode, Schema parentSchema) {
         return doCreate(validationContext, schemaLocation, evaluationPath, schemaNode, parentSchema, false);
     }
 
-    private JsonSchema doCreate(ValidationContext validationContext, SchemaLocation schemaLocation, JsonNodePath evaluationPath, JsonNode schemaNode, JsonSchema parentSchema, boolean suppressSubSchemaRetrieval) {
-        return JsonSchema.from(withMetaSchema(validationContext, schemaNode), schemaLocation, evaluationPath,
+    private Schema doCreate(ValidationContext validationContext, SchemaLocation schemaLocation, JsonNodePath evaluationPath, JsonNode schemaNode, Schema parentSchema, boolean suppressSubSchemaRetrieval) {
+        return Schema.from(withMetaSchema(validationContext, schemaNode), schemaLocation, evaluationPath,
                 schemaNode, parentSchema, suppressSubSchemaRetrieval);
     }
 
@@ -509,7 +509,7 @@ ObjectMapper getObjectMapper(InputFormat inputFormat) {
      * @param config the config
      * @return the schema
      */
-    public JsonSchema getSchema(final String schema, final SchemaValidatorsConfig config) {
+    public Schema getSchema(final String schema, final SchemaValidatorsConfig config) {
         return getSchema(schema, InputFormat.JSON, config);
     }
 
@@ -524,7 +524,7 @@ public JsonSchema getSchema(final String schema, final SchemaValidatorsConfig co
      * @param config the config
      * @return the schema
      */
-    public JsonSchema getSchema(final String schema, InputFormat inputFormat, final SchemaValidatorsConfig config) {
+    public Schema getSchema(final String schema, InputFormat inputFormat, final SchemaValidatorsConfig config) {
         try {
             final JsonNode schemaNode = readTree(schema, inputFormat);
             return newJsonSchema(null, schemaNode, config);
@@ -544,7 +544,7 @@ public JsonSchema getSchema(final String schema, InputFormat inputFormat, final
      * @param schema the schema data as a string
      * @return the schema
      */
-    public JsonSchema getSchema(final String schema) {
+    public Schema getSchema(final String schema) {
         return getSchema(schema, createSchemaValidatorsConfig());
     }
 
@@ -558,7 +558,7 @@ public JsonSchema getSchema(final String schema) {
      * @param inputFormat input format
      * @return the schema
      */
-    public JsonSchema getSchema(final String schema, InputFormat inputFormat) {
+    public Schema getSchema(final String schema, InputFormat inputFormat) {
         return getSchema(schema, inputFormat, createSchemaValidatorsConfig());
     }
 
@@ -572,7 +572,7 @@ public JsonSchema getSchema(final String schema, InputFormat inputFormat) {
      * @param config the config
      * @return the schema
      */
-    public JsonSchema getSchema(final InputStream schemaStream, final SchemaValidatorsConfig config) {
+    public Schema getSchema(final InputStream schemaStream, final SchemaValidatorsConfig config) {
         return getSchema(schemaStream, InputFormat.JSON, config);
     }
 
@@ -587,7 +587,7 @@ public JsonSchema getSchema(final InputStream schemaStream, final SchemaValidato
      * @param config the config
      * @return the schema
      */
-    public JsonSchema getSchema(final InputStream schemaStream, InputFormat inputFormat, final SchemaValidatorsConfig config) {
+    public Schema getSchema(final InputStream schemaStream, InputFormat inputFormat, final SchemaValidatorsConfig config) {
         try {
             final JsonNode schemaNode = readTree(schemaStream, inputFormat);
             return newJsonSchema(null, schemaNode, config);
@@ -606,7 +606,7 @@ public JsonSchema getSchema(final InputStream schemaStream, InputFormat inputFor
      * @param schemaStream the input stream with the schema data
      * @return the schema
      */
-    public JsonSchema getSchema(final InputStream schemaStream) {
+    public Schema getSchema(final InputStream schemaStream) {
         return getSchema(schemaStream, createSchemaValidatorsConfig());
     }
 
@@ -617,8 +617,8 @@ public JsonSchema getSchema(final InputStream schemaStream) {
      * @param config the config
      * @return the schema
      */
-    public JsonSchema getSchema(final SchemaLocation schemaUri, final SchemaValidatorsConfig config) {
-        JsonSchema schema = loadSchema(schemaUri, config);
+    public Schema getSchema(final SchemaLocation schemaUri, final SchemaValidatorsConfig config) {
+        Schema schema = loadSchema(schemaUri, config);
         preload(schema, config);
         return schema;
     }
@@ -630,12 +630,12 @@ public JsonSchema getSchema(final SchemaLocation schemaUri, final SchemaValidato
      * @param config the config
      * @return the schema
      */
-    public JsonSchema loadSchema(final SchemaLocation schemaUri, final SchemaValidatorsConfig config) {
+    public Schema loadSchema(final SchemaLocation schemaUri, final SchemaValidatorsConfig config) {
         if (enableSchemaCache) {
             // ConcurrentHashMap computeIfAbsent does not allow calls that result in a
             // recursive update to the map.
             // The getMapperSchema potentially recurses to call back to getSchema again
-            JsonSchema cachedUriSchema = schemaCache.get(schemaUri);
+            Schema cachedUriSchema = schemaCache.get(schemaUri);
             if (cachedUriSchema == null) {
                 synchronized (this) { // acquire lock on shared factory object to prevent deadlock
                     cachedUriSchema = schemaCache.get(schemaUri);
@@ -670,7 +670,7 @@ protected SchemaValidatorsConfig createSchemaValidatorsConfig() {
         return new SchemaValidatorsConfig();
     }
 
-    protected JsonSchema getMappedSchema(final SchemaLocation schemaUri, SchemaValidatorsConfig config) {
+    protected Schema getMappedSchema(final SchemaLocation schemaUri, SchemaValidatorsConfig config) {
         try (InputStream inputStream = this.schemaLoader.getSchema(schemaUri.getAbsoluteIri()).getInputStream()) {
             if (inputStream == null) {
                 throw new IOException("Cannot load schema at " + schemaUri);
@@ -693,7 +693,7 @@ protected JsonSchema getMappedSchema(final SchemaLocation schemaUri, SchemaValid
                 // Schema with fragment pointing to sub schema
                 final ValidationContext validationContext = createValidationContext(schemaNode, config);
                 SchemaLocation documentLocation = new SchemaLocation(schemaUri.getAbsoluteIri());
-                JsonSchema document = doCreate(validationContext, documentLocation, evaluationPath, schemaNode, null, false);
+                Schema document = doCreate(validationContext, documentLocation, evaluationPath, schemaNode, null, false);
                 return document.getRefSchema(schemaUri.getFragment());
             }
         } catch (IOException e) {
@@ -710,7 +710,7 @@ protected JsonSchema getMappedSchema(final SchemaLocation schemaUri, SchemaValid
      * @param schemaUri the absolute IRI of the schema which can map to the retrieval IRI.
      * @return the schema
      */
-    public JsonSchema getSchema(final URI schemaUri) {
+    public Schema getSchema(final URI schemaUri) {
         return getSchema(SchemaLocation.of(schemaUri.toString()), createSchemaValidatorsConfig());
     }
 
@@ -722,7 +722,7 @@ public JsonSchema getSchema(final URI schemaUri) {
      * @param config the config
      * @return the schema
      */
-    public JsonSchema getSchema(final URI schemaUri, final JsonNode jsonNode, final SchemaValidatorsConfig config) {
+    public Schema getSchema(final URI schemaUri, final JsonNode jsonNode, final SchemaValidatorsConfig config) {
         return newJsonSchema(SchemaLocation.of(schemaUri.toString()), jsonNode, config);
     }
 
@@ -733,7 +733,7 @@ public JsonSchema getSchema(final URI schemaUri, final JsonNode jsonNode, final
      * @param jsonNode the node
      * @return the schema
      */
-    public JsonSchema getSchema(final URI schemaUri, final JsonNode jsonNode) {
+    public Schema getSchema(final URI schemaUri, final JsonNode jsonNode) {
         return newJsonSchema(SchemaLocation.of(schemaUri.toString()), jsonNode, createSchemaValidatorsConfig());
     }
 
@@ -743,7 +743,7 @@ public JsonSchema getSchema(final URI schemaUri, final JsonNode jsonNode) {
      * @param schemaUri the absolute IRI of the schema which can map to the retrieval IRI.
      * @return the schema
      */
-    public JsonSchema getSchema(final SchemaLocation schemaUri) {
+    public Schema getSchema(final SchemaLocation schemaUri) {
         return getSchema(schemaUri, createSchemaValidatorsConfig());
     }
 
@@ -755,7 +755,7 @@ public JsonSchema getSchema(final SchemaLocation schemaUri) {
      * @param config the config
      * @return the schema
      */
-    public JsonSchema getSchema(final SchemaLocation schemaUri, final JsonNode jsonNode, final SchemaValidatorsConfig config) {
+    public Schema getSchema(final SchemaLocation schemaUri, final JsonNode jsonNode, final SchemaValidatorsConfig config) {
         return newJsonSchema(schemaUri, jsonNode, config);
     }
 
@@ -766,7 +766,7 @@ public JsonSchema getSchema(final SchemaLocation schemaUri, final JsonNode jsonN
      * @param jsonNode  the node
      * @return the schema
      */
-    public JsonSchema getSchema(final SchemaLocation schemaUri, final JsonNode jsonNode) {
+    public Schema getSchema(final SchemaLocation schemaUri, final JsonNode jsonNode) {
         return newJsonSchema(schemaUri, jsonNode, createSchemaValidatorsConfig());
     }
 
@@ -783,7 +783,7 @@ public JsonSchema getSchema(final SchemaLocation schemaUri, final JsonNode jsonN
      * @param config   the config
      * @return the schema
      */
-    public JsonSchema getSchema(final JsonNode jsonNode, final SchemaValidatorsConfig config) {
+    public Schema getSchema(final JsonNode jsonNode, final SchemaValidatorsConfig config) {
         return newJsonSchema(null, jsonNode, config);
     }
 
@@ -799,7 +799,7 @@ public JsonSchema getSchema(final JsonNode jsonNode, final SchemaValidatorsConfi
      * @param jsonNode the node
      * @return the schema
      */
-    public JsonSchema getSchema(final JsonNode jsonNode) {
+    public Schema getSchema(final JsonNode jsonNode) {
         return newJsonSchema(null, jsonNode, createSchemaValidatorsConfig());
     }
 

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

@@ -22,13 +22,13 @@
  */
 public class JsonSchemaRef {
 
-    private final Supplier<JsonSchema> schemaSupplier;
+    private final Supplier<Schema> schemaSupplier;
 
-    public JsonSchemaRef(Supplier<JsonSchema> schema) {
+    public JsonSchemaRef(Supplier<Schema> schema) {
         this.schemaSupplier = schema;
     }
 
-    public JsonSchema getSchema() {
+    public Schema getSchema() {
         return this.schemaSupplier.get();
     }
 }

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

@@ -49,7 +49,7 @@ default void customize(ExecutionContext executionContext, ValidationContext vali
      * 
      * @return the result
      */
-    T format(JsonSchema jsonSchema, 
+    T format(Schema jsonSchema, 
             ExecutionContext executionContext, ValidationContext validationContext);
 
     /**
@@ -95,7 +95,7 @@ public void customize(ExecutionContext executionContext, ValidationContext valid
         }
 
         @Override
-        public java.util.List<Error> format(JsonSchema jsonSchema,
+        public java.util.List<Error> format(Schema jsonSchema,
                 ExecutionContext executionContext, ValidationContext validationContext) {
             return executionContext.getErrors();
         }
@@ -112,7 +112,7 @@ public void customize(ExecutionContext executionContext, ValidationContext valid
         }
 
         @Override
-        public OutputFlag format(JsonSchema jsonSchema, 
+        public OutputFlag format(Schema jsonSchema, 
                 ExecutionContext executionContext, ValidationContext validationContext) {
             return new OutputFlag(executionContext.getErrors().isEmpty());
         }
@@ -129,7 +129,7 @@ public void customize(ExecutionContext executionContext, ValidationContext valid
         }
 
         @Override
-        public java.lang.Boolean format(JsonSchema jsonSchema, 
+        public java.lang.Boolean format(Schema jsonSchema, 
                 ExecutionContext executionContext, ValidationContext validationContext) {
             return executionContext.getErrors().isEmpty();
         }
@@ -159,7 +159,7 @@ public void customize(ExecutionContext executionContext, ValidationContext valid
         }
 
         @Override
-        public OutputUnit format(JsonSchema jsonSchema,
+        public OutputUnit format(Schema jsonSchema,
                 ExecutionContext executionContext, ValidationContext validationContext) {
             return ListOutputUnitFormatter.format(executionContext.getErrors(), executionContext, validationContext,
                     this.errorMapper);
@@ -190,7 +190,7 @@ public void customize(ExecutionContext executionContext, ValidationContext valid
         }
 
         @Override
-        public OutputUnit format(JsonSchema jsonSchema, 
+        public OutputUnit format(Schema jsonSchema, 
                 ExecutionContext executionContext, ValidationContext validationContext) {
             return HierarchicalOutputUnitFormatter.format(jsonSchema, executionContext.getErrors(), executionContext,
                     validationContext, this.errorMapper);
@@ -208,7 +208,7 @@ public void customize(ExecutionContext executionContext, ValidationContext valid
         }
 
         @Override
-        public ValidationResult format(JsonSchema jsonSchema,ExecutionContext executionContext, ValidationContext validationContext) {
+        public ValidationResult format(Schema jsonSchema,ExecutionContext executionContext, ValidationContext validationContext) {
             return new ValidationResult(executionContext);
         }
     }