flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-29 12:45:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add RequiredForJson JSON

Browse Source
This commit is contained in:
Lars Toenning
2024-02-09 14:05:36 +01:00
parent 65e4c9742b
commit 43b9404827
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackmisc/metaclass.h
View File

@@ -209,7 +209,8 @@ namespace BlackMisc
DisabledForHashing = 1 << 3, //!< Element will be ignored by qHash() DisabledForHashing = 1 << 3, //!< Element will be ignored by qHash()
DisabledForJson = 1 << 4, //!< Element will be ignored during JSON serialization DisabledForJson = 1 << 4, //!< Element will be ignored during JSON serialization
CaseInsensitiveComparison = 1 << 5, //!< Element will be compared case insensitively (must be a QString) CaseInsensitiveComparison = 1 << 5, //!< Element will be compared case insensitively (must be a QString)
LosslessMarshalling = 1 << 6 //!< Element marshalling will preserve data at the expense of size LosslessMarshalling = 1 << 6, //!< Element marshalling will preserve data at the expense of size
RequiredForJson = 1 << 7 //!< Element is required when parsing from JSON
}; };
/*! /*!
@@ -229,6 +230,7 @@ namespace BlackMisc
constexpr static MetaFlags<MetaFlag::DisabledForJson> DisabledForJson {}; constexpr static MetaFlags<MetaFlag::DisabledForJson> DisabledForJson {};
constexpr static MetaFlags<MetaFlag::CaseInsensitiveComparison> CaseInsensitiveComparison {}; constexpr static MetaFlags<MetaFlag::CaseInsensitiveComparison> CaseInsensitiveComparison {};
constexpr static MetaFlags<MetaFlag::LosslessMarshalling> LosslessMarshalling {}; constexpr static MetaFlags<MetaFlag::LosslessMarshalling> LosslessMarshalling {};
constexpr static MetaFlags<MetaFlag::RequiredForJson> RequiredForJson {};
//! @} //! @}
//! Return a CMetaMemberList of type deduced from the types of the meta members. //! Return a CMetaMemberList of type deduced from the types of the meta members.

2
src/blackmisc/mixin/mixinjson.h
View File

@@ -155,7 +155,7 @@ namespace BlackMisc
const auto value = json.value(CExplicitLatin1String(member.latin1Name())); const auto value = json.value(CExplicitLatin1String(member.latin1Name()));
if (value.isUndefined()) if (value.isUndefined())
{ {
constexpr bool required = false; //! \fixme add RequiredForJson flag in metaclass system constexpr bool required = decltype(member)::has(MetaFlags<RequiredForJson>());
// QLatin1String used instead of QStringLiteral below since the latter causes an internal compiler bug // QLatin1String used instead of QStringLiteral below since the latter causes an internal compiler bug
// in GCC 8 and higher // in GCC 8 and higher
if (required) { throw CJsonException(QLatin1String("Missing required member '%1'").arg(member.latin1Name())); } // cppcheck-suppress knownConditionTrueFalse if (required) { throw CJsonException(QLatin1String("Missing required member '%1'").arg(member.latin1Name())); } // cppcheck-suppress knownConditionTrueFalse