Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/main/java/com/retailsvc/http/validate/DefaultValidator.java
Original file line number Diff line number Diff line change
Expand Up @@ -127,24 +127,24 @@ Optional<ValidationError> check(Object value, Schema schema, String pointer) {
}

return switch (schema) {
case RefSchema(String ref, var _) -> check(value, refResolver.apply(ref), pointer);
case RefSchema(String ref, _) -> check(value, refResolver.apply(ref), pointer);
case BooleanSchema _ -> checkBoolean(value, pointer);
case NullSchema _ -> value == null ? OK : err(pointer, "type", "expected null", value);
case StringSchema s -> checkString(value, s, pointer);
case IntegerSchema i -> checkInteger(value, i, pointer);
case NumberSchema n -> checkNumber(value, n, pointer);
case ObjectSchema o -> checkObject(value, o, pointer);
case ArraySchema a -> checkArray(value, a, pointer);
case EnumSchema(List<Object> values, var _) ->
case EnumSchema(List<Object> values, _) ->
values.contains(value) ? OK : err(pointer, "enum", "value not in enum", value);
case ConstSchema(Object expected, var _) ->
case ConstSchema(Object expected, _) ->
Objects.equals(expected, value)
? OK
: err(pointer, "const", "value does not equal const", value);
case AllOfSchema(List<Schema> parts, var _) -> checkAllOf(value, parts, pointer);
case AnyOfSchema(List<Schema> options, var _) -> checkAnyOf(value, options, pointer);
case OneOfSchema(List<Schema> options, var _) -> checkOneOf(value, options, pointer);
case NotSchema(Schema inner, var _) -> checkNot(value, inner, pointer);
case AllOfSchema(List<Schema> parts, _) -> checkAllOf(value, parts, pointer);
case AnyOfSchema(List<Schema> options, _) -> checkAnyOf(value, options, pointer);
case OneOfSchema(List<Schema> options, _) -> checkOneOf(value, options, pointer);
case NotSchema(Schema inner, _) -> checkNot(value, inner, pointer);
case AlwaysSchema _ -> OK;
case NeverSchema _ -> err(pointer, "false", "schema rejects all values", value);
};
Expand Down
Loading