Fixed parallel processing (issue-335) (#377)

Mike Weber · web-flow · commit b322058a7fa1 · 2021-02-17T08:17:35.000-05:00
diff --git a/src/main/java/com/networknt/schema/AdditionalPropertiesValidator.java b/src/main/java/com/networknt/schema/AdditionalPropertiesValidator.java
@@ -40,8 +40,7 @@ public AdditionalPropertiesValidator(String schemaPath, JsonNode schemaNode, Jso
             additionalPropertiesSchema = null;
         } else if (schemaNode.isObject()) {
             allowAdditionalProperties = true;
-            additionalPropertiesSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema)
-                .initialize();
+            additionalPropertiesSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema);
         } else {
             allowAdditionalProperties = false;
             additionalPropertiesSchema = null;
diff --git a/src/main/java/com/networknt/schema/AllOfValidator.java b/src/main/java/com/networknt/schema/AllOfValidator.java
@@ -31,8 +31,7 @@ public AllOfValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentS
         super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.ALL_OF, validationContext);
         int size = schemaNode.size();
         for (int i = 0; i < size; i++) {
-            schemas.add(new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode.get(i), parentSchema)
-                .initialize());
+            schemas.add(new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode.get(i), parentSchema));
         }
     }
 
diff --git a/src/main/java/com/networknt/schema/AnyOfValidator.java b/src/main/java/com/networknt/schema/AnyOfValidator.java
@@ -31,8 +31,7 @@ public AnyOfValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentS
         super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.ANY_OF, validationContext);
         int size = schemaNode.size();
         for (int i = 0; i < size; i++) {
-            schemas.add(new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode.get(i), parentSchema)
-                .initialize());
+            schemas.add(new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode.get(i), parentSchema));
         }
     }
 
@@ -43,8 +42,8 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
         String typeValidatorName = "anyOf/type";
 
         for (JsonSchema schema : schemas) {
-            if (schema.validators.containsKey(typeValidatorName)) {
-                TypeValidator typeValidator = ((TypeValidator) schema.validators.get(typeValidatorName));
+            if (schema.getValidators().containsKey(typeValidatorName)) {
+                TypeValidator typeValidator = ((TypeValidator) schema.getValidators().get(typeValidatorName));
                 //If schema has type validator and node type doesn't match with schemaType then ignore it
                 //For union type, it is must to call TypeValidator
                 if (typeValidator.getSchemaType() != JsonType.UNION && !typeValidator.equalsToSchemaType(node)) {
diff --git a/src/main/java/com/networknt/schema/ContainsValidator.java b/src/main/java/com/networknt/schema/ContainsValidator.java
@@ -31,8 +31,7 @@ public class ContainsValidator extends BaseJsonValidator implements JsonValidato
     public ContainsValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
         super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.CONTAINS, validationContext);
         if (schemaNode.isObject() || schemaNode.isBoolean()) {
-            schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema)
-                .initialize();
+            schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema);
         }
 
         parseErrorCode(getValidatorType().getErrorCodeKey());
diff --git a/src/main/java/com/networknt/schema/DependenciesValidator.java b/src/main/java/com/networknt/schema/DependenciesValidator.java
@@ -44,8 +44,7 @@ public DependenciesValidator(String schemaPath, JsonNode schemaNode, JsonSchema
                     depsProps.add(pvalue.get(i).asText());
                 }
             } else if (pvalue.isObject() || pvalue.isBoolean()) {
-                schemaDeps.put(pname, new JsonSchema(validationContext, pname, parentSchema.getCurrentUri(), pvalue, parentSchema)
-                    .initialize());
+                schemaDeps.put(pname, new JsonSchema(validationContext, pname, parentSchema.getCurrentUri(), pvalue, parentSchema));
             }
         }
 
diff --git a/src/main/java/com/networknt/schema/IfValidator.java b/src/main/java/com/networknt/schema/IfValidator.java
@@ -37,14 +37,11 @@ public IfValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSche
         for (final String keyword : KEYWORDS) {
             final JsonNode node = schemaNode.get(keyword);
             if (keyword.equals("if")) {
-                ifSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema)
-                    .initialize();
+                ifSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema);
             } else if (keyword.equals("then") && node != null) {
-                thenSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema)
-                    .initialize();
+                thenSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema);
             } else if (keyword.equals("else") && node != null) {
-                elseSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema)
-                    .initialize();
+                elseSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema);
             }
         }
     }
