Merge pull request #275 from francesc79/bug/cyclic-dep

stevehu · web-flow · commit 5bb9b44d7588 · 2020-03-20T22:07:06.000-04:00
#258 fixed cyclic dependencies
diff --git a/src/main/java/com/networknt/schema/AdditionalPropertiesValidator.java b/src/main/java/com/networknt/schema/AdditionalPropertiesValidator.java
@@ -40,7 +40,8 @@ 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);
+            additionalPropertiesSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema)
+                .initialize();
         } 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,7 +31,8 @@ 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));
+            schemas.add(new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode.get(i), parentSchema)
+                .initialize());
         }
     }
 
diff --git a/src/main/java/com/networknt/schema/AnyOfValidator.java b/src/main/java/com/networknt/schema/AnyOfValidator.java
@@ -31,7 +31,8 @@ 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));
+            schemas.add(new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode.get(i), parentSchema)
+                .initialize());
         }
     }
 
diff --git a/src/main/java/com/networknt/schema/ContainsValidator.java b/src/main/java/com/networknt/schema/ContainsValidator.java
@@ -31,7 +31,8 @@ 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);
+            schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema)
+                .initialize();
         }
 
         parseErrorCode(getValidatorType().getErrorCodeKey());
diff --git a/src/main/java/com/networknt/schema/DependenciesValidator.java b/src/main/java/com/networknt/schema/DependenciesValidator.java
@@ -44,7 +44,8 @@ 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));
+                schemaDeps.put(pname, new JsonSchema(validationContext, pname, parentSchema.getCurrentUri(), pvalue, parentSchema)
+                    .initialize());
             }
         }
 
diff --git a/src/main/java/com/networknt/schema/IfValidator.java b/src/main/java/com/networknt/schema/IfValidator.java
@@ -37,11 +37,14 @@ 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);
+                ifSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema)
+                    .initialize();
             } else if (keyword.equals("then") && node != null) {
-                thenSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema);
+                thenSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema)
+                    .initialize();
             } else if (keyword.equals("else") && node != null) {
-                elseSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema);
+                elseSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema)
+                    .initialize();
             }
         }
     }
diff --git a/src/main/java/com/networknt/schema/ItemsValidator.java b/src/main/java/com/networknt/schema/ItemsValidator.java
@@ -34,19 +34,22 @@ public class ItemsValidator extends BaseJsonValidator implements JsonValidator {
     public ItemsValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
         super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.ITEMS, validationContext);
         if (schemaNode.isObject() || schemaNode.isBoolean()) {
-            schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema);
+            schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema)
+                .initialize();
         } else {
             tupleSchema = new ArrayList<JsonSchema>();
             for (JsonNode s : schemaNode) {
-                tupleSchema.add(new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), s, parentSchema));
+                tupleSchema.add(new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), s, parentSchema)
+                    .initialize());
             }
 
             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);
+                    additionalSchema = new JsonSchema(validationContext, parentSchema.getCurrentUri(), addItemNode)
+                        .initialize();
                 }
             }
         }
