Merge pull request #137 from rhwood/url-map-performance

fix: avoid performance penalty of using URL in map or set

Author: stevehu

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

@@ -29,6 +29,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.networknt.schema.url.StandardURLFetcher;
+import com.networknt.schema.url.URLFactory;
 import com.networknt.schema.url.URLFetcher;
 
 public class JsonSchemaFactory {
@@ -41,7 +42,7 @@ 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>();
+        private Map<String, String> urlMap = new HashMap<String, String>();
 
         public Builder objectMapper(ObjectMapper objectMapper) {
             this.objectMapper = objectMapper;
@@ -70,7 +71,7 @@ public Builder addMetaSchemas(Collection<? extends JsonMetaSchema> jsonMetaSchem
             return this;
         }
 
-        public Builder addUrlMappings(Map<URL, URL> map) {
+        public Builder addUrlMappings(Map<String, String> map) {
             this.urlMap.putAll(map);
             return this;
         }
@@ -91,9 +92,9 @@ public JsonSchemaFactory build() {
     private final URLFetcher urlFetcher;
     private final String defaultMetaSchemaURI;
     private final Map<String, JsonMetaSchema> jsonMetaSchemas;
-    private final Map<URL, URL> urlMap;
+    private final Map<String, String> 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, Map<String, String> urlMap) {
         if (mapper == null) {
             throw new IllegalArgumentException("ObjectMapper must not be null");
         }
@@ -204,9 +205,9 @@ 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<String, String> map = (config != null) ? config.getUrlMappings() : new HashMap<String, String>(urlMap);
             map.putAll(urlMap);
-            URL mappedURL = map.getOrDefault(schemaURL, schemaURL);
+            URL mappedURL = URLFactory.toURL(map.getOrDefault(schemaURL.toString(), schemaURL.toString()));
             try {
                 inputStream = urlFetcher.fetch(mappedURL);
                 JsonNode schemaNode = mapper.readTree(inputStream);

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

@@ -18,7 +18,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.net.URL;
 
 public class SchemaValidatorsConfig {
     /**
@@ -43,7 +42,7 @@ public class SchemaValidatorsConfig {
      * 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>();
+    private Map<String, String> urlMappings = new HashMap<String, String>();
 
     public boolean isTypeLoose() {
         return typeLoose;
@@ -53,11 +52,12 @@ public void setTypeLoose(boolean typeLoose) {
         this.typeLoose = typeLoose;
     }
 
-    public Map<URL, URL> getUrlMappings() {
-        return new HashMap<URL, URL>(urlMappings);
+    public Map<String, String> getUrlMappings() {
+        // return a copy of the mappings
+        return new HashMap<String, String>(urlMappings);
     }
 
-    public void setUrlMappings(Map<URL, URL> urlMappings) {
+    public void setUrlMappings(Map<String, String> urlMappings) {
         this.urlMappings = urlMappings;
     }
 
@@ -83,6 +83,6 @@ public SchemaValidatorsConfig() {
 
     private void loadDefaultConfig() {
         this.typeLoose = true;
-        this.urlMappings = new HashMap<URL, URL>();
+        this.urlMappings = new HashMap<String, String>();
     }
 }

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

@@ -141,11 +141,11 @@ public void testMappingsForRef() throws IOException {
         assertEquals(0, schema.validate(mapper.readTree("[]")).size());
     }
 
-    private Map<URL, URL> getUrlMappingsFromUrl(URL url) throws MalformedURLException, IOException {
-        HashMap<URL, URL> map = new HashMap<URL, URL>();
+    private Map<String, String> getUrlMappingsFromUrl(URL url) throws MalformedURLException, IOException {
+        HashMap<String, String> map = new HashMap<String, String>();
         for (JsonNode mapping : mapper.readTree(url)) {
-            map.put(URLFactory.toURL(mapping.get("publicURL").asText()),
-                    URLFactory.toURL(mapping.get("localURL").asText()));
+            map.put(mapping.get("publicURL").asText(),
+                    mapping.get("localURL").asText());
         }
         return map;
     }