Skip to content

Commit 95a7eb4

Browse files
asopov-hereasopov-here
committed
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 second part of the task: olp-cpp-sdk-write. Relates-To: NLAM-23 Signed-off-by: sopov <[email protected]>
1 parent cbf2c46 commit 95a7eb4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+481
-462
lines changed

‎olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/StreamLayerClient.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ class DATASERVICE_WRITE_API StreamLayerClient {
124124
*
125125
* @param request The `PublishDataRequest` object.
126126
*
127-
* @return An optional boost that is `boost::none` if the queue call is
127+
* @return An optional boost that is `olp::porting::none` if the queue call is
128128
* successful. Otherwise, it contains a string with error details.
129129
*/
130-
boost::optional<std::string> Queue(model::PublishDataRequest request);
130+
porting::optional<std::string> Queue(model::PublishDataRequest request);
131131

132132
/**
133133
* @brief Flushes `PublishDataRequests` that are queued via the Queue API.

‎olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/generated/model/Index.h‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <string>
2525
#include <utility>
2626

27-
#include <boost/optional.hpp>
27+
#include <olp/core/porting/optional.hpp>
2828

2929
#include <olp/dataservice/write/DataServiceWriteApi.h>
3030

@@ -324,9 +324,9 @@ class DATASERVICE_WRITE_API Index final {
324324
: id_(std::move(uuid)), indexFields_(std::move(indexFields)) {}
325325

326326
private:
327-
boost::optional<std::string> checksum_;
328-
boost::optional<std::map<std::string, std::string>> metadata_;
329-
boost::optional<int64_t> size_;
327+
porting::optional<std::string> checksum_;
328+
porting::optional<std::map<std::string, std::string>> metadata_;
329+
porting::optional<int64_t> size_;
330330
std::string id_;
331331
std::map<IndexName, std::shared_ptr<IndexValue>> indexFields_;
332332

@@ -336,14 +336,16 @@ class DATASERVICE_WRITE_API Index final {
336336
*
337337
* @return The checksum.
338338
*/
339-
const boost::optional<std::string>& GetCheckSum() const { return checksum_; }
339+
const porting::optional<std::string>& GetCheckSum() const {
340+
return checksum_;
341+
}
340342

341343
/**
342344
* @brief Gets a mutable reference to the checksum of the index layer.
343345
*
344346
* @return The mutable reference to the checksum.
345347
*/
346-
boost::optional<std::string>& GetMutableCheckSum() { return checksum_; }
348+
porting::optional<std::string>& GetMutableCheckSum() { return checksum_; }
347349

348350
/**
349351
* @brief Sets the checksum.
@@ -357,7 +359,7 @@ class DATASERVICE_WRITE_API Index final {
357359
*
358360
* @return The metadata of the index layer.
359361
*/
360-
const boost::optional<std::map<std::string, std::string>>& GetMetadata()
362+
const porting::optional<std::map<std::string, std::string>>& GetMetadata()
361363
const {
362364
return metadata_;
363365
}
@@ -367,7 +369,7 @@ class DATASERVICE_WRITE_API Index final {
367369
*
368370
* @return The mutable reference to the metadata.
369371
*/
370-
boost::optional<std::map<std::string, std::string>>& GetMutableMetadata() {
372+
porting::optional<std::map<std::string, std::string>>& GetMutableMetadata() {
371373
return metadata_;
372374
}
373375

@@ -435,14 +437,14 @@ class DATASERVICE_WRITE_API Index final {
435437
*
436438
* @return The size of the index layer.
437439
*/
438-
const boost::optional<int64_t>& GetSize() const { return size_; }
440+
const porting::optional<int64_t>& GetSize() const { return size_; }
439441

440442
/**
441443
* @brief Gets a mutable reference to the size of the index layer.
442444
*
443445
* @return The mutable reference to the size of the index layer.
444446
*/
445-
boost::optional<int64_t>& GetMutableSize() { return size_; }
447+
porting::optional<int64_t>& GetMutableSize() { return size_; }
446448

447449
/**
448450
* @brief Sets the size of the index layer.

‎olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/generated/model/Publication.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <string>
2323
#include <vector>
2424

25-
#include <boost/optional.hpp>
25+
#include <olp/core/porting/optional.hpp>
2626

2727
#include <olp/dataservice/write/DataServiceWriteApi.h>
2828
#include <olp/dataservice/write/generated/model/Details.h>
@@ -44,26 +44,26 @@ class DATASERVICE_WRITE_API Publication {
4444
virtual ~Publication() = default;
4545

4646
private:
47-
boost::optional<std::string> id_;
48-
boost::optional<Details> details_;
49-
boost::optional<std::vector<std::string>> layer_ids_;
50-
boost::optional<int64_t> catalog_version_;
51-
boost::optional<std::vector<VersionDependency>> version_dependencies_;
47+
porting::optional<std::string> id_;
48+
porting::optional<Details> details_;
49+
porting::optional<std::vector<std::string>> layer_ids_;
50+
porting::optional<int64_t> catalog_version_;
51+
porting::optional<std::vector<VersionDependency>> version_dependencies_;
5252

5353
public:
5454
/**
5555
* @brief Gets the publication ID.
5656
*
5757
* @return The publication ID.
5858
*/
59-
const boost::optional<std::string>& GetId() const { return id_; }
59+
const porting::optional<std::string>& GetId() const { return id_; }
6060

6161
/**
6262
* @brief Gets a mutable reference to the publication ID.
6363
*
6464
* @return The mutable reference to the publication ID.
6565
*/
66-
boost::optional<std::string>& GetMutableId() { return id_; }
66+
porting::optional<std::string>& GetMutableId() { return id_; }
6767

6868
/**
6969
* @brief Sets the publication ID.
@@ -77,14 +77,14 @@ class DATASERVICE_WRITE_API Publication {
7777
*
7878
* @return The details of the publication.
7979
*/
80-
const boost::optional<Details>& GetDetails() const { return details_; }
80+
const porting::optional<Details>& GetDetails() const { return details_; }
8181

8282
/**
8383
* @brief Gets a mutable reference to the details of the publication.
8484
*
8585
* @return The mutable reference to the details of the publication.
8686
*/
87-
boost::optional<Details>& GetMutableDetails() { return details_; }
87+
porting::optional<Details>& GetMutableDetails() { return details_; }
8888

8989
/**
9090
* @brief Sets the details of the publication.
@@ -98,7 +98,7 @@ class DATASERVICE_WRITE_API Publication {
9898
*
9999
* @return The layer ID.
100100
*/
101-
const boost::optional<std::vector<std::string>>& GetLayerIds() const {
101+
const porting::optional<std::vector<std::string>>& GetLayerIds() const {
102102
return layer_ids_;
103103
}
104104

@@ -108,7 +108,7 @@ class DATASERVICE_WRITE_API Publication {
108108
*
109109
* @return The mutable reference to the layer ID.
110110
*/
111-
boost::optional<std::vector<std::string>>& GetMutableLayerIds() {
111+
porting::optional<std::vector<std::string>>& GetMutableLayerIds() {
112112
return layer_ids_;
113113
}
114114

@@ -126,7 +126,7 @@ class DATASERVICE_WRITE_API Publication {
126126
*
127127
* @return The catalog version.
128128
*/
129-
const boost::optional<int64_t>& GetCatalogVersion() const {
129+
const porting::optional<int64_t>& GetCatalogVersion() const {
130130
return catalog_version_;
131131
}
132132

@@ -137,7 +137,7 @@ class DATASERVICE_WRITE_API Publication {
137137
* @return The mutable reference to the version of the catalog to be
138138
* published.
139139
*/
140-
boost::optional<int64_t>& GetMutableCatalogVersion() {
140+
porting::optional<int64_t>& GetMutableCatalogVersion() {
141141
return catalog_version_;
142142
}
143143

@@ -155,7 +155,7 @@ class DATASERVICE_WRITE_API Publication {
155155
*
156156
* @return The version dependencies.
157157
*/
158-
const boost::optional<std::vector<VersionDependency>>&
158+
const porting::optional<std::vector<VersionDependency>>&
159159
GetVersionDependencies() const {
160160
return version_dependencies_;
161161
}
@@ -165,7 +165,7 @@ class DATASERVICE_WRITE_API Publication {
165165
*
166166
* @return The mutable reference to the version dependencies.
167167
*/
168-
boost::optional<std::vector<VersionDependency>>&
168+
porting::optional<std::vector<VersionDependency>>&
169169
GetMutableVersionDependencies() {
170170
return version_dependencies_;
171171
}

‎olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishDataRequest.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <utility>
2525
#include <vector>
2626

27-
#include <boost/optional.hpp>
27+
#include <olp/core/porting/optional.hpp>
2828

2929
#include <olp/dataservice/write/DataServiceWriteApi.h>
3030

@@ -113,7 +113,7 @@ class DATASERVICE_WRITE_API PublishDataRequest {
113113
*
114114
* @return The trace ID of the request.
115115
*/
116-
inline const boost::optional<std::string>& GetTraceId() const {
116+
inline const porting::optional<std::string>& GetTraceId() const {
117117
return trace_id_;
118118
}
119119

@@ -152,10 +152,10 @@ class DATASERVICE_WRITE_API PublishDataRequest {
152152
* billing records together. If supplied, it must be 4–16 characters
153153
* long and contain only alphanumeric ASCII characters [A-Za-z0-9].
154154
*
155-
* @return The `BillingTag` string or `boost::none` if the billing tag is not
156-
* set.
155+
* @return The `BillingTag` string or `olp::porting::none` if the billing tag
156+
* is not set.
157157
*/
158-
inline const boost::optional<std::string>& GetBillingTag() const {
158+
inline const porting::optional<std::string>& GetBillingTag() const {
159159
return billing_tag_;
160160
}
161161

@@ -164,7 +164,7 @@ class DATASERVICE_WRITE_API PublishDataRequest {
164164
*
165165
* @see `GetBillingTag()` for information on usage and format.
166166
*
167-
* @param billing_tag The `BillingTag` string or `boost::none`.
167+
* @param billing_tag The `BillingTag` string or `olp::porting::none`.
168168
*/
169169
inline PublishDataRequest& WithBillingTag(const std::string& billing_tag) {
170170
billing_tag_ = billing_tag;
@@ -177,7 +177,7 @@ class DATASERVICE_WRITE_API PublishDataRequest {
177177
* @see `GetBillingTag()` for information on usage and format.
178178
*
179179
* @param billing_tag The rvalue reference to the `BillingTag` string or
180-
* `boost::none`.
180+
* `olp::porting::none`.
181181
*/
182182
inline PublishDataRequest& WithBillingTag(std::string&& billing_tag) {
183183
billing_tag_ = std::move(billing_tag);
@@ -195,7 +195,7 @@ class DATASERVICE_WRITE_API PublishDataRequest {
195195
*
196196
* @return The request checksum.
197197
*/
198-
inline const boost::optional<std::string>& GetChecksum() const {
198+
inline const porting::optional<std::string>& GetChecksum() const {
199199
return checksum_;
200200
}
201201

@@ -228,11 +228,11 @@ class DATASERVICE_WRITE_API PublishDataRequest {
228228

229229
std::string layer_id_;
230230

231-
boost::optional<std::string> trace_id_;
231+
porting::optional<std::string> trace_id_;
232232

233-
boost::optional<std::string> billing_tag_;
233+
porting::optional<std::string> billing_tag_;
234234

235-
boost::optional<std::string> checksum_;
235+
porting::optional<std::string> checksum_;
236236
};
237237

238238
} // namespace model

‎olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/model/PublishIndexRequest.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <utility>
2525
#include <vector>
2626

27-
#include <boost/optional.hpp>
27+
#include <olp/core/porting/optional.hpp>
2828

2929
#include <olp/dataservice/write/DataServiceWriteApi.h>
3030
#include <olp/dataservice/write/generated/model/Index.h>
@@ -112,10 +112,10 @@ class DATASERVICE_WRITE_API PublishIndexRequest {
112112
* billing records together. If supplied, it must be 4–16 characters
113113
* long and contain only alphanumeric ASCII characters [A-Za-z0-9].
114114
*
115-
* @return The `BillingTag` string or `boost::none` if the billing tag is not
116-
* set.
115+
* @return The `BillingTag` string or `olp::porting::none` if the billing tag
116+
* is not set.
117117
*/
118-
inline const boost::optional<std::string>& GetBillingTag() const {
118+
inline const porting::optional<std::string>& GetBillingTag() const {
119119
return billing_tag_;
120120
}
121121

@@ -125,7 +125,7 @@ class DATASERVICE_WRITE_API PublishIndexRequest {
125125
* @see `GetBillingTag()` for information on usage and format.
126126
*
127127
* @param billing_tag The rvalue reference to the `BillingTag` string or
128-
* `boost::none`.
128+
* `olp::porting::none`.
129129
*/
130130
inline PublishIndexRequest& WithBillingTag(const std::string& billing_tag) {
131131
billing_tag_ = billing_tag;
@@ -138,7 +138,7 @@ class DATASERVICE_WRITE_API PublishIndexRequest {
138138
* @see `GetBillingTag()` for information on usage and format.
139139
*
140140
* @param billing_tag The rvalue reference to the `BillingTag` string or
141-
* `boost::none`.
141+
* `olp::porting::none`.
142142
*/
143143
inline PublishIndexRequest& WithBillingTag(std::string&& billing_tag) {
144144
billing_tag_ = std::move(billing_tag);
@@ -156,7 +156,7 @@ class DATASERVICE_WRITE_API PublishIndexRequest {
156156
*
157157
* @return The request checksum.
158158
*/
159-
inline const boost::optional<std::string>& GetChecksum() const {
159+
inline const porting::optional<std::string>& GetChecksum() const {
160160
return checksum_;
161161
}
162162

@@ -226,9 +226,9 @@ class DATASERVICE_WRITE_API PublishIndexRequest {
226226

227227
std::string layer_id_;
228228

229-
boost::optional<std::string> billing_tag_;
229+
porting::optional<std::string> billing_tag_;
230230

231-
boost::optional<std::string> checksum_;
231+
porting::optional<std::string> checksum_;
232232

233233
Index index_;
234234
};

0 commit comments

Comments
 (0)