Skip to content

Commit 96d3350

Browse files
justin-tayjustin-tay
committed
Rename ValidationMessage to Error
1 parent 512b465 commit 96d3350

File tree

192 files changed

+679
-732
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+679
-732
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ protected void validate(ExecutionContext executionContext, JsonNode node, JsonNo
117117
}
118118
if (!allowedProperties.contains(pname) && !handledByPatternProperties(pname)) {
119119
if (!allowAdditionalProperties) {
120-
executionContext.addError(message().instanceNode(node).property(pname)
120+
executionContext.addError(error().instanceNode(node).property(pname)
121121
.instanceLocation(instanceLocation)
122122
.locale(executionContext.getExecutionConfig().getLocale())
123123
.arguments(pname).build());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public AllOfValidator(SchemaLocation schemaLocation, JsonNodePath evaluationPath
3636
super(schemaLocation, evaluationPath, schemaNode, parentSchema, ValidatorTypeCode.ALL_OF, validationContext);
3737
if (!schemaNode.isArray()) {
3838
JsonType nodeType = TypeFactory.getValueNodeType(schemaNode, this.validationContext.getConfig());
39-
throw new JsonSchemaException(message().instanceNode(schemaNode)
39+
throw new JsonSchemaException(error().instanceNode(schemaNode)
4040
.instanceLocation(schemaLocation.getFragment())
4141
.messageKey("type")
4242
.arguments(nodeType.toString(), "array")

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public AnyOfValidator(SchemaLocation schemaLocation, JsonNodePath evaluationPath
3838
super(schemaLocation, evaluationPath, schemaNode, parentSchema, ValidatorTypeCode.ANY_OF, validationContext);
3939
if (!schemaNode.isArray()) {
4040
JsonType nodeType = TypeFactory.getValueNodeType(schemaNode, this.validationContext.getConfig());
41-
throw new JsonSchemaException(message().instanceNode(schemaNode)
41+
throw new JsonSchemaException(error().instanceNode(schemaNode)
4242
.instanceLocation(schemaLocation.getFragment())
4343
.messageKey("type")
4444
.arguments(nodeType.toString(), "array")
@@ -66,9 +66,9 @@ protected void validate(ExecutionContext executionContext, JsonNode node, JsonNo
6666
executionContext.enterDiscriminatorContext(new DiscriminatorContext(), instanceLocation);
6767
}
6868
int numberOfValidSubSchemas = 0;
69-
List<ValidationMessage> existingErrors = executionContext.getErrors();
70-
List<ValidationMessage> allErrors = null;
71-
List<ValidationMessage> errors = new ArrayList<>();
69+
List<Error> existingErrors = executionContext.getErrors();
70+
List<Error> allErrors = null;
71+
List<Error> errors = new ArrayList<>();
7272
executionContext.setErrors(errors);
7373
try {
7474
// Save flag as nested schema evaluation shouldn't trigger fail fast
@@ -120,7 +120,7 @@ && canShortCircuit() && canShortCircuit(executionContext)) {
120120
if (allErrors == null) {
121121
allErrors = new ArrayList<>();
122122
}
123-
allErrors.add(message().instanceNode(node).instanceLocation(instanceLocation)
123+
allErrors.add(error().instanceNode(node).instanceLocation(instanceLocation)
124124
.locale(executionContext.getExecutionConfig().getLocale())
125125
.arguments(DISCRIMINATOR_REMARK)
126126
.build());
@@ -146,7 +146,7 @@ && canShortCircuit() && canShortCircuit(executionContext)) {
146146
if (this.validationContext.getConfig().isDiscriminatorKeywordEnabled()
147147
&& executionContext.getCurrentDiscriminatorContext().isActive()
148148
&& !executionContext.getCurrentDiscriminatorContext().isDiscriminatorIgnore()) {
149-
existingErrors.add(message().instanceNode(node).instanceLocation(instanceLocation)
149+
existingErrors.add(error().instanceNode(node).instanceLocation(instanceLocation)
150150
.locale(executionContext.getExecutionConfig().getLocale())
151151
.arguments(
152152
"based on the provided discriminator. No alternative could be chosen based on the discriminator property")

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ protected BaseJsonValidator(
7676
/* Below from BaseJsonValidator */
7777
JsonNode schemaNode,
7878
ValidationContext validationContext,
79-
/* Below from ValidationMessageHandler */
8079
Keyword keyword,
8180
JsonSchema parentSchema,
8281
SchemaLocation schemaLocation,
@@ -215,8 +214,8 @@ protected boolean hasAdjacentKeywordInEvaluationPath(String keyword) {
215214
return false;
216215
}
217216

218-
protected MessageSourceValidationMessage.Builder message() {
219-
return MessageSourceValidationMessage
217+
protected MessageSourceError.Builder error() {
218+
return MessageSourceError
220219
.builder(this.validationContext.getConfig().getMessageSource(), this.errorMessage)
221220
.schemaNode(this.schemaNode).schemaLocation(this.schemaLocation).evaluationPath(this.evaluationPath)
222221
.keyword(this.keyword != null ? this.keyword.getValue() : null).messageKey(this.getKeyword());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
3535

3636
if (schemaNode.isNumber() && node.isNumber()) {
3737
if (schemaNode.decimalValue().compareTo(node.decimalValue()) != 0) {
38-
executionContext.addError(message().instanceNode(node).instanceLocation(instanceLocation)
38+
executionContext.addError(error().instanceNode(node).instanceLocation(instanceLocation)
3939
.locale(executionContext.getExecutionConfig().getLocale())
4040
.arguments(schemaNode.asText(), node.asText())
4141
.build());
4242
}
4343
} else if (!schemaNode.equals(node)) {
44-
executionContext.addError(message().instanceNode(node).instanceLocation(instanceLocation)
44+
executionContext.addError(error().instanceNode(node).instanceLocation(instanceLocation)
4545
.locale(executionContext.getExecutionConfig().getLocale()).arguments(schemaNode.asText(), node.asText()).build());
4646
}
4747
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
8888
if (null != this.schema && node.isArray()) {
8989
// Save flag as nested schema evaluation shouldn't trigger fail fast
9090
boolean failFast = executionContext.isFailFast();
91-
List<ValidationMessage> existingErrors = executionContext.getErrors();
91+
List<Error> existingErrors = executionContext.getErrors();
9292
try {
9393
executionContext.setFailFast(false);
94-
List<ValidationMessage> test = new ArrayList<>();
94+
List<Error> test = new ArrayList<>();
9595
executionContext.setErrors(test);
9696
for (JsonNode n : node) {
9797
JsonNodePath path = instanceLocation.append(i);
@@ -192,7 +192,7 @@ private void boundsViolated(ExecutionContext executionContext, ValidatorTypeCode
192192
} else if (ValidatorTypeCode.MAX_CONTAINS.equals(validatorTypeCode)) {
193193
messageKey = CONTAINS_MAX;
194194
}
195-
executionContext.addError(message().instanceNode(instanceNode).instanceLocation(instanceLocation).messageKey(messageKey)
195+
executionContext.addError(error().instanceNode(instanceNode).instanceLocation(instanceLocation).messageKey(messageKey)
196196
.locale(locale).arguments(String.valueOf(bounds), this.schema.getSchemaNode().toString())
197197
.keyword(validatorTypeCode.getValue()).build());
198198
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* {@link JsonValidator} for contentEncoding.
2828
* <p>
2929
* Note that since 2019-09 this keyword only generates annotations and not
30-
* assertions.
30+
* errors.
3131
*/
3232
public class ContentEncodingValidator extends BaseJsonValidator {
3333
private static final Logger logger = LoggerFactory.getLogger(ContentEncodingValidator.class);
@@ -79,7 +79,7 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
7979
}
8080

8181
if (!matches(node.asText())) {
82-
executionContext.addError(message().instanceNode(node).instanceLocation(instanceLocation)
82+
executionContext.addError(error().instanceNode(node).instanceLocation(instanceLocation)
8383
.locale(executionContext.getExecutionConfig().getLocale())
8484
.arguments(this.contentEncoding)
8585
.build());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/**
3131
* {@link JsonValidator} for contentMediaType.
3232
* <p>
33-
* Note that since 2019-09 this keyword only generates annotations and not assertions.
33+
* Note that since 2019-09 this keyword only generates annotations and not errors.
3434
*/
3535
public class ContentMediaTypeValidator extends BaseJsonValidator {
3636
private static final Logger logger = LoggerFactory.getLogger(ContentMediaTypeValidator.class);
@@ -102,7 +102,7 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
102102
}
103103

104104
if (!matches(node.asText())) {
105-
executionContext.addError(message().instanceNode(node).instanceLocation(instanceLocation)
105+
executionContext.addError(error().instanceNode(node).instanceLocation(instanceLocation)
106106
.locale(executionContext.getExecutionConfig().getLocale())
107107
.arguments(this.contentMediaType)
108108
.build());

‎src/main/java/com/networknt/schema/DefaultJsonMetaSchemaFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ protected JsonMetaSchema loadMetaSchema(String iri, JsonSchemaFactory schemaFact
4545
} catch (InvalidSchemaException e) {
4646
throw e;
4747
} catch (Exception e) {
48-
ValidationMessage validationMessage = ValidationMessage.builder()
48+
Error error = Error.builder()
4949
.message("Failed to load meta-schema ''{0}''").arguments(iri).build();
50-
throw new InvalidSchemaException(validationMessage, e);
50+
throw new InvalidSchemaException(error, e);
5151
}
5252
}
5353

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void validate(ExecutionContext executionContext, JsonNode node, JsonNode
7171
if (deps != null && !deps.isEmpty()) {
7272
for (String field : deps) {
7373
if (node.get(field) == null) {
74-
executionContext.addError(message().instanceNode(node).property(pname).instanceLocation(instanceLocation)
74+
executionContext.addError(error().instanceNode(node).property(pname).instanceLocation(instanceLocation)
7575
.locale(executionContext.getExecutionConfig().getLocale())
7676
.arguments(propertyDeps.toString()).build());
7777
}

0 commit comments

Comments
 (0)