Adding Unevaluated properties keyword.

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

@@ -52,39 +52,55 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
 
         Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();
 
+        // As AllOf might contain multiple schemas take a backup of evaluatedProperties.
+        Object backupEvaluatedProperties = CollectorContext.getInstance().get(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES);
+
+        // Make the evaluatedProperties list empty.
+        CollectorContext.getInstance().add(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES, new ArrayList<>());
+
         for (JsonSchema schema : schemas) {
-            errors.addAll(schema.validate(node, rootNode, at));
-
-            if (this.validationContext.getConfig().isOpenAPI3StyleDiscriminators()) {
-                final Iterator<JsonNode> arrayElements = schemaNode.elements();
-                while (arrayElements.hasNext()) {
-                    final ObjectNode allOfEntry = (ObjectNode) arrayElements.next();
-                    final JsonNode $ref = allOfEntry.get("$ref");
-                    if (null != $ref) {
-                        final ValidationContext.DiscriminatorContext currentDiscriminatorContext = validationContext
-                                .getCurrentDiscriminatorContext();
-                        if (null != currentDiscriminatorContext) {
-                            final ObjectNode discriminator = currentDiscriminatorContext
-                                    .getDiscriminatorForPath(allOfEntry.get("$ref").asText());
-                            if (null != discriminator) {
-                                registerAndMergeDiscriminator(currentDiscriminatorContext, discriminator, parentSchema, at);
-                                // now we have to check whether we have hit the right target
-                                final String discriminatorPropertyName = discriminator.get("propertyName").asText();
-                                final JsonNode discriminatorNode = node.get(discriminatorPropertyName);
-                                final String discriminatorPropertyValue = discriminatorNode == null
-                                        ? null
-                                        : discriminatorNode.textValue();
-
-                                final JsonSchema jsonSchema = parentSchema;
-                                checkDiscriminatorMatch(
-                                        currentDiscriminatorContext,
-                                        discriminator,
-                                        discriminatorPropertyValue,
-                                        jsonSchema);
+            try {
+                errors.addAll(schema.validate(node, rootNode, at));
+
+                if (this.validationContext.getConfig().isOpenAPI3StyleDiscriminators()) {
+                    final Iterator<JsonNode> arrayElements = schemaNode.elements();
+                    while (arrayElements.hasNext()) {
+                        final ObjectNode allOfEntry = (ObjectNode) arrayElements.next();
+                        final JsonNode $ref = allOfEntry.get("$ref");
+                        if (null != $ref) {
+                            final ValidationContext.DiscriminatorContext currentDiscriminatorContext = validationContext
+                                    .getCurrentDiscriminatorContext();
+                            if (null != currentDiscriminatorContext) {
+                                final ObjectNode discriminator = currentDiscriminatorContext
+                                        .getDiscriminatorForPath(allOfEntry.get("$ref").asText());
+                                if (null != discriminator) {
+                                    registerAndMergeDiscriminator(currentDiscriminatorContext, discriminator, parentSchema, at);
+                                    // now we have to check whether we have hit the right target
+                                    final String discriminatorPropertyName = discriminator.get("propertyName").asText();
+                                    final JsonNode discriminatorNode = node.get(discriminatorPropertyName);
+                                    final String discriminatorPropertyValue = discriminatorNode == null
+                                            ? null
+                                            : discriminatorNode.textValue();
+
+                                    final JsonSchema jsonSchema = parentSchema;
+                                    checkDiscriminatorMatch(
+                                            currentDiscriminatorContext,
+                                            discriminator,
+                                            discriminatorPropertyValue,
+                                            jsonSchema);
+                                }
                             }
                         }
                     }
                 }
+            } finally {
+                if (errors.isEmpty()) {
+                    List<String> backupEvaluatedPropertiesList = (backupEvaluatedProperties == null ? new ArrayList<>() : (List<String>) backupEvaluatedProperties);
+                    backupEvaluatedPropertiesList.addAll((List<String>) CollectorContext.getInstance().get(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES));
+                    CollectorContext.getInstance().add(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES, backupEvaluatedPropertiesList);
+                } else {
+                    CollectorContext.getInstance().add(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES, backupEvaluatedProperties);
+                }
             }
         }
 

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

@@ -61,6 +61,12 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
         Set<ValidationMessage> allErrors = new LinkedHashSet<ValidationMessage>();
         String typeValidatorName = "anyOf/type";
 
+        // As anyOf might contain multiple schemas take a backup of evaluatedProperties.
+        Object backupEvaluatedProperties = CollectorContext.getInstance().get(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES);
+
+        // Make the evaluatedProperties list empty.
+        CollectorContext.getInstance().add(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES, new ArrayList<>());
+
         try {
             for (JsonSchema schema : schemas) {
                 if (schema.getValidators().containsKey(typeValidatorName)) {
@@ -74,11 +80,18 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
                 }
                 Set<ValidationMessage> errors = schema.validate(node, rootNode, at);
                 if (errors.isEmpty() && (!this.validationContext.getConfig().isOpenAPI3StyleDiscriminators())) {
+                    // Clear all errors.
+                    allErrors.clear();
+                    // return empty errors.
                     return errors;
                 } else if (this.validationContext.getConfig().isOpenAPI3StyleDiscriminators()) {
                     if (discriminatorContext.isDiscriminatorMatchFound()) {
                         if (!errors.isEmpty()) {
                             errors.add(buildValidationMessage(at, DISCRIMINATOR_REMARK));
+                            allErrors.addAll(errors);
+                        } else {
+                            // Clear all errors.
+                            allErrors.clear();
                         }
                         return errors;
                     }
@@ -95,10 +108,22 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
             if (this.validationContext.getConfig().isOpenAPI3StyleDiscriminators()) {
                 validationContext.leaveDiscriminatorContextImmediately(at);
             }
+            if (allErrors.isEmpty()) {
+                addEvaluatedProperties(backupEvaluatedProperties);
+            } else {
+                CollectorContext.getInstance().add(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES, backupEvaluatedProperties);
+            }
         }
         return Collections.unmodifiableSet(allErrors);
     }
 
+    private void addEvaluatedProperties(Object backupEvaluatedProperties) {
+        // Add all the evaluated properties.
+        List<String> backupEvaluatedPropertiesList = (backupEvaluatedProperties == null ? new ArrayList<>() : (List<String>) backupEvaluatedProperties);
+        backupEvaluatedPropertiesList.addAll((List<String>) CollectorContext.getInstance().get(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES));
+        CollectorContext.getInstance().add(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES, backupEvaluatedPropertiesList);
+    }
+
     @Override
     public Set<ValidationMessage> walk(JsonNode node, JsonNode rootNode, String at, boolean shouldValidateSchema) {
         ArrayList<Set<ValidationMessage>> results = new ArrayList<>(schemas.size());

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

@@ -57,21 +57,73 @@ public IfValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSche
     public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String at) {
         debug(logger, node, rootNode, at);
 
+        // As if-then-else might contain multiple schemas take a backup of evaluatedProperties.
+        Object backupEvaluatedProperties = CollectorContext.getInstance().get(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES);
+
+        Object ifEvaluatedProperties = null;
+
+        Object thenEvaluatedProperties = null;
+
+        Object elseEvaluatedProperties = null;
+
+        // Make the evaluatedProperties list empty.
+        CollectorContext.getInstance().add(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES, new ArrayList<>());
+
         Set<ValidationMessage> errors = new LinkedHashSet<ValidationMessage>();
 
         boolean ifConditionPassed;
         try {
-            ifConditionPassed = ifSchema.validate(node, rootNode, at).isEmpty();
-        } catch (JsonSchemaException ex) {
-            // When failFast is enabled, validations are thrown as exceptions.
-            // An exception means the condition failed
-            ifConditionPassed = false;
-        }
+            try {
+                ifConditionPassed = ifSchema.validate(node, rootNode, at).isEmpty();
+            } catch (JsonSchemaException ex) {
+                // When failFast is enabled, validations are thrown as exceptions.
+                // An exception means the condition failed
+                ifConditionPassed = false;
+            }
+            // Evaluated Properties from if.
+            ifEvaluatedProperties = CollectorContext.getInstance().get(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES);
+
+            if (ifConditionPassed && thenSchema != null) {
+
+                // Make the evaluatedProperties list empty.
+                CollectorContext.getInstance().add(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES, new ArrayList<>());
+
+                errors.addAll(thenSchema.validate(node, rootNode, at));
+
+                // Collect the then evaluated properties.
+                thenEvaluatedProperties = CollectorContext.getInstance().get(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES);
 
-        if (ifConditionPassed && thenSchema != null) {
-            errors.addAll(thenSchema.validate(node, rootNode, at));
-        } else if (!ifConditionPassed && elseSchema != null) {
-            errors.addAll(elseSchema.validate(node, rootNode, at));
+            } else if (!ifConditionPassed && elseSchema != null) {
+
+                // Make the evaluatedProperties list empty.
+                CollectorContext.getInstance().add(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES, new ArrayList<>());
+
+                errors.addAll(elseSchema.validate(node, rootNode, at));
+
+                // Collect the else evaluated properties.
+                elseEvaluatedProperties = CollectorContext.getInstance().get(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES);
+            }
+
+        } finally {
+            if (errors.isEmpty()) {
+                List<String> backupEvaluatedPropertiesList = (backupEvaluatedProperties == null ? new ArrayList<>() : (List<String>) backupEvaluatedProperties);
+
+                if (ifEvaluatedProperties != null) {
+                    backupEvaluatedPropertiesList.addAll((List<String>) ifEvaluatedProperties);
+                }
+
+                if (thenEvaluatedProperties != null) {
+                    backupEvaluatedPropertiesList.addAll((List<String>) thenEvaluatedProperties);
+                }
+
+                if (elseEvaluatedProperties != null) {
+                    backupEvaluatedPropertiesList.addAll((List<String>) elseEvaluatedProperties);
+                }
+
+                CollectorContext.getInstance().add(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES, backupEvaluatedPropertiesList);
+            } else {
+                CollectorContext.getInstance().add(UnEvaluatedPropertiesValidator.EVALUATED_PROPERTIES, backupEvaluatedProperties);
+            }
         }
 
         return Collections.unmodifiableSet(errors);