refactor

Author: justin-tay

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

@@ -36,7 +36,6 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -651,6 +650,69 @@ public Schema getSchema(final SchemaLocation schemaUri) {
         return schema;
     }
 
+    /**
+     * Gets the schema.
+     * 
+     * @param schemaUri the base absolute IRI
+     * @param jsonNode  the node
+     * @return the schema
+     */
+    public Schema getSchema(final SchemaLocation schemaUri, final JsonNode jsonNode) {
+        return newSchema(schemaUri, jsonNode);
+    }
+
+    /**
+     * Gets the schema.
+     * 
+     * @param schemaUri   the base absolute IRI
+     * @param schema      the input schema data
+     * @param inputFormat input format
+     * @return the schema
+     */
+    public Schema getSchema(final SchemaLocation schemaUri, final String schema, InputFormat inputFormat) {
+        try {
+            final JsonNode schemaNode = readTree(schema, inputFormat);
+            return newSchema(schemaUri, schemaNode);
+        } catch (IOException ioe) {
+            logger.error("Failed to load json schema!", ioe);
+            throw new SchemaException(ioe);
+        }
+    }
+
+    /**
+     * Gets the schema.
+     * 
+     * @param schemaUri   the base absolute IRI
+     * @param schemaStream      the input schema data
+     * @param inputFormat input format
+     * @return the schema
+     */
+    public Schema getSchema(final SchemaLocation schemaUri, final InputStream schemaStream, InputFormat inputFormat) {
+        try {
+            final JsonNode schemaNode = readTree(schemaStream, inputFormat);
+            return newSchema(schemaUri, schemaNode);
+        } catch (IOException ioe) {
+            logger.error("Failed to load json schema!", ioe);
+            throw new SchemaException(ioe);
+        }
+    }
+
+    /**
+     * Gets the schema.
+     * <p>
+     * Using this is not recommended as there is potentially no base IRI for
+     * resolving references to the absolute IRI.
+     * <p>
+     * Prefer {@link #getSchema(SchemaLocation, JsonNode)} instead to ensure the
+     * base IRI if no id is present.
+     * 
+     * @param jsonNode the node
+     * @return the schema
+     */
+    public Schema getSchema(final JsonNode jsonNode) {
+        return newSchema(null, jsonNode);
+    }
+
     /**
      * Loads the schema.
      * 
@@ -720,56 +782,6 @@ protected Schema getMappedSchema(final SchemaLocation schemaUri) {
         }
     }
 
-    /**
-     * Gets the schema.
-     * 
-     * @param schemaUri the absolute IRI of the schema which can map to the
-     *                  retrieval IRI.
-     * @return the schema
-     */
-    public Schema getSchema(final URI schemaUri) {
-        return getSchema(SchemaLocation.of(schemaUri.toString()));
-    }
-
-    /**
-     * Gets the schema.
-     * 
-     * @param schemaUri the absolute IRI of the schema which can map to the
-     *                  retrieval IRI.
-     * @param jsonNode  the node
-     * @return the schema
-     */
-    public Schema getSchema(final URI schemaUri, final JsonNode jsonNode) {
-        return newSchema(SchemaLocation.of(schemaUri.toString()), jsonNode);
-    }
-
-    /**
-     * Gets the schema.
-     * 
-     * @param schemaUri the base absolute IRI
-     * @param jsonNode  the node
-     * @return the schema
-     */
-    public Schema getSchema(final SchemaLocation schemaUri, final JsonNode jsonNode) {
-        return newSchema(schemaUri, jsonNode);
-    }
-
-    /**
-     * Gets the schema.
-     * <p>
-     * Using this is not recommended as there is potentially no base IRI for
-     * resolving references to the absolute IRI.
-     * <p>
-     * Prefer {@link #getSchema(SchemaLocation, JsonNode)} instead to ensure the
-     * base IRI if no id is present.
-     * 
-     * @param jsonNode the node
-     * @return the schema
-     */
-    public Schema getSchema(final JsonNode jsonNode) {
-        return newSchema(null, jsonNode);
-    }
-
     /**
      * Gets the schema registry config.
      *

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

@@ -3,7 +3,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -19,7 +18,6 @@
 import com.networknt.schema.dialect.Dialects;
 import com.networknt.schema.output.OutputUnit;
 import com.networknt.schema.regex.JoniRegularExpressionFactory;
-import com.networknt.schema.resource.SchemaIdResolver;
 import com.networknt.schema.serialization.JsonMapperFactory;
 import com.networknt.schema.utils.JsonNodes;