From 5490ce4919199308a418ff1cd569e0b9c80a0827 Mon Sep 17 00:00:00 2001 From: Alexander Sopov Date: Mon, 11 Aug 2025 09:46:18 +0200 Subject: [PATCH] Use std::optional if available. Currently, SDK requires C++11 minimum. So, boost::optional type is used for optional values. For C++17 and above more convenient is to use std::optional instead. The task NLAM-23 is about making this type configurable. This commit is a renaming of the initially proposed "optional.hpp" into optional.h to avoid clang-format header sorting issue. Relates-To: NLAM-23 Signed-off-by: sopov --- .../olp/authentication/AuthenticationClient.h | 2 +- .../AuthenticationCredentials.h | 2 +- .../authentication/AuthenticationSettings.h | 2 +- .../olp/authentication/AuthorizeRequest.h | 2 +- .../include/olp/authentication/Settings.h | 3 +- .../include/olp/authentication/TokenResult.h | 2 +- .../src/TokenEndpointImpl.h | 2 +- olp-cpp-sdk-core/CMakeLists.txt | 2 +- .../include/olp/core/cache/CacheSettings.h | 2 +- .../include/olp/core/cache/KeyGenerator.h | 14 +++++----- .../olp/core/client/OlpClientSettings.h | 2 +- .../olp/core/generated/parser/ParserWrapper.h | 2 +- .../generated/serializer/SerializerWrapper.h | 4 +-- .../include/olp/core/geo/tiling/PathTiling.h | 2 +- .../include/olp/core/geo/tiling/TileKey.h | 28 +++++++++++-------- .../include/olp/core/http/NetworkResponse.h | 2 +- .../include/olp/core/logging/FilterGroup.h | 11 +++++--- .../include/olp/core/logging/Log.h | 2 +- .../core/porting/{optional.hpp => optional.h} | 0 olp-cpp-sdk-core/include/olp/core/utils/Url.h | 5 ++-- olp-cpp-sdk-core/src/client/api/PlatformApi.h | 2 +- .../src/client/api/ResourcesApi.h | 2 +- .../client/repository/ApiCacheRepository.h | 4 +-- olp-cpp-sdk-core/src/http/curl/NetworkCurl.h | 2 +- .../dataservice/write/generated/model/Index.h | 3 +- .../write/generated/model/Publication.h | 3 +- .../write/model/PublishDataRequest.h | 3 +- .../write/model/PublishIndexRequest.h | 3 +- .../write/model/PublishPartitionDataRequest.h | 3 +- .../write/model/PublishSdiiRequest.h | 3 +- .../write/model/StartBatchRequest.h | 3 +- .../write/model/UpdateIndexRequest.h | 3 +- .../src/StreamLayerClientImpl.h | 4 +-- .../src/generated/ConfigApi.h | 4 +-- .../src/generated/IngestApi.h | 3 +- .../src/generated/MetadataApi.h | 2 +- .../src/generated/QueryApi.h | 2 +- .../src/generated/model/Partitions.h | 2 +- .../src/generated/model/PublishPartition.h | 2 +- .../src/generated/model/PublishPartitions.h | 3 +- 40 files changed, 71 insertions(+), 76 deletions(-) rename olp-cpp-sdk-core/include/olp/core/porting/{optional.hpp => optional.h} (100%) diff --git a/olp-cpp-sdk-authentication/include/olp/authentication/AuthenticationClient.h b/olp-cpp-sdk-authentication/include/olp/authentication/AuthenticationClient.h index f95eb2194..453dbc16e 100644 --- a/olp-cpp-sdk-authentication/include/olp/authentication/AuthenticationClient.h +++ b/olp-cpp-sdk-authentication/include/olp/authentication/AuthenticationClient.h @@ -36,7 +36,7 @@ #include #include #include -#include +#include /** * @brief Rules all the other namespaces. diff --git a/olp-cpp-sdk-authentication/include/olp/authentication/AuthenticationCredentials.h b/olp-cpp-sdk-authentication/include/olp/authentication/AuthenticationCredentials.h index 4aeea40c8..c5c2821e8 100644 --- a/olp-cpp-sdk-authentication/include/olp/authentication/AuthenticationCredentials.h +++ b/olp-cpp-sdk-authentication/include/olp/authentication/AuthenticationCredentials.h @@ -21,7 +21,7 @@ #include -#include +#include #include "AuthenticationApi.h" namespace olp { diff --git a/olp-cpp-sdk-authentication/include/olp/authentication/AuthenticationSettings.h b/olp-cpp-sdk-authentication/include/olp/authentication/AuthenticationSettings.h index 89c49cd3e..95552fd14 100644 --- a/olp-cpp-sdk-authentication/include/olp/authentication/AuthenticationSettings.h +++ b/olp-cpp-sdk-authentication/include/olp/authentication/AuthenticationSettings.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include namespace olp { namespace http { diff --git a/olp-cpp-sdk-authentication/include/olp/authentication/AuthorizeRequest.h b/olp-cpp-sdk-authentication/include/olp/authentication/AuthorizeRequest.h index fe0f6f008..e90d77182 100644 --- a/olp-cpp-sdk-authentication/include/olp/authentication/AuthorizeRequest.h +++ b/olp-cpp-sdk-authentication/include/olp/authentication/AuthorizeRequest.h @@ -23,7 +23,7 @@ #include #include -#include +#include namespace olp { namespace authentication { diff --git a/olp-cpp-sdk-authentication/include/olp/authentication/Settings.h b/olp-cpp-sdk-authentication/include/olp/authentication/Settings.h index 6019306c2..dd8994fec 100644 --- a/olp-cpp-sdk-authentication/include/olp/authentication/Settings.h +++ b/olp-cpp-sdk-authentication/include/olp/authentication/Settings.h @@ -24,8 +24,7 @@ #include #include -#include - +#include #include "AuthenticationApi.h" #include "AuthenticationCredentials.h" diff --git a/olp-cpp-sdk-authentication/include/olp/authentication/TokenResult.h b/olp-cpp-sdk-authentication/include/olp/authentication/TokenResult.h index d63f1697d..b4be8a39d 100644 --- a/olp-cpp-sdk-authentication/include/olp/authentication/TokenResult.h +++ b/olp-cpp-sdk-authentication/include/olp/authentication/TokenResult.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include "AuthenticationApi.h" #include "ErrorResponse.h" diff --git a/olp-cpp-sdk-authentication/src/TokenEndpointImpl.h b/olp-cpp-sdk-authentication/src/TokenEndpointImpl.h index 639f57f6a..c051b922e 100644 --- a/olp-cpp-sdk-authentication/src/TokenEndpointImpl.h +++ b/olp-cpp-sdk-authentication/src/TokenEndpointImpl.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include "TokenRequest.h" namespace olp { diff --git a/olp-cpp-sdk-core/CMakeLists.txt b/olp-cpp-sdk-core/CMakeLists.txt index ec84d313d..908d970c8 100644 --- a/olp-cpp-sdk-core/CMakeLists.txt +++ b/olp-cpp-sdk-core/CMakeLists.txt @@ -131,7 +131,7 @@ set(OLP_SDK_PORTING_HEADERS ./include/olp/core/porting/deprecated.h ./include/olp/core/porting/export.h ./include/olp/core/porting/make_unique.h - ./include/olp/core/porting/optional.hpp + ./include/olp/core/porting/optional.h ./include/olp/core/porting/platform.h ./include/olp/core/porting/shared_mutex.h ./include/olp/core/porting/try_emplace.h diff --git a/olp-cpp-sdk-core/include/olp/core/cache/CacheSettings.h b/olp-cpp-sdk-core/include/olp/core/cache/CacheSettings.h index 34b9cd845..300b55140 100644 --- a/olp-cpp-sdk-core/include/olp/core/cache/CacheSettings.h +++ b/olp-cpp-sdk-core/include/olp/core/cache/CacheSettings.h @@ -24,7 +24,7 @@ #include #include -#include +#include namespace olp { namespace cache { diff --git a/olp-cpp-sdk-core/include/olp/core/cache/KeyGenerator.h b/olp-cpp-sdk-core/include/olp/core/cache/KeyGenerator.h index b0cf8ccc5..8b1fc06a8 100644 --- a/olp-cpp-sdk-core/include/olp/core/cache/KeyGenerator.h +++ b/olp-cpp-sdk-core/include/olp/core/cache/KeyGenerator.h @@ -23,7 +23,7 @@ #include #include -#include +#include namespace olp { namespace cache { @@ -76,7 +76,8 @@ class CORE_API KeyGenerator { */ static std::string CreatePartitionKey( const std::string& hrn, const std::string& layer_id, - const std::string& partition_id, const porting::optional& version); + const std::string& partition_id, + const porting::optional& version); /** * @brief Generates cache key for storing list of partitions. @@ -113,11 +114,10 @@ class CORE_API KeyGenerator { * * @return A key used to store the quadtree in cache. */ - static std::string CreateQuadTreeKey(const std::string& hrn, - const std::string& layer_id, - olp::geo::TileKey root, - const porting::optional& version, - int32_t depth); + static std::string CreateQuadTreeKey( + const std::string& hrn, const std::string& layer_id, + olp::geo::TileKey root, const porting::optional& version, + int32_t depth); /** * @brief Generates cache key for data handle entities. diff --git a/olp-cpp-sdk-core/include/olp/core/client/OlpClientSettings.h b/olp-cpp-sdk-core/include/olp/core/client/OlpClientSettings.h index ad0d5b22b..3ce485dbf 100644 --- a/olp-cpp-sdk-core/include/olp/core/client/OlpClientSettings.h +++ b/olp-cpp-sdk-core/include/olp/core/client/OlpClientSettings.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include namespace olp { namespace cache { diff --git a/olp-cpp-sdk-core/include/olp/core/generated/parser/ParserWrapper.h b/olp-cpp-sdk-core/include/olp/core/generated/parser/ParserWrapper.h index fd6b5d316..3cdd5e1bd 100644 --- a/olp-cpp-sdk-core/include/olp/core/generated/parser/ParserWrapper.h +++ b/olp-cpp-sdk-core/include/olp/core/generated/parser/ParserWrapper.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include namespace olp { diff --git a/olp-cpp-sdk-core/include/olp/core/generated/serializer/SerializerWrapper.h b/olp-cpp-sdk-core/include/olp/core/generated/serializer/SerializerWrapper.h index 50ee0117c..62250586d 100644 --- a/olp-cpp-sdk-core/include/olp/core/generated/serializer/SerializerWrapper.h +++ b/olp-cpp-sdk-core/include/olp/core/generated/serializer/SerializerWrapper.h @@ -22,10 +22,10 @@ #include #include #include -#include #include +#include -#include +#include #include namespace olp { diff --git a/olp-cpp-sdk-core/include/olp/core/geo/tiling/PathTiling.h b/olp-cpp-sdk-core/include/olp/core/geo/tiling/PathTiling.h index 92eb1327b..c4ac33baa 100644 --- a/olp-cpp-sdk-core/include/olp/core/geo/tiling/PathTiling.h +++ b/olp-cpp-sdk-core/include/olp/core/geo/tiling/PathTiling.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include namespace olp { namespace geo { diff --git a/olp-cpp-sdk-core/include/olp/core/geo/tiling/TileKey.h b/olp-cpp-sdk-core/include/olp/core/geo/tiling/TileKey.h index 8a6434e86..a37110dd8 100644 --- a/olp-cpp-sdk-core/include/olp/core/geo/tiling/TileKey.h +++ b/olp-cpp-sdk-core/include/olp/core/geo/tiling/TileKey.h @@ -24,7 +24,7 @@ #include #include -#include +#include namespace olp { namespace geo { @@ -46,12 +46,13 @@ namespace geo { * To create a tile key, use `FromRowColumnLevel()`. * * For vertical navigation within the tree, use the following functions: - * `Parent()`, `ChangedLevelBy()`, and `ChangedLevelTo()`. To navigate within a level, use - * the `HasNextRow()`, `NextRow()`, `HasNextColumn()`, and `NextColumn()` functions. - * To get the number of available rows and columns on the tile level, use `RowCount()` and - * `ColumnCount()`. + * `Parent()`, `ChangedLevelBy()`, and `ChangedLevelTo()`. To navigate within a + * level, use the `HasNextRow()`, `NextRow()`, `HasNextColumn()`, and + * `NextColumn()` functions. To get the number of available rows and columns on + * the tile level, use `RowCount()` and `ColumnCount()`. * - * You can also create tile keys from and converted them into various alternative formats: + * You can also create tile keys from and converted them into various + * alternative formats: * * - `ToQuadKey()` / `FromQuadKey()` – 4-based string representation. * @@ -121,7 +122,8 @@ class CORE_API TileKey { } /** - * @brief Creates a quad string from a tile key to later use it in REST API calls. + * @brief Creates a quad string from a tile key to later use it in REST API + * calls. * * If the tile is the root tile, the quadkey is '-'. * Otherwise, the string is a number to the base of 4 without the leading @@ -142,11 +144,13 @@ class CORE_API TileKey { static TileKey FromQuadKey(const std::string& quad_key); /** - * @brief Creates a HERE tile code string from a tile key to later use it in REST API calls. + * @brief Creates a HERE tile code string from a tile key to later use it in + * REST API calls. * * The string is a quadkey Morton code. * - * To convert the HERE tile code string back into the tile key, use `FromHereTile()`. + * To convert the HERE tile code string back into the tile key, use + * `FromHereTile()`. */ std::string ToHereTile() const; @@ -160,7 +164,8 @@ class CORE_API TileKey { /** * @brief Creates a 64-bit Morton code from a tile key. * - * To convert the 64-bit Morton code back into the tile key, use `FromQuadKey64()`. + * To convert the 64-bit Morton code back into the tile key, use + * `FromQuadKey64()`. */ std::uint64_t ToQuadKey64() const; @@ -174,7 +179,8 @@ class CORE_API TileKey { /** * @brief Creates a tile key. * - * @param row The requested row. Must be less than 2 to the power of the level. + * @param row The requested row. Must be less than 2 to the power of the + * level. * @param column The requested column. Must be less than 2 to the power of * the level. * @param level The requested level. diff --git a/olp-cpp-sdk-core/include/olp/core/http/NetworkResponse.h b/olp-cpp-sdk-core/include/olp/core/http/NetworkResponse.h index f0a4891e8..a6b99d46f 100644 --- a/olp-cpp-sdk-core/include/olp/core/http/NetworkResponse.h +++ b/olp-cpp-sdk-core/include/olp/core/http/NetworkResponse.h @@ -26,7 +26,7 @@ #include #include -#include +#include namespace olp { namespace http { diff --git a/olp-cpp-sdk-core/include/olp/core/logging/FilterGroup.h b/olp-cpp-sdk-core/include/olp/core/logging/FilterGroup.h index 881975972..c924f6702 100644 --- a/olp-cpp-sdk-core/include/olp/core/logging/FilterGroup.h +++ b/olp-cpp-sdk-core/include/olp/core/logging/FilterGroup.h @@ -26,7 +26,7 @@ #include #include -#include +#include namespace olp { namespace logging { @@ -54,7 +54,8 @@ class CORE_API FilterGroup { /** * @brief Gets the default log level. * - * @return The default log level or `olp::porting::none` if the level is not set. + * @return The default log level or `olp::porting::none` if the level is not + * set. */ inline porting::optional getLevel() const; @@ -78,7 +79,8 @@ class CORE_API FilterGroup { * * @param tag The tag for which to get the log level. * - * @return The log level for the tag, or `olp::porting::none` if the level is not set. + * @return The log level for the tag, or `olp::porting::none` if the level is + * not set. */ inline porting::optional getLevel(const std::string& tag) const; @@ -184,7 +186,8 @@ inline FilterGroup& FilterGroup::clearLevel() { inline porting::optional FilterGroup::getLevel( const std::string& tag) const { auto foundIter = m_tagLevels.find(tag); - if (foundIter == m_tagLevels.end()) return porting::none; + if (foundIter == m_tagLevels.end()) + return porting::none; return foundIter->second; } diff --git a/olp-cpp-sdk-core/include/olp/core/logging/Log.h b/olp-cpp-sdk-core/include/olp/core/logging/Log.h index 2e5a520fb..f25ae6760 100644 --- a/olp-cpp-sdk-core/include/olp/core/logging/Log.h +++ b/olp-cpp-sdk-core/include/olp/core/logging/Log.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include /** diff --git a/olp-cpp-sdk-core/include/olp/core/porting/optional.hpp b/olp-cpp-sdk-core/include/olp/core/porting/optional.h similarity index 100% rename from olp-cpp-sdk-core/include/olp/core/porting/optional.hpp rename to olp-cpp-sdk-core/include/olp/core/porting/optional.h diff --git a/olp-cpp-sdk-core/include/olp/core/utils/Url.h b/olp-cpp-sdk-core/include/olp/core/utils/Url.h index e630e1a98..04c6f300a 100644 --- a/olp-cpp-sdk-core/include/olp/core/utils/Url.h +++ b/olp-cpp-sdk-core/include/olp/core/utils/Url.h @@ -25,7 +25,7 @@ #include #include -#include +#include namespace olp { namespace utils { @@ -81,7 +81,8 @@ class CORE_API Url { * @return An optional pair representing host part and the rest of URL. * Returns olp::porting::none when url cannot be split. */ - static porting::optional ParseHostAndRest(const std::string& url); + static porting::optional ParseHostAndRest( + const std::string& url); }; } // namespace utils diff --git a/olp-cpp-sdk-core/src/client/api/PlatformApi.h b/olp-cpp-sdk-core/src/client/api/PlatformApi.h index 0dbcdfef3..2cfa68cc8 100644 --- a/olp-cpp-sdk-core/src/client/api/PlatformApi.h +++ b/olp-cpp-sdk-core/src/client/api/PlatformApi.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include namespace olp { namespace client { diff --git a/olp-cpp-sdk-core/src/client/api/ResourcesApi.h b/olp-cpp-sdk-core/src/client/api/ResourcesApi.h index 24535f8ec..b9c610a53 100644 --- a/olp-cpp-sdk-core/src/client/api/ResourcesApi.h +++ b/olp-cpp-sdk-core/src/client/api/ResourcesApi.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include namespace olp { namespace client { diff --git a/olp-cpp-sdk-core/src/client/repository/ApiCacheRepository.h b/olp-cpp-sdk-core/src/client/repository/ApiCacheRepository.h index 73cc00e49..43d00faf9 100644 --- a/olp-cpp-sdk-core/src/client/repository/ApiCacheRepository.h +++ b/olp-cpp-sdk-core/src/client/repository/ApiCacheRepository.h @@ -24,7 +24,7 @@ #include #include -#include +#include namespace olp { namespace cache { @@ -44,7 +44,7 @@ class ApiCacheRepository final { const std::string& url, porting::optional expiry); porting::optional Get(const std::string& service, - const std::string& version); + const std::string& version); private: std::string hrn_; diff --git a/olp-cpp-sdk-core/src/http/curl/NetworkCurl.h b/olp-cpp-sdk-core/src/http/curl/NetworkCurl.h index c55b155b7..30cef28ec 100644 --- a/olp-cpp-sdk-core/src/http/curl/NetworkCurl.h +++ b/olp-cpp-sdk-core/src/http/curl/NetworkCurl.h @@ -31,7 +31,7 @@ #include #include -#include +#include #if defined(OLP_SDK_ENABLE_ANDROID_CURL) && !defined(ANDROID_HOST) #include diff --git a/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/generated/model/Index.h b/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/generated/model/Index.h index 299b18c8f..a6c4fe6e5 100644 --- a/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/generated/model/Index.h +++ b/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/generated/model/Index.h @@ -24,8 +24,7 @@ #include #include -#include - +#include #include namespace olp { diff --git a/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/generated/model/Publication.h b/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/generated/model/Publication.h index 36a64e143..1fdf119c1 100644 --- a/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/generated/model/Publication.h +++ b/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/generated/model/Publication.h @@ -22,8 +22,7 @@ #include #include -#include - +#include #include #include #include diff --git a/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishDataRequest.h b/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishDataRequest.h index 850aca3b4..ce12c2a7b 100644 --- a/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishDataRequest.h +++ b/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishDataRequest.h @@ -24,8 +24,7 @@ #include #include -#include - +#include #include namespace olp { diff --git a/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishIndexRequest.h b/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishIndexRequest.h index 8ead25231..a3b5aa8cf 100644 --- a/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishIndexRequest.h +++ b/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishIndexRequest.h @@ -24,8 +24,7 @@ #include #include -#include - +#include #include #include diff --git a/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishPartitionDataRequest.h b/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishPartitionDataRequest.h index 613f5a105..2b6b27301 100644 --- a/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishPartitionDataRequest.h +++ b/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishPartitionDataRequest.h @@ -24,8 +24,7 @@ #include #include -#include - +#include #include namespace olp { diff --git a/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishSdiiRequest.h b/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishSdiiRequest.h index 0f3d08273..77b2a0d9e 100644 --- a/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishSdiiRequest.h +++ b/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishSdiiRequest.h @@ -24,8 +24,7 @@ #include #include -#include - +#include #include namespace olp { diff --git a/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/StartBatchRequest.h b/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/StartBatchRequest.h index e3e928d4f..300c69e68 100644 --- a/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/StartBatchRequest.h +++ b/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/StartBatchRequest.h @@ -23,8 +23,7 @@ #include #include -#include - +#include #include #include diff --git a/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/UpdateIndexRequest.h b/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/UpdateIndexRequest.h index 21e5ede93..c8c334efb 100644 --- a/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/UpdateIndexRequest.h +++ b/olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/UpdateIndexRequest.h @@ -24,8 +24,7 @@ #include #include -#include - +#include #include #include diff --git a/olp-cpp-sdk-dataservice-write/src/StreamLayerClientImpl.h b/olp-cpp-sdk-dataservice-write/src/StreamLayerClientImpl.h index 3aeae9be4..1fe808de7 100644 --- a/olp-cpp-sdk-dataservice-write/src/StreamLayerClientImpl.h +++ b/olp-cpp-sdk-dataservice-write/src/StreamLayerClientImpl.h @@ -21,11 +21,9 @@ #include -#include - #include #include - +#include #include #include "CatalogSettings.h" #include "generated/model/Catalog.h" diff --git a/olp-cpp-sdk-dataservice-write/src/generated/ConfigApi.h b/olp-cpp-sdk-dataservice-write/src/generated/ConfigApi.h index b0bc570ef..602247c59 100644 --- a/olp-cpp-sdk-dataservice-write/src/generated/ConfigApi.h +++ b/olp-cpp-sdk-dataservice-write/src/generated/ConfigApi.h @@ -22,13 +22,11 @@ #include #include -#include - #include #include #include #include - +#include #include "model/Catalog.h" namespace olp { diff --git a/olp-cpp-sdk-dataservice-write/src/generated/IngestApi.h b/olp-cpp-sdk-dataservice-write/src/generated/IngestApi.h index a567b126c..8aa4f8e0f 100644 --- a/olp-cpp-sdk-dataservice-write/src/generated/IngestApi.h +++ b/olp-cpp-sdk-dataservice-write/src/generated/IngestApi.h @@ -21,10 +21,9 @@ #include -#include - #include #include +#include namespace olp { namespace client { diff --git a/olp-cpp-sdk-dataservice-write/src/generated/MetadataApi.h b/olp-cpp-sdk-dataservice-write/src/generated/MetadataApi.h index a2258b294..77908a07a 100644 --- a/olp-cpp-sdk-dataservice-write/src/generated/MetadataApi.h +++ b/olp-cpp-sdk-dataservice-write/src/generated/MetadataApi.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include "generated/model/LayerVersions.h" #include "generated/model/Partitions.h" #include "olp/dataservice/write/model/VersionResponse.h" diff --git a/olp-cpp-sdk-dataservice-write/src/generated/QueryApi.h b/olp-cpp-sdk-dataservice-write/src/generated/QueryApi.h index b0c4bf903..2dda1b3c5 100644 --- a/olp-cpp-sdk-dataservice-write/src/generated/QueryApi.h +++ b/olp-cpp-sdk-dataservice-write/src/generated/QueryApi.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "generated/model/Partitions.h" namespace olp { diff --git a/olp-cpp-sdk-dataservice-write/src/generated/model/Partitions.h b/olp-cpp-sdk-dataservice-write/src/generated/model/Partitions.h index 85b26e54c..d0cb73e5d 100644 --- a/olp-cpp-sdk-dataservice-write/src/generated/model/Partitions.h +++ b/olp-cpp-sdk-dataservice-write/src/generated/model/Partitions.h @@ -22,7 +22,7 @@ #include #include -#include +#include namespace olp { namespace dataservice { diff --git a/olp-cpp-sdk-dataservice-write/src/generated/model/PublishPartition.h b/olp-cpp-sdk-dataservice-write/src/generated/model/PublishPartition.h index 4c899355e..08d3dc437 100644 --- a/olp-cpp-sdk-dataservice-write/src/generated/model/PublishPartition.h +++ b/olp-cpp-sdk-dataservice-write/src/generated/model/PublishPartition.h @@ -23,7 +23,7 @@ #include #include -#include +#include namespace olp { namespace dataservice { diff --git a/olp-cpp-sdk-dataservice-write/src/generated/model/PublishPartitions.h b/olp-cpp-sdk-dataservice-write/src/generated/model/PublishPartitions.h index 8299b8521..f98687ff2 100644 --- a/olp-cpp-sdk-dataservice-write/src/generated/model/PublishPartitions.h +++ b/olp-cpp-sdk-dataservice-write/src/generated/model/PublishPartitions.h @@ -22,9 +22,8 @@ #include #include -#include - #include +#include namespace olp { namespace dataservice {