Revert "Develop (#128)" (#129)

This reverts commit 9746310.

Author: stevehu

README.md

@@ -6,7 +6,6 @@ This is an implementation of the [JSON Schema Core Draft v4](http://json-schema.
 [Subreddit](https://www.reddit.com/r/lightapi/) |
 [Youtube Channel](https://www.youtube.com/channel/UCHCRMWJVXw8iB7zKxF55Byw) |
 [Documentation](https://doc.networknt.com/library/json-overlay/) |
-[Javadocs](https://www.javadoc.io/doc/com.networknt/json-schema-validator) |
 [Contribution Guide](https://doc.networknt.com/contribute/) |
 
 [![Build Status](https://travis-ci.org/networknt/json-schema-validator.svg?branch=master)](https://travis-ci.org/networknt/json-schema-validator)

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

@@ -41,7 +41,6 @@ public static class Builder {
         private URLFetcher urlFetcher;
         private String defaultMetaSchemaURI;
         private Map<String, JsonMetaSchema> jsonMetaSchemas = new HashMap<String, JsonMetaSchema>();
-        private Map<URL, URL> urlMap = new HashMap<URL, URL>();
 
         public Builder objectMapper(ObjectMapper objectMapper) {
             this.objectMapper = objectMapper;
@@ -70,19 +69,13 @@ public Builder addMetaSchemas(Collection<? extends JsonMetaSchema> jsonMetaSchem
             return this;
         }
 
-        public Builder addUrlMappings(Map<URL, URL> map) {
-            this.urlMap.putAll(map);
-            return this;
-        }
-        
         public JsonSchemaFactory build() {
             // create builtin keywords with (custom) formats.
             return new JsonSchemaFactory(
                     objectMapper == null ? new ObjectMapper() : objectMapper, 
                     urlFetcher == null ? new StandardURLFetcher(): urlFetcher, 
                     defaultMetaSchemaURI, 
-                    jsonMetaSchemas,
-                    urlMap
+                    jsonMetaSchemas
             );
         }
     }
@@ -91,9 +84,8 @@ public JsonSchemaFactory build() {
     private final URLFetcher urlFetcher;
     private final String defaultMetaSchemaURI;
     private final Map<String, JsonMetaSchema> jsonMetaSchemas;
-    private final Map<URL, URL> urlMap;
 
-    private JsonSchemaFactory(ObjectMapper mapper, URLFetcher urlFetcher, String defaultMetaSchemaURI, Map<String, JsonMetaSchema> jsonMetaSchemas, Map<URL, URL> urlMap) {
+    private JsonSchemaFactory(ObjectMapper mapper, URLFetcher urlFetcher, String defaultMetaSchemaURI, Map<String, JsonMetaSchema> jsonMetaSchemas) {
         if (mapper == null) {
             throw new IllegalArgumentException("ObjectMapper must not be null");
         }
@@ -109,14 +101,10 @@ private JsonSchemaFactory(ObjectMapper mapper, URLFetcher urlFetcher, String def
         if (jsonMetaSchemas.get(defaultMetaSchemaURI) == null) {
             throw new IllegalArgumentException("Meta Schema for default Meta Schema URI must be provided");
         }
-        if (urlMap == null) {
-            throw new IllegalArgumentException("URL Mappings must not be null");
-        }
         this.mapper = mapper;
         this.defaultMetaSchemaURI = defaultMetaSchemaURI;
         this.urlFetcher = urlFetcher;
         this.jsonMetaSchemas = jsonMetaSchemas;
-        this.urlMap = urlMap;
     }
 
     /**
@@ -147,8 +135,7 @@ public static Builder builder(JsonSchemaFactory blueprint) {
                 .addMetaSchemas(blueprint.jsonMetaSchemas.values())
                 .urlFetcher(blueprint.urlFetcher)
                 .defaultMetaSchemaURI(blueprint.defaultMetaSchemaURI)
-                .objectMapper(blueprint.mapper)
-                .addUrlMappings(blueprint.urlMap);
+                .objectMapper(blueprint.mapper);
     }
 
     private JsonSchema newJsonSchema(JsonNode schemaNode, SchemaValidatorsConfig config) {
@@ -204,11 +191,8 @@ public JsonSchema getSchema(InputStream schemaStream) {
     public JsonSchema getSchema(URL schemaURL, SchemaValidatorsConfig config) {
         try {
             InputStream inputStream = null;
-            Map<URL, URL> map = (config != null) ? config.getUrlMappings() : new HashMap<URL, URL>(urlMap);
-            map.putAll(urlMap);
-            URL mappedURL = map.getOrDefault(schemaURL, schemaURL);
             try {
-                inputStream = urlFetcher.fetch(mappedURL);
+                inputStream = urlFetcher.fetch(schemaURL);
                 JsonNode schemaNode = mapper.readTree(inputStream);
                 final JsonMetaSchema jsonMetaSchema = findMetaSchemaForSchema(schemaNode);
 

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

@@ -1,9 +1,5 @@
 package com.networknt.schema;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.net.URL;
-
 public class SchemaValidatorsConfig {
     /**
      * when validate type, if TYPE_LOOSE = true, will try to convert string to different types to match the type defined in schema.
@@ -22,13 +18,6 @@ public class SchemaValidatorsConfig {
      */
     private boolean elementValidationError = false;
 
-    /**
-     * Map of public, normally internet accessible schema URLs to alternate locations; this allows for offline
-     * validation of schemas that refer to public URLs. This is merged with any mappings the {@link JsonSchemaFactory} 
-     * may have been built with.
-     */
-    private Map<URL, URL> urlMappings = new HashMap<URL, URL>();
-
     public boolean isTypeLoose() {
         return typeLoose;
     }
@@ -37,14 +26,6 @@ public void setTypeLoose(boolean typeLoose) {
         this.typeLoose = typeLoose;
     }
 
-    public Map<URL, URL> getUrlMappings() {
-        return new HashMap<URL, URL>(urlMappings);
-    }
-
-    public void setUrlMappings(Map<URL, URL> urlMappings) {
-        this.urlMappings = urlMappings;
-    }
-
     public boolean isMissingNodeAsError() {
     	return missingNodeAsError;
     }
@@ -67,6 +48,5 @@ public SchemaValidatorsConfig() {
 
     private void loadDefaultConfig() {
         this.typeLoose = true;
-        this.urlMappings = new HashMap<URL, URL>();
     }
 }