Skip to content

Feature/encode struct names : using boost.type index to disambiguate variants instead of fields collection #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daminetreg merged 3 commits into from
Dec 18, 2015
Merged

Feature/encode struct names : using boost.type index to disambiguate variants instead of fields collection #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e13502
FEATURE: Encode struct name in json object and decode after it.
daminetreg Dec 9, 2015
3a88ad3
FEATURE: Names only to disambiguate variant and not for everything.
daminetreg Dec 9, 2015
0f8f768
FEATURE: Prepare next release 1.3.3.
daminetreg Dec 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ enable_testing()

set (pre_VERSION_MAJOR 1)
set (pre_VERSION_MINOR 3)
set (pre_VERSION_PATCH 2)
set (pre_VERSION_PATCH 3)

set (PRE_VERSION "${pre_VERSION_MAJOR}.${pre_VERSION_MINOR}.${pre_VERSION_PATCH}")

Expand Down
24 changes: 13 additions & 11 deletions pre/json/detail/dejsonizer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <boost/variant.hpp>
#include <boost/optional.hpp>
#include <boost/type_index.hpp>

#include <boost/mpl/for_each.hpp>
#include <boost/fusion/include/for_each.hpp>
Expand Down Expand Up @@ -60,7 +61,7 @@ namespace pre { namespace json { namespace detail {
if (_json_object.is_object()) {
pre::fusion::for_each_member(value, *this);
} else {
throw std::runtime_error("The JSON Object " + _json_object.dump() + " isn't an object");
throw std::runtime_error("The JSON Object " + _json_object.dump() + " isn't an object that we can map to an internal type");
}
}

Expand All @@ -72,16 +73,17 @@ namespace pre { namespace json { namespace detail {

template< typename U > void operator()(U& x) {
if (!successed) {
try {
dejsonizer dejsonizer(_json_object);
U test_value;
dejsonizer(test_value);
successed = true;
value = test_value;
} catch (...) { //XXX: LOGIC BASED ON Exceptions !!! ARgh
//std::cout << "ERROR" << std::endl;
//std::cout << boost::current_exception_diagnostic_information(true) << std::endl;
}
auto struct_it = _json_object.find("struct");

if ( (struct_it != _json_object.end()) &&
(*struct_it == boost::typeindex::type_id<U>().pretty_name()) ) {

dejsonizer dejsonizer(_json_object);
U test_value;
dejsonizer(test_value);
successed = true;
value = test_value;
}
}
}

Expand Down
13 changes: 12 additions & 1 deletion pre/json/detail/jsonizer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <boost/variant.hpp>
#include <boost/optional.hpp>
#include <boost/type_index.hpp>

#include <boost/fusion/include/for_each.hpp>

Expand All @@ -20,7 +21,9 @@ namespace pre { namespace json { namespace detail {
struct jsonizer : public boost::static_visitor<> {

jsonizer(nlohmann::json& json_object)
: boost::static_visitor<>(), _json_object(json_object) {}
: boost::static_visitor<>(),
_json_object(json_object),
_disambiguate_struct(false) {}

template<class T>
void operator()(const char* name, const T& value) const {
Expand Down Expand Up @@ -51,6 +54,11 @@ namespace pre { namespace json { namespace detail {
template<class T,
enable_if_is_adapted_struct_t<T>* = nullptr>
void operator()(const T& value) const {

if (_disambiguate_struct) {
_json_object["struct"] = boost::typeindex::type_id<T>().pretty_name();
_disambiguate_struct = false; // Do it only once in hierarchy
}
pre::fusion::for_each_member(value, *this);
}

Expand All @@ -64,6 +72,8 @@ namespace pre { namespace json { namespace detail {
template<class T,
enable_if_is_variant_t<T>* = nullptr>
void operator()(const T& value) const {
// struct has to be disambiguated in case of variant.
_disambiguate_struct = true;
boost::apply_visitor(*this, value);
}

Expand Down Expand Up @@ -110,6 +120,7 @@ namespace pre { namespace json { namespace detail {

private:
nlohmann::json& _json_object;
mutable bool _disambiguate_struct;

};

Expand Down
44 changes: 22 additions & 22 deletions test/dejsonize_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ BOOST_AUTO_TEST_CASE (composedtype) {
};

auto json_customer = pre::json::to_json(customer);
std::cout << json_customer << std::endl;
std::cout << json_customer.dump(2) << std::endl;

auto customer_parsed = pre::json::from_json<datamodel::customer>(json_customer);
BOOST_ASSERT(customer_parsed == customer);

auto json_customer_after_reserialize = pre::json::to_json(customer);
std::cout << json_customer_after_reserialize << std::endl;
std::cout << json_customer_after_reserialize.dump(2) << std::endl;
BOOST_ASSERT(json_customer == json_customer_after_reserialize);

// testing an adapted skill alone from plain json
Expand All @@ -122,7 +122,7 @@ BOOST_AUTO_TEST_CASE (composedtype) {

BOOST_ASSERT(skill_parsed.skill_name == "GML");
BOOST_ASSERT(skill_parsed.experience == 10);
std::cout << pre::json::to_json(skill_parsed) << std::endl;
std::cout << pre::json::to_json(skill_parsed).dump(2) << std::endl;
}

/**
Expand All @@ -138,12 +138,12 @@ BOOST_AUTO_TEST_CASE (nested) {

datamodel::sales_assitant assistant{"Mr. Gold", 130000, customer};
auto json_sales_assistant = pre::json::to_json(assistant);
std::cout << json_sales_assistant << std::endl;
std::cout << json_sales_assistant.dump(2) << std::endl;

auto deser_assistant = pre::json::from_json<datamodel::sales_assitant>(json_sales_assistant);

auto json_sales_assistant_reserialized = pre::json::to_json(deser_assistant);
std::cout << json_sales_assistant_reserialized << std::endl;
std::cout << json_sales_assistant_reserialized.dump(2) << std::endl;

BOOST_ASSERT(json_sales_assistant_reserialized == json_sales_assistant);
}
Expand Down Expand Up @@ -182,7 +182,7 @@ BOOST_AUTO_TEST_CASE (working_plain_json) {
auto deser_assistant = pre::json::from_json<datamodel::sales_assitant>(json);

auto json_sales_assistant_reserialized = pre::json::to_json(deser_assistant);
std::cout << json_sales_assistant_reserialized << std::endl;
std::cout << json_sales_assistant_reserialized.dump(2) << std::endl;
}

BOOST_AUTO_TEST_CASE (incorrect_plain_json) {
Expand Down Expand Up @@ -284,7 +284,7 @@ BOOST_AUTO_TEST_CASE (containers_direct) {
};

auto skills_json = pre::json::to_json(skills);
std::cout << skills_json << std::endl;
std::cout << skills_json.dump(2) << std::endl;

auto skills_deserialized = pre::json::from_json<std::vector<datamodel::skill>>(skills_json);
BOOST_ASSERT(skills == skills_deserialized);
Expand Down Expand Up @@ -353,12 +353,12 @@ BOOST_AUTO_TEST_CASE (vairants) {
};

auto employees_json = pre::json::to_json(employees);
std::cout << employees_json << std::endl;
std::cout << employees_json.dump(2) << std::endl;

auto employees_deserialized = pre::json::from_json<std::vector<datamodel::employee>>(employees_json);

auto employees_reserialized = pre::json::to_json(employees_deserialized);
std::cout << employees_reserialized << std::endl;
std::cout << employees_reserialized.dump(2) << std::endl;

BOOST_ASSERT(employees == employees_deserialized);
}
Expand Down Expand Up @@ -387,7 +387,7 @@ BOOST_AUTO_TEST_CASE(maps) {
};

auto some_json = pre::json::to_json(some);
std::cout << some_json << std::endl;
std::cout << some_json.dump(2) << std::endl;

auto some_deserialized = pre::json::from_json<datamodel::struct_with_a_map>(some_json);

Expand Down Expand Up @@ -426,12 +426,12 @@ BOOST_AUTO_TEST_CASE (enums) {
datamodel::some_value val{datamodel::my_value_type::TYPE2, 12, datamodel::THREE};

auto val_json = pre::json::to_json(val);
std::cout << val_json << std::endl;
std::cout << val_json.dump(2) << std::endl;

auto val_deserialized = pre::json::from_json<datamodel::some_value>(val_json);

auto val_reserialized = pre::json::to_json(val_deserialized);
std::cout << val_reserialized << std::endl;
std::cout << val_reserialized.dump(2) << std::endl;

BOOST_ASSERT(val == val_deserialized);
}
Expand All @@ -441,12 +441,12 @@ BOOST_AUTO_TEST_CASE (adapted_struct_jsonize_chrono) {
boost::chrono::milliseconds val{100};

auto val_json = pre::json::to_json(val);
std::cout << val_json << std::endl;
std::cout << val_json.dump(2) << std::endl;

auto val_deserialized = pre::json::from_json<boost::chrono::milliseconds>(val_json);

auto val_reserialized = pre::json::to_json(val_deserialized);
std::cout << val_reserialized << std::endl;
std::cout << val_reserialized.dump(2) << std::endl;

BOOST_ASSERT(val == val_deserialized);
}
Expand All @@ -470,12 +470,12 @@ BOOST_AUTO_TEST_CASE (adapted_struct_jsonize_chrono_composed) {
datamodel::some_time val{"my time", boost::chrono::milliseconds(100), std::chrono::minutes(43)};

auto val_json = pre::json::to_json(val);
std::cout << val_json << std::endl;
std::cout << val_json.dump(2) << std::endl;

auto val_deserialized = pre::json::from_json<datamodel::some_time>(val_json);

auto val_reserialized = pre::json::to_json(val_deserialized);
std::cout << val_reserialized << std::endl;
std::cout << val_reserialized.dump(2) << std::endl;

BOOST_ASSERT(val == val_deserialized);
}
Expand All @@ -496,12 +496,12 @@ BOOST_AUTO_TEST_CASE (optional) {
boost::optional<std::string> val{"some text"};

auto val_json = pre::json::to_json(val);
std::cout << val_json << std::endl;
std::cout << val_json.dump(2) << std::endl;

auto val_deserialized = pre::json::from_json<boost::optional<std::string>>(val_json);

auto val_reserialized = pre::json::to_json(val_deserialized);
std::cout << val_reserialized << std::endl;
std::cout << val_reserialized.dump(2) << std::endl;

BOOST_ASSERT(val == val_deserialized);
}
Expand All @@ -514,12 +514,12 @@ BOOST_AUTO_TEST_CASE (optional_member) {
val.other = 13.21;

auto val_json = pre::json::to_json(val);
std::cout << val_json << std::endl;
std::cout << val_json.dump(2) << std::endl;

auto val_deserialized = pre::json::from_json<datamodel::with_optional_member>(val_json);

auto val_reserialized = pre::json::to_json(val_deserialized);
std::cout << val_reserialized << std::endl;
std::cout << val_reserialized.dump(2) << std::endl;

BOOST_ASSERT(val == val_deserialized);
}
Expand All @@ -529,12 +529,12 @@ BOOST_AUTO_TEST_CASE (optional_member) {
val.other = 43.21;

auto val_json = pre::json::to_json(val);
std::cout << val_json << std::endl;
std::cout << val_json.dump(2) << std::endl;

auto val_deserialized = pre::json::from_json<datamodel::with_optional_member>(val_json);

auto val_reserialized = pre::json::to_json(val_deserialized);
std::cout << val_reserialized << std::endl;
std::cout << val_reserialized.dump(2) << std::endl;

BOOST_ASSERT(val == val_deserialized);
}
Expand Down