diff --git a/src/main/java/com/networknt/schema/ItemsValidator.java b/src/main/java/com/networknt/schema/ItemsValidator.java
@@ -41,22 +41,20 @@ public ItemsValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentS
         super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.ITEMS, validationContext);
         if (schemaNode.isObject() || schemaNode.isBoolean()) {
             schema = new JsonSchema(validationContext, schemaPath, parentSchema.getCurrentUri(), schemaNode,
-                    parentSchema).initialize();
+                    parentSchema);
         } else {
             tupleSchema = new ArrayList<JsonSchema>();
             for (JsonNode s : schemaNode) {
                 tupleSchema.add(
-                        new JsonSchema(validationContext, schemaPath, parentSchema.getCurrentUri(), s, parentSchema)
-                                .initialize());
+                        new JsonSchema(validationContext, schemaPath, parentSchema.getCurrentUri(), s, parentSchema));
             }
 
             JsonNode addItemNode = getParentSchema().getSchemaNode().get(PROPERTY_ADDITIONAL_ITEMS);
             if (addItemNode != null) {
                 if (addItemNode.isBoolean()) {
                     additionalItems = addItemNode.asBoolean();
                 } else if (addItemNode.isObject()) {
-                    additionalSchema = new JsonSchema(validationContext, parentSchema.getCurrentUri(), addItemNode)
-                            .initialize();
+                    additionalSchema = new JsonSchema(validationContext, parentSchema.getCurrentUri(), addItemNode);
                 }
             }
         }
diff --git a/src/main/java/com/networknt/schema/JsonSchema.java b/src/main/java/com/networknt/schema/JsonSchema.java
@@ -36,7 +36,7 @@
  */
 public class JsonSchema extends BaseJsonValidator {
     private static final Pattern intPattern = Pattern.compile("^[0-9]+$");
-    protected Map<String, JsonValidator> validators;
+    private Map<String, JsonValidator> validators;
     private final String idKeyword;
     private final ValidationContext validationContext;
     private WalkListenerRunner keywordWalkListenerRunner;
@@ -80,11 +80,6 @@ private JsonSchema(ValidationContext validationContext, String schemaPath, URI c
 		}
     }
 