diff --git a/src/main/java/com/networknt/schema/JsonSchema.java b/src/main/java/com/networknt/schema/JsonSchema.java
@@ -32,7 +32,7 @@
  */
 public class JsonSchema extends BaseJsonValidator {
     private static final Pattern intPattern = Pattern.compile("^[0-9]+$");
-    protected final Map<String, JsonValidator> validators;
+    protected Map<String, JsonValidator> validators;
     private final String idKeyword;
     private final ValidationContext validationContext;
 
@@ -70,7 +70,11 @@ private JsonSchema(ValidationContext validationContext, String schemaPath, URI c
         this.config = validationContext.getConfig();
         this.idKeyword = validationContext.getMetaSchema().getIdKeyword();
         this.currentUri = this.combineCurrentUriWithIds(currentUri, schemaNode);
-        this.validators = Collections.unmodifiableMap(this.read(schemaNode));
+    }
+
+    JsonSchema initialize() {
+        this.validators = Collections.unmodifiableMap(this.read(getSchemaNode()));
+        return this;
     }
 
     private URI combineCurrentUriWithIds(URI currentUri, JsonNode schemaNode) {
diff --git a/src/main/java/com/networknt/schema/JsonSchemaFactory.java b/src/main/java/com/networknt/schema/JsonSchemaFactory.java
@@ -29,6 +29,8 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 public class JsonSchemaFactory {
     private static final Logger logger = LoggerFactory
@@ -147,6 +149,7 @@ public JsonSchemaFactory build() {
     private final URNFactory urnFactory;
     private final Map<String, JsonMetaSchema> jsonMetaSchemas;
     private final Map<String, String> uriMap;
+    private final ConcurrentMap<URI, JsonSchema> uriSchemaCache = new ConcurrentHashMap<URI, JsonSchema>();
 
 
     private JsonSchemaFactory(
@@ -260,7 +263,8 @@ 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);
-        JsonSchema jsonSchema = new JsonSchema(validationContext, schemaUri, schemaNode);
+        JsonSchema jsonSchema = new JsonSchema(validationContext, schemaUri, schemaNode)
+            .initialize();
         return jsonSchema;
     }
 
@@ -327,16 +331,27 @@ public JsonSchema getSchema(final URI schemaUri, final SchemaValidatorsConfig co
                 logger.error("Failed to create URI.", e);
                 throw new JsonSchemaException(e);
             }
+
+            if (uriSchemaCache.containsKey(mappedUri))
+                return uriSchemaCache.get(mappedUri);
+
             try {
                 inputStream = this.uriFetcher.fetch(mappedUri);
                 final JsonNode schemaNode = mapper.readTree(inputStream);
                 final JsonMetaSchema jsonMetaSchema = findMetaSchemaForSchema(schemaNode);
 
+                JsonSchema jsonSchema;
                 if (idMatchesSourceUri(jsonMetaSchema, schemaNode, schemaUri)) {
-                    return new JsonSchema(new ValidationContext(this.uriFactory, this.urnFactory, jsonMetaSchema, this, config), mappedUri, schemaNode, true /*retrieved via id, resolving will not change anything*/);
+                    jsonSchema = new JsonSchema(new ValidationContext(this.uriFactory, this.urnFactory, jsonMetaSchema, this, config), mappedUri, schemaNode, true /*retrieved via id, resolving will not change anything*/);
+                } else {
+                    final ValidationContext validationContext = createValidationContext(schemaNode);
+                    validationContext.setConfig(config);
+                    jsonSchema = new JsonSchema(validationContext, mappedUri, schemaNode);
                 }
+                uriSchemaCache.put(mappedUri, jsonSchema);
+                jsonSchema.initialize();
 
-                return newJsonSchema(mappedUri, schemaNode, config);
+                return jsonSchema;
             } finally {
                 if (inputStream != null) {
                     inputStream.close();
diff --git a/src/main/java/com/networknt/schema/NotValidator.java b/src/main/java/com/networknt/schema/NotValidator.java
@@ -30,7 +30,8 @@ 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);
+        schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema)
+            .initialize();
 
         parseErrorCode(getValidatorType().getErrorCodeKey());
     }
diff --git a/src/main/java/com/networknt/schema/OneOfValidator.java b/src/main/java/com/networknt/schema/OneOfValidator.java
@@ -114,7 +114,8 @@ 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);
+            JsonSchema childSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), childNode, parentSchema)
+                .initialize();
             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,7 +38,8 @@ 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));
+            schemas.put(Pattern.compile(name), new JsonSchema(validationContext, name, parentSchema.getCurrentUri(), schemaNode.get(name), parentSchema)
+                .initialize());
         }
     }
 
diff --git a/src/main/java/com/networknt/schema/PropertiesValidator.java b/src/main/java/com/networknt/schema/PropertiesValidator.java
@@ -32,7 +32,8 @@ 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));
+            schemas.put(pname, new JsonSchema(validationContext, schemaPath + "/" + pname, parentSchema.getCurrentUri(), schemaNode.get(pname), parentSchema)
+                .initialize());
         }
     }
 
