Skip to content

Commit 750b641

Browse files
mykhailo-kuchmamykhailo-kuchma
committed
Adapt Version and Volatile layers to use Types.h
Adapted layers implementations classes and tests. Methods in public API do not use const modifier, since it implies that nothing will be changed. Relates-To: OLPEDGE-957 Signed-off-by: Mykhailo Kuchma <[email protected]>
1 parent e21e50d commit 750b641

File tree

13 files changed

+308
-468
lines changed

13 files changed

+308
-468
lines changed

‎olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/VersionedLayerClient.h‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
#include <olp/dataservice/read/PrefetchTileResult.h>
3434
#include <olp/dataservice/read/PrefetchTilesRequest.h>
3535
#include <olp/dataservice/read/Types.h>
36-
#include <olp/dataservice/read/model/Data.h>
37-
#include <olp/dataservice/read/model/Partitions.h>
3836

3937
namespace olp {
4038
namespace dataservice {
@@ -46,27 +44,6 @@ class VersionedLayerClientImpl;
4644
*/
4745
class DATASERVICE_READ_API VersionedLayerClient final {
4846
public:
49-
/// DataResult alias
50-
using DataResult = model::Data;
51-
/// CallbackResponse alias
52-
using CallbackResponse = client::ApiResponse<DataResult, client::ApiError>;
53-
/// Callback alias
54-
using Callback = std::function<void(CallbackResponse response)>;
55-
56-
using PartitionsResult = model::Partitions;
57-
using PartitionsResponse =
58-
client::ApiResponse<PartitionsResult, client::ApiError>;
59-
using PartitionsCallback = std::function<void(PartitionsResponse response)>;
60-
61-
/// PrefetchTileResult alias
62-
using PrefetchTilesResult = std::vector<std::shared_ptr<PrefetchTileResult>>;
63-
/// Alias for the response to the \c PrefetchTileRequest
64-
using PrefetchTilesResponse =
65-
client::ApiResponse<PrefetchTilesResult, client::ApiError>;
66-
/// Alias for the callback to the results of PrefetchTilesResponse
67-
using PrefetchTilesResponseCallback =
68-
std::function<void(const PrefetchTilesResponse& response)>;
69-
7047
/**
7148
* @brief VersionedLayerClient constructor
7249
* @param catalog a catalog that the versioned layer client uses during
@@ -94,7 +71,7 @@ class DATASERVICE_READ_API VersionedLayerClient final {
9471
* @return A token that can be used to cancel this request.
9572
*/
9673
client::CancellationToken GetData(DataRequest data_request,
97-
Callback callback);
74+
DataResponseCallback callback);
9875

9976
/**
10077
* @brief fetches a list partitions for given generic layer asynchronously.
@@ -106,7 +83,7 @@ class DATASERVICE_READ_API VersionedLayerClient final {
10683
* @return A token that can be used to cancel this request
10784
*/
10885
client::CancellationToken GetPartitions(PartitionsRequest partitions_request,
109-
PartitionsCallback callback) const;
86+
PartitionsResponseCallback callback);
11087

11188
/**
11289
* @brief Pre-fetches a set of tiles asychronously.
@@ -126,8 +103,7 @@ class DATASERVICE_READ_API VersionedLayerClient final {
126103
* @return A token that can be used to cancel this request.
127104
*/
128105
client::CancellationToken PrefetchTiles(
129-
PrefetchTilesRequest request,
130-
PrefetchTilesResponseCallback callback) const;
106+
PrefetchTilesRequest request, PrefetchTilesResponseCallback callback);
131107

132108
/**
133109
* @brief Pre-fetches a set of tiles asychronously.
@@ -147,7 +123,7 @@ class DATASERVICE_READ_API VersionedLayerClient final {
147123
* \c CancellableFuture can be used to cancel this request.
148124
*/
149125
client::CancellableFuture<PrefetchTilesResponse> PrefetchTiles(
150-
PrefetchTilesRequest request) const;
126+
PrefetchTilesRequest request);
151127

