diff --git a/include/nlohmann/detail/macro_scope.hpp b/include/nlohmann/detail/macro_scope.hpp index 706f1b9714..756350bbcb 100644 --- a/include/nlohmann/detail/macro_scope.hpp +++ b/include/nlohmann/detail/macro_scope.hpp @@ -374,32 +374,96 @@ #define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1); #define NLOHMANN_JSON_FROM_WITH_DEFAULT(v1) nlohmann_json_t.v1 = nlohmann_json_j.value(#v1, nlohmann_json_default_obj.v1); +#define NLOHMANN_DEFINE_TYPE_TO_IMPL(ReturnType, BasicJsonType, Type, ...) \ + ReturnType to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) \ + { \ + NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) \ + } +#define NLOHMANN_DEFINE_TYPE_IMPL(ReturnType, BasicJsonType, Type, ...) \ + NLOHMANN_DEFINE_TYPE_TO_IMPL(ReturnType, BasicJsonType, Type, __VA_ARGS__) \ + ReturnType from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) \ + { \ + NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) \ + } +#define NLOHMANN_DEFINE_TYPE_WITH_DEFAULT_IMPL(ReturnType, BasicJsonType, Type, ...) \ + NLOHMANN_DEFINE_TYPE_TO_IMPL(ReturnType, BasicJsonType, Type, __VA_ARGS__) \ + ReturnType from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) \ + { \ + Type nlohmann_json_default_obj; \ + NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) \ + } + /*! -@brief macro +@brief macro to briefly define intrusive serialization of given type to/from nlohmann::json @def NLOHMANN_DEFINE_TYPE_INTRUSIVE @since version 3.9.0 +@sa NLOHMANN_DEFINE_TYPE_INTRUSIVE_IMPL */ -#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...) \ - friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ - friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } +#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...) NLOHMANN_DEFINE_TYPE_IMPL(friend void, nlohmann::json, Type, __VA_ARGS__) -#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Type, ...) \ - friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ - friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { Type nlohmann_json_default_obj; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) } +#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Type, ...) NLOHMANN_DEFINE_TYPE_WITH_DEFAULT_IMPL(friend void, nlohmann::json, Type, __VA_ARGS__) /*! -@brief macro +@brief macro to briefly define non-intrusive serialization of given type to/from nlohmann::json @def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE @since version 3.9.0 +@sa NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_IMPL +*/ +#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...) NLOHMANN_DEFINE_TYPE_IMPL(inline void, nlohmann::json, Type, __VA_ARGS__) + +#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, ...) NLOHMANN_DEFINE_TYPE_WITH_DEFAULT_IMPL(inline void, nlohmann::json, Type, __VA_ARGS__) + +#define NLOHMANN_DEFINE_TYPE_T_TO_IMPL(ReturnType, Type, ...) \ + template \ + ReturnType to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) \ + { \ + NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) \ + } + +#define NLOHMANN_DEFINE_TYPE_T_IMPL(ReturnType, Type, ...) \ + NLOHMANN_DEFINE_TYPE_T_TO_IMPL(ReturnType, Type, __VA_ARGS__) \ + template \ + ReturnType from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) \ + { \ + NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) \ + } + +#define NLOHMANN_DEFINE_TYPE_T_WITH_DEFAULT_IMPL(ReturnType, Type, ...) \ + NLOHMANN_DEFINE_TYPE_T_TO_IMPL(ReturnType, Type, __VA_ARGS__) \ + template \ + ReturnType from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) \ + { \ + Type nlohmann_json_default_obj; \ + NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) \ + } + +/*! +@brief macro to briefly define intrusive serialization of a given type to/from any basic_json object +@def NLOHMANN_DEFINE_TYPE_INTRUSIVE_T +@since version 3.10.6 +*/ +#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_T(Type, ...) NLOHMANN_DEFINE_TYPE_T_IMPL(friend void, Type, __VA_ARGS__) + +/*! +@brief macro to briefly define non-intrusive serialization of a given type to/from any basic_json object +@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_T +@since version 3.10.6 */ -#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...) \ - inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ - inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } +#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_T(Type, ...) NLOHMANN_DEFINE_TYPE_T_IMPL(void, Type, __VA_ARGS__) -#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, ...) \ - inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ - inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { Type nlohmann_json_default_obj; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) } +/*! +@brief macro to briefly define intrusive serialization of a given type to/from any basic_json object (works with missing fields in json) +@def NLOHMANN_DEFINE_TYPE_INTRUSIVE_T_WITH_DEFAULT +@since version 3.10.6 +*/ +#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_T_WITH_DEFAULT(Type, ...) NLOHMANN_DEFINE_TYPE_T_WITH_DEFAULT_IMPL(friend void, Type, __VA_ARGS__) +/*! +@brief macro to briefly define non-intrusive serialization of a given type to/from any basic_json object (works with missing fields in json) +@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_T_WITH_DEFAULT +@since version 3.10.6 +*/ +#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_T_WITH_DEFAULT(Type, ...) NLOHMANN_DEFINE_TYPE_T_WITH_DEFAULT_IMPL(void, Type, __VA_ARGS__) // inspired from https://stackoverflow.com/a/26745591 // allows to call any std function as if (e.g. with begin): diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 50e5c805c0..bbc6c8a7fc 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -2601,32 +2601,96 @@ using is_detected_convertible = #define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1); #define NLOHMANN_JSON_FROM_WITH_DEFAULT(v1) nlohmann_json_t.v1 = nlohmann_json_j.value(#v1, nlohmann_json_default_obj.v1); +#define NLOHMANN_DEFINE_TYPE_TO_IMPL(ReturnType, BasicJsonType, Type, ...) \ + ReturnType to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) \ + { \ + NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) \ + } +#define NLOHMANN_DEFINE_TYPE_IMPL(ReturnType, BasicJsonType, Type, ...) \ + NLOHMANN_DEFINE_TYPE_TO_IMPL(ReturnType, BasicJsonType, Type, __VA_ARGS__) \ + ReturnType from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) \ + { \ + NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) \ + } +#define NLOHMANN_DEFINE_TYPE_WITH_DEFAULT_IMPL(ReturnType, BasicJsonType, Type, ...) \ + NLOHMANN_DEFINE_TYPE_TO_IMPL(ReturnType, BasicJsonType, Type, __VA_ARGS__) \ + ReturnType from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) \ + { \ + Type nlohmann_json_default_obj; \ + NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) \ + } + /*! -@brief macro +@brief macro to briefly define intrusive serialization of given type to/from nlohmann::json @def NLOHMANN_DEFINE_TYPE_INTRUSIVE @since version 3.9.0 +@sa NLOHMANN_DEFINE_TYPE_INTRUSIVE_IMPL */ -#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...) \ - friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ - friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } +#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...) NLOHMANN_DEFINE_TYPE_IMPL(friend void, nlohmann::json, Type, __VA_ARGS__) -#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Type, ...) \ - friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ - friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { Type nlohmann_json_default_obj; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) } +#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Type, ...) NLOHMANN_DEFINE_TYPE_WITH_DEFAULT_IMPL(friend void, nlohmann::json, Type, __VA_ARGS__) /*! -@brief macro +@brief macro to briefly define non-intrusive serialization of given type to/from nlohmann::json @def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE @since version 3.9.0 +@sa NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_IMPL +*/ +#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...) NLOHMANN_DEFINE_TYPE_IMPL(inline void, nlohmann::json, Type, __VA_ARGS__) + +#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, ...) NLOHMANN_DEFINE_TYPE_WITH_DEFAULT_IMPL(inline void, nlohmann::json, Type, __VA_ARGS__) + +#define NLOHMANN_DEFINE_TYPE_T_TO_IMPL(ReturnType, Type, ...) \ + template \ + ReturnType to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) \ + { \ + NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) \ + } + +#define NLOHMANN_DEFINE_TYPE_T_IMPL(ReturnType, Type, ...) \ + NLOHMANN_DEFINE_TYPE_T_TO_IMPL(ReturnType, Type, __VA_ARGS__) \ + template \ + ReturnType from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) \ + { \ + NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) \ + } + +#define NLOHMANN_DEFINE_TYPE_T_WITH_DEFAULT_IMPL(ReturnType, Type, ...) \ + NLOHMANN_DEFINE_TYPE_T_TO_IMPL(ReturnType, Type, __VA_ARGS__) \ + template \ + ReturnType from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) \ + { \ + Type nlohmann_json_default_obj; \ + NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) \ + } + +/*! +@brief macro to briefly define intrusive serialization of a given type to/from any basic_json object +@def NLOHMANN_DEFINE_TYPE_INTRUSIVE_T +@since version 3.10.6 */ -#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...) \ - inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ - inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } +#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_T(Type, ...) NLOHMANN_DEFINE_TYPE_T_IMPL(friend void, Type, __VA_ARGS__) -#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, ...) \ - inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ - inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { Type nlohmann_json_default_obj; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) } +/*! +@brief macro to briefly define non-intrusive serialization of a given type to/from any basic_json object +@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_T +@since version 3.10.6 +*/ +#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_T(Type, ...) NLOHMANN_DEFINE_TYPE_T_IMPL(void, Type, __VA_ARGS__) +/*! +@brief macro to briefly define intrusive serialization of a given type to/from any basic_json object (works with missing fields in json) +@def NLOHMANN_DEFINE_TYPE_INTRUSIVE_T_WITH_DEFAULT +@since version 3.10.6 +*/ +#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_T_WITH_DEFAULT(Type, ...) NLOHMANN_DEFINE_TYPE_T_WITH_DEFAULT_IMPL(friend void, Type, __VA_ARGS__) + +/*! +@brief macro to briefly define non-intrusive serialization of a given type to/from any basic_json object (works with missing fields in json) +@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_T_WITH_DEFAULT +@since version 3.10.6 +*/ +#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_T_WITH_DEFAULT(Type, ...) NLOHMANN_DEFINE_TYPE_T_WITH_DEFAULT_IMPL(void, Type, __VA_ARGS__) // inspired from https://stackoverflow.com/a/26745591 // allows to call any std function as if (e.g. with begin): diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8f9240f1ae..2741cb429d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -42,10 +42,11 @@ target_compile_features(test_main PRIVATE cxx_std_11) target_compile_options(test_main PUBLIC $<$:/EHsc;$<$:/Od>> # MSVC: Force to always compile with W4 + # Disable warning C4503: ...: decorated name length (4096) exceeded, name was truncated # Disable warning C4566: character represented by universal-character-name '\uFF01' # cannot be represented in the current code page (1252) # Disable warning C4996: 'nlohmann::basic_json<...>::operator <<': was declared deprecated - $<$:/W4 /wd4566 /wd4996> + $<$:/W4 /wd4503 /wd4566 /wd4996> # https://github.com/nlohmann/json/issues/1114 $<$:/bigobj> $<$:-Wa,-mbig-obj> diff --git a/tests/src/unit-udt_macro.cpp b/tests/src/unit-udt_macro.cpp index 1762d08da6..519dae9053 100644 --- a/tests/src/unit-udt_macro.cpp +++ b/tests/src/unit-udt_macro.cpp @@ -27,350 +27,327 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "doctest_compatibility.h" #include #include -#include "doctest_compatibility.h" #include using nlohmann::json; namespace persons { -class person_with_private_data -{ - private: - std::string name{}; - int age = 0; - json metadata = nullptr; - - public: - bool operator==(const person_with_private_data& rhs) const - { - return name == rhs.name && age == rhs.age && metadata == rhs.metadata; +#define PERSON_CLASS_BODY(ClassName, Visibility) \ + /* NOLINTNEXTLINE(bugprone-macro-parentheses) */ \ + Visibility: \ + /* NOLINTNEXTLINE(readability-redundant-string-init): collides with -Weffc++ */ \ + std::string name = ""; \ + int age = 0; \ + json metadata = nullptr; \ + public: \ + bool operator==(const ClassName& rhs) const \ + { \ + return name == rhs.name && age == rhs.age && metadata == rhs.metadata; \ + } \ + ClassName() = default; \ + ClassName(std::string name_, int age_, json metadata_) \ + : name(std::move(name_)) \ + , age(age_) \ + , metadata(std::move(metadata_)) \ + {} \ + std::string getName() const \ + { \ + return name; \ + } \ + int getAge() const \ + { \ + return age; \ + } \ + json getMetadata() const \ + { \ + return metadata; \ } - person_with_private_data() = default; - person_with_private_data(std::string name_, int age_, json metadata_) - : name(std::move(name_)) - , age(age_) - , metadata(std::move(metadata_)) - {} +#define ALPHABET_CLASS_BODY(ClassName, Visibility) \ + public: \ + bool operator==(const ClassName& other) const \ + { \ + return a == other.a && \ + b == other.b && \ + c == other.c && \ + d == other.d && \ + e == other.e && \ + f == other.f && \ + g == other.g && \ + h == other.h && \ + i == other.i && \ + j == other.j && \ + k == other.k && \ + l == other.l && \ + m == other.m && \ + n == other.n && \ + o == other.o && \ + p == other.p && \ + q == other.q && \ + r == other.r && \ + s == other.s && \ + t == other.t && \ + u == other.u && \ + v == other.v && \ + w == other.w && \ + x == other.x && \ + y == other.y && \ + z == other.z; \ + } \ + /* NOLINTNEXTLINE(bugprone-macro-parentheses) */ \ + Visibility: \ + int a = 0; \ + int b = 0; \ + int c = 0; \ + int d = 0; \ + int e = 0; \ + int f = 0; \ + int g = 0; \ + int h = 0; \ + int i = 0; \ + int j = 0; \ + int k = 0; \ + int l = 0; \ + int m = 0; \ + int n = 0; \ + int o = 0; \ + int p = 0; \ + int q = 0; \ + int r = 0; \ + int s = 0; \ + int t = 0; \ + int u = 0; \ + int v = 0; \ + int w = 0; \ + int x = 0; \ + int y = 0; \ + int z = 0; +class person_with_private_data +{ + PERSON_CLASS_BODY(person_with_private_data, private) NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_with_private_data, age, name, metadata) }; class person_with_private_data_2 { - private: - std::string name{}; - int age = 0; - json metadata = nullptr; - - public: - bool operator==(const person_with_private_data_2& rhs) const - { - return name == rhs.name && age == rhs.age && metadata == rhs.metadata; - } - - person_with_private_data_2() = default; - person_with_private_data_2(std::string name_, int age_, json metadata_) - : name(std::move(name_)) - , age(age_) - , metadata(std::move(metadata_)) - {} - - std::string getName() const - { - return name; - } - int getAge() const - { - return age; - } - json getMetadata() const - { - return metadata; - } - + PERSON_CLASS_BODY(person_with_private_data_2, private) NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(person_with_private_data_2, age, name, metadata) }; class person_without_private_data_1 { - public: - std::string name{}; - int age = 0; - json metadata = nullptr; - - bool operator==(const person_without_private_data_1& rhs) const - { - return name == rhs.name && age == rhs.age && metadata == rhs.metadata; - } - - person_without_private_data_1() = default; - person_without_private_data_1(std::string name_, int age_, json metadata_) - : name(std::move(name_)) - , age(age_) - , metadata(std::move(metadata_)) - {} - + PERSON_CLASS_BODY(person_without_private_data_1, public) NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_without_private_data_1, age, name, metadata) }; class person_without_private_data_2 { - public: - std::string name{}; - int age = 0; - json metadata = nullptr; - - bool operator==(const person_without_private_data_2& rhs) const - { - return name == rhs.name && age == rhs.age && metadata == rhs.metadata; - } - - person_without_private_data_2() = default; - person_without_private_data_2(std::string name_, int age_, json metadata_) - : name(std::move(name_)) - , age(age_) - , metadata(std::move(metadata_)) - {} + PERSON_CLASS_BODY(person_without_private_data_2, public) }; - NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(person_without_private_data_2, age, name, metadata) class person_without_private_data_3 { - public: - std::string name{}; - int age = 0; - json metadata = nullptr; + PERSON_CLASS_BODY(person_without_private_data_3, public) +}; +NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(person_without_private_data_3, age, name, metadata) - bool operator==(const person_without_private_data_3& rhs) const - { - return name == rhs.name && age == rhs.age && metadata == rhs.metadata; - } +class person_t_with_private_data +{ + PERSON_CLASS_BODY(person_t_with_private_data, private) + NLOHMANN_DEFINE_TYPE_INTRUSIVE_T(person_t_with_private_data, age, name, metadata) +}; - person_without_private_data_3() = default; - person_without_private_data_3(std::string name_, int age_, json metadata_) - : name(std::move(name_)) - , age(age_) - , metadata(std::move(metadata_)) - {} +class person_t_with_private_data_2 +{ + PERSON_CLASS_BODY(person_t_with_private_data_2, private) + NLOHMANN_DEFINE_TYPE_INTRUSIVE_T_WITH_DEFAULT(person_t_with_private_data_2, age, name, metadata) +}; - std::string getName() const - { - return name; - } - int getAge() const - { - return age; - } - json getMetadata() const - { - return metadata; - } +class person_t_without_private_data_1 +{ + PERSON_CLASS_BODY(person_t_without_private_data_1, public) + NLOHMANN_DEFINE_TYPE_INTRUSIVE_T(person_t_without_private_data_1, age, name, metadata) }; -NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(person_without_private_data_3, age, name, metadata) +class person_t_without_private_data_2 +{ + PERSON_CLASS_BODY(person_t_without_private_data_2, public) +}; +NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_T(person_t_without_private_data_2, age, name, metadata) -class person_with_private_alphabet +class person_t_without_private_data_3 { - public: - bool operator==(const person_with_private_alphabet& other) const - { - return a == other.a && - b == other.b && - c == other.c && - d == other.d && - e == other.e && - f == other.f && - g == other.g && - h == other.h && - i == other.i && - j == other.j && - k == other.k && - l == other.l && - m == other.m && - n == other.n && - o == other.o && - p == other.p && - q == other.q && - r == other.r && - s == other.s && - t == other.t && - u == other.u && - v == other.v && - w == other.w && - x == other.x && - y == other.y && - z == other.z; - } + PERSON_CLASS_BODY(person_t_without_private_data_3, public) +}; +NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_T_WITH_DEFAULT(person_t_without_private_data_3, age, name, metadata) - private: - int a = 0; - int b = 0; - int c = 0; - int d = 0; - int e = 0; - int f = 0; - int g = 0; - int h = 0; - int i = 0; - int j = 0; - int k = 0; - int l = 0; - int m = 0; - int n = 0; - int o = 0; - int p = 0; - int q = 0; - int r = 0; - int s = 0; - int t = 0; - int u = 0; - int v = 0; - int w = 0; - int x = 0; - int y = 0; - int z = 0; +class person_with_private_alphabet +{ + ALPHABET_CLASS_BODY(person_with_private_alphabet, private) NLOHMANN_DEFINE_TYPE_INTRUSIVE(person_with_private_alphabet, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z) }; class person_with_public_alphabet { - public: - bool operator==(const person_with_public_alphabet& other) const - { - return a == other.a && - b == other.b && - c == other.c && - d == other.d && - e == other.e && - f == other.f && - g == other.g && - h == other.h && - i == other.i && - j == other.j && - k == other.k && - l == other.l && - m == other.m && - n == other.n && - o == other.o && - p == other.p && - q == other.q && - r == other.r && - s == other.s && - t == other.t && - u == other.u && - v == other.v && - w == other.w && - x == other.x && - y == other.y && - z == other.z; - } + ALPHABET_CLASS_BODY(person_with_public_alphabet, public) +}; +NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(person_with_public_alphabet, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z) - int a = 0; - int b = 0; - int c = 0; - int d = 0; - int e = 0; - int f = 0; - int g = 0; - int h = 0; - int i = 0; - int j = 0; - int k = 0; - int l = 0; - int m = 0; - int n = 0; - int o = 0; - int p = 0; - int q = 0; - int r = 0; - int s = 0; - int t = 0; - int u = 0; - int v = 0; - int w = 0; - int x = 0; - int y = 0; - int z = 0; +class person_t_with_private_alphabet +{ + ALPHABET_CLASS_BODY(person_t_with_private_alphabet, private) + NLOHMANN_DEFINE_TYPE_INTRUSIVE_T(person_t_with_private_alphabet, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z) }; -NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(person_with_public_alphabet, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z) +class person_t_with_public_alphabet +{ + ALPHABET_CLASS_BODY(person_t_with_public_alphabet, public) +}; +NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_T(person_t_with_public_alphabet, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z) +} // namespace persons -} // namespace persons +// Trick described in https://github.com/onqtam/doctest/blob/master/doc/markdown/parameterized-tests.md +// in note "if you need parameterization on more than 1 type" +template +struct TestTypePair +{ + using TestedType = TestedType_; + using BasicJsonType = BasicJsonType_; +}; -TEST_CASE_TEMPLATE("Serialization/deserialization via NLOHMANN_DEFINE_TYPE_INTRUSIVE and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE", T, - persons::person_with_private_data, - persons::person_without_private_data_1, - persons::person_without_private_data_2) +#define PERSON_TYPES_TO_TEST \ + TestTypePair, \ + TestTypePair, \ + TestTypePair, \ + TestTypePair, \ + TestTypePair, \ + TestTypePair, \ + TestTypePair, \ + TestTypePair, \ + TestTypePair + +TEST_CASE_TEMPLATE("Serialization/deserialization via NLOHMANN_DEFINE_TYPE_INTRUSIVE and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE", PairT, PERSON_TYPES_TO_TEST) +#undef PERSON_TYPES_TO_TEST { + using T = typename PairT::TestedType; + using json_t = typename PairT::BasicJsonType; + SECTION("person") { // serialization T p1("Erik", 1, {{"haircuts", 2}}); - CHECK(json(p1).dump() == "{\"age\":1,\"metadata\":{\"haircuts\":2},\"name\":\"Erik\"}"); + std::string json_string; + if (std::is_same::value) + { + json_string = R"str({"age":1,"name":"Erik","metadata":{"haircuts":2}})str"; + } + else + { + json_string = R"str({"age":1,"metadata":{"haircuts":2},"name":"Erik"})str"; + } + CHECK(json_t(p1).dump() == json_string); // deserialization - auto p2 = json(p1).get(); + auto p2 = json_t(p1).template get(); CHECK(p2 == p1); // roundtrip - CHECK(T(json(p1)) == p1); - CHECK(json(T(json(p1))) == json(p1)); + CHECK(T(json_t(p1)) == p1); + CHECK(json_t(T(json_t(p1))) == json_t(p1)); // check exception in case of missing field - json j = json(p1); + json_t j = json_t(p1); j.erase("age"); - CHECK_THROWS_WITH_AS(j.get(), "[json.exception.out_of_range.403] key 'age' not found", json::out_of_range); + CHECK_THROWS_WITH_AS(j.template get(), "[json.exception.out_of_range.403] key 'age' not found", typename json_t::out_of_range); } } -TEST_CASE_TEMPLATE("Serialization/deserialization via NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT", T, - persons::person_with_private_data_2, - persons::person_without_private_data_3) +#define PERSON_TYPES_TO_TEST \ + TestTypePair, \ + TestTypePair, \ + TestTypePair, \ + TestTypePair, \ + TestTypePair, \ + TestTypePair + +TEST_CASE_TEMPLATE("Serialization/deserialization via NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT", PairT, PERSON_TYPES_TO_TEST) +#undef PERSON_TYPES_TO_TEST { + using T = typename PairT::TestedType; + using json_t = typename PairT::BasicJsonType; + SECTION("person with default values") { // serialization of default constructed object T p0; - CHECK(json(p0).dump() == "{\"age\":0,\"metadata\":null,\"name\":\"\"}"); + std::string json_string; + if (std::is_same::value) + { + json_string = R"str({"age":0,"name":"","metadata":null})str"; + } + else + { + json_string = R"str({"age":0,"metadata":null,"name":""})str"; + } + CHECK(json_t(p0).dump() == json_string); // serialization T p1("Erik", 1, {{"haircuts", 2}}); - CHECK(json(p1).dump() == "{\"age\":1,\"metadata\":{\"haircuts\":2},\"name\":\"Erik\"}"); + if (std::is_same::value) + { + json_string = R"str({"age":1,"name":"Erik","metadata":{"haircuts":2}})str"; + } + else + { + json_string = R"str({"age":1,"metadata":{"haircuts":2},"name":"Erik"})str"; + } + CHECK(json_t(p1).dump() == json_string); // deserialization - auto p2 = json(p1).get(); + auto p2 = json_t(p1).template get(); CHECK(p2 == p1); // roundtrip - CHECK(T(json(p1)) == p1); - CHECK(json(T(json(p1))) == json(p1)); + CHECK(T(json_t(p1)) == p1); + CHECK(json_t(T(json_t(p1))) == json_t(p1)); // check default value in case of missing field - json j = json(p1); + json_t j = json_t(p1); j.erase("name"); j.erase("age"); j.erase("metadata"); - T p3 = j.get(); + T p3 = j.template get(); CHECK(p3.getName() == ""); CHECK(p3.getAge() == 0); CHECK(p3.getMetadata() == nullptr); } } -TEST_CASE_TEMPLATE("Serialization/deserialization of classes with 26 public/private member variables via NLOHMANN_DEFINE_TYPE_INTRUSIVE and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE", T, - persons::person_with_private_alphabet, - persons::person_with_public_alphabet) +#define ALPHABET_PAIRS \ + TestTypePair, \ + TestTypePair, \ + TestTypePair, \ + TestTypePair, \ + TestTypePair, \ + TestTypePair + +TEST_CASE_TEMPLATE("Serialization/deserialization of classes with 26 public/private member variables via NLOHMANN_DEFINE_TYPE_INTRUSIVE and NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE", PairT, ALPHABET_PAIRS) +#undef ALPHABET_PAIRS { + using T = typename PairT::TestedType; + using json_t = typename PairT::BasicJsonType; + SECTION("alphabet") { { T obj1; - nlohmann::json j = obj1; //via json object + json_t j = obj1; //via json object T obj2; j.get_to(obj2); bool ok = (obj1 == obj2); @@ -379,9 +356,9 @@ TEST_CASE_TEMPLATE("Serialization/deserialization of classes with 26 public/priv { T obj1; - nlohmann::json j1 = obj1; //via json string + json_t j1 = obj1; //via json string std::string s = j1.dump(); - nlohmann::json j2 = nlohmann::json::parse(s); + json_t j2 = json_t::parse(s); T obj2; j2.get_to(obj2); bool ok = (obj1 == obj2); @@ -390,9 +367,9 @@ TEST_CASE_TEMPLATE("Serialization/deserialization of classes with 26 public/priv { T obj1; - nlohmann::json j1 = obj1; //via msgpack - std::vector buf = nlohmann::json::to_msgpack(j1); - nlohmann::json j2 = nlohmann::json::from_msgpack(buf); + json_t j1 = obj1; //via msgpack + std::vector buf = json_t::to_msgpack(j1); + json_t j2 = json_t::from_msgpack(buf); T obj2; j2.get_to(obj2); bool ok = (obj1 == obj2); @@ -401,9 +378,9 @@ TEST_CASE_TEMPLATE("Serialization/deserialization of classes with 26 public/priv { T obj1; - nlohmann::json j1 = obj1; //via bson - std::vector buf = nlohmann::json::to_bson(j1); - nlohmann::json j2 = nlohmann::json::from_bson(buf); + json_t j1 = obj1; //via bson + std::vector buf = json_t::to_bson(j1); + json_t j2 = json_t::from_bson(buf); T obj2; j2.get_to(obj2); bool ok = (obj1 == obj2); @@ -412,9 +389,9 @@ TEST_CASE_TEMPLATE("Serialization/deserialization of classes with 26 public/priv { T obj1; - nlohmann::json j1 = obj1; //via cbor - std::vector buf = nlohmann::json::to_cbor(j1); - nlohmann::json j2 = nlohmann::json::from_cbor(buf); + json_t j1 = obj1; //via cbor + std::vector buf = json_t::to_cbor(j1); + json_t j2 = json_t::from_cbor(buf); T obj2; j2.get_to(obj2); bool ok = (obj1 == obj2); @@ -423,9 +400,9 @@ TEST_CASE_TEMPLATE("Serialization/deserialization of classes with 26 public/priv { T obj1; - nlohmann::json j1 = obj1; //via ubjson - std::vector buf = nlohmann::json::to_ubjson(j1); - nlohmann::json j2 = nlohmann::json::from_ubjson(buf); + json_t j1 = obj1; //via ubjson + std::vector buf = json_t::to_ubjson(j1); + json_t j2 = json_t::from_ubjson(buf); T obj2; j2.get_to(obj2); bool ok = (obj1 == obj2);