-    JsonSchema initialize() {
-        this.validators = Collections.unmodifiableMap(this.read(getSchemaNode()));
-        return this;
-    }
-
     private URI combineCurrentUriWithIds(URI currentUri, JsonNode schemaNode) {
         final String id = validationContext.resolveSchemaId(schemaNode);
         if (id == null) {
@@ -225,7 +220,7 @@ private Map<String, JsonValidator> read(JsonNode schemaNode) {
 
     public Set<ValidationMessage> validate(JsonNode jsonNode, JsonNode rootNode, String at) {
         Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();
-        for (JsonValidator v : validators.values()) {
+        for (JsonValidator v : getValidators().values()) {
             errors.addAll(v.validate(jsonNode, rootNode, at));
         }
         return errors;
@@ -296,7 +291,7 @@ public ValidationResult walk(JsonNode node, boolean shouldValidateSchema) {
 	public Set<ValidationMessage> walk(JsonNode node, JsonNode rootNode, String at, boolean shouldValidateSchema) {
 		Set<ValidationMessage> validationMessages = new LinkedHashSet<ValidationMessage>();
 		// Walk through all the JSONWalker's.
-		for (Entry<String, JsonValidator> entry : validators.entrySet()) {
+		for (Entry<String, JsonValidator> entry : getValidators().entrySet()) {
 			JsonSchemaWalker jsonWalker = entry.getValue();
 			String schemaPathWithKeyword = entry.getKey();
 			try {
@@ -343,6 +338,9 @@ public JsonValidator getRequiredValidator() {
     }
 
     public Map<String, JsonValidator> getValidators() {
+        if (validators == null) {
+            validators = Collections.unmodifiableMap(this.read(getSchemaNode()));
+        }
         return validators;
     }
 
diff --git a/src/main/java/com/networknt/schema/JsonSchemaFactory.java b/src/main/java/com/networknt/schema/JsonSchemaFactory.java
@@ -263,7 +263,7 @@ public static Builder builder(final JsonSchemaFactory blueprint) {
     protected JsonSchema newJsonSchema(final URI schemaUri, final JsonNode schemaNode, final SchemaValidatorsConfig config) {
         final ValidationContext validationContext = createValidationContext(schemaNode);
         validationContext.setConfig(config);
-        return new JsonSchema(validationContext, schemaUri, schemaNode).initialize();
+        return new JsonSchema(validationContext, schemaUri, schemaNode);
     }
 
     protected ValidationContext createValidationContext(final JsonNode schemaNode) {
@@ -349,7 +349,6 @@ public JsonSchema getSchema(final URI schemaUri, final SchemaValidatorsConfig co
                     jsonSchema = new JsonSchema(validationContext, mappedUri, schemaNode);
                 }
                 uriSchemaCache.put(mappedUri, jsonSchema);
-                jsonSchema.initialize();
 
                 return jsonSchema;
             } finally {
diff --git a/src/main/java/com/networknt/schema/NotValidator.java b/src/main/java/com/networknt/schema/NotValidator.java
@@ -31,8 +31,7 @@ public class NotValidator extends BaseJsonValidator implements JsonValidator {
 
     public NotValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
         super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.NOT, validationContext);
-        schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema)
-            .initialize();
+        schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema);
 
         parseErrorCode(getValidatorType().getErrorCodeKey());
     }
diff --git a/src/main/java/com/networknt/schema/OneOfValidator.java b/src/main/java/com/networknt/schema/OneOfValidator.java
@@ -118,8 +118,7 @@ public OneOfValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentS
         int size = schemaNode.size();
         for (int i = 0; i < size; i++) {
             JsonNode childNode = schemaNode.get(i);
-            JsonSchema childSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), childNode, parentSchema)
-                    .initialize();
+            JsonSchema childSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), childNode, parentSchema);
             schemas.add(new ShortcutValidator(childNode, parentSchema, validationContext, childSchema));
         }
 
diff --git a/src/main/java/com/networknt/schema/PatternPropertiesValidator.java b/src/main/java/com/networknt/schema/PatternPropertiesValidator.java
@@ -38,8 +38,7 @@ public PatternPropertiesValidator(String schemaPath, JsonNode schemaNode, JsonSc
         Iterator<String> names = schemaNode.fieldNames();
         while (names.hasNext()) {
             String name = names.next();
-            schemas.put(Pattern.compile(name), new JsonSchema(validationContext, name, parentSchema.getCurrentUri(), schemaNode.get(name), parentSchema)
-                .initialize());
+            schemas.put(Pattern.compile(name), new JsonSchema(validationContext, name, parentSchema.getCurrentUri(), schemaNode.get(name), parentSchema));
         }
     }
 
diff --git a/src/main/java/com/networknt/schema/PropertiesValidator.java b/src/main/java/com/networknt/schema/PropertiesValidator.java
@@ -37,8 +37,7 @@ public PropertiesValidator(String schemaPath, JsonNode schemaNode, JsonSchema pa
         schemas = new HashMap<String, JsonSchema>();
         for (Iterator<String> it = schemaNode.fieldNames(); it.hasNext(); ) {
             String pname = it.next();
-            schemas.put(pname, new JsonSchema(validationContext, schemaPath + "/" + pname, parentSchema.getCurrentUri(), schemaNode.get(pname), parentSchema)
-                .initialize());
+            schemas.put(pname, new JsonSchema(validationContext, schemaPath + "/" + pname, parentSchema.getCurrentUri(), schemaNode.get(pname), parentSchema));
         }
 		propertyWalkListenerRunner = new DefaultPropertyWalkListenerRunner(
                 config.getPropertyWalkListeners());    
diff --git a/src/main/java/com/networknt/schema/PropertyNamesValidator.java b/src/main/java/com/networknt/schema/PropertyNamesValidator.java
@@ -34,8 +34,7 @@ public PropertyNamesValidator(String schemaPath, JsonNode schemaNode, JsonSchema
             schemas = new HashMap<String, JsonSchema>();
             for (Iterator<String> it = schemaNode.fieldNames(); it.hasNext(); ) {
                 String pname = it.next();
-                schemas.put(pname, new JsonSchema(validationContext, schemaPath + "/" + pname, parentSchema.getCurrentUri(), schemaNode.get(pname), parentSchema)
-                    .initialize());
+                schemas.put(pname, new JsonSchema(validationContext, schemaPath + "/" + pname, parentSchema.getCurrentUri(), schemaNode.get(pname), parentSchema));
             }
         }
     }
diff --git a/src/main/java/com/networknt/schema/RefValidator.java b/src/main/java/com/networknt/schema/RefValidator.java
@@ -97,8 +97,7 @@ static JsonSchemaRef getRefSchema(JsonSchema parentSchema, ValidationContext val
                 if (ref == null) {
                     ref = new JsonSchemaRef(validationContext, refValue);
                     validationContext.setReferenceParsingInProgress(refValueOriginal, ref);
-                    JsonSchema ret = new JsonSchema(validationContext, refValue, parentSchema.getCurrentUri(), node, parentSchema)
-                        .initialize();
+                    JsonSchema ret = new JsonSchema(validationContext, refValue, parentSchema.getCurrentUri(), node, parentSchema);
                     ref.set(ret);
                 }
                 return ref;
diff --git a/src/main/java/com/networknt/schema/UnionTypeValidator.java b/src/main/java/com/networknt/schema/UnionTypeValidator.java
@@ -50,8 +50,7 @@ public UnionTypeValidator(String schemaPath, JsonNode schemaNode, JsonSchema par
             sep = ", ";
 
             if (n.isObject())
-                schemas.add(new JsonSchema(validationContext, ValidatorTypeCode.TYPE.getValue(), parentSchema.getCurrentUri(), n, parentSchema)
-                    .initialize());
+                schemas.add(new JsonSchema(validationContext, ValidatorTypeCode.TYPE.getValue(), parentSchema.getCurrentUri(), n, parentSchema));
             else
                 schemas.add(new TypeValidator(schemaPath + "/" + i, n, parentSchema, validationContext));
 

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,7 @@ public AllOfValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentS`
`31`	`31`	`super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.ALL_OF, validationContext);`
`32`	`32`	`int size = schemaNode.size();`
`33`	`33`	`for (int i = 0; i < size; i++) {`
`34`		`- schemas.add(new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode.get(i), parentSchema)`
`35`		`- .initialize());`
	`34`	`+ schemas.add(new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode.get(i), parentSchema));`
`36`	`35`	`}`
`37`	`36`	`}`
`38`	`37`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,7 @@ public class ContainsValidator extends BaseJsonValidator implements JsonValidato`
`31`	`31`	`public ContainsValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {`
`32`	`32`	`super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.CONTAINS, validationContext);`
`33`	`33`	`if (schemaNode.isObject() \|\| schemaNode.isBoolean()) {`
`34`		`- schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema)`
`35`		`- .initialize();`
	`34`	`+ schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema);`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`parseErrorCode(getValidatorType().getErrorCodeKey());`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,7 @@ public DependenciesValidator(String schemaPath, JsonNode schemaNode, JsonSchema`
`44`	`44`	`depsProps.add(pvalue.get(i).asText());`
`45`	`45`	`}`
`46`	`46`	`} else if (pvalue.isObject() \|\| pvalue.isBoolean()) {`
`47`		`- schemaDeps.put(pname, new JsonSchema(validationContext, pname, parentSchema.getCurrentUri(), pvalue, parentSchema)`
`48`		`- .initialize());`
	`47`	`+ schemaDeps.put(pname, new JsonSchema(validationContext, pname, parentSchema.getCurrentUri(), pvalue, parentSchema));`
`49`	`48`	`}`
`50`	`49`	`}`
`51`	`50`
Original file line number	Diff line number	Diff line change
`@@ -37,14 +37,11 @@ public IfValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSche`
`37`	`37`	`for (final String keyword : KEYWORDS) {`
`38`	`38`	`final JsonNode node = schemaNode.get(keyword);`
`39`	`39`	`if (keyword.equals("if")) {`
`40`		`- ifSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema)`
`41`		`- .initialize();`
	`40`	`+ ifSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema);`
`42`	`41`	`} else if (keyword.equals("then") && node != null) {`
`43`		`- thenSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema)`
`44`		`- .initialize();`
	`42`	`+ thenSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema);`
`45`	`43`	`} else if (keyword.equals("else") && node != null) {`
`46`		`- elseSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema)`
`47`		`- .initialize();`
	`44`	`+ elseSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema);`
`48`	`45`	`}`
`49`	`46`	`}`
`50`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ public static Builder builder(final JsonSchemaFactory blueprint) {`
`263`	`263`	`protected JsonSchema newJsonSchema(final URI schemaUri, final JsonNode schemaNode, final SchemaValidatorsConfig config) {`
`264`	`264`	`final ValidationContext validationContext = createValidationContext(schemaNode);`
`265`	`265`	`validationContext.setConfig(config);`
`266`		`- return new JsonSchema(validationContext, schemaUri, schemaNode).initialize();`
	`266`	`+ return new JsonSchema(validationContext, schemaUri, schemaNode);`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`protected ValidationContext createValidationContext(final JsonNode schemaNode) {`
`@@ -349,7 +349,6 @@ public JsonSchema getSchema(final URI schemaUri, final SchemaValidatorsConfig co`
`349`	`349`	`jsonSchema = new JsonSchema(validationContext, mappedUri, schemaNode);`
`350`	`350`	`}`
`351`	`351`	`uriSchemaCache.put(mappedUri, jsonSchema);`
`352`		`- jsonSchema.initialize();`
`353`	`352`
`354`	`353`	`return jsonSchema;`
`355`	`354`	`} finally {`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,7 @@ public class NotValidator extends BaseJsonValidator implements JsonValidator {`
`31`	`31`
`32`	`32`	`public NotValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {`
`33`	`33`	`super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.NOT, validationContext);`
`34`		`- schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema)`
`35`		`- .initialize();`
	`34`	`+ schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema);`
`36`	`35`
`37`	`36`	`parseErrorCode(getValidatorType().getErrorCodeKey());`
`38`	`37`	`}`