Refactor SchemaLoader

Author: justin-tay

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

@@ -24,27 +24,27 @@
 /**
  * Loads from classpath.
  */
-public class ClasspathSchemaLoader implements SchemaLoader {
+public class ClasspathResourceLoader implements ResourceLoader {
     private final Supplier<ClassLoader> classLoaderSource;
 
     /**
      * Constructor.
      */
-    public ClasspathSchemaLoader() {
-        this(ClasspathSchemaLoader::getClassLoader);
+    public ClasspathResourceLoader() {
+        this(ClasspathResourceLoader::getClassLoader);
     }
 
     /**
      * Constructor.
      *
      * @param classLoaderSource the class loader source
      */
-    public ClasspathSchemaLoader(Supplier<ClassLoader> classLoaderSource) {
+    public ClasspathResourceLoader(Supplier<ClassLoader> classLoaderSource) {
         this.classLoaderSource = classLoaderSource;
     }
 
     @Override
-    public InputStreamSource getSchema(AbsoluteIri absoluteIri) {
+    public InputStreamSource getResource(AbsoluteIri absoluteIri) {
         String iri = absoluteIri != null ? absoluteIri.toString() : "";
         String name = null;
         if (iri.startsWith("classpath:")) {
@@ -75,7 +75,7 @@ public InputStreamSource getSchema(AbsoluteIri absoluteIri) {
     protected static ClassLoader getClassLoader() {
         ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
         if (classLoader == null) {
-            classLoader = SchemaLoader.class.getClassLoader();
+            classLoader = ResourceLoader.class.getClassLoader();
         }
         return classLoader;
     }

src/main/java/com/networknt/schema/resource/AllowSchemaLoader.java

@@ -27,11 +27,19 @@
 import com.networknt.schema.utils.AbsoluteIris;
 
 /**
- * Loads from uri.
+ * Loads from iri.
  */
-public class UriSchemaLoader implements SchemaLoader {
+public class IriResourceLoader implements ResourceLoader {
+    private static class Holder {
+        private static final IriResourceLoader INSTANCE = new IriResourceLoader();
+    }
+    
+    public static IriResourceLoader getInstance() {
+        return Holder.INSTANCE;
+    }
+    
     @Override
-    public InputStreamSource getSchema(AbsoluteIri absoluteIri) {
+    public InputStreamSource getResource(AbsoluteIri absoluteIri) {
         URI uri = toURI(absoluteIri);
         URL url = toURL(uri);
         return () -> {
@@ -97,7 +105,7 @@ protected InputStream openConnectionCheckRedirects(URLConnection c) throws IOExc
                     // and should be limited to 5 redirections at most.
                     if (target == null || !(target.getProtocol().equals("http") || target.getProtocol().equals("https"))
                             || redirects >= 5) {
-                        throw new SecurityException("illegal URL redirect");
+                        throw new SecurityException("Maximum number of redirects exceeded");
                     }
                     redir = true;
                     c = target.openConnection();

src/main/java/com/networknt/schema/resource/ClasspathSchemaLoader.java renamed to src/main/java/com/networknt/schema/resource/ClasspathResourceLoader.java

@@ -8,42 +8,42 @@
 import com.networknt.schema.AbsoluteIri;
 
 /**
- * Map implementation of {@link SchemaLoader}.
+ * Map implementation of {@link ResourceLoader}.
  */
-public class MapSchemaLoader implements SchemaLoader {
+public class MapResourceLoader implements ResourceLoader {
     private final Function<String, String> mappings;
 
     /**
-     * Sets the schema data by absolute IRI.
+     * Sets the resource data by absolute IRI.
      * 
      * @param mappings the mappings
      */
-    public MapSchemaLoader(Map<String, String> mappings) {
+    public MapResourceLoader(Map<String, String> mappings) {
         this(mappings::get);
     }
 
     /**
-     * Sets the schema data by absolute IRI function.
+     * Sets the resource data by absolute IRI function.
      * 
      * @param mappings the mappings
      */
-    public MapSchemaLoader(Function<String, String> mappings) {
+    public MapResourceLoader(Function<String, String> mappings) {
         this.mappings = mappings;
     }
 
     /**
-     * Sets the schema data by using two mapping functions.
+     * Sets the resource data by using two mapping functions.
      * <p>
      * Firstly to map the IRI to an object. If the object is null no mapping is
      * performed.
      * <p>
-     * Next to map the object to the schema data.
+     * Next to map the object to the resource data.
      * 
      * @param <T>             the type of the object
      * @param mapIriToObject  the mapping of IRI to object
-     * @param mapObjectToData the mappingof object to schema data
+     * @param mapObjectToData the mappingof object to resource data
      */
-    public <T> MapSchemaLoader(Function<String, T> mapIriToObject, Function<T, String> mapObjectToData) {
+    public <T> MapResourceLoader(Function<String, T> mapIriToObject, Function<T, String> mapObjectToData) {
         this.mappings = iri -> {
             T result = mapIriToObject.apply(iri);
             if (result != null) {
@@ -54,7 +54,7 @@ public <T> MapSchemaLoader(Function<String, T> mapIriToObject, Function<T, Strin
     }
 
     @Override
-    public InputStreamSource getSchema(AbsoluteIri absoluteIri) {
+    public InputStreamSource getResource(AbsoluteIri absoluteIri) {
         try {
             String result = mappings.apply(absoluteIri.toString());
             if (result != null) {

src/main/java/com/networknt/schema/resource/DefaultSchemaLoader.java

@@ -7,16 +7,16 @@
 import com.networknt.schema.AbsoluteIri;
 
 /**
- * Map implementation of {@link SchemaMapper}.
+ * Map implementation of {@link SchemaIdResolver}.
  */
-public class MapSchemaMapper implements SchemaMapper {
+public class MapSchemaIdResolver implements SchemaIdResolver {
     private final Function<String, String> mappings;
 
-    public MapSchemaMapper(Map<String, String> mappings) {
+    public MapSchemaIdResolver(Map<String, String> mappings) {
         this(mappings::get);
     }
 
-    public MapSchemaMapper(Function<String, String> mappings) {
+    public MapSchemaIdResolver(Function<String, String> mappings) {
         this.mappings = mappings;
     }
 
@@ -26,7 +26,7 @@ public MapSchemaMapper(Function<String, String> mappings) {
      * @param test     the predicate
      * @param mappings the mapping
      */
-    public MapSchemaMapper(Predicate<String> test, Function<String, String> mappings) {
+    public MapSchemaIdResolver(Predicate<String> test, Function<String, String> mappings) {
         this.mappings = iri -> {
             if (test.test(iri)) {
                 return mappings.apply(iri);
@@ -36,7 +36,7 @@ public MapSchemaMapper(Predicate<String> test, Function<String, String> mappings
     }
 
     @Override
-    public AbsoluteIri map(AbsoluteIri absoluteIRI) {
+    public AbsoluteIri resolve(AbsoluteIri absoluteIRI) {
         String mapped = this.mappings.apply(absoluteIRI.toString());
         if (mapped != null) {
             return AbsoluteIri.of(mapped);

src/main/java/com/networknt/schema/resource/DisallowSchemaLoader.java

@@ -20,14 +20,14 @@
 /**
  * Maps the JSON Schema meta schema to the class path location.
  */
-public class MetaSchemaMapper implements SchemaMapper {
+public class MetaSchemaIdResolver implements SchemaIdResolver {
     private static final char ANCHOR = '#';
     private static final String CLASSPATH_PREFIX = "classpath:";
     private static final String HTTP_JSON_SCHEMA_ORG_PREFIX = "http://json-schema.org/";
     private static final String HTTPS_JSON_SCHEMA_ORG_PREFIX = "https://json-schema.org/";
 
     @Override
-    public AbsoluteIri map(AbsoluteIri absoluteIRI) {
+    public AbsoluteIri resolve(AbsoluteIri absoluteIRI) {
         String absoluteIRIString = absoluteIRI != null ? absoluteIRI.toString() : null;
         if (absoluteIRIString != null) {
             if (absoluteIRIString.startsWith(HTTPS_JSON_SCHEMA_ORG_PREFIX)) {

src/main/java/com/networknt/schema/resource/UriSchemaLoader.java renamed to src/main/java/com/networknt/schema/resource/IriResourceLoader.java

@@ -3,19 +3,19 @@
 import com.networknt.schema.AbsoluteIri;
 
 /**
- * Prefix implementation of {@link SchemaMapper}.
+ * Prefix implementation of {@link SchemaIdResolver}.
  */
-public class PrefixSchemaMapper implements SchemaMapper {
+public class PrefixSchemaIdResolver implements SchemaIdResolver {
     private final String source;
     private final String replacement;
 
-    public PrefixSchemaMapper(String source, String replacement) {
+    public PrefixSchemaIdResolver(String source, String replacement) {
         this.source = source;
         this.replacement = replacement;
     }
 
     @Override
-    public AbsoluteIri map(AbsoluteIri absoluteIRI) {
+    public AbsoluteIri resolve(AbsoluteIri absoluteIRI) {
         String absoluteIRIString = absoluteIRI != null ? absoluteIRI.toString() : null;
         if (absoluteIRIString != null && absoluteIRIString.startsWith(source)) {
             return AbsoluteIri.of(replacement + absoluteIRIString.substring(source.length()));