generic-library/valijson
1
0
Fork 0
mirror of https://github.com/tristanpenman/valijson.git synced 2025-03-03 12:58:03 +01:00
Code Issues Projects Releases Wiki Activity

Add helper function to SchemaParser to sanitise JSON Pointers (and ensure that they have consistent endings)

Browse Source
This commit is contained in:
Tristan Penman 2016-02-13 21:03:20 -08:00
parent 39da77d17e
commit a74ce3fb2c
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/valijson/schema_parser.hpp
View File

@ -170,6 +170,25 @@ private:
return true;
}
/**
* Sanitise an optional JSON Pointer, trimming trailing slashes
*/
std::string sanitiseJsonPointer(const boost::optional<std::string> input)
{
if (input) {
// Trim trailing slash(es)
std::string sanitised = *input;
sanitised.erase(sanitised.find_last_not_of('/') + 1,
std::string::npos);
return sanitised;
}
// If the JSON Pointer is not set, assume that the URI points to
// the root of the document
return "";
}
/**
* @brief Populate a Schema object from JSON Schema document
*
@ -543,8 +562,8 @@ private:
internal::json_reference::getJsonReferenceUri(jsonRef);
// Extract JSON Pointer from JSON Reference
const std::string jsonPointer =
internal::json_reference::getJsonReferencePointer(jsonRef);
const std::string jsonPointer = sanitiseJsonPointer(
internal::json_reference::getJsonReferencePointer(jsonRef));
if (documentUri) {
// Resolve reference against remote document