improve error messages when probing JSON path value type
This commit is contained in:
parent
9e7a0bca31
commit
926a0b992d
@ -112,6 +112,12 @@ std::optional<float> getFromString(char const* val)
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
char const* getTypename();
|
||||||
|
|
||||||
|
template<>
|
||||||
|
char const* getTypename<float>() { return "float"; }
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
std::pair<T, String> Utils::getJsonValueByPath(JsonDocument const& root, String const& path)
|
std::pair<T, String> Utils::getJsonValueByPath(JsonDocument const& root, String const& path)
|
||||||
{
|
{
|
||||||
@ -179,15 +185,17 @@ std::pair<T, String> Utils::getJsonValueByPath(JsonDocument const& root, String
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!value.is<char const*>()) {
|
if (!value.is<char const*>()) {
|
||||||
snprintf(errBuffer, kErrBufferSize, "Value '%s' at JSON path '%s' is not "
|
snprintf(errBuffer, kErrBufferSize, "Value '%s' at JSON path '%s' is "
|
||||||
"of the expected type", value.as<String>().c_str(), path.c_str());
|
"neither a string nor of type %s", value.as<String>().c_str(),
|
||||||
|
path.c_str(), getTypename<T>());
|
||||||
return { T(), String(errBuffer) };
|
return { T(), String(errBuffer) };
|
||||||
}
|
}
|
||||||
|
|
||||||
auto res = getFromString<T>(value.as<char const*>());
|
auto res = getFromString<T>(value.as<char const*>());
|
||||||
if (!res.has_value()) {
|
if (!res.has_value()) {
|
||||||
snprintf(errBuffer, kErrBufferSize, "String '%s' at JSON path '%s' cannot "
|
snprintf(errBuffer, kErrBufferSize, "String '%s' at JSON path '%s' cannot "
|
||||||
"be converted to the expected type", value.as<String>().c_str(), path.c_str());
|
"be converted to %s", value.as<String>().c_str(), path.c_str(),
|
||||||
|
getTypename<T>());
|
||||||
return { T(), String(errBuffer) };
|
return { T(), String(errBuffer) };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user