Skip to content

Commit 99b56b2

Browse files
committed
-Rename ValidatorConfig to SchemaValidatorsConfig
1 parent 9d6d94e commit 99b56b2

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ public abstract class BaseJsonValidator implements JsonValidator {
3333
private ValidatorTypeCode validatorType;
3434
private ErrorMessageType errorMessageType;
3535
/**
36-
* ValidatorConfig can only get and set in validationContext
36+
* SchemaValidatorsConfig can only get and set in validationContext
3737
*/
38-
protected ValidatorConfig config;
38+
protected SchemaValidatorsConfig config;
3939

4040

4141
public BaseJsonValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema,
4242
ValidatorTypeCode validatorType, ValidationContext validationContext) {
4343
this(schemaPath, schemaNode, parentSchema, validatorType, false );
44-
this.config = validationContext.getConfig() == null ? new ValidatorConfig() : validationContext.getConfig();
44+
this.config = validationContext.getConfig() == null ? new SchemaValidatorsConfig() : validationContext.getConfig();
4545
}
4646

4747
public BaseJsonValidator(String schemaPath, JsonNode schemaNode, JsonSchema parentSchema,

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public static Builder builder(JsonSchemaFactory blueprint) {
138138
.objectMapper(blueprint.mapper);
139139
}
140140

141-
private JsonSchema newJsonSchema(JsonNode schemaNode, ValidatorConfig config) {
141+
private JsonSchema newJsonSchema(JsonNode schemaNode, SchemaValidatorsConfig config) {
142142
final ValidationContext validationContext = createValidationContext(schemaNode);
143143
validationContext.setConfig(config);
144144
JsonSchema jsonSchema = new JsonSchema(validationContext, schemaNode);
@@ -160,7 +160,7 @@ private JsonMetaSchema findMetaSchemaForSchema(JsonNode schemaNode) {
160160
return jsonMetaSchema;
161161
}
162162

163-
public JsonSchema getSchema(String schema, ValidatorConfig config) {
163+
public JsonSchema getSchema(String schema, SchemaValidatorsConfig config) {
164164
try {
165165
final JsonNode schemaNode = mapper.readTree(schema);
166166
return newJsonSchema(schemaNode, config);
@@ -174,7 +174,7 @@ public JsonSchema getSchema(String schema) {
174174
return getSchema(schema, null);
175175
}
176176

177-
public JsonSchema getSchema(InputStream schemaStream, ValidatorConfig config) {
177+
public JsonSchema getSchema(InputStream schemaStream, SchemaValidatorsConfig config) {
178178
try {
179179
final JsonNode schemaNode = mapper.readTree(schemaStream);
180180
return newJsonSchema(schemaNode, config);
@@ -188,7 +188,7 @@ public JsonSchema getSchema(InputStream schemaStream) {
188188
return getSchema(schemaStream, null);
189189
}
190190

191-
public JsonSchema getSchema(URL schemaURL, ValidatorConfig config) {
191+
public JsonSchema getSchema(URL schemaURL, SchemaValidatorsConfig config) {
192192
try {
193193
InputStream inputStream = null;
194194
try {
@@ -217,7 +217,7 @@ public JsonSchema getSchema(URL schemaURL) {
217217
return getSchema(schemaURL, null);
218218
}
219219

220-
public JsonSchema getSchema(JsonNode jsonNode, ValidatorConfig config) {
220+
public JsonSchema getSchema(JsonNode jsonNode, SchemaValidatorsConfig config) {
221221
return newJsonSchema(jsonNode, config);
222222
}
223223

src/main/java/com/networknt/schema/ValidatorConfig.java renamed to src/main/java/com/networknt/schema/SchemaValidatorsConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.networknt.schema;
22

3-
public class ValidatorConfig {
3+
public class SchemaValidatorsConfig {
44
/**
55
* when validate type, if TYPE_LOOSE = true, will try to convert string to different types to match the type defined in schema.
66
*/
@@ -14,7 +14,7 @@ public void setTypeLoose(boolean typeLoose) {
1414
this.typeLoose = typeLoose;
1515
}
1616

17-
public ValidatorConfig() {
17+
public SchemaValidatorsConfig() {
1818
loadDefaultConfig();
1919
}
2020

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
public class ValidationContext {
66
private final JsonMetaSchema metaSchema;
77
private final JsonSchemaFactory jsonSchemaFactory;
8-
private ValidatorConfig config;
8+
private SchemaValidatorsConfig config;
99

1010
public ValidationContext(JsonMetaSchema metaSchema, JsonSchemaFactory jsonSchemaFactory) {
1111
if (metaSchema == null) {
@@ -27,11 +27,11 @@ public JsonSchemaFactory getJsonSchemaFactory() {
2727
return jsonSchemaFactory;
2828
}
2929

30-
public ValidatorConfig getConfig() {
30+
public SchemaValidatorsConfig getConfig() {
3131
return config;
3232
}
3333

34-
public void setConfig(ValidatorConfig config) {
34+
public void setConfig(SchemaValidatorsConfig config) {
3535
this.config = config;
3636
}
3737
}

0 commit comments

Comments
 (0)