Commit Graph

96 Commits

Author SHA1 Message Date
Francesco Biscani
1b27d5cf01 Increase the verbosity of the error message produced when there are undefined references. 2022-09-03 09:24:09 +02:00
Chris Wright
e1e48ddbe0 Replace dynamic_cast with member functions (#210) 2022-09-02 17:50:07 +02:00
res0nance
d2210f65da chore: use to_string() to avoid warning 2022-08-24 18:59:13 +02:00
Patrick Boettcher
4f67636760 ref-schema: create a new ref-schema when default-value is present
Default-values on schemas with a $ref field are now stored within
a new reference schema which links to the original reference schema.
It contains the default value and keeps a strong reference (shared_ptr)
to the original reference.

Fixes #209
2022-06-27 10:30:11 +02:00
Martin KOCH
5e5918d2ae distinguish between schema_ref and type_schema 2022-06-06 10:09:51 +02:00
Patrick Boettcher
61d8b6deb4 make default-values work for stacked $refs 2022-06-06 10:08:43 +02:00
Martin KOCH
686f3b1cc5 Support override of default value when using referenced schemas (#189) 2022-06-06 10:08:43 +02:00
Matthias Deimbacher
0d563960cd Fix explicit conversion to string 2022-06-06 08:59:43 +02:00
Luke
d8467b7c08
Updated exclusive min/max error message #182 (#183)
The error messages for exclusive minimum and maximum have been updated
to include 'or equals' for greater clarity.

Fix #182
2021-11-18 18:32:40 +01:00
qvfh83
0097de3c54
Use explicit type conversion from json (#173)
* Use explicit type conversion

As detailed in https://github.com/nlohmann/json#implicit-conversions, it's recommended not to use implicit conversions from json. This change allows those using "JSON_ImplicitConversions" OFF to still build this package.

* Use matching type from declaration for some variables.
2021-10-10 18:03:09 +02:00
Patrick Boettcher
89ed13d76b First implementation of sub-schema-validation on request.
#149 and #135
2021-06-17 09:06:23 +02:00
eike-fokken
e1cef0b58b
fixed occurences of old-style casts and an implicit cast to double (#151)
* fixed occurences of old-style casts and an implicit cast to double

Co-authored-by: Eike <e.fokken+git@posteo.de>
2021-03-16 00:11:10 +01:00
Patrick Boettcher
3893a2c3af fix #143: the whole unknown keywords-hierarchy needs to be an object
Even if the key is a number in a string. See issue for more details.
2021-03-09 10:39:19 +01:00
Patrick Boettcher
a4bc67d754 force schema-instance-type of unknown-keywords to an object
fixes #143
2021-02-08 17:57:21 +01:00
Mark Marshall
1519c845c2 Don't shadow "schema" with local variables of the same name
This fixes a warning from gcc (-Wshadow).
2020-09-03 10:41:40 +02:00
Patrick Boettcher
5782bdcf9e use auto for char-type 2020-07-13 11:17:18 +02:00
andrejlevkovitch
b9d8e098cd add checks about content checker at shema parsing stage 2020-07-13 11:13:08 +02:00
andrejlevkovitch
dbf59ab4c3 move checks contentEncoding and contentMediaType to string schema 2020-07-13 11:13:08 +02:00
andrejlevkovitch
a632d2707b add support for validate binary data in nlohmann::json
Used for bson or other implementations of binary json-instances.
2020-07-13 11:13:08 +02:00
Patrick Boettcher
5ef4f903af add content-checker-callback
Used when contentEncoding or mediaType attributes are present
on a string-value.
2020-07-13 11:12:48 +02:00
Guillaume G
32af07ce19
fix default is empty object (#123)
* fix default is empty object

* add counter check with no default or null
2020-06-29 15:20:07 +02:00
andrejlevkovitch
0a83ee0c68 remove {} from one line if 2020-06-12 17:22:46 +02:00
andrejlevkovitch
7554b4ca70 add checking about format-checker existance at schema parsing time 2020-06-12 17:22:46 +02:00
Patrick Boettcher
8125a3e352 after et_root_schema, throw if there are undef refs
fix #97
2020-05-15 09:35:11 +02:00
Patrick Boettcher
c12a27eee1 use schema to validate json-patch and use json_pointer to verify path
fix #107
2020-05-15 08:59:11 +02:00
Patrick Boettcher
a0fca479f6 fix #109: use weak_ptr in schema_refs 2020-05-01 11:19:16 +02:00
Patrick Boettcher
2cc7e9aaa5 schema-URIs with plain name identifiers cannot have derived sub-schema-URIs
fix #96
2020-04-25 08:26:55 +02:00
Patrick Boettcher
b28c15adea fix #101: throw an exception if JSON-type of schema is not one of the expected types 2020-04-15 09:37:16 +02:00
Patrick Boettcher
03af1b5e1e fix #100: only look for "unknown keyword" if the uri contains a pointer. 2020-04-15 09:37:04 +02:00
Patrick Boettcher
81eba4928d fix #98: catch out-of-range-exception only
Leave other exception go through - real errors.
2020-04-09 15:16:25 +02:00
Patrick Boettcher
940262ceae fix #93 by returning default-values for refs
and also return them for root-schemas
2020-03-26 10:49:58 +01:00
Sven Fink
cb95425f59 Add schema class that is aware of a default entry
Uses json patch format for defaults: json patch (RFC 6902) makes it
clearer in case of array contents. It is supported by nlohmann::json and
can be applied with `patch` to fill up the json with defaults.
2020-03-10 14:32:10 +01:00
Sven Fink
7264fa0a05 Internal root_schema may move callbacks 2020-02-11 07:30:09 +01:00
Sven Fink
d84e0a28d6 Allow create validator from rvalue json 2020-02-11 07:30:09 +01:00
Sven Fink
01e3dea71b Avoid copy of json on set_root_schema
If a json object containing a schema is moved into the json validator it
should not be copied. At least the public interface of the validator
class schould not force the copy.
2020-02-10 11:52:12 +01:00
Sven Fink
e146b37a32 Add virtual dtor to schema 2020-02-10 08:11:28 +01:00
Luke Kersting
8a7d1d3fde Adapt CMake project name to be coherent with nlohmann::json's naming
Now when json-schema-validator is installed CMake config files are installed in the lib/cmake/json-schema-validator directory.
The install json-schema-validatorTargets.cmake file properly imports the json-hpp and json-schema-validator libraries.
The install json-schema-validatorConfig.cmake file is used by CMake find_package function to include the json-schema-validatorTargets.cmake file and to set the variable JSON_SCHEMA_VALIDATOR_INCLUDE_DIRS to the install include directory.
To use find_package to find the json-schema-validator simply include.
A new test (test_cmake_install) has been added.

When NLohmann's JSON is install with CMake, it follows a certain
naming convention.

As we learned to do proper CMake-install thanks to @lkersting's work
this project now adapts to the way NLohmann is doing it. Namely:

- json-schema.hpp is now located (and installed)
  in a nlohmann/-subdirectory
- the CMake library and project's name is now
  nlohmann_json_schema_validator

Instead of doing non-standard acrobatics to find the json.hpp
now find_package is used in order to find NLohmann's package

Co-Authored-By: Patrick Boettcher <p@yai.se>
2019-12-05 11:12:23 +01:00
mxmlnkn
ad8f158284 add support for some built-in string format specifiers: date-time, date, time, ipv4, ipv6 2019-12-03 16:28:54 +01:00
Patrick Boettcher
fa978cb766 fix #76: fix compilation when there is not regex-library at all
Contributed by @mrspacemankey
2019-11-27 13:58:38 +01:00
Patrick Boettcher
49131a8713 fix #75: unknown keywords may contain sub-schemas
Now when an unknown keyword appears and its value is an object,
sub-unknown-keywords are inserted as possible sub-schemas.
2019-11-27 13:53:28 +01:00
Patrick Boettcher
e2bdcbea2d update comments 2019-11-27 13:53:23 +01:00
Patrick Boettcher
3ec0e69a0b Add support for plain-name-fragment
Plain-name-fragments are something like

    file.json#plain

plain here is not a JSON-pointer but a
Location-independent Identifier or plain-name.

Fixes #72
2019-10-23 14:46:34 +02:00
Patrick Boettcher
79639446a0 Add constructor taking a root-schema as argument
This way the validator can be used static/global loading once a root-schema.

As no try/catch-compound can be placed around, it has to be a valid schema.

Related to #70
2019-10-14 11:58:16 +02:00
Patrick Boettcher
5617eeec4e root-schema: allow re-setting a new root-schema
Fixes #70
2019-10-14 11:46:13 +02:00
Patrick Boettcher
c0d3a287d3 fix #55: make additionalProperties-error-message clearer
Done this by using sub-error-handler of type first_error_handler
and constructing a message.
2019-05-02 17:11:38 +02:00
garethsb-sony
6d5ab6cf37 Error reporting improvements
report first error message of first subschema failure for 'allOf'
make other error messages more consistent
json_validator::validate can be const
introduce error_handler 'interface'
typedefs for schema_loader and format_checker functions
remove some commented-out debugging code
2019-03-29 11:08:20 +01:00
Patrick Boettcher
4ca18cbd63 fix #54: use signed-integer-validator even for number_unsigned 2019-03-29 10:57:01 +01:00
garethsb-sony
c40fb7aa34 Improve error-message-grammar and style. 2019-03-20 15:44:14 +01:00
Patrick Boettcher
6c482e1035 error-handler now receives a json_pointer as path
Indicating where in the instance the error occurred.
The pointer is relative to the root of the instance.
2019-03-20 15:22:51 +01:00
Patrick Boettcher
746394922a Use push_back of nlohmann::json_pointer if available. 2019-03-20 14:36:07 +01:00