Migrate from rapidjson to boost::json (#1688)

* CI: Add build with OLP_SDK_NO_EXCEPTION=ON (#1661)

To catch issues in this kind of build earlier

Relates-To: OCMAM-442

Signed-off-by: Rustam Gamidov <ext-rustam.gamidov@here.com>

* Integrate Boost.Json patching 1.82 for no exception (#1662)

Patch boost::json 1.82 with BOOST_NO_EXCEPTIONS
Is is solved in boost::json 1.83 but we preferred to stay at 1.82

Relates-To: OCMAM-442

Signed-off-by: Rustam Gamidov <ext-rustam.gamidov@here.com>

* Refactor PartitionsSaxHandler to use boost::json (#1670)

Previously it was based on rapidjson
The tests are adjusted accordingly.

Relates-To: OCMAM-448
Signed-off-by: Alexander Sopov <ext-alexander.sopov@here.com>
Signed-off-by: Rustam Gamidov <ext-rustam.gamidov@here.com>

* CI: build with hidden symbols using Clang (#1675)

Good to be able to do this. No tests as not exposed classes are
accessed in tests.
Examples: export functions from libs to utilize in the common binary

Make boost::json header only in the read lib
Otherwise there are unresolved external symbols when built with
visibility=hidden

Relates-To: MINOR
Signed-off-by: Rustam Gamidov <ext-rustam.gamidov@here.com>

* Use Boost::json in olp-cpp-sdk-authentication (#1674)

Migrating from RapidJSON

Relates-To: OCMAM-443
Signed-off-by: Rustam Gamidov <ext-rustam.gamidov@here.com>

* Build with OLP_SDK_NO_EXCEPTION=ON using clang (#1676)

It appeared that Clang and GCC complains on different lines
at least in case of Boost  codebase

Relates-To: MINOR

Signed-off-by: Rustam Gamidov <ext-rustam.gamidov@here.com>

* Boost includes to private section of auth lib (#1678)

Migrating from RapidJSON

Relates-To: OCMAM-443

Signed-off-by: Rustam Gamidov <ext-rustam.gamidov@here.com>

* Use Boost::json in olp-cpp-sdk-dataservice-write (#1681)

Migrating from RapidJSON
Copy json implementation wrappers to write lib

This allows to keep other libs untouched until fully migrated to the
boost::json and remove write lib dependency from public json wrappers.
Alternative solutions tried are:
 - add boost json wrappers to the same files in the core but to
   additional namespace - changes in core, json still exposed
 - move boost json wrappers from core to internal for the repository
   include location and add it to all DataSDK projects - huge change

Relates-To: OCMAM-445
Signed-off-by: Rustam Gamidov <ext-rustam.gamidov@here.com>

* Use Boost::json in olp-cpp-sdk-dataservice-read (#1684)

Migrating from RapidJSON
Copy json implementation wrappers to read lib

This allows to keep other libs untouched until fully migrated to the
boost::json and remove read lib dependency from public json wrappers.
Alternative solutions tried are:
 - add boost json wrappers to the same files in the core but to
   additional namespace - changes in core, json still exposed
 - move boost json wrappers from core to internal for the repository
   include location and add it to all DataSDK projects - huge change

Relates-To: OCMAM-444
Signed-off-by: Rustam Gamidov <ext-rustam.gamidov@here.com>

* Use Boost::json in olp-cpp-sdk-core (#1685)

Migrating from RapidJSON
Json wrappers has been moved and not exposed anymore
Use Boost::json in mock-server-client
Use boost::json in HarCaptureAdapter

Relates-To: OCMAM-446
Signed-off-by: Rustam Gamidov <ext-rustam.gamidov@here.com>

* Exclude RapidJSON from build

Migrating to boost::json

Relates-To: OCMAM-447
Signed-off-by: Rustam Gamidov <ext-rustam.gamidov@here.com>

* Skip clang no exception build

Boost date_time has no 'no_exception' setup and clang is compiling
that code even if it's not used. GCC is OK

Relates-To: OCMAM-447
Signed-off-by: Rustam Gamidov <ext-rustam.gamidov@here.com>

---------

Signed-off-by: Rustam Gamidov <ext-rustam.gamidov@here.com>
Signed-off-by: Alexander Sopov <ext-alexander.sopov@here.com>
Co-authored-by: asopov-here <ext-alexander.sopov@here.com>
Signed-off-by: Yaroslav Stefinko <ext-yaroslav.stefinko@here.com>

Author: 2 people

.github/workflows/psv_pipelines.yml

@@ -108,6 +108,21 @@ jobs:
       run: ./scripts/linux/psv/test_psv.sh
       shell: bash
 
+  psv-linux-22-04-gcc11-build-no-exceptions:
+    name: PSV.Linux.22.04.gcc11.OLP_SDK_NO_EXCEPTION=ON
+    runs-on: ubuntu-22.04
+    env:
+      BUILD_TYPE: RelWithDebInfo
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: Install Ubuntu dependencies
+        run: sudo apt-get update && sudo apt-get install -y ccache libssl-dev libcurl4-openssl-dev --no-install-recommends
+        shell: bash
+      - name: Compile project with cmake and ccache
+        run: gcc --version && ./scripts/linux/psv/build_psv_no_exceptions.sh
+        shell: bash
+
   psv-linux-latest-gcc14-build-no-cache:
     name: PSV.Linux.latest.gcc14.OLP_SDK_ENABLE_DEFAULT_CACHE=OFF
     runs-on: ubuntu-latest
@@ -181,6 +196,25 @@ jobs:
       run: scripts/linux/psv/test_psv.sh
       shell: bash
 
+  psv-linux-22-04-clang-hidden-build:
+    name: PSV.Linux.22.04.clang.hidden
+    runs-on: ubuntu-22.04
+    env:
+      BUILD_TYPE: RelWithDebInfo
+      CC: clang-11
+      CXX: clang++-11
+      CXXFLAGS: -Wno-deprecated-copy
+      EXTRA_CMAKE_OPTIONS: -DCMAKE_CXX_VISIBILITY_PRESET=hidden -DOLP_SDK_ENABLE_TESTING=OFF
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v4
+    - name: Install Ubuntu dependencies
+      run: sudo apt-get update -y && sudo apt-get install clang-11 ccache libcurl4-openssl-dev -y --no-install-recommends --fix-missing
+      shell: bash
+    - name: Compile project on Clang
+      run: scripts/linux/psv/build_psv.sh
+      shell: bash
+
   psv-android-22-04-build:
     name: PSV.Linux.Android.22.04
     runs-on: ubuntu-22.04

README.md

@@ -64,7 +64,6 @@ The table below lists the dependencies of the Data SDK.
 | Boost (headers only) | 1.82.0              |
 | LevelDB              | 1.21                |
 | Snappy               | 1.1.7               |
-| RapidJSON            | latest              |
 | Zlib                 | 1.3.1               |
 
 ### Linux dependencies

docs/get-started.md

@@ -71,7 +71,7 @@ cmake --build . --target install
 
 <a href="https://cmake.org/download/" target="_blank">CMake</a> is the main build system. The minimal required version of CMake is 3.9.
 
-CMake downloads <a href="https://github.com/google/leveldb" target="_blank">LevelDB</a>, <a href="https://github.com/google/snappy" target="_blank">Snappy</a>, <a href="https://github.com/Tencent/rapidjson" target="_blank">RapidJSON</a>, and <a href="https://www.boost.org/" target="_blank">Boost</a>. To disable downloading, set `OLP_SDK_BUILD_EXTERNAL_DEPS` to `OFF`. For details on CMake flags, see the [related](#cmake-flags) section.
+CMake downloads <a href="https://github.com/google/leveldb" target="_blank">LevelDB</a>, <a href="https://github.com/google/snappy" target="_blank">Snappy</a>, and <a href="https://www.boost.org/" target="_blank">Boost</a>. To disable downloading, set `OLP_SDK_BUILD_EXTERNAL_DEPS` to `OFF`. For details on CMake flags, see the [related](#cmake-flags) section.
 
 **To build the Data SDK:**
 

docs/work-with-data-apis.md

@@ -59,7 +59,7 @@ The example below demonstrates how to use the `olp::client::OlpClient` class fro
     }
     ```
 
-5. If the check passed and the status of the received `olp::client::HttpResponse` is `olp::http::HttpStatusCode::OK` (that is 200 OK), extract the encoded JSON from the response and parse it using RapidJSON or any other JSON parsing library.
+5. If the check passed and the status of the received `olp::client::HttpResponse` is `olp::http::HttpStatusCode::OK` (that is 200 OK), extract the encoded JSON from the response and parse it using JSON parsing library.
 
     ```cpp
     std::string response_json;

examples/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2020 HERE Europe B.V.
+# Copyright (C) 2019-2026 HERE Europe B.V.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -81,6 +81,25 @@ else()
         olp-cpp-sdk-authentication
         olp-cpp-sdk-dataservice-read)
 
+    target_compile_definitions(${OLP_SDK_DATASERVICE_READ_EXAMPLE_TARGET}
+        PRIVATE EXAMPLES_LIBRARY)
+    target_compile_definitions(${OLP_SDK_DATASERVICE_WRITE_EXAMPLE_TARGET}
+        PRIVATE EXAMPLES_LIBRARY)
+    target_compile_definitions(${OLP_SDK_DATASERVICE_CACHE_EXAMPLE_TARGET}
+        PRIVATE EXAMPLES_LIBRARY)
+    target_compile_definitions(${OLP_SDK_DATASERVICE_READ_STREAM_LAYER_EXAMPLE_TARGET}
+        PRIVATE EXAMPLES_LIBRARY)
+    if(BUILD_SHARED_LIBS)
+        target_compile_definitions(${OLP_SDK_DATASERVICE_READ_EXAMPLE_TARGET}
+            PUBLIC EXAMPLES_SHARED_LIBRARY)
+        target_compile_definitions(${OLP_SDK_DATASERVICE_WRITE_EXAMPLE_TARGET}
+            PUBLIC EXAMPLES_SHARED_LIBRARY)
+        target_compile_definitions(${OLP_SDK_DATASERVICE_CACHE_EXAMPLE_TARGET}
+            PUBLIC EXAMPLES_SHARED_LIBRARY)
+        target_compile_definitions(${OLP_SDK_DATASERVICE_READ_STREAM_LAYER_EXAMPLE_TARGET}
+            PUBLIC EXAMPLES_SHARED_LIBRARY)
+    endif()
+
     add_executable(${OLP_SDK_DATASERVICE_EXAMPLE_TARGET}
         ./main.cpp
         ./Examples.h

examples/Examples.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 HERE Europe B.V.
+ * Copyright (C) 2019-2026 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,21 @@
 
 #pragma once
 
+#include <olp/core/porting/export.h>
+
+#ifdef EXAMPLES_SHARED_LIBRARY
+#ifdef EXAMPLES_LIBRARY
+#define EXAMPLES_API OLP_CPP_SDK_DECL_EXPORT
+#else
+#define EXAMPLES_API OLP_CPP_SDK_DECL_IMPORT
+#endif  // EXAMPLES_LIBRARY
+#else
+#define EXAMPLES_API
+#endif  // EXAMPLES_SHARED_LIBRARY
+
 #include <string>
 
-struct AccessKey
-{
+struct AccessKey {
   std::string id;      // Your here.access.key.id
   std::string secret;  // Your here.access.key.secret
 };

examples/ProtectedCacheExample.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 HERE Europe B.V.
+ * Copyright (C) 2020-2026 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,14 +21,19 @@
 
 #include "Examples.h"
 
+#include <string>
+
 /**
-  * @brief Dataservice cache example.
+ * @brief Dataservice cache example.
  *
- * Gets the partition data using the HERE Open Location Platform with mutable cache. 
- * Makes the mutable cache path
- * protected. Reads the same data from the protected cache.
+ * Gets the partition data using the HERE Open Location Platform with mutable
+ * cache. Makes the mutable cache path protected. Reads the same data from the
+ * protected cache.
  * @param access_key Your access key ID and access key secret.
- * @param The HERE Resource Name (HRN) of the catalog from which you want to read data.
+ * @param The HERE Resource Name (HRN) of the catalog from which you want to
+ * read data.
  * @return 0 if data was published successfully.
  */
-int RunExampleProtectedCache(const AccessKey& access_key, const std::string& catalog);
+EXAMPLES_API
+int RunExampleProtectedCache(const AccessKey& access_key,
+                             const std::string& catalog);

examples/ReadExample.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 HERE Europe B.V.
+ * Copyright (C) 2019-2026 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 #include "Examples.h"
 
 #include <olp/core/porting/optional.h>
+#include <string>
 
 /**
  * @brief Dataservice read example. Authenticate client using access key id and
@@ -33,6 +34,7 @@
  * @param catalog_version The desired version of the catalog.
  * @return result of publish data(0 - if succeed)
  */
+EXAMPLES_API
 int RunExampleRead(const AccessKey& access_key, const std::string& catalog,
                    const olp::porting::optional<int64_t>& catalog_version =
                        olp::porting::none);

examples/StreamLayerReadExample.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 HERE Europe B.V.
+ * Copyright (C) 2019-2026 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 #include "Examples.h"
 
 #include <olp/dataservice/read/SubscribeRequest.h>
+#include <string>
 
 /**
  * @brief Dataservice read from stream layer example. Authenticate client using
@@ -34,6 +35,7 @@
  * @param subscription_mode The type of client subscription.
  * @return 0 on success, -1 otherwise.
  */
+EXAMPLES_API
 int RunStreamLayerExampleRead(
     const AccessKey& access_key, const std::string& catalog,
     const std::string& layer_id,

examples/WriteExample.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 HERE Europe B.V.
+ * Copyright (C) 2019-2026 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,13 +21,18 @@
 
 #include "Examples.h"
 
+#include <string>
+
 /**
  * @brief Dataservice write example. Authenticate client using access key id and
  * secret. Publish data to some layer in HRN catalog.
  * @param access_key Your access key ID and access key secret.
- * @param The HERE Resource Name (HRN) of the catalog to which you want to publish data.
- * @param layer_id The layer ID of the catalog to which you want to publish data.
+ * @param The HERE Resource Name (HRN) of the catalog to which you want to
+ * publish data.
+ * @param layer_id The layer ID of the catalog to which you want to publish
+ * data.
  * @return result of publish data(0 - if succeed)
  */
+EXAMPLES_API
 int RunExampleWrite(const AccessKey& access_key, const std::string& catalog,
                     const std::string& layer_id);