152128
private:
153129
std::unique_ptr<VersionedLayerClientImpl> impl_;

‎olp-cpp-sdk-dataservice-read/include/olp/dataservice/read/VolatileLayerClient.h‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
#include <olp/core/client/OlpClientSettings.h>
2929
#include <olp/dataservice/read/DataRequest.h>
3030
#include <olp/dataservice/read/PartitionsRequest.h>
31-
#include <olp/dataservice/read/model/Data.h>
32-
#include <olp/dataservice/read/model/Partitions.h>
31+
#include <olp/dataservice/read/Types.h>
3332

3433
namespace olp {
3534
namespace dataservice {
@@ -75,19 +74,6 @@ class VolatileLayerClientImpl;
7574
*/
7675
class DATASERVICE_READ_API VolatileLayerClient final {
7776
public:
78-
/// DataResult alias
79-
using DataResult = model::Data;
80-
/// CallbackResponse alias
81-
using DataResponse = client::ApiResponse<DataResult, client::ApiError>;
82-
/// PartitionResult alias
83-
using PartitionsResult = model::Partitions;
84-
/// CallbackResponse
85-
using PartitionsResponse =
86-
client::ApiResponse<PartitionsResult, client::ApiError>;
87-
/// Callback alias
88-
template <class Response>
89-
using Callback = std::function<void(Response response)>;
90-
9177
/**
9278
* @brief VolatileLayerClient constructor.
9379
* @param catalog a catalog that the volatile layer client uses during
@@ -108,8 +94,8 @@ class DATASERVICE_READ_API VolatileLayerClient final {
10894
* or an error is encountered.
10995
* @return A token that can be used to cancel this request
11096
*/
111-
client::CancellationToken GetPartitions(
112-
PartitionsRequest request, Callback<PartitionsResponse> callback);
97+
client::CancellationToken GetPartitions(PartitionsRequest request,
98+
PartitionsResponseCallback callback);
11399

114100
/**
115101
* @brief Fetches a list partitions for given volatile layer asynchronously.
@@ -133,7 +119,7 @@ class DATASERVICE_READ_API VolatileLayerClient final {
133119
* @return Token that can be used to cancel this request.
134120
*/
135121
olp::client::CancellationToken GetData(DataRequest request,
136-
Callback<DataResponse> callback);
122+
DataResponseCallback callback);
137123

138124
/**
139125
* @brief Fetches data for a partition or data handle asynchronously.

‎olp-cpp-sdk-dataservice-read/src/VersionedLayerClient.cpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,23 @@ VersionedLayerClient::VersionedLayerClient(client::HRN catalog,
3535
VersionedLayerClient::~VersionedLayerClient() = default;
3636

3737
client::CancellationToken VersionedLayerClient::GetData(
38-
DataRequest data_request, Callback callback) {
38+
DataRequest data_request, DataResponseCallback callback) {
3939
return impl_->GetData(std::move(data_request), std::move(callback));
4040
}
4141

4242
client::CancellationToken VersionedLayerClient::GetPartitions(
43-
PartitionsRequest partitions_request, PartitionsCallback callback) const {
43+
PartitionsRequest partitions_request, PartitionsResponseCallback callback) {
4444
return impl_->GetPartitions(std::move(partitions_request),
4545
std::move(callback));
4646
}
4747

4848
client::CancellationToken VersionedLayerClient::PrefetchTiles(
49-
PrefetchTilesRequest request,
50-
PrefetchTilesResponseCallback callback) const {
49+
PrefetchTilesRequest request, PrefetchTilesResponseCallback callback) {
5150
return impl_->PrefetchTiles(std::move(request), std::move(callback));
5251
}
5352

54-
client::CancellableFuture<VersionedLayerClient::PrefetchTilesResponse>
55-
VersionedLayerClient::PrefetchTiles(PrefetchTilesRequest request) const {
53+
client::CancellableFuture<PrefetchTilesResponse>
54+
VersionedLayerClient::PrefetchTiles(PrefetchTilesRequest request) {
5655
return impl_->PrefetchTiles(std::move(request));
5756
}
5857

‎olp-cpp-sdk-dataservice-read/src/VersionedLayerClientImpl.cpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ VersionedLayerClientImpl::~VersionedLayerClientImpl() {
7676
}
7777

7878
client::CancellationToken VersionedLayerClientImpl::GetPartitions(
79-
PartitionsRequest partitions_request, PartitionsCallback callback) const {
79+
PartitionsRequest partitions_request, PartitionsResponseCallback callback) {
8080
partitions_request.WithLayerId(layer_id_);
8181
client::CancellationToken token;
8282
int64_t request_key = pending_requests_->GenerateRequestPlaceholder();
@@ -107,8 +107,8 @@ client::CancellationToken VersionedLayerClientImpl::GetPartitions(
107107
}
108108

109109
client::CancellationToken VersionedLayerClientImpl::GetData(
110-
DataRequest request, Callback callback) const {
111-
auto add_task = [&](DataRequest& request, Callback callback) {
110+
DataRequest request, DataResponseCallback callback) {
111+
auto add_task = [&](DataRequest& request, DataResponseCallback callback) {
112112
auto catalog = catalog_;
113113
auto layer_id = layer_id_;
114114
auto settings = *settings_;
@@ -148,8 +148,7 @@ client::CancellationToken VersionedLayerClientImpl::GetData(
148148
}
149149

150150
client::CancellationToken VersionedLayerClientImpl::PrefetchTiles(
151-
PrefetchTilesRequest request,
152-
PrefetchTilesResponseCallback callback) const {
151+
PrefetchTilesRequest request, PrefetchTilesResponseCallback callback) {
153152
const int64_t request_key = pending_requests_->GenerateRequestPlaceholder();
154153
auto pending_requests = pending_requests_;
155154
auto request_callback = [=](PrefetchTilesResponse response) {
@@ -166,7 +165,7 @@ client::CancellationToken VersionedLayerClientImpl::PrefetchTiles(
166165
}
167166

168167
client::CancellableFuture<PrefetchTilesResponse>
169-
VersionedLayerClientImpl::PrefetchTiles(PrefetchTilesRequest request) const {
168+
VersionedLayerClientImpl::PrefetchTiles(PrefetchTilesRequest request) {
170169
auto promise = std::make_shared<std::promise<PrefetchTilesResponse>>();
171170
auto cancel_token = PrefetchTiles(std::move(request),
172171
[promise](PrefetchTilesResponse response) {

‎olp-cpp-sdk-dataservice-read/src/VersionedLayerClientImpl.h‎

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121

2222
#include <memory>
2323

24-
#include <PendingRequests.h>
25-
#include <olp/core/client/ApiError.h>
26-
#include <olp/core/client/ApiResponse.h>
2724
#include <olp/core/client/CancellationContext.h>
2825
#include <olp/core/client/CancellationToken.h>
2926
#include <olp/core/client/HRN.h>
@@ -32,8 +29,9 @@
3229
#include <olp/dataservice/read/PartitionsRequest.h>
3330
#include <olp/dataservice/read/PrefetchTileResult.h>
3431
#include <olp/dataservice/read/PrefetchTilesRequest.h>
35-
#include <olp/dataservice/read/model/Data.h>
36-
#include <olp/dataservice/read/model/Partitions.h>
32+
#include <olp/dataservice/read/Types.h>
33+
34+
#include "PendingRequests.h"
3735

3836
namespace olp {
3937
namespace thread {
@@ -49,44 +47,23 @@ class PrefetchTilesProvider;
4947

5048
class VersionedLayerClientImpl {
5149
public:
52-
/// DataResult alias
53-
using DataResult = model::Data;
54-
/// CallbackResponse alias
55-
using CallbackResponse = client::ApiResponse<DataResult, client::ApiError>;
56-
/// Callback alias
57-
using Callback = std::function<void(CallbackResponse response)>;
58-
59-
using PartitionsResult = model::Partitions;
60-
using PartitionsResponse =
61-
client::ApiResponse<PartitionsResult, client::ApiError>;
62-
using PartitionsCallback = std::function<void(PartitionsResponse response)>;
63-
64-
/// PrefetchTileResult alias
65-
using PrefetchTilesResult = std::vector<std::shared_ptr<PrefetchTileResult>>;
66-
/// Alias for the response to the \c PrefetchTileRequest
67-
using PrefetchTilesResponse =
68-
client::ApiResponse<PrefetchTilesResult, client::ApiError>;
69-
/// Alias for the callback to the results of PrefetchTilesResponse
70-
using PrefetchTilesResponseCallback =
71-
std::function<void(const PrefetchTilesResponse& response)>;
72-
7350
VersionedLayerClientImpl(client::HRN catalog, std::string layer_id,
7451
client::OlpClientSettings settings);
7552

7653
virtual ~VersionedLayerClientImpl();
7754

7855
virtual client::CancellationToken GetData(DataRequest data_request,
79-
Callback callback) const;
56+
DataResponseCallback callback);
8057

8158
virtual client::CancellationToken GetPartitions(
82-
PartitionsRequest partitions_request, PartitionsCallback callback) const;
59+
PartitionsRequest partitions_request,
60+
PartitionsResponseCallback callback);
8361

8462
virtual client::CancellationToken PrefetchTiles(
85-
PrefetchTilesRequest request,
86-
PrefetchTilesResponseCallback callback) const;
63+
PrefetchTilesRequest request, PrefetchTilesResponseCallback callback);
8764

8865
virtual client::CancellableFuture<PrefetchTilesResponse> PrefetchTiles(
89-
PrefetchTilesRequest request) const;
66+
PrefetchTilesRequest request);
9067

9168
protected:
9269
client::HRN catalog_;

‎olp-cpp-sdk-dataservice-read/src/VolatileLayerClient.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@ VolatileLayerClient::VolatileLayerClient(client::HRN catalog,
3535
VolatileLayerClient::~VolatileLayerClient() = default;
3636

3737
client::CancellationToken VolatileLayerClient::GetPartitions(
38-
PartitionsRequest request, Callback<PartitionsResponse> callback) {
38+
PartitionsRequest request, PartitionsResponseCallback callback) {
3939
return impl_->GetPartitions(std::move(request), std::move(callback));
4040
}
4141

42-
olp::client::CancellableFuture<VolatileLayerClient::PartitionsResponse>
42+
olp::client::CancellableFuture<PartitionsResponse>
4343
VolatileLayerClient::GetPartitions(PartitionsRequest request) {
4444
return impl_->GetPartitions(std::move(request));
4545
}
4646

4747
client::CancellationToken VolatileLayerClient::GetData(
48-
DataRequest request, Callback<DataResponse> callback) {
48+
DataRequest request, DataResponseCallback callback) {
4949
return impl_->GetData(std::move(request), std::move(callback));
5050
}
5151

52-
olp::client::CancellableFuture<VolatileLayerClient::DataResponse>
53-
VolatileLayerClient::GetData(DataRequest request) {
52+
olp::client::CancellableFuture<DataResponse> VolatileLayerClient::GetData(
53+
DataRequest request) {
5454
return impl_->GetData(std::move(request));
5555
}
5656
} // namespace read

‎olp-cpp-sdk-dataservice-read/src/VolatileLayerClientImpl.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ VolatileLayerClientImpl::~VolatileLayerClientImpl() {
7070
}
7171

7272
client::CancellationToken VolatileLayerClientImpl::GetPartitions(
73-
PartitionsRequest request, Callback<PartitionsResponse> callback) {
73+
PartitionsRequest request, PartitionsResponseCallback callback) {
7474
request.WithLayerId(layer_id_);
7575
client::CancellationToken token;
7676
int64_t request_key = pending_requests_->GenerateRequestPlaceholder();
@@ -110,8 +110,8 @@ VolatileLayerClientImpl::GetPartitions(PartitionsRequest request) {
110110
}
111111

112112
client::CancellationToken VolatileLayerClientImpl::GetData(
113-
DataRequest request, Callback<DataResponse> callback) {
114-
auto add_task = [&](DataRequest& request, Callback<DataResponse> callback) {
113+
DataRequest request, DataResponseCallback callback) {
114+
auto add_task = [&](DataRequest& request, DataResponseCallback callback) {
115115
auto catalog = catalog_;
116116
auto layer_id = layer_id_;
117117
auto settings = *settings_;

‎olp-cpp-sdk-dataservice-read/src/VolatileLayerClientImpl.h‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,12 @@
1919

2020
#pragma once
2121

22-
#include <olp/core/client/ApiError.h>
23-
#include <olp/core/client/ApiResponse.h>
2422
#include <olp/core/client/CancellationToken.h>
2523
#include <olp/core/client/HRN.h>
2624
#include <olp/core/client/OlpClientSettings.h>
2725
#include <olp/dataservice/read/DataRequest.h>
2826
#include <olp/dataservice/read/PartitionsRequest.h>
29-
#include <olp/dataservice/read/model/Data.h>
30-
#include <olp/dataservice/read/model/Partitions.h>
27+
#include <olp/dataservice/read/Types.h>
3128

3229
#include "PendingRequests.h"
3330

@@ -42,34 +39,21 @@ class PartitionsRepository;
4239

4340
class VolatileLayerClientImpl {
4441
public:
45-
/// DataResult alias
46-
using DataResult = model::Data;
47-
/// CallbackResponse alias
48-
using DataResponse = client::ApiResponse<DataResult, client::ApiError>;
49-
/// PartitionResult alias
50-
using PartitionsResult = model::Partitions;
51-
/// CallbackResponse
52-
using PartitionsResponse =
53-
client::ApiResponse<PartitionsResult, client::ApiError>;
54-
/// Callback alias
55-
template <class Response>
56-
using Callback = std::function<void(Response response)>;
57-
5842
VolatileLayerClientImpl(client::HRN catalog, std::string layer_id,
5943
client::OlpClientSettings settings);
6044

61-
~VolatileLayerClientImpl();
45+
virtual ~VolatileLayerClientImpl();
6246

63-
client::CancellationToken GetPartitions(
64-
PartitionsRequest request, Callback<PartitionsResponse> callback);
47+
virtual client::CancellationToken GetPartitions(
48+
PartitionsRequest request, PartitionsResponseCallback callback);
6549

66-
client::CancellableFuture<PartitionsResponse> GetPartitions(
50+
virtual client::CancellableFuture<PartitionsResponse> GetPartitions(
6751
PartitionsRequest request);
6852

69-
client::CancellationToken GetData(DataRequest request,
70-
Callback<DataResponse> callback);
53+
virtual client::CancellationToken GetData(DataRequest request,
54+
DataResponseCallback callback);
7155

72-
client::CancellableFuture<DataResponse> GetData(DataRequest request);
56+
virtual client::CancellableFuture<DataResponse> GetData(DataRequest request);
7357

7458
private:
7559
client::HRN catalog_;

‎olp-cpp-sdk-dataservice-read/tests/VolatileLayerClientImplTest.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ namespace {
3030
using namespace olp::dataservice::read;
3131
using namespace ::testing;
3232
using namespace olp::tests::common;
33-
using DataResponse = VolatileLayerClientImpl::DataResponse;
3433

3534
constexpr auto kUrlLookupVolatileBlob =
3635
R"(https://api-lookup.data.api.platform.here.com/lookup/v1/resources/hrn:here:data:::hereos-internal-test-v2/apis/volatile-blob/v1)";

0 commit comments

Comments
 (0)