Skip to content

Commit 885110e

Browse files
justin-tayjustin-tay
committed
Rename ValidationResult to Result
1 parent 1f32f35 commit 885110e

20 files changed

+68
-67
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,14 +202,15 @@ public OutputUnit format(Schema jsonSchema,
202202
* <p>
203203
* This is currently not exposed to consumers.
204204
*/
205-
class Result implements OutputFormat<ValidationResult> {
205+
class Result implements OutputFormat<com.networknt.schema.Result> {
206206
@Override
207207
public void customize(ExecutionContext executionContext, SchemaContext schemaContext) {
208208
}
209209

210210
@Override
211-
public ValidationResult format(Schema jsonSchema,ExecutionContext executionContext, SchemaContext schemaContext) {
212-
return new ValidationResult(executionContext);
211+
public com.networknt.schema.Result format(Schema jsonSchema, ExecutionContext executionContext,
212+
SchemaContext schemaContext) {
213+
return new com.networknt.schema.Result(executionContext);
213214
}
214215
}
215216
}

‎src/main/java/com/networknt/schema/ValidationResult.java‎ renamed to ‎src/main/java/com/networknt/schema/Result.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
/**
2121
* Represents a validation result.
2222
*/
23-
public class ValidationResult {
23+
public class Result {
2424
private final ExecutionContext executionContext;
2525

26-
public ValidationResult(ExecutionContext executionContext) {
26+
public Result(ExecutionContext executionContext) {
2727
super();
2828
this.executionContext = executionContext;
2929
}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,7 @@ private JsonNode deserialize(String input, InputFormat inputFormat) {
10431043
*
10441044
* @return the validation result
10451045
*/
1046-
public ValidationResult walk(ExecutionContext executionContext, JsonNode node, boolean validate,
1046+
public Result walk(ExecutionContext executionContext, JsonNode node, boolean validate,
10471047
ExecutionContextCustomizer executionCustomizer) {
10481048
return walkAtNodeInternal(executionContext, node, node, atRoot(), validate, OutputFormat.RESULT,
10491049
executionCustomizer);
@@ -1076,7 +1076,7 @@ public <T> T walk(ExecutionContext executionContext, JsonNode node, OutputFormat
10761076
*
10771077
* @return the validation result
10781078
*/
1079-
public ValidationResult walk(ExecutionContext executionContext, JsonNode node, boolean validate,
1079+
public Result walk(ExecutionContext executionContext, JsonNode node, boolean validate,
10801080
Consumer<ExecutionContext> executionCustomizer) {
10811081
return walkAtNodeInternal(executionContext, node, node, atRoot(), validate, OutputFormat.RESULT,
10821082
executionCustomizer);
@@ -1108,7 +1108,7 @@ public <T> T walk(ExecutionContext executionContext, JsonNode node, OutputFormat
11081108
*
11091109
* @return the validation result
11101110
*/
1111-
public ValidationResult walk(ExecutionContext executionContext, JsonNode node, boolean validate) {
1111+
public Result walk(ExecutionContext executionContext, JsonNode node, boolean validate) {
11121112
return walkAtNodeInternal(executionContext, node, node, atRoot(), validate, OutputFormat.RESULT,
11131113
(ExecutionContextCustomizer) null);
11141114
}
@@ -1122,7 +1122,7 @@ public ValidationResult walk(ExecutionContext executionContext, JsonNode node, b
11221122
* @param validate true to validate the input against the schema
11231123
* @return the validation result
11241124
*/
1125-
public ValidationResult walk(ExecutionContext executionContext, String input, InputFormat inputFormat,
1125+
public Result walk(ExecutionContext executionContext, String input, InputFormat inputFormat,
11261126
boolean validate) {
11271127
JsonNode node = deserialize(input, inputFormat);
11281128
return walkAtNodeInternal(executionContext, node, node, atRoot(), validate, OutputFormat.RESULT,
@@ -1157,7 +1157,7 @@ public <T> T walk(ExecutionContext executionContext, String input, InputFormat i
11571157
* @param executionCustomizer the customizer
11581158
* @return the validation result
11591159
*/
1160-
public ValidationResult walk(ExecutionContext executionContext, String input, InputFormat inputFormat,
1160+
public Result walk(ExecutionContext executionContext, String input, InputFormat inputFormat,
11611161
boolean validate, ExecutionContextCustomizer executionCustomizer) {
11621162
JsonNode node = deserialize(input, inputFormat);
11631163
return walkAtNodeInternal(executionContext, node, node, atRoot(), validate, OutputFormat.RESULT, executionCustomizer);
@@ -1188,7 +1188,7 @@ public <T> T walk(ExecutionContext executionContext, String input, InputFormat i
11881188
* @param validate true to validate the input against the schema
11891189
* @return the validation result
11901190
*/
1191-
public ValidationResult walk(JsonNode node, boolean validate) {
1191+
public Result walk(JsonNode node, boolean validate) {
11921192
return walk(createExecutionContext(), node, validate);
11931193
}
11941194

@@ -1200,7 +1200,7 @@ public ValidationResult walk(JsonNode node, boolean validate) {
12001200
* @param executionCustomizer the customizer
12011201
* @return the validation result
12021202
*/
1203-
public ValidationResult walk(JsonNode node, boolean validate, ExecutionContextCustomizer executionCustomizer) {
1203+
public Result walk(JsonNode node, boolean validate, ExecutionContextCustomizer executionCustomizer) {
12041204
return walk(createExecutionContext(), node, validate, executionCustomizer);
12051205
}
12061206

@@ -1212,7 +1212,7 @@ public ValidationResult walk(JsonNode node, boolean validate, ExecutionContextCu
12121212
* @param executionCustomizer the customizer
12131213
* @return the validation result
12141214
*/
1215-
public ValidationResult walk(JsonNode node, boolean validate, Consumer<ExecutionContext> executionCustomizer) {
1215+
public Result walk(JsonNode node, boolean validate, Consumer<ExecutionContext> executionCustomizer) {
12161216
return walk(createExecutionContext(), node, validate, executionCustomizer);
12171217
}
12181218

@@ -1237,7 +1237,7 @@ public <T> T walk(JsonNode node, OutputFormat<T> outputFormat, boolean validate)
12371237
* @param validate true to validate the input against the schema
12381238
* @return the validation result
12391239
*/
1240-
public ValidationResult walk(String input, InputFormat inputFormat, boolean validate) {
1240+
public Result walk(String input, InputFormat inputFormat, boolean validate) {
12411241
return walk(createExecutionContext(), deserialize(input, inputFormat), validate);
12421242
}
12431243

@@ -1250,7 +1250,7 @@ public ValidationResult walk(String input, InputFormat inputFormat, boolean vali
12501250
* @param executionCustomizer the customizer
12511251
* @return the validation result
12521252
*/
1253-
public ValidationResult walk(String input, InputFormat inputFormat, boolean validate,
1253+
public Result walk(String input, InputFormat inputFormat, boolean validate,
12541254
ExecutionContextCustomizer executionCustomizer) {
12551255
return walk(createExecutionContext(), deserialize(input, inputFormat), validate, executionCustomizer);
12561256
}
@@ -1264,7 +1264,7 @@ public ValidationResult walk(String input, InputFormat inputFormat, boolean vali
12641264
* @param executionCustomizer the customizer
12651265
* @return the validation result
12661266
*/
1267-
public ValidationResult walk(String input, InputFormat inputFormat, boolean validate,
1267+
public Result walk(String input, InputFormat inputFormat, boolean validate,
12681268
Consumer<ExecutionContext> executionCustomizer) {
12691269
return walk(createExecutionContext(), deserialize(input, inputFormat), validate, executionCustomizer);
12701270
}
@@ -1279,7 +1279,7 @@ public ValidationResult walk(String input, InputFormat inputFormat, boolean vali
12791279
* @param validate true to validate the input against the schema
12801280
* @return the validation result
12811281
*/
1282-
public ValidationResult walkAtNode(ExecutionContext executionContext, JsonNode node, JsonNode rootNode,
1282+
public Result walkAtNode(ExecutionContext executionContext, JsonNode node, JsonNode rootNode,
12831283
NodePath instanceLocation, boolean validate) {
12841284
return walkAtNodeInternal(executionContext, node, rootNode, instanceLocation, validate, OutputFormat.RESULT,
12851285
(ExecutionContextCustomizer) null);

‎src/test/java/com/networknt/schema/AllOfValidatorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void walkValidationWithNullNodeShouldNotValidate() {
6161

6262
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(Specification.Version.DRAFT_7);
6363
Schema schema = factory.getSchema(schemaContents);
64-
ValidationResult result = schema.walk(jsonContents, InputFormat.JSON, true);
64+
Result result = schema.walk(jsonContents, InputFormat.JSON, true);
6565
assertEquals(true, result.getErrors().isEmpty());
6666
}
6767
}

‎src/test/java/com/networknt/schema/AnyOfValidatorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void walkValidationWithNullNodeShouldNotValidate() {
6161

6262
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(Specification.Version.DRAFT_7);
6363
Schema schema = factory.getSchema(schemaContents);
64-
ValidationResult result = schema.walk(jsonContents, InputFormat.JSON, true);
64+
Result result = schema.walk(jsonContents, InputFormat.JSON, true);
6565
assertEquals(true, result.getErrors().isEmpty());
6666
}
6767
}

‎src/test/java/com/networknt/schema/CollectorContextTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void setup() throws Exception {
6161

6262
@Test
6363
void testCollectorContextWithKeyword() throws Exception {
64-
ValidationResult validationResult = validate("{\"test-property1\":\"sample1\",\"test-property2\":\"sample2\"}");
64+
Result validationResult = validate("{\"test-property1\":\"sample1\",\"test-property2\":\"sample2\"}");
6565
Assertions.assertEquals(0, validationResult.getErrors().size());
6666
List<String> contextValues = validationResult.getCollectorContext().get(Data.SAMPLE_COLLECTOR);
6767
contextValues.sort(null);
@@ -93,9 +93,9 @@ void testCollectorContextWithMultipleThreads() throws Exception {
9393
thread2.join();
9494
thread3.join();
9595

96-
ValidationResult validationResult1 = validationRunnable1.getValidationResult();
97-
ValidationResult validationResult2 = validationRunnable2.getValidationResult();
98-
ValidationResult validationResult3 = validationRunnable3.getValidationResult();
96+
Result validationResult1 = validationRunnable1.getValidationResult();
97+
Result validationResult2 = validationRunnable2.getValidationResult();
98+
Result validationResult3 = validationRunnable3.getValidationResult();
9999

100100
Assertions.assertEquals(0, validationResult1.getErrors().size());
101101
Assertions.assertEquals(0, validationResult2.getErrors().size());
@@ -117,7 +117,7 @@ void testCollectorGetAll() throws IOException {
117117
executionContext.executionConfig(executionConfig -> executionConfig.formatAssertionsEnabled(true));
118118
jsonSchemaForCombine.validate(executionContext, objectMapper
119119
.readTree("{\"property1\":\"sample1\",\"property2\":\"sample2\",\"property3\":\"sample3\" }"));
120-
ValidationResult validationResult = new ValidationResult(executionContext);
120+
Result validationResult = new Result(executionContext);
121121
CollectorContext collectorContext = validationResult.getCollectorContext();
122122
List<String> sampleCollector = collectorContext.get(Data.SAMPLE_COLLECTOR);
123123
List<String> sampleCollectorOther = collectorContext.get(Data.SAMPLE_COLLECTOR_OTHER);
@@ -222,7 +222,7 @@ private class ValidationThread implements Runnable {
222222

223223
private final String name;
224224

225-
private ValidationResult validationResult;
225+
private Result validationResult;
226226

227227
ValidationThread(String data, String name) {
228228
this.name = name;
@@ -242,7 +242,7 @@ public void run() {
242242
}
243243
}
244244

245-
ValidationResult getValidationResult() {
245+
Result getValidationResult() {
246246
return this.validationResult;
247247
}
248248

@@ -395,11 +395,11 @@ public void walk(ExecutionContext executionContext, JsonNode node, JsonNode root
395395
}
396396
}
397397

398-
private ValidationResult validate(String jsonData) throws Exception {
398+
private Result validate(String jsonData) throws Exception {
399399
ObjectMapper objectMapper = new ObjectMapper();
400400
ExecutionContext executionContext = this.jsonSchema.createExecutionContext();
401401
this.jsonSchema.validate(executionContext, objectMapper.readTree(jsonData));
402-
return new ValidationResult(executionContext);
402+
return new Result(executionContext);
403403
}
404404

405405
protected static Map<String, String> getDatasourceMap() {

‎src/test/java/com/networknt/schema/IfValidatorTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void onWalkEnd(WalkEvent walkEvent, List<Error> errors) {
7373
.build();
7474
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(Version.DRAFT_2020_12);
7575
Schema schema = factory.getSchema(schemaData);
76-
ValidationResult result = schema.walk("\"false\"", InputFormat.JSON, true, executionContext -> executionContext.setWalkConfig(walkConfig));
76+
Result result = schema.walk("\"false\"", InputFormat.JSON, true, executionContext -> executionContext.setWalkConfig(walkConfig));
7777
assertFalse(result.getErrors().isEmpty());
7878

7979
List<WalkEvent> types = result.getExecutionContext().getCollectorContext().get("types");
@@ -118,7 +118,7 @@ public void onWalkEnd(WalkEvent walkEvent, List<Error> errors) {
118118
.build();
119119
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(Version.DRAFT_2020_12);
120120
Schema schema = factory.getSchema(schemaData);
121-
ValidationResult result = schema.walk("\"hello\"", InputFormat.JSON, true, executionContext -> executionContext.setWalkConfig(walkConfig));
121+
Result result = schema.walk("\"hello\"", InputFormat.JSON, true, executionContext -> executionContext.setWalkConfig(walkConfig));
122122
assertFalse(result.getErrors().isEmpty());
123123

124124
@SuppressWarnings("unchecked")
@@ -164,7 +164,7 @@ public void onWalkEnd(WalkEvent walkEvent, List<Error> errors) {
164164
.build();
165165
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(Version.DRAFT_2020_12);
166166
Schema schema = factory.getSchema(schemaData);
167-
ValidationResult result = schema.walk(null, true, executionContext -> executionContext.setWalkConfig(walkConfig));
167+
Result result = schema.walk(null, true, executionContext -> executionContext.setWalkConfig(walkConfig));
168168
assertTrue(result.getErrors().isEmpty());
169169

170170
@SuppressWarnings("unchecked")
@@ -208,7 +208,7 @@ public void onWalkEnd(WalkEvent walkEvent, List<Error> errors) {
208208
.build();
209209
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(Version.DRAFT_2020_12);
210210
Schema schema = factory.getSchema(schemaData);
211-
ValidationResult result = schema.walk("\"false\"", InputFormat.JSON, false, executionContext -> executionContext.setWalkConfig(walkConfig));
211+
Result result = schema.walk("\"false\"", InputFormat.JSON, false, executionContext -> executionContext.setWalkConfig(walkConfig));
212212
assertTrue(result.getErrors().isEmpty());
213213

214214
@SuppressWarnings("unchecked")

‎src/test/java/com/networknt/schema/Issue461Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void shouldWalkWithValidation() throws IOException {
3434

3535
Schema schema = getJsonSchemaFromStreamContentV7(SchemaLocation.of("resource:/draft-07/schema#"));
3636
JsonNode data = mapper.readTree(Issue461Test.class.getResource("/data/issue461-v7.json"));
37-
ValidationResult result = schema.walk(data, true, executionContext -> executionContext.setWalkConfig(walkConfig));
37+
Result result = schema.walk(data, true, executionContext -> executionContext.setWalkConfig(walkConfig));
3838
Assertions.assertTrue(result.getErrors().isEmpty());
3939
}
4040

‎src/test/java/com/networknt/schema/Issue467Test.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void onWalkEnd(WalkEvent walkEvent, List<Error> set) {
6767
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(Specification.Version.DRAFT_7);
6868
Schema schema = factory.getSchema(schemaInputStream);
6969
JsonNode data = mapper.readTree(Issue467Test.class.getResource("/data/issue467.json"));
70-
ValidationResult result = schema.walk(data, true, executionContext -> executionContext.setWalkConfig(walkConfig));
70+
Result result = schema.walk(data, true, executionContext -> executionContext.setWalkConfig(walkConfig));
7171
assertEquals(new HashSet<>(Arrays.asList("/properties", "/properties/tags/items/0/properties")),
7272
properties.stream().map(Object::toString).collect(Collectors.toSet()));
7373
assertEquals(1, result.getErrors().size());
@@ -96,7 +96,7 @@ public void onWalkEnd(WalkEvent walkEvent, List<Error> set) {
9696
SchemaRegistry factory = SchemaRegistry.withDefaultDialect(Specification.Version.DRAFT_7);
9797
Schema schema = factory.getSchema(schemaInputStream);
9898
JsonNode data = mapper.readTree(Issue467Test.class.getResource("/data/issue467.json"));
99-
ValidationResult result = schema.walk(data, true, executionContext -> executionContext.setWalkConfig(walkConfig));
99+
Result result = schema.walk(data, true, executionContext -> executionContext.setWalkConfig(walkConfig));
100100
assertEquals(
101101
new HashSet<>(Arrays.asList("/properties/tags", "/properties/tags/items/0/properties/category", "/properties/tags/items/0/properties/value")),
102102
properties.stream().map(Object::toString).collect(Collectors.toSet()));

‎src/test/java/com/networknt/schema/Issue877Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void test() throws Exception {
3333
SchemaRegistry jsonSchemaFactory = SchemaRegistry.withDefaultDialect(Version.DRAFT_2020_12);
3434
Schema schema = jsonSchemaFactory.getSchema(schemaData);
3535
String input = "{}";
36-
ValidationResult result = schema.walk(JsonMapperFactory.getInstance().readTree(input), true);
36+
Result result = schema.walk(JsonMapperFactory.getInstance().readTree(input), true);
3737
assertEquals(0, result.getErrors().size());
3838

3939
input = "";

0 commit comments

Comments
 (0)