Switch to Boost.JSON

andrey-kashcheev · andrey-kashcheev · commit 9dd546d476cb · 2025-02-11T15:40:39.000+01:00
Complete overhaul

Relates-To: DATASDK-58

Signed-off-by: Andrey Kashcheev &lt;ext-andrey.kashcheev@here.com&gt;
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -88,7 +88,7 @@ if(OLP_SDK_ENABLE_DEFAULT_CACHE_LMDB)
     endif()
 endif()
 
-find_package(Boost QUIET)
+find_package(Boost 1.82.0 QUIET)
 if(NOT TARGET Boost AND NOT Boost_FOUND)
     add_subdirectory(boost)
     set(BOOST_ROOT ${EXTERNAL_BOOST_ROOT} PARENT_SCOPE)
diff --git a/olp-cpp-sdk-core/CMakeLists.txt b/olp-cpp-sdk-core/CMakeLists.txt
@@ -436,6 +436,9 @@ if (OLP_SDK_NO_EXCEPTION AND NOT OLP_SDK_BOOST_THROW_EXCEPTION_EXTERNAL)
         PRIVATE OLP_SDK_BOOST_THROW_EXCEPTION=1)
 endif()
 
+target_compile_definitions(${PROJECT_NAME}
+        PRIVATE BOOST_ALL_NO_LIB)
+
 target_include_directories(${PROJECT_NAME} PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
diff --git a/olp-cpp-sdk-dataservice-read/src/generated/parser/CatalogParser.cpp b/olp-cpp-sdk-dataservice-read/src/generated/parser/CatalogParser.cpp
@@ -23,7 +23,7 @@
 
 namespace olp {
 namespace parser {
-using namespace olp::dataservice::read;
+namespace model = olp::dataservice::read::model;
 
 void from_json(const boost::json::value& value, model::Coverage& x) {
   x.SetAdminAreas(parse<std::vector<std::string>>(value, "adminAreas"));
diff --git a/olp-cpp-sdk-dataservice-read/src/generated/parser/IndexParser.cpp b/olp-cpp-sdk-dataservice-read/src/generated/parser/IndexParser.cpp
@@ -23,7 +23,8 @@
 
 namespace olp {
 namespace parser {
-using namespace olp::dataservice::read;
+
+namespace model = olp::dataservice::read::model;
 
 void from_json(const boost::json::value& value,
                std::shared_ptr<model::SubQuad>& x) {
diff --git a/olp-cpp-sdk-dataservice-read/src/generated/parser/LayerVersionsParser.cpp b/olp-cpp-sdk-dataservice-read/src/generated/parser/LayerVersionsParser.cpp
@@ -23,7 +23,7 @@
 
 namespace olp {
 namespace parser {
-using namespace olp::dataservice::read;
+namespace model = olp::dataservice::read::model;
 
 void from_json(const boost::json::value& value, model::LayerVersion& x) {
   x.SetLayer(parse<std::string>(value, "layer"));
diff --git a/olp-cpp-sdk-dataservice-read/src/generated/parser/MessagesParser.cpp b/olp-cpp-sdk-dataservice-read/src/generated/parser/MessagesParser.cpp
@@ -26,7 +26,7 @@
 
 namespace olp {
 namespace parser {
-using namespace olp::dataservice::read;
+namespace model = olp::dataservice::read::model;
 
 void from_json(const boost::json::value& value, model::Metadata& x) {
   x.SetPartition(parse<std::string>(value, "partition"));
diff --git a/olp-cpp-sdk-dataservice-read/src/generated/parser/PartitionsParser.cpp b/olp-cpp-sdk-dataservice-read/src/generated/parser/PartitionsParser.cpp
@@ -23,7 +23,7 @@
 
 namespace olp {
 namespace parser {
-using namespace olp::dataservice::read;
+namespace model = olp::dataservice::read::model;
 
 void from_json(const boost::json::value& value, model::Partition& x) {
   x.SetChecksum(parse<boost::optional<std::string>>(value, "checksum"));
diff --git a/olp-cpp-sdk-dataservice-read/src/generated/parser/StreamOffsetParser.cpp b/olp-cpp-sdk-dataservice-read/src/generated/parser/StreamOffsetParser.cpp
@@ -23,7 +23,7 @@
 
 namespace olp {
 namespace parser {
-using namespace olp::dataservice::read;
+namespace model = olp::dataservice::read::model;
 
 void from_json(const boost::json::value& value, model::StreamOffset& x) {
   x.SetPartition(parse<int32_t>(value, "partition"));
diff --git a/olp-cpp-sdk-dataservice-read/src/generated/parser/SubscribeResponseParser.cpp b/olp-cpp-sdk-dataservice-read/src/generated/parser/SubscribeResponseParser.cpp
@@ -23,7 +23,7 @@
 
 namespace olp {
 namespace parser {
-using namespace olp::dataservice::read;
+namespace model = olp::dataservice::read::model;
 
 void from_json(const boost::json::value& value, model::SubscribeResponse& x) {
   x.SetNodeBaseURL(parse<std::string>(value, "nodeBaseURL"));
diff --git a/olp-cpp-sdk-dataservice-read/src/generated/parser/VersionResponseParser.cpp b/olp-cpp-sdk-dataservice-read/src/generated/parser/VersionResponseParser.cpp
@@ -23,7 +23,7 @@
 
 namespace olp {
 namespace parser {
-using namespace olp::dataservice::read;
+namespace model = olp::dataservice::read::model;
 
 void from_json(const boost::json::value& value, model::VersionResponse& x) {
   x.SetVersion(parse<int64_t>(value, "version"));
diff --git a/olp-cpp-sdk-dataservice-write/src/generated/parser/CatalogParser.cpp b/olp-cpp-sdk-dataservice-write/src/generated/parser/CatalogParser.cpp
@@ -23,7 +23,7 @@
 
 namespace olp {
 namespace parser {
-using namespace olp::dataservice::write;
+namespace model = olp::dataservice::write::model;
 
 void from_json(const boost::json::value& value, model::Coverage& x) {
   x.SetAdminAreas(parse<std::vector<std::string> >(value, "adminAreas"));
diff --git a/olp-cpp-sdk-dataservice-write/src/generated/parser/LayerVersionsParser.cpp b/olp-cpp-sdk-dataservice-write/src/generated/parser/LayerVersionsParser.cpp
@@ -23,7 +23,7 @@
 
 namespace olp {
 namespace parser {
-using namespace olp::dataservice::write;
+namespace model = olp::dataservice::write::model;
 
 void from_json(const boost::json::value& value, model::LayerVersion& x) {
   x.SetLayer(parse<std::string>(value, "layer"));
diff --git a/olp-cpp-sdk-dataservice-write/src/generated/parser/PartitionsParser.cpp b/olp-cpp-sdk-dataservice-write/src/generated/parser/PartitionsParser.cpp
@@ -23,7 +23,7 @@
 
 namespace olp {
 namespace parser {
-using namespace olp::dataservice::write;
+namespace model = olp::dataservice::write::model;
 
 void from_json(const boost::json::value& value, model::Partition& x) {
   x.SetChecksum(parse<boost::optional<std::string>>(value, "checksum"));
diff --git a/olp-cpp-sdk-dataservice-write/src/generated/parser/ResponseOkParser.cpp b/olp-cpp-sdk-dataservice-write/src/generated/parser/ResponseOkParser.cpp
@@ -21,17 +21,17 @@
 
 #include <olp/core/generated/parser/ParserWrapper.h>
 
-using namespace olp::dataservice::write::model;
+namespace model = olp::dataservice::write::model;
 
 namespace olp {
 namespace parser {
-void from_json(const boost::json::value& value, TraceID& x) {
+void from_json(const boost::json::value& value, model::TraceID& x) {
   x.SetParentID(parse<std::string>(value, "ParentID"));
   x.SetGeneratedIDs(parse<std::vector<std::string> >(value, "GeneratedIDs"));
 }
 
-void from_json(const boost::json::value& value, ResponseOk& x) {
-  x.SetTraceID(parse<TraceID>(value, "TraceID"));
+void from_json(const boost::json::value& value, model::ResponseOk& x) {
+  x.SetTraceID(parse<model::TraceID>(value, "TraceID"));
 }
 
 }  // namespace parser
diff --git a/olp-cpp-sdk-dataservice-write/src/generated/parser/VersionResponseParser.cpp b/olp-cpp-sdk-dataservice-write/src/generated/parser/VersionResponseParser.cpp
@@ -23,7 +23,7 @@
 
 namespace olp {
 namespace parser {
-using namespace olp::dataservice::write;
+namespace model = olp::dataservice::write::model;
 
 void from_json(const boost::json::value& value, model::VersionResponse& x) {
   x.SetVersion(parse<int64_t>(value, "version"));
diff --git a/olp-cpp-sdk-dataservice-write/src/generated/serializer/IndexInfoSerializer.cpp b/olp-cpp-sdk-dataservice-write/src/generated/serializer/IndexInfoSerializer.cpp
@@ -29,25 +29,25 @@ void to_json(const dataservice::write::model::Index &x,
 
   boost::json::object indexFields;
   for (auto &field_pair : x.GetIndexFields()) {
-    using namespace dataservice::write::model;
+    namespace model = dataservice::write::model;
     const auto &field = field_pair.second;
     const auto &key = field_pair.first;
     auto index_type = field->getIndexType();
-    if (index_type == IndexType::String) {
-      auto s = std::static_pointer_cast<StringIndexValue>(field);
+    if (index_type == model::IndexType::String) {
+      auto s = std::static_pointer_cast<model::StringIndexValue>(field);
       boost::json::string str_val{s->GetValue()};
       indexFields.emplace(key, std::move(str_val));
-    } else if (index_type == IndexType::Int) {
-      auto s = std::static_pointer_cast<IntIndexValue>(field);
+    } else if (index_type == model::IndexType::Int) {
+      auto s = std::static_pointer_cast<model::IntIndexValue>(field);
       indexFields.emplace(key, s->GetValue());
-    } else if (index_type == IndexType::Bool) {
-      auto s = std::static_pointer_cast<BooleanIndexValue>(field);
+    } else if (index_type == model::IndexType::Bool) {
+      auto s = std::static_pointer_cast<model::BooleanIndexValue>(field);
       indexFields.emplace(key, s->GetValue());
-    } else if (index_type == IndexType::Heretile) {
-      auto s = std::static_pointer_cast<HereTileIndexValue>(field);
+    } else if (index_type == model::IndexType::Heretile) {
+      auto s = std::static_pointer_cast<model::HereTileIndexValue>(field);
       indexFields.emplace(key, s->GetValue());
-    } else if (index_type == IndexType::TimeWindow) {
-      auto s = std::static_pointer_cast<TimeWindowIndexValue>(field);
+    } else if (index_type == model::IndexType::TimeWindow) {
+      auto s = std::static_pointer_cast<model::TimeWindowIndexValue>(field);
       indexFields.emplace(key, s->GetValue());
     }
   }
diff --git a/olp-cpp-sdk-dataservice-write/src/generated/serializer/UpdateIndexRequestSerializer.cpp b/olp-cpp-sdk-dataservice-write/src/generated/serializer/UpdateIndexRequestSerializer.cpp
@@ -31,25 +31,25 @@ void to_json(const dataservice::write::model::UpdateIndexRequest &x,
 
     boost::json::object indexFields;
     for (const auto &field_pair : addition.GetIndexFields()) {
-      using namespace dataservice::write::model;
+      namespace model = dataservice::write::model;
       const auto &field = field_pair.second;
       const auto &key = field_pair.first;
       auto index_type = field->getIndexType();
-      if (index_type == IndexType::String) {
-        auto s = std::static_pointer_cast<StringIndexValue>(field);
+      if (index_type == model::IndexType::String) {
+        auto s = std::static_pointer_cast<model::StringIndexValue>(field);
         boost::json::value str_val{s->GetValue()};
         indexFields.emplace(key, std::move(str_val));
-      } else if (index_type == IndexType::Int) {
-        auto s = std::static_pointer_cast<IntIndexValue>(field);
+      } else if (index_type == model::IndexType::Int) {
+        auto s = std::static_pointer_cast<model::IntIndexValue>(field);
         indexFields.emplace(key, s->GetValue());
-      } else if (index_type == IndexType::Bool) {
-        auto s = std::static_pointer_cast<BooleanIndexValue>(field);
+      } else if (index_type == model::IndexType::Bool) {
+        auto s = std::static_pointer_cast<model::BooleanIndexValue>(field);
         indexFields.emplace(key, s->GetValue());
-      } else if (index_type == IndexType::Heretile) {
-        auto s = std::static_pointer_cast<HereTileIndexValue>(field);
+      } else if (index_type == model::IndexType::Heretile) {
+        auto s = std::static_pointer_cast<model::HereTileIndexValue>(field);
         indexFields.emplace(key, s->GetValue());
-      } else if (index_type == IndexType::TimeWindow) {
-        auto s = std::static_pointer_cast<TimeWindowIndexValue>(field);
+      } else if (index_type == model::IndexType::TimeWindow) {
+        auto s = std::static_pointer_cast<model::TimeWindowIndexValue>(field);
         indexFields.emplace(key, s->GetValue());
       }
     }
diff --git a/tests/functional/olp-cpp-sdk-authentication/AuthenticationTestUtils.cpp b/tests/functional/olp-cpp-sdk-authentication/AuthenticationTestUtils.cpp
diff --git a/tests/functional/olp-cpp-sdk-authentication/FederatedAuthenticationTest.cpp b/tests/functional/olp-cpp-sdk-authentication/FederatedAuthenticationTest.cpp
