Use std::optional if available.

asopov-here · asopov-here · commit 385eea950bc4 · 2025-08-08T15:30:35.000+02:00
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 third part of the task: olp-cpp-sdk-read.

Relates-To: NLAM-23
Signed-off-by: sopov &lt;ext-alexander.sopov@here.com&gt;
diff --git a/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/CatalogRequest.h b/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/CatalogRequest.h
@@ -23,9 +23,9 @@
 #include <string>
 #include <utility>
 
-#include <olp/core/porting/optional.hpp>
 #include <olp/dataservice/read/DataServiceReadApi.h>
 #include <olp/dataservice/read/FetchOptions.h>
+#include <olp/core/porting/optional.hpp>
 
 namespace olp {
 namespace dataservice {
diff --git a/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/DataRequest.h b/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/DataRequest.h
@@ -23,10 +23,10 @@
 #include <string>
 #include <utility>
 
-#include <olp/core/porting/optional.hpp>
 #include <olp/core/thread/TaskScheduler.h>
 #include <olp/dataservice/read/DataServiceReadApi.h>
 #include <olp/dataservice/read/FetchOptions.h>
+#include <olp/core/porting/optional.hpp>
 
 namespace olp {
 namespace dataservice {
diff --git a/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/PartitionsRequest.h b/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/PartitionsRequest.h
@@ -24,9 +24,9 @@
 #include <utility>
 #include <vector>
 
-#include <olp/core/porting/optional.hpp>
 #include <olp/dataservice/read/DataServiceReadApi.h>
 #include <olp/dataservice/read/FetchOptions.h>
+#include <olp/core/porting/optional.hpp>
 
 namespace olp {
 namespace dataservice {
diff --git a/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/PrefetchPartitionsRequest.h b/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/PrefetchPartitionsRequest.h
@@ -24,10 +24,10 @@
 #include <utility>
 #include <vector>
 
-#include <olp/core/porting/optional.hpp>
 #include <olp/core/thread/TaskScheduler.h>
 #include <olp/dataservice/read/DataServiceReadApi.h>
 #include <olp/dataservice/read/FetchOptions.h>
+#include <olp/core/porting/optional.hpp>
 
 namespace olp {
 namespace dataservice {
diff --git a/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/PrefetchTilesRequest.h b/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/PrefetchTilesRequest.h
@@ -25,9 +25,9 @@
 #include <vector>
 
 #include <olp/core/geo/tiling/TileKey.h>
-#include <olp/core/porting/optional.hpp>
 #include <olp/core/thread/TaskScheduler.h>
 #include <olp/dataservice/read/DataServiceReadApi.h>
+#include <olp/core/porting/optional.hpp>
 
 namespace olp {
 namespace dataservice {
diff --git a/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/SubscribeRequest.h b/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/SubscribeRequest.h
@@ -22,9 +22,9 @@
 #include <string>
 #include <utility>
 
-#include <olp/core/porting/optional.hpp>
 #include <olp/dataservice/read/ConsumerProperties.h>
 #include <olp/dataservice/read/Types.h>
+#include <olp/core/porting/optional.hpp>
 
 namespace olp {
 namespace dataservice {
diff --git a/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/TileRequest.h b/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/TileRequest.h
@@ -24,9 +24,9 @@
 #include <utility>
 
 #include <olp/core/geo/tiling/TileKey.h>
-#include <olp/core/porting/optional.hpp>
 #include <olp/core/thread/TaskScheduler.h>
 #include <olp/dataservice/read/FetchOptions.h>
+#include <olp/core/porting/optional.hpp>
 
 namespace olp {
 namespace dataservice {
diff --git a/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/VersionedLayerClient.h b/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/VersionedLayerClient.h
@@ -28,7 +28,6 @@
 #include <olp/core/client/CancellationToken.h>
 #include <olp/core/client/HRN.h>
 #include <olp/core/client/OlpClientSettings.h>
-#include <olp/core/porting/optional.hpp>
 #include <olp/dataservice/read/DataRequest.h>
 #include <olp/dataservice/read/DataServiceReadApi.h>
 #include <olp/dataservice/read/PartitionsRequest.h>
@@ -37,6 +36,7 @@
 #include <olp/dataservice/read/PrefetchTilesRequest.h>
 #include <olp/dataservice/read/TileRequest.h>
 #include <olp/dataservice/read/Types.h>
+#include <olp/core/porting/optional.hpp>
 
 namespace olp {
 namespace dataservice {
diff --git a/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/VersionsRequest.h b/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/VersionsRequest.h
@@ -23,8 +23,8 @@
 #include <string>
 #include <utility>
 
-#include <olp/core/porting/optional.hpp>
 #include <olp/dataservice/read/DataServiceReadApi.h>
+#include <olp/core/porting/optional.hpp>
 
 namespace olp {
 namespace dataservice {
diff --git a/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/model/Catalog.h b/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/model/Catalog.h
@@ -22,8 +22,8 @@
 #include <string>
 #include <vector>
 
-#include <olp/core/porting/optional.hpp>
 #include <olp/dataservice/read/DataServiceReadApi.h>
+#include <olp/core/porting/optional.hpp>
 
 namespace olp {
 namespace dataservice {
diff --git a/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/model/Messages.h b/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/model/Messages.h
@@ -23,10 +23,10 @@
 #include <utility>
 #include <vector>
 
-#include <olp/core/porting/optional.hpp>
 #include <olp/dataservice/read/DataServiceReadApi.h>
 #include <olp/dataservice/read/model/Data.h>
 #include <olp/dataservice/read/model/StreamOffsets.h>
+#include <olp/core/porting/optional.hpp>
 
 namespace olp {
 namespace dataservice {
diff --git a/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/model/Partitions.h b/olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/model/Partitions.h
@@ -23,8 +23,8 @@
 #include <utility>
 #include <vector>
 
-#include <olp/core/porting/optional.hpp>
 #include <olp/dataservice/read/DataServiceReadApi.h>
+#include <olp/core/porting/optional.hpp>
 
 namespace olp {
 namespace dataservice {
diff --git a/olp-cpp-sdk-dataservice-read/src/TaskSink.h b/olp-cpp-sdk-dataservice-read/src/TaskSink.h
@@ -22,8 +22,8 @@
 #include <olp/core/client/CancellationToken.h>
 #include <olp/core/client/PendingRequests.h>
 #include <olp/core/client/TaskContext.h>
-#include <olp/core/porting/optional.hpp>
 #include <olp/core/thread/TaskScheduler.h>
+#include <olp/core/porting/optional.hpp>
 
 namespace olp {
 namespace dataservice {
diff --git a/olp-cpp-sdk-dataservice-read/src/VersionedLayerClientImpl.h b/olp-cpp-sdk-dataservice-read/src/VersionedLayerClientImpl.h
@@ -28,14 +28,14 @@
 #include <olp/core/client/HRN.h>
 #include <olp/core/client/OlpClientSettings.h>
 #include <olp/core/client/PendingRequests.h>
-#include <olp/core/porting/optional.hpp>
 #include <olp/dataservice/read/DataRequest.h>
 #include <olp/dataservice/read/PartitionsRequest.h>
 #include <olp/dataservice/read/PrefetchPartitionsRequest.h>
 #include <olp/dataservice/read/PrefetchTileResult.h>
 #include <olp/dataservice/read/PrefetchTilesRequest.h>
 #include <olp/dataservice/read/TileRequest.h>
 #include <olp/dataservice/read/Types.h>
+#include <olp/core/porting/optional.hpp>
 #include "TaskSink.h"
 #include "repositories/NamedMutex.h"
 
diff --git a/olp-cpp-sdk-dataservice-read/src/generated/api/StreamApi.h b/olp-cpp-sdk-dataservice-read/src/generated/api/StreamApi.h
@@ -23,11 +23,11 @@
 
 #include <olp/core/client/ApiError.h>
 #include <olp/core/client/ApiResponse.h>
-#include <olp/core/porting/optional.hpp>
 #include <olp/dataservice/read/ConsumerProperties.h>
 #include <olp/dataservice/read/Types.h>
 #include <olp/dataservice/read/model/Messages.h>
 #include <olp/dataservice/read/model/StreamOffsets.h>
+#include <olp/core/porting/optional.hpp>
 #include "generated/model/SubscribeResponse.h"
 
 namespace olp {
diff --git a/olp-cpp-sdk-dataservice-read/src/repositories/CatalogCacheRepository.h b/olp-cpp-sdk-dataservice-read/src/repositories/CatalogCacheRepository.h
@@ -23,9 +23,9 @@
 #include <memory>
 
 #include <olp/core/client/HRN.h>
-#include <olp/core/porting/optional.hpp>
 #include <olp/dataservice/read/model/Catalog.h>
 #include <olp/dataservice/read/model/VersionResponse.h>
+#include <olp/core/porting/optional.hpp>
 
 namespace olp {
 namespace cache {
diff --git a/olp-cpp-sdk-dataservice-read/src/repositories/DataCacheRepository.h b/olp-cpp-sdk-dataservice-read/src/repositories/DataCacheRepository.h
@@ -24,8 +24,8 @@
 
 #include <olp/core/client/ApiNoResult.h>
 #include <olp/core/client/HRN.h>
-#include <olp/core/porting/optional.hpp>
 #include <olp/dataservice/read/model/Data.h>
+#include <olp/core/porting/optional.hpp>
 
 namespace olp {
 namespace cache {
diff --git a/olp-cpp-sdk-dataservice-read/src/repositories/PartitionsCacheRepository.h b/olp-cpp-sdk-dataservice-read/src/repositories/PartitionsCacheRepository.h
@@ -24,9 +24,9 @@
 
 #include <olp/core/client/ApiNoResult.h>
 #include <olp/core/client/HRN.h>
-#include <olp/core/porting/optional.hpp>
 #include <olp/dataservice/read/PartitionsRequest.h>
 #include <olp/dataservice/read/model/Partitions.h>
+#include <olp/core/porting/optional.hpp>
 #include "QuadTreeIndex.h"
 #include "generated/model/LayerVersions.h"
 
diff --git a/olp-cpp-sdk-dataservice-read/tests/StreamLayerClientImplTest.cpp b/olp-cpp-sdk-dataservice-read/tests/StreamLayerClientImplTest.cpp
@@ -19,12 +19,12 @@
 
 #include <thread>
 
-#include <boost/optional/optional_io.hpp>
 #include <gtest/gtest.h>
 #include <matchers/NetworkUrlMatchers.h>
 #include <mocks/CacheMock.h>
 #include <mocks/NetworkMock.h>
 #include <olp/core/client/OlpClientSettingsFactory.h>
+#include <boost/optional/optional_io.hpp>
 #include "StreamLayerClientImpl.h"
 
 namespace {
