tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8697 from Icinga/bugfix/json-int

Browse Source 
JsonEncode(): serialize integers w/o trailing .0
This commit is contained in:
Julian Brost 2021-03-25 11:12:53 +01:00 committed by GitHub
commit e1c6e53458
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/base/json.cpp
View File

@ -365,7 +365,25 @@ inline
void JsonEncoder<prettyPrint>::NumberFloat(double value)
{
BeforeItem();
// Make sure 0.0 is serialized as 0, so e.g. Icinga DB can parse it as int.
if (value < 0) {
long long i = value;
if (i == value) {
AppendJson(i);
} else {
AppendJson(value);
}
} else {
unsigned long long i = value;
if (i == value) {
AppendJson(i);
} else {
AppendJson(value);
}
}
}
template<bool prettyPrint>

8
test/base-json.cpp
View File

@ -31,11 +31,11 @@ BOOST_AUTO_TEST_CASE(encode)
],
"false": false,
"float": -1.25,
"int": -42.0,
"int": -42,
"null": null,
"string": "LF\nTAB\tAUml\u00e4Ill\ufffd",
"true": true,
"uint": 23.0
"uint": 23
}
)EOF");
@ -55,11 +55,11 @@ BOOST_AUTO_TEST_CASE(decode)
],
"false": false,
"float": -1.25,
"int": -42.0,
"int": -42,
"null": null,
"string": "LF\nTAB\tAUmlIll",
"true": true,
"uint": 23.0
"uint": 23
}
)EOF");