$ref caching issue

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

@@ -55,7 +55,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
         for (JsonSchema schema : schemas) {
             errors.addAll(schema.validate(node, rootNode, at));
 
-            if (config.isOpenAPI3StyleDiscriminators()) {
+            if (this.validationContext.getConfig().isOpenAPI3StyleDiscriminators()) {
                 final Iterator<JsonNode> arrayElements = schemaNode.elements();
                 while (arrayElements.hasNext()) {
                     final ObjectNode allOfEntry = (ObjectNode) arrayElements.next();

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

@@ -37,13 +37,13 @@ public AnyOfValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentS
         int size = schemaNode.size();
         for (int i = 0; i < size; i++) {
             schemas.add(new JsonSchema(validationContext,
-                                       getValidatorType().getValue(),
-                                       parentSchema.getCurrentUri(),
-                                       schemaNode.get(i),
-                                       parentSchema));
+                    getValidatorType().getValue(),
+                    parentSchema.getCurrentUri(),
+                    schemaNode.get(i),
+                    parentSchema));
         }
 
-        if (config.isOpenAPI3StyleDiscriminators()) {
+        if (this.validationContext.getConfig().isOpenAPI3StyleDiscriminators()) {
             this.discriminatorContext = new ValidationContext.DiscriminatorContext();
         } else {
             this.discriminatorContext = null;
@@ -53,7 +53,7 @@ public AnyOfValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentS
     public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
         debug(logger, node, rootNode, at);
 
-        if (config.isOpenAPI3StyleDiscriminators()) {
+        if (this.validationContext.getConfig().isOpenAPI3StyleDiscriminators()) {
             validationContext.enterDiscriminatorContext(this.discriminatorContext, at);
         }
 
@@ -72,9 +72,9 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
                     }
                 }
                 Set<ValidationMessage> errors = schema.validate(node, rootNode, at);
-                if (errors.isEmpty() && !config.isOpenAPI3StyleDiscriminators()) {
+                if (errors.isEmpty() && (!this.validationContext.getConfig().isOpenAPI3StyleDiscriminators())) {
                     return errors;
-                } else if (config.isOpenAPI3StyleDiscriminators()) {
+                } else if (this.validationContext.getConfig().isOpenAPI3StyleDiscriminators()) {
                     if (discriminatorContext.isDiscriminatorMatchFound()) {
                         if (!errors.isEmpty()) {
                             errors.add(buildValidationMessage(at, DISCRIMINATOR_REMARK));
@@ -85,13 +85,13 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
                 allErrors.addAll(errors);
             }
 
-            if (config.isOpenAPI3StyleDiscriminators() && discriminatorContext.isActive()) {
-               final Set<ValidationMessage> errors = new HashSet<ValidationMessage>();
-               errors.add(buildValidationMessage(at, "based on the provided discriminator. No alternative could be chosen based on the discriminator property"));
-               return Collections.unmodifiableSet(errors);
+            if (this.validationContext.getConfig().isOpenAPI3StyleDiscriminators() && discriminatorContext.isActive()) {
+                final Set<ValidationMessage> errors = new HashSet<ValidationMessage>();
+                errors.add(buildValidationMessage(at, "based on the provided discriminator. No alternative could be chosen based on the discriminator property"));
+                return Collections.unmodifiableSet(errors);
             }
         } finally {
-            if (config.isOpenAPI3StyleDiscriminators()) {
+            if (this.validationContext.getConfig().isOpenAPI3StyleDiscriminators()) {
                 validationContext.leaveDiscriminatorContextImmediately(at);
             }
         }

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

@@ -36,17 +36,13 @@ 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;
+
     protected final boolean failFast;
 
     public BaseJsonValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema,
                              ValidatorTypeCode validatorType, ValidationContext validationContext) {
         this(schemaPath, schemaNode, parentSchema, validatorType, false,
              validationContext.getConfig() != null && validationContext.getConfig().isFailFast());
-        this.config = validationContext.getConfig() == null ? new SchemaValidatorsConfig() : validationContext.getConfig();
     }
 
     public BaseJsonValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema,

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

@@ -32,6 +32,8 @@
 public class DateTimeValidator extends BaseJsonValidator implements JsonValidator {
     private static final Logger logger = LoggerFactory.getLogger(DateTimeValidator.class);
 
+    private final ValidationContext validationContext;
+
     private final String formatName;
     private final String DATE = "date";
     private final String DATETIME = "date-time";
@@ -44,6 +46,7 @@ public class DateTimeValidator extends BaseJsonValidator implements JsonValidato
     public DateTimeValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext, String formatName) {
         super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.DATETIME, validationContext);
         this.formatName = formatName;
+        this.validationContext = validationContext;
         parseErrorCode(getValidatorType().getErrorCodeKey());
     }
 
@@ -52,7 +55,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
 
         Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();
 
-        JsonType nodeType = TypeFactory.getValueNodeType(node, super.config);
+        JsonType nodeType = TypeFactory.getValueNodeType(node, this.validationContext.getConfig());
         if (nodeType != JsonType.STRING) {
             return errors;
         }

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

@@ -32,10 +32,11 @@ public class EnumValidator extends BaseJsonValidator implements JsonValidator {
 
     private final Set<JsonNode> nodes;
     private final String error;
+    private final ValidationContext validationContext;
 
     public EnumValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
         super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.ENUM, validationContext);
-
+        this.validationContext = validationContext;
         if (schemaNode != null && schemaNode.isArray()) {
             nodes = new HashSet<JsonNode>();
             StringBuilder sb = new StringBuilder();
@@ -57,7 +58,7 @@ public EnumValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSc
             }
 
             // check if the parent schema declares the fields as nullable
-            if (config.isHandleNullableField()) {
+            if (validationContext.getConfig().isHandleNullableField()) {
                 JsonNode nullable = parentSchema.getSchemaNode().get("nullable");
                 if (nullable != null && nullable.asBoolean()) {
                     nodes.add(NullNode.getInstance());
@@ -83,7 +84,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
 
         Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();
         if (node.isNumber()) node = DecimalNode.valueOf(node.decimalValue());
-        if (!nodes.contains(node) && !(config.isTypeLoose() && isTypeLooseContainsInEnum(node))) {
+        if (!nodes.contains(node) && !( this.validationContext.getConfig().isTypeLoose() && isTypeLooseContainsInEnum(node))) {
             errors.add(buildValidationMessage(at, error));
         }
 
@@ -96,7 +97,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
      * @param node JsonNode to check
      */
     private boolean isTypeLooseContainsInEnum(JsonNode node) {
-        if (TypeFactory.getValueNodeType(node, super.config) == JsonType.STRING) {
+        if (TypeFactory.getValueNodeType(node, this.validationContext.getConfig()) == JsonType.STRING) {
             String nodeText = node.textValue();
             for (JsonNode n : nodes) {
                 String value = n.asText();

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

@@ -30,9 +30,11 @@ public class ExclusiveMaximumValidator extends BaseJsonValidator implements Json
 
     private final ThresholdMixin typedMaximum;
 
+    private final ValidationContext validationContext;
+
     public ExclusiveMaximumValidator(String schemaPath, final JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
         super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.EXCLUSIVE_MAXIMUM, validationContext);
-
+        this.validationContext = validationContext;
         if (!schemaNode.isNumber()) {
             throw new JsonSchemaException("exclusiveMaximum value is not a number");
         }
@@ -99,7 +101,7 @@ public String thresholdValue() {
     public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
         debug(logger, node, rootNode, at);
 
-        if (!TypeValidator.isNumber(node, super.config)) {
+        if (!TypeValidator.isNumber(node, validationContext.getConfig())) {
             // maximum only applies to numbers
             return Collections.emptySet();
         }

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

@@ -34,9 +34,11 @@ public class ExclusiveMinimumValidator extends BaseJsonValidator implements Json
      */
     private final ThresholdMixin typedMinimum;
 
+    private final ValidationContext validationContext;
+
     public ExclusiveMinimumValidator(String schemaPath, final JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
         super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.EXCLUSIVE_MINIMUM, validationContext);
-
+        this.validationContext = validationContext;
         if (!schemaNode.isNumber()) {
             throw new JsonSchemaException("exclusiveMinimum value is not a number");
         }
@@ -106,7 +108,7 @@ public String thresholdValue() {
     public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
         debug(logger, node, rootNode, at);
 
-        if (!TypeValidator.isNumber(node, super.config)) {
+        if (!TypeValidator.isNumber(node, this.validationContext.getConfig())) {
             // minimum only applies to numbers
             return Collections.emptySet();
         }

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

@@ -29,10 +29,12 @@ public class FormatValidator extends BaseJsonValidator implements JsonValidator
     private static final Logger logger = LoggerFactory.getLogger(FormatValidator.class);
 
     private final Format format;
+    private final ValidationContext validationContext;
 
     public FormatValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext, Format format) {
         super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.FORMAT, validationContext);
         this.format = format;
+        this.validationContext = validationContext;
         parseErrorCode(getValidatorType().getErrorCodeKey());
     }
 
@@ -41,7 +43,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
 
         Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();
 
-        JsonType nodeType = TypeFactory.getValueNodeType(node, super.config);
+        JsonType nodeType = TypeFactory.getValueNodeType(node, this.validationContext.getConfig());
         if (nodeType != JsonType.STRING) {
             return errors;
         }

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

@@ -33,7 +33,7 @@ public class ItemsValidator extends BaseJsonValidator implements JsonValidator {
     private final List<JsonSchema> tupleSchema;
     private boolean additionalItems = true;
     private final JsonSchema additionalSchema;
-    private final WalkListenerRunner arrayItemWalkListenerRunner;
+    private WalkListenerRunner arrayItemWalkListenerRunner;
     private final ValidationContext validationContext;
 
     public ItemsValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema,
@@ -61,7 +61,7 @@ public ItemsValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentS
                 }
             }
         }
-        arrayItemWalkListenerRunner = new DefaultItemWalkListenerRunner(config.getArrayItemWalkListeners());
+        arrayItemWalkListenerRunner = new DefaultItemWalkListenerRunner(validationContext.getConfig().getArrayItemWalkListeners());
 
         this.validationContext = validationContext;
 
@@ -76,7 +76,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
 
         Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();
 
-        if (!node.isArray() && !config.isTypeLoose()) {
+        if (!node.isArray() && !this.validationContext.getConfig().isTypeLoose()) {
             // ignores non-arrays
             return errors;
         }

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

@@ -19,6 +19,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLDecoder;
+import java.sql.Ref;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -36,6 +37,8 @@
 import com.networknt.schema.walk.JsonSchemaWalker;
 import com.networknt.schema.walk.WalkListenerRunner;
 
+import javax.xml.validation.Schema;
+
 /**
  * This is the core of json constraint implementation. It parses json constraint
  * file and generates JsonValidators. The class is thread safe, once it is
@@ -46,7 +49,6 @@ public class JsonSchema extends BaseJsonValidator {
     private Map<String, JsonValidator> validators;
     private final String idKeyword;
     private final ValidationContext validationContext;
-    private WalkListenerRunner keywordWalkListenerRunner;
     private boolean validatorsLoaded = false;
 
     /**
@@ -80,13 +82,10 @@ private JsonSchema(ValidationContext validationContext, String schemaPath, URI c
         super(schemaPath, schemaNode, parent, null, suppressSubSchemaRetrieval,
               validationContext.getConfig() != null && validationContext.getConfig().isFailFast());
         this.validationContext = validationContext;
-        this.config = validationContext.getConfig();
         this.idKeyword = validationContext.getMetaSchema().getIdKeyword();
         this.currentUri = this.combineCurrentUriWithIds(currentUri, schemaNode);
-        if (config != null) {
-            this.keywordWalkListenerRunner = new DefaultKeywordWalkListenerRunner(config.getKeywordWalkListenersMap());
-
-            if (config.isOpenAPI3StyleDiscriminators()) {
+        if (validationContext.getConfig() != null) {
+            if (validationContext.getConfig().isOpenAPI3StyleDiscriminators()) {
                 ObjectNode discriminator = (ObjectNode) schemaNode.get("discriminator");
                 if (null != discriminator && null != validationContext.getCurrentDiscriminatorContext()) {
                     validationContext.getCurrentDiscriminatorContext().registerDiscriminator(schemaPath, discriminator);
@@ -95,6 +94,10 @@ private JsonSchema(ValidationContext validationContext, String schemaPath, URI c
         }
     }
 
+    ValidationContext getValidationContext() {
+        return this.validationContext;
+    }
+
     private URI combineCurrentUriWithIds(URI currentUri, JsonNode schemaNode) {
         final String id = validationContext.resolveSchemaId(schemaNode);
         if (id == null) {
@@ -257,6 +260,7 @@ private JsonNode getMessageNode(JsonNode schemaNode, JsonSchema parentSchema) {
     /************************ START OF VALIDATE METHODS **********************************/
 
     public Set<ValidationMessage> validate(JsonNode jsonNode, JsonNode rootNode, String at) {
+        SchemaValidatorsConfig config = validationContext.getConfig();
         Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();
         // Get the collector context.
         getCollectorContext();
@@ -353,6 +357,7 @@ public ValidationResult walk(JsonNode node, boolean shouldValidateSchema) {
     @Override
     public Set<ValidationMessage> walk(JsonNode node, JsonNode rootNode, String at, boolean shouldValidateSchema) {
         Set<ValidationMessage> validationMessages = new LinkedHashSet<ValidationMessage>();
+        WalkListenerRunner keywordWalkListenerRunner = new DefaultKeywordWalkListenerRunner(this.validationContext.getConfig().getKeywordWalkListenersMap());
         // Walk through all the JSONWalker's.
         for (Entry<String, JsonValidator> entry : getValidators().entrySet()) {
             JsonSchemaWalker jsonWalker = entry.getValue();
@@ -401,11 +406,12 @@ private void setValidatorState(boolean isWalkEnabled, boolean shouldValidateSche
     }
 
     public CollectorContext getCollectorContext() {
+        SchemaValidatorsConfig config = validationContext.getConfig();
         CollectorContext collectorContext = (CollectorContext) ThreadInfo
                 .get(CollectorContext.COLLECTOR_CONTEXT_THREAD_LOCAL_KEY);
         if (collectorContext == null) {
-            if (this.config != null && this.config.getCollectorContext() != null) {
-                collectorContext = this.config.getCollectorContext();
+            if (config != null && config.getCollectorContext() != null) {
+                collectorContext = config.getCollectorContext();
             } else {
                 collectorContext = new CollectorContext();
             }

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

@@ -338,8 +338,14 @@ public JsonSchema getSchema(final URI schemaUri, final SchemaValidatorsConfig co
                 throw new JsonSchemaException(e);
             }
 
-            if (uriSchemaCache.containsKey(mappedUri))
-                return uriSchemaCache.get(mappedUri);
+            if (uriSchemaCache.containsKey(mappedUri)) {
+                JsonSchema cachedUriSchema =  uriSchemaCache.get(mappedUri);
+                // This is important because if we use same JsonSchemaFactory for creating multiple JSONSchema instances,
+                // these schemas will be cached along with config. We have to replace the config for cached $ref references
+                // with the latest config.
+                cachedUriSchema.getValidationContext().setConfig(config);
+                return cachedUriSchema;
+            }
 
             try {
                 inputStream = this.uriFetcher.fetch(mappedUri);

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

@@ -24,16 +24,19 @@
 import java.util.Set;
 
 public class MaxItemsValidator extends BaseJsonValidator implements JsonValidator {
+
     private static final Logger logger = LoggerFactory.getLogger(MaxItemsValidator.class);
 
+    private final ValidationContext validationContext;
+
     private int max = 0;
 
     public MaxItemsValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema, ValidationContext validationContext) {
         super(schemaPath, schemaNode, parentSchema, ValidatorTypeCode.MAX_ITEMS, validationContext);
         if (schemaNode.isIntegralNumber()) {
             max = schemaNode.intValue();
         }
-
+        this.validationContext = validationContext;
         parseErrorCode(getValidatorType().getErrorCodeKey());
     }
 
@@ -44,7 +47,7 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
             if (node.size() > max) {
                 return Collections.singleton(buildValidationMessage(at, "" + max));
             }
-        } else if (config.isTypeLoose()) {
+        } else if (this.validationContext.getConfig().isTypeLoose()) {
             if (1 > max) {
                 return Collections.singleton(buildValidationMessage(at, "" + max));
             }