Fixed issue with json_type_traits specialization for optional

Author: danielaparker

ChangeLog.md

@@ -1,3 +1,10 @@
+v0.145.2
+--------
+
+Defect fixes:
+
+- Fixed issue with `json_type_traits` specialization for optional 
+
 v0.145.1
 --------
 

include/jsoncons/config/version.hpp

@@ -11,7 +11,7 @@
 
 #define JSONCONS_VERSION_MAJOR 0
 #define JSONCONS_VERSION_MINOR 145
-#define JSONCONS_VERSION_PATCH 1
+#define JSONCONS_VERSION_PATCH 2
 
 namespace jsoncons {
 

include/jsoncons/json_type_traits.hpp

@@ -886,7 +886,7 @@ struct json_type_traits<Json, jsoncons::optional<T>,
 
     static Json to_json(const jsoncons::optional<T>& val)
     {
-        return val.has_value() ? Json::null() : Json(val.value());
+        return val.has_value() ? Json(val.value()) : Json::null();
     }
 };
 

tests/src/json_type_traits_tests.cpp

@@ -131,6 +131,24 @@ TEST_CASE("test_byte_string_as_vector")
     CHECK('l' == bytes[3]);
     CHECK('o' == bytes[4]);
 }
+
+TEST_CASE("jsoncons::json_type_traits<optional>")
+{
+    std::vector<jsoncons::optional<int>> v = { 0,1,jsoncons::optional<int>{} };
+    json j = v;
+    std::cout << j << "\n";
+
+    REQUIRE(j.size() == 3);
+    CHECK(j[0].as<int>() == 0);
+    CHECK(j[1].as<int>() == 1);
+    j[2].is_null();
+
+    CHECK(j[0].is<jsoncons::optional<int>>());
+    CHECK_FALSE(j[0].is<jsoncons::optional<double>>());
+    CHECK(j[1].is<jsoncons::optional<int>>());
+    CHECK_FALSE(j[1].is<jsoncons::optional<double>>());
+    CHECK(j[2].is<jsoncons::optional<int>>()); // null can be any optinal
+}
 /*
 TEST_CASE("test_own_vector")
 {