diff --git a/src/main/java/com/networknt/schema/RefValidator.java b/src/main/java/com/networknt/schema/RefValidator.java
@@ -90,7 +90,8 @@ 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);
+                    JsonSchema ret = new JsonSchema(validationContext, refValue, parentSchema.getCurrentUri(), node, parentSchema)
+                        .initialize();
                     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,7 +50,8 @@ public UnionTypeValidator(String schemaPath, JsonNode schemaNode, JsonSchema par
             sep = ", ";
 
             if (n.isObject())
-                schemas.add(new JsonSchema(validationContext, ValidatorTypeCode.TYPE.getValue(), parentSchema.getCurrentUri(), n, parentSchema));
+                schemas.add(new JsonSchema(validationContext, ValidatorTypeCode.TYPE.getValue(), parentSchema.getCurrentUri(), n, parentSchema)
+                    .initialize());
             else
                 schemas.add(new TypeValidator(schemaPath + "/" + i, n, parentSchema, validationContext));
 
diff --git a/src/test/java/com/networknt/schema/CyclicDependencyTest.java b/src/test/java/com/networknt/schema/CyclicDependencyTest.java
@@ -0,0 +1,47 @@
+package com.networknt.schema;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
+
+import java.net.URI;
+import java.net.URL;
+
+import static org.junit.Assert.assertEquals;
+
+public class CyclicDependencyTest {
+
+
+    @Test
+    public void whenDependencyBetweenSchemaThenValidationSuccessful() throws Exception {
+
+        JsonSchemaFactory schemaFactory = JsonSchemaFactory
+            .builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V4))
+            .build();
+        String jsonObject = "{\n" +
+                "  \"element\": {\n" +
+                "    \"id\": \"top\",\n" +
+                "    \"extension\": [\n" +
+                "      {\n" +
+                "        \"url\": \"http://inner.test\"\n" +
+                "      }\n" +
+                "    ]\n" +
+                "  },\n" +
+                "  \"extension\": [\n" +
+                "    {\n" +
+                "      \"url\": \"http://top.test\",\n" +
+                "      \"valueElement\": {\n" +
+                "        \"id\": \"inner\"\n" +
+                "      }\n" +
+                "    }\n" +
+                "  ]\n" +
+                "}";
+
+        URI jsonSchemaLocation = new URL("https://raw.githubusercontent.com/francesc79/json-schema-validator/bug/cyclic-dep/src/test/resources/draft4/cyclic/Master.json").toURI();
+
+        SchemaValidatorsConfig config = new SchemaValidatorsConfig();
+        JsonSchema schema = schemaFactory.getSchema(jsonSchemaLocation, config);
+        assertEquals(0, schema.validate(new ObjectMapper().readTree(jsonObject)).size());
+    }
+
+
+}
diff --git a/src/test/resources/draft4/cyclic/Element.json b/src/test/resources/draft4/cyclic/Element.json
@@ -0,0 +1,19 @@
+{
+  "id": "Element.json",
+  "type": "object",
+  "datatype": true,
+  "category": "fhir",
+  "properties": {
+    "id": {
+      "type": "string",
+      "pattern": "[A-Za-z0-9\\-\\.]{1,64}"
+    },
+    "extension": {
+      "type": "array",
+      "items": {
+        "$ref": "Extension.json"
+      }
+    }
+  },
+  "additionalProperties": false
+}
diff --git a/src/test/resources/draft4/cyclic/Extension.json b/src/test/resources/draft4/cyclic/Extension.json
@@ -0,0 +1,19 @@
+{
+  "id": "Extension.json",
+  "type": "object",
+  "datatype": true,
+  "category": "fhir",
+  "properties": {
+    "url": {
+      "type": "string",
+      "format": "url"
+    },
+    "valueElement": {
+      "$ref": "Element.json"
+    }
+  },
+  "additionalProperties": false,
+  "required": [
+    "url"
+  ]
+}
diff --git a/src/test/resources/draft4/cyclic/Master.json b/src/test/resources/draft4/cyclic/Master.json
@@ -0,0 +1,18 @@
+{
+  "id": "Master.json",
+  "type": "object",
+  "datatype": true,
+  "category": "fhir",
+  "properties": {
+    "element": {
+      "$ref": "Element.json"
+    },
+    "extension": {
+      "type": "array",
+      "items": {
+        "$ref": "Extension.json"
+      }
+    }
+  },
+  "additionalProperties": false
+}

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ 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));`
	`34`	`+ schemas.add(new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode.get(i), parentSchema)`
	`35`	`+ .initialize());`
`35`	`36`	`}`
`36`	`37`	`}`
`37`	`38`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ public AnyOfValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentS`
`31`	`31`	`super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.ANY_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));`
	`34`	`+ schemas.add(new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode.get(i), parentSchema)`
	`35`	`+ .initialize());`
`35`	`36`	`}`
`36`	`37`	`}`
`37`	`38`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ 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);`
	`34`	`+ schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema)`
	`35`	`+ .initialize();`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`parseErrorCode(getValidatorType().getErrorCodeKey());`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@ 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));`
	`47`	`+ schemaDeps.put(pname, new JsonSchema(validationContext, pname, parentSchema.getCurrentUri(), pvalue, parentSchema)`
	`48`	`+ .initialize());`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`
Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,14 @@ 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);`
	`40`	`+ ifSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema)`
	`41`	`+ .initialize();`
`41`	`42`	`} else if (keyword.equals("then") && node != null) {`
`42`		`- thenSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema);`
	`43`	`+ thenSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema)`
	`44`	`+ .initialize();`
`43`	`45`	`} else if (keyword.equals("else") && node != null) {`
`44`		`- elseSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema);`
	`46`	`+ elseSchema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), node, parentSchema)`
	`47`	`+ .initialize();`
`45`	`48`	`}`
`46`	`49`	`}`
`47`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,8 @@ public class NotValidator extends BaseJsonValidator implements JsonValidator {`
`30`	`30`
`31`	`31`	`public NotValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {`
`32`	`32`	`super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.NOT, validationContext);`
`33`		`- schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema);`
	`33`	`+ schema = new JsonSchema(validationContext, getValidatorType().getValue(), parentSchema.getCurrentUri(), schemaNode, parentSchema)`
	`34`	`+ .initialize();`
`34`	`35`
`35`	`36`	`parseErrorCode(getValidatorType().getErrorCodeKey());`
`36`	`37`	`}`