evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable stack capture on common Json patching exceptions

Browse Source 
Speeds up asset loading
This commit is contained in:
Kae 2024-11-05 10:40:05 +11:00
parent 515d71409c
commit 01770c78db
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/core/StarJsonPatch.cpp
View File

@ -12,7 +12,7 @@ Json jsonPatch(Json const& base, JsonArray const& patch) {
} }
return res; return res;
} catch (JsonException const& e) { } catch (JsonException const& e) {
throw JsonPatchException(strf("Could not apply patch to base. {}", e.what())); throw JsonPatchException(strf("Could not apply patch to base. {}", e.what()), false);
} }
} }
@ -26,7 +26,7 @@ size_t findJsonMatch(Json const& searchable, Json const& value, JsonPath::Pointe
return i + 1; return i + 1;
} }
} else { } else {
throw JsonPatchException(strf("Search operation failure, value at '{}' is not an array.", pointer.path())); throw JsonPatchException(strf("Search operation failure, value at '{}' is not an array.", pointer.path()), false);
} }
return 0; return 0;
} }
@ -49,9 +49,9 @@ namespace JsonPatching {
auto operation = op.getString("op"); auto operation = op.getString("op");
return JsonPatching::functionMap.get(operation)(base, op); return JsonPatching::functionMap.get(operation)(base, op);
} catch (JsonException const& e) { } catch (JsonException const& e) {
throw JsonPatchException(strf("Could not apply operation to base. {}", e.what())); throw JsonPatchException(strf("Could not apply operation to base. {}", e.what()), false);
} catch (MapException const&) { } catch (MapException const&) {
throw JsonPatchException(strf("Invalid operation: {}", op.getString("op"))); throw JsonPatchException(strf("Invalid operation: {}", op.getString("op")), false);
} }
} }
@ -66,28 +66,28 @@ namespace JsonPatching {
auto searchValue = op.get("search"); auto searchValue = op.get("search");
bool found = findJsonMatch(searchable, searchValue, pointer); bool found = findJsonMatch(searchable, searchValue, pointer);
if (found && inverseTest) if (found && inverseTest)
throw JsonPatchTestFail(strf("Test operation failure, expected {} to be missing.", searchValue)); throw JsonPatchTestFail(strf("Test operation failure, expected {} to be missing.", searchValue), false);
else if (!found && !inverseTest) else if (!found && !inverseTest)
throw JsonPatchTestFail(strf("Test operation failure, could not find {}.", searchValue)); throw JsonPatchTestFail(strf("Test operation failure, could not find {}.", searchValue), false);
return base; return base;
} else { } else {
auto value = op.opt("value"); auto value = op.opt("value");
auto testValue = pointer.get(base); auto testValue = pointer.get(base);
if (!value) { if (!value) {
if (inverseTest) if (inverseTest)
throw JsonPatchTestFail(strf("Test operation failure, expected {} to be missing.", path)); throw JsonPatchTestFail(strf("Test operation failure, expected {} to be missing.", path), false);
return base; return base;
} }
if ((value && (testValue == *value)) ^ inverseTest) if ((value && (testValue == *value)) ^ inverseTest)
return base; return base;
else else
throw JsonPatchTestFail(strf("Test operation failure, expected {} found {}.", value, testValue)); throw JsonPatchTestFail(strf("Test operation failure, expected {} found {}.", value, testValue), false);
} }
} catch (JsonPath::TraversalException& e) { } catch (JsonPath::TraversalException& e) {
if (inverseTest) if (inverseTest)
return base; return base;
throw JsonPatchTestFail(strf("Test operation failure: {}", e.what())); throw JsonPatchTestFail(strf("Test operation failure: {}", e.what()), false);
} }
} }