Remove failFast from MessageSourceValidationMessage builder

Author: justin-tay

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

@@ -120,7 +120,7 @@ protected void validate(ExecutionContext executionContext, JsonNode node, JsonNo
                     executionContext.addError(message().instanceNode(node).property(pname)
                             .instanceLocation(instanceLocation)
                             .locale(executionContext.getExecutionConfig().getLocale())
-                            .failFast(executionContext.isFailFast()).arguments(pname).build());
+                            .arguments(pname).build());
                 } else {
                     if (additionalPropertiesSchema != null) {
                         if (!walk) {

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

@@ -122,7 +122,7 @@ && canShortCircuit() && canShortCircuit(executionContext)) {
                                 }
                                 allErrors.add(message().instanceNode(node).instanceLocation(instanceLocation)
                                         .locale(executionContext.getExecutionConfig().getLocale())
-                                        .failFast(executionContext.isFailFast()).arguments(DISCRIMINATOR_REMARK)
+                                        .arguments(DISCRIMINATOR_REMARK)
                                         .build());
                             } else {
                                 // Clear all errors. Note that this is checked in finally.

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

@@ -216,13 +216,10 @@ protected boolean hasAdjacentKeywordInEvaluationPath(String keyword) {
     }
 
     protected MessageSourceValidationMessage.Builder message() {
-        return MessageSourceValidationMessage.builder(this.validationContext.getConfig().getMessageSource(), this.errorMessage, (message, failFast) -> {
-            if (failFast) {
-                throw new FailFastAssertionException(message);
-            }
-        }).schemaNode(this.schemaNode).schemaLocation(this.schemaLocation)
-                .evaluationPath(this.evaluationPath).keyword(this.keyword != null ? this.keyword.getValue() : null)
-                .messageKey(this.getKeyword());
+        return MessageSourceValidationMessage
+                .builder(this.validationContext.getConfig().getMessageSource(), this.errorMessage)
+                .schemaNode(this.schemaNode).schemaLocation(this.schemaLocation).evaluationPath(this.evaluationPath)
+                .keyword(this.keyword != null ? this.keyword.getValue() : null).messageKey(this.getKeyword());
     }
 
     /**

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

@@ -37,7 +37,7 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
             if (schemaNode.decimalValue().compareTo(node.decimalValue()) != 0) {
                 executionContext.addError(message().instanceNode(node).instanceLocation(instanceLocation)
                         .locale(executionContext.getExecutionConfig().getLocale())
-                        .failFast(executionContext.isFailFast()).arguments(schemaNode.asText(), node.asText())
+                        .arguments(schemaNode.asText(), node.asText())
                         .build());
             }
         } else if (!schemaNode.equals(node)) {

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

@@ -116,13 +116,13 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
             if (actual < m) {
                 boundsViolated(executionContext, isMinV201909 ? ValidatorTypeCode.MIN_CONTAINS : ValidatorTypeCode.CONTAINS,
                         executionContext.getExecutionConfig().getLocale(),
-                        executionContext.isFailFast(), node, instanceLocation, m);
+                        node, instanceLocation, m);
             }
 
             if (this.max != null && actual > this.max) {
                 boundsViolated(executionContext, isMinV201909 ? ValidatorTypeCode.MAX_CONTAINS : ValidatorTypeCode.CONTAINS,
                         executionContext.getExecutionConfig().getLocale(),
-                        executionContext.isFailFast(), node, instanceLocation, this.max);
+                        node, instanceLocation, this.max);
             }
         }
 
@@ -184,7 +184,7 @@ public void preloadJsonSchema() {
         collectAnnotations(); // cache the flag
     }
 
-    private void boundsViolated(ExecutionContext executionContext, ValidatorTypeCode validatorTypeCode, Locale locale, boolean failFast,
+    private void boundsViolated(ExecutionContext executionContext, ValidatorTypeCode validatorTypeCode, Locale locale,
             JsonNode instanceNode, JsonNodePath instanceLocation, int bounds) {
         String messageKey = "contains";
         if (ValidatorTypeCode.MIN_CONTAINS.equals(validatorTypeCode)) {
@@ -193,7 +193,7 @@ private void boundsViolated(ExecutionContext executionContext, ValidatorTypeCode
             messageKey = CONTAINS_MAX;
         }
         executionContext.addError(message().instanceNode(instanceNode).instanceLocation(instanceLocation).messageKey(messageKey)
-                        .locale(locale).failFast(failFast).arguments(String.valueOf(bounds), this.schema.getSchemaNode().toString())
+                        .locale(locale).arguments(String.valueOf(bounds), this.schema.getSchemaNode().toString())
                         .keyword(validatorTypeCode.getValue()).build());
     }
 

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

@@ -81,7 +81,7 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
         if (!matches(node.asText())) {
             executionContext.addError(message().instanceNode(node).instanceLocation(instanceLocation)
                     .locale(executionContext.getExecutionConfig().getLocale())
-                    .failFast(executionContext.isFailFast()).arguments(this.contentEncoding)
+                    .arguments(this.contentEncoding)
                     .build());
         }
     }

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

@@ -104,7 +104,7 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
         if (!matches(node.asText())) {
             executionContext.addError(message().instanceNode(node).instanceLocation(instanceLocation)
                     .locale(executionContext.getExecutionConfig().getLocale())
-                    .failFast(executionContext.isFailFast()).arguments(this.contentMediaType)
+                    .arguments(this.contentMediaType)
                     .build());
         }
     }

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

@@ -73,7 +73,6 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
                     if (node.get(field) == null) {
                         executionContext.addError(message().instanceNode(node).property(pname).instanceLocation(instanceLocation)
                                 .locale(executionContext.getExecutionConfig().getLocale())
-                                .failFast(executionContext.isFailFast())
                                 .arguments(propertyDeps.toString()).build());
                     }
                 }

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

@@ -57,7 +57,7 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
                     if (node.get(field) == null) {
                         executionContext.addError(message().instanceNode(node).property(pname).instanceLocation(instanceLocation)
                                 .locale(executionContext.getExecutionConfig().getLocale())
-                                .failFast(executionContext.isFailFast()).arguments(field, pname)
+                                .arguments(field, pname)
                                 .build());
                     }
                 }

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

@@ -100,7 +100,7 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
         if (!nodes.contains(node) && !( this.validationContext.getConfig().isTypeLoose() && isTypeLooseContainsInEnum(node))) {
             executionContext.addError(message().instanceNode(node).instanceLocation(instanceLocation)
                     .locale(executionContext.getExecutionConfig().getLocale())
-                    .failFast(executionContext.isFailFast()).arguments(error).build());
+                    .arguments(error).build());
         }
     }