Skip to content

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

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

Open
rustam-gamidov-here wants to merge 3 commits into
base: feature_boost_json
Choose a base branch
from
Open

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

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
1d922e9
Use Boost::json in olp-cpp-sdk-core
rustam-gamidov-here Mar 17, 2026
2d3e76a
Use Boost::json in mock-server-client
rustam-gamidov-here Mar 17, 2026
fe21927
Use boost::json in HarCaptureAdapter
rustam-gamidov-here Mar 18, 2026
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
17 changes: 7 additions & 10 deletions olp-cpp-sdk-core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
project(olp-cpp-sdk-core VERSION 1.24.0)
set(DESCRIPTION "Core network and utility library for the HERE OLP SDK C++")

find_package(RapidJSON 1.1.0 REQUIRED)
find_package(Boost REQUIRED)
find_package(Threads REQUIRED)

Expand Down Expand Up @@ -97,12 +96,6 @@ set(OLP_SDK_CLIENT_HEADERS
./include/olp/core/client/TaskContext.h
)

set(OLP_SDK_GENERATED_HEADERS
./include/olp/core/generated/parser/JsonParser.h
./include/olp/core/generated/parser/ParserWrapper.h
./include/olp/core/generated/serializer/SerializerWrapper.h
)

set(OLP_SDK_HTTP_HEADERS
./include/olp/core/http/adapters/HarCaptureAdapter.h
./include/olp/core/http/CertificateSettings.h
Expand Down Expand Up @@ -229,6 +222,12 @@ set(OLP_SDK_COREAPI_HEADERS
./include/olp/core/CoreApi.h
)

set(OLP_SDK_GENERATED_HEADERS
./src/generated/parser/JsonParser.h
./src/generated/parser/ParserWrapper.h
./src/generated/serializer/SerializerWrapper.h
)

set(OLP_SDK_GEO_SOURCES
./src/geo/coordinates/GeoCoordinates.cpp
./src/geo/coordinates/GeoCoordinates3d.cpp
Expand Down Expand Up @@ -390,7 +389,6 @@ set(OLP_SDK_THREAD_SOURCES
set(OLP_SDK_CORE_HEADERS
${OLP_SDK_CACHE_HEADERS}
${OLP_SDK_CLIENT_HEADERS}
${OLP_SDK_GENERATED_HEADERS}
${OLP_SDK_HTTP_HEADERS}
${OLP_SDK_MODEL_HEADERS}
${OLP_SDK_PLATFORM_HEADERS}
Expand All @@ -408,6 +406,7 @@ set(OLP_SDK_CORE_HEADERS
)

set(OLP_SDK_CORE_SOURCES
${OLP_SDK_GENERATED_HEADERS}
${OLP_SDK_CLIENT_SOURCES}
${OLP_SDK_HTTP_SOURCES}
${OLP_SDK_PLATFORM_SOURCES}
Expand Down Expand Up @@ -466,8 +465,6 @@ target_include_directories(${PROJECT_NAME} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
$<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>

$<BUILD_INTERFACE:${RapidJSON_INCLUDE_DIRS}/..>

$<INSTALL_INTERFACE:include>)

if (ANDROID)
Expand Down
98 changes: 0 additions & 98 deletions olp-cpp-sdk-core/include/olp/core/generated/parser/ParserWrapper.h
View file
Open in desktop

This file was deleted.

114 changes: 0 additions & 114 deletions olp-cpp-sdk-core/include/olp/core/generated/serializer/SerializerWrapper.h
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions olp-cpp-sdk-core/src/client/api/JsonResultParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -23,8 +23,8 @@
#include <string>
#include <utility>

#include <generated/parser/JsonParser.h>
#include <olp/core/client/ApiError.h>
#include <olp/core/generated/parser/JsonParser.h>
#include <olp/core/logging/Log.h>

namespace olp {
Expand Down
9 changes: 6 additions & 3 deletions olp-cpp-sdk-core/src/client/parser/ApiParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -19,11 +19,14 @@

#include "ApiParser.h"

#include <olp/core/generated/parser/ParserWrapper.h>
#include <map>
#include <string>

#include <generated/parser/ParserWrapper.h>

namespace olp {
namespace parser {
void from_json(const rapidjson::Value& value, olp::client::Api& x) {
void from_json(const boost::json::value& value, olp::client::Api& x) {
x.SetApi(parse<std::string>(value, "api"));
x.SetVersion(parse<std::string>(value, "version"));
x.SetBaseUrl(parse<std::string>(value, "baseURL"));
Expand Down
6 changes: 3 additions & 3 deletions olp-cpp-sdk-core/src/client/parser/ApiParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -20,11 +20,11 @@
#pragma once

#include <olp/core/client/model/Api.h>
#include <rapidjson/document.h>
#include <boost/json/value.hpp>

namespace olp {
namespace parser {
void from_json(const rapidjson::Value& value, olp::client::Api& x);
void from_json(const boost::json::value& value, olp::client::Api& x);

} // namespace parser
} // namespace olp
Loading
Loading