Merge branch 'develop' into master

Author: stevehu

CHANGELOG.md

@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+## 0.1.24 - 2018-11-21
+
+### Added
+
+### Changed
+- fixes #105 temporary fix to performance issue. Thanks @nitin456
+
 ## 0.1.23 - 2018-10-02
 
 ### Added

pom.xml

@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.networknt</groupId>
     <artifactId>json-schema-validator</artifactId>
-    <version>0.1.23</version>
+    <version>0.1.24</version>
     <packaging>bundle</packaging>
     <description>A json schema validator that supports draft v4</description>
     <url>https://github.com/networknt/json-schema-validator</url>

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

@@ -32,11 +32,16 @@ public abstract class BaseJsonValidator implements JsonValidator {
     private boolean suppressSubSchemaRetrieval;
     private ValidatorTypeCode validatorType;
     private ErrorMessageType errorMessageType;
+    /**
+     * SchemaValidatorsConfig can only get and set in validationContext
+     */
+    protected SchemaValidatorsConfig config;
 
 
     public BaseJsonValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema,
                              ValidatorTypeCode validatorType, ValidationContext validationContext) {
     	this(schemaPath, schemaNode, parentSchema, validatorType, false );
+    	this.config = validationContext.getConfig() == null ? new SchemaValidatorsConfig() : validationContext.getConfig();
     }
 
     public BaseJsonValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema,

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

@@ -16,19 +16,14 @@
 
 package com.networknt.schema;
 
+import com.fasterxml.jackson.databind.JsonNode;
+
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.fasterxml.jackson.databind.JsonNode;
-
 /**
  * This is the core of json constraint implementation. It parses json constraint
  * file and generates JsonValidators. The class is thread safe, once it is
@@ -48,10 +43,11 @@ public JsonSchema(ValidationContext validationContext,  String schemaPath, JsonN
         this(validationContext,  schemaPath, schemaNode, parent, false);
     }
 
-    public JsonSchema(ValidationContext validatorFactory,  String schemaPath, JsonNode schemaNode,
+    public JsonSchema(ValidationContext validationContext,  String schemaPath, JsonNode schemaNode,
                JsonSchema parent, boolean suppressSubSchemaRetrieval) {
         super(schemaPath, schemaNode, parent, null, suppressSubSchemaRetrieval);
-        this.validationContext = validatorFactory;
+        this.validationContext = validationContext;
+        this.config = validationContext.getConfig();
         this.validators = Collections.unmodifiableMap(this.read(schemaNode));
     }
 
@@ -133,5 +129,4 @@ public Set<ValidationMessage> validate(JsonNode jsonNode, JsonNode rootNode, Str
     public String toString() {
         return "\"" + getSchemaPath() + "\" : " + getSchemaNode().toString();
     }
-
 }

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

@@ -32,7 +32,6 @@
 import com.networknt.schema.url.URLFetcher;
 
 public class JsonSchemaFactory {
-
     private static final Logger logger = LoggerFactory
             .getLogger(JsonSchemaFactory.class);
 
@@ -139,9 +138,11 @@ public static Builder builder(JsonSchemaFactory blueprint) {
                 .objectMapper(blueprint.mapper);
     }
 
-    private JsonSchema newJsonSchema(JsonNode schemaNode) {
+    private JsonSchema newJsonSchema(JsonNode schemaNode, SchemaValidatorsConfig config) {
         final ValidationContext validationContext = createValidationContext(schemaNode);
-        return new JsonSchema(validationContext, schemaNode);
+        validationContext.setConfig(config);
+        JsonSchema jsonSchema = new JsonSchema(validationContext, schemaNode);
+        return jsonSchema;
     }
 
     protected ValidationContext createValidationContext(JsonNode schemaNode) {
@@ -158,28 +159,36 @@ private JsonMetaSchema findMetaSchemaForSchema(JsonNode schemaNode) {
         }
         return jsonMetaSchema;
     }
-    
-    public JsonSchema getSchema(String schema) {
+
+    public JsonSchema getSchema(String schema, SchemaValidatorsConfig config) {
         try {
             final JsonNode schemaNode = mapper.readTree(schema);
-            return newJsonSchema(schemaNode);
+            return newJsonSchema(schemaNode, config);
         } catch (IOException ioe) {
             logger.error("Failed to load json schema!", ioe);
             throw new JsonSchemaException(ioe);
         }
     }
 
-    public JsonSchema getSchema(InputStream schemaStream) {
+    public JsonSchema getSchema(String schema) {
+        return getSchema(schema, null);
+    }
+
+    public JsonSchema getSchema(InputStream schemaStream, SchemaValidatorsConfig config) {
         try {
             final JsonNode schemaNode = mapper.readTree(schemaStream);
-            return newJsonSchema(schemaNode);
+            return newJsonSchema(schemaNode, config);
         } catch (IOException ioe) {
             logger.error("Failed to load json schema!", ioe);
             throw new JsonSchemaException(ioe);
         }
     }
 
-    public JsonSchema getSchema(URL schemaURL) {
+    public JsonSchema getSchema(InputStream schemaStream) {
+        return getSchema(schemaStream, null);
+    }
+
+    public JsonSchema getSchema(URL schemaURL, SchemaValidatorsConfig config) {
         try {
             InputStream inputStream = null;
             try {
@@ -192,7 +201,7 @@ public JsonSchema getSchema(URL schemaURL) {
                     return new JsonSchema(new ValidationContext(jsonMetaSchema, this), schemaNode, true /*retrieved via id, resolving will not change anything*/);
                 }
 
-                return newJsonSchema(schemaNode);
+                return newJsonSchema(schemaNode, config);
             } finally {
                 if (inputStream != null) {
                     inputStream.close();
@@ -204,8 +213,16 @@ public JsonSchema getSchema(URL schemaURL) {
         }
     }
 
+    public JsonSchema getSchema(URL schemaURL) {
+        return getSchema(schemaURL, null);
+    }
+
+    public JsonSchema getSchema(JsonNode jsonNode, SchemaValidatorsConfig config) {
+        return newJsonSchema(jsonNode, config);
+    }
+
     public JsonSchema getSchema(JsonNode jsonNode) {
-        return newJsonSchema(jsonNode);
+        return newJsonSchema(jsonNode, null);
     }
 
     private boolean idMatchesSourceUrl(JsonMetaSchema metaSchema, JsonNode schema, URL schemaUrl) {
@@ -219,7 +236,5 @@ private boolean idMatchesSourceUrl(JsonMetaSchema metaSchema, JsonNode schema, U
             logger.debug("Matching " + id + " to " + schemaUrl.toString() + ": " + result);
         }
         return result;
-
     }
-
 }

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

@@ -0,0 +1,24 @@
+package com.networknt.schema;
+
+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.
+     */
+    private boolean typeLoose;
+
+    public boolean isTypeLoose() {
+        return typeLoose;
+    }
+
+    public void setTypeLoose(boolean typeLoose) {
+        this.typeLoose = typeLoose;
+    }
+
+    public SchemaValidatorsConfig() {
+        loadDefaultConfig();
+    }
+
+    private void loadDefaultConfig() {
+        this.typeLoose = true;
+    }
+}