Second batch of SonarCube reported issues fixed. (#1288)

This commit fixes some of SonarCube reported issues with major and
minor levels including:
- Effective move of passed by value parameters.
- Moved ougth to be static methods to anonymous namespace.
- Initialize variables and members before usage.

Relates-To: OAM-1366

Signed-off-by: Andrei Popescu <[email protected]>

Author: Andrei Popescu

olp-cpp-sdk-dataservice-read/src/TaskSink.cpp

@@ -26,7 +26,9 @@ namespace dataservice {
 namespace read {
 namespace {
 constexpr auto kLogTag = "TaskSink";
-}
+
+void ExecuteTask(client::TaskContext task) { task.Execute(); }
+}  // namespace
 
 TaskSink::TaskSink(std::shared_ptr<thread::TaskScheduler> task_scheduler)
     : task_scheduler_(std::move(task_scheduler)),
@@ -93,8 +95,6 @@ bool TaskSink::ScheduleTask(client::TaskContext task, uint32_t priority) {
   return true;
 }
 
-void TaskSink::ExecuteTask(client::TaskContext task) { task.Execute(); }
-
 }  // namespace read
 }  // namespace dataservice
 }  // namespace olp

olp-cpp-sdk-dataservice-read/src/TaskSink.h

@@ -72,8 +72,6 @@ class TaskSink {
 
   bool ScheduleTask(client::TaskContext task, uint32_t priority);
 
-  void ExecuteTask(client::TaskContext task);
-
   const std::shared_ptr<thread::TaskScheduler> task_scheduler_;
   const std::shared_ptr<client::PendingRequests> pending_requests_;
   std::mutex mutex_;

olp-cpp-sdk-dataservice-read/src/repositories/QuadTreeIndex.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 HERE Europe B.V.
+ * Copyright (C) 2020-2021 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.
@@ -29,6 +29,9 @@
 #include "BlobDataReader.h"
 #include "BlobDataWriter.h"
 
+namespace olp {
+namespace dataservice {
+namespace read {
 namespace {
 constexpr auto kParentQuadsKey = "parentQuads";
 constexpr auto kSubQuadsKey = "subQuads";
@@ -70,11 +73,18 @@ olp::dataservice::read::QuadTreeIndex::IndexData ParseCommonIndexData(
   }
   return data;
 }
-}  // namespace
 
-namespace olp {
-namespace dataservice {
-namespace read {
+bool WriteIndexData(const QuadTreeIndex::IndexData& data,
+                    BlobDataWriter& writer) {
+  bool success = writer.Write(data.version);
+  success &= writer.Write(data.data_size);
+  success &= writer.Write(data.compressed_data_size);
+  success &= writer.Write(data.data_handle);
+  success &= writer.Write(data.checksum);
+  success &= writer.Write(data.additional_metadata);
+  return success;
+}
+}  // namespace
 
 QuadTreeIndex::QuadTreeIndex(cache::KeyValueCache::ValueTypePtr data) {
   if (data == nullptr || data->empty()) {
@@ -158,17 +168,6 @@ bool QuadTreeIndex::ReadIndexData(QuadTreeIndex::IndexData& data,
   return success;
 }
 
-bool QuadTreeIndex::WriteIndexData(const IndexData& data,
-                                   BlobDataWriter& writer) {
-  bool success = writer.Write(data.version);
-  success &= writer.Write(data.data_size);
-  success &= writer.Write(data.compressed_data_size);
-  success &= writer.Write(data.data_handle);
-  success &= writer.Write(data.checksum);
-  success &= writer.Write(data.additional_metadata);
-  return success;
-}
-
 void QuadTreeIndex::CreateBlob(olp::geo::TileKey root, int depth,
                                std::vector<IndexData> parents,
                                std::vector<IndexData> subs) {

olp-cpp-sdk-dataservice-read/src/repositories/QuadTreeIndex.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 HERE Europe B.V.
+ * Copyright (C) 2020-2021 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.
@@ -126,7 +126,6 @@ class QuadTreeIndex {
     return reinterpret_cast<const uint8_t*>(data_) + size_;
   }
 
-  bool WriteIndexData(const IndexData& data, BlobDataWriter& writer);
   bool ReadIndexData(IndexData& data, uint32_t offset) const;
 
   DataHeader* data_ = nullptr;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 HERE Europe B.V.
+ * Copyright (C) 2019-2021 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.
@@ -49,15 +49,15 @@ enum class DATASERVICE_WRITE_API IndexType {
   /**
    * @brief The index value of the HERE tile type.
    *
-   * Represents the tile ID in the HERE map tiling scheme. 
+   * Represents the tile ID in the HERE map tiling scheme.
    */
   Heretile,
 
-
   /**
    * @brief The index value of the time window type.
    *
-   * The minimum value is 10 minutes, and the maximum is 24 hours (1440 minutes).
+   * The minimum value is 10 minutes, and the maximum is 24 hours (1440
+   * minutes).
    */
   TimeWindow,
 
@@ -102,7 +102,7 @@ class DATASERVICE_WRITE_API IndexValue {
 /// Represents values that are not supported by the index layer.
 class DATASERVICE_WRITE_API UnsupportedIndexValue final : public IndexValue {
  public:
- /**
+  /**
    * @brief Creates the `UnsupportedIndexValue` instance.
    *
    * @param type The`IndexType` instance.
@@ -199,9 +199,8 @@ class DATASERVICE_WRITE_API StringIndexValue final : public IndexValue {
    * @param stringValue The string value.
    * @param type The `IndexType` instance.
    */
-  StringIndexValue(std::string stringValue, IndexType type) : IndexValue(type) {
-    stringValue_ = std::move(stringValue);
-  }
+  StringIndexValue(std::string stringValue, IndexType type)
+      : IndexValue(type), stringValue_{std::move(stringValue)} {}
 
   /**
    * @brief Gets the string value of the index layer.
@@ -239,9 +238,7 @@ class DATASERVICE_WRITE_API TimeWindowIndexValue final : public IndexValue {
    * @param type  The `IndexType` instance.
    */
   TimeWindowIndexValue(int64_t timeWindowValue, IndexType type)
-      : IndexValue(type) {
-    timeWindowValue_ = std::move(timeWindowValue);
-  }
+      : IndexValue(type), timeWindowValue_{std::move(timeWindowValue)} {}
 
   /**
    * @brief Gets the time vindow value of the index layer.
@@ -251,7 +248,8 @@ class DATASERVICE_WRITE_API TimeWindowIndexValue final : public IndexValue {
   const int64_t& GetValue() const { return timeWindowValue_; }
 
   /**
-   * @brief Gets a mutable reference to the time window value of the index layer.
+   * @brief Gets a mutable reference to the time window value of the index
+   * layer.
    *
    * @return The mutable reference to the time window value.
    */
@@ -276,9 +274,8 @@ class DATASERVICE_WRITE_API HereTileIndexValue final : public IndexValue {
    * @param hereTileValue The HERE tile value.
    * @param type The `IndexType` instance.
    */
-  HereTileIndexValue(int64_t hereTileValue, IndexType type) : IndexValue(type) {
-    hereTileValue_ = std::move(hereTileValue);
-  }
+  HereTileIndexValue(int64_t hereTileValue, IndexType type)
+      : IndexValue(type), hereTileValue_{std::move(hereTileValue)} {}
 
   /**
    * @brief Gets the HERE tile value of the index layer.
@@ -329,7 +326,7 @@ class DATASERVICE_WRITE_API Index final {
    */
   Index(std::string uuid,
         std::map<IndexName, std::shared_ptr<IndexValue>> indexFields)
-      : id_(uuid), indexFields_(indexFields) {}
+      : id_(std::move(uuid)), indexFields_(std::move(indexFields)) {}
 
  private:
   boost::optional<std::string> checksum_;

olp-cpp-sdk-dataservice-write/src/CatalogSettings.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 HERE Europe B.V.
+ * Copyright (C) 2020-2021 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.
@@ -47,8 +47,7 @@ class CatalogSettings {
   using LayerSettingsResult =
       client::ApiResponse<LayerSettings, client::ApiError>;
 
-  CatalogSettings(const client::HRN catalog,
-                  client::OlpClientSettings settings);
+  CatalogSettings(client::HRN catalog, client::OlpClientSettings settings);
 
   LayerSettingsResult GetLayerSettings(client::CancellationContext context,
                                        BillingTag billing_tag,

olp-cpp-sdk-dataservice-write/src/IndexLayerClient.cpp

@@ -26,7 +26,8 @@ namespace dataservice {
 namespace write {
 IndexLayerClient::IndexLayerClient(client::HRN catalog,
                                    client::OlpClientSettings settings)
-    : impl_(std::make_shared<IndexLayerClientImpl>(catalog, settings)) {}
+    : impl_(std::make_shared<IndexLayerClientImpl>(std::move(catalog),
+                                                   std::move(settings))) {}
 
 void IndexLayerClient::CancelPendingRequests() {
   impl_->CancelPendingRequests();

olp-cpp-sdk-dataservice-write/src/IndexLayerClientImpl.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 HERE Europe B.V.
+ * Copyright (C) 2019-2021 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.
@@ -47,9 +47,9 @@ namespace write {
 
 IndexLayerClientImpl::IndexLayerClientImpl(client::HRN catalog,
                                            client::OlpClientSettings settings)
-    : catalog_(catalog),
-      catalog_settings_(catalog, settings),
-      settings_(settings),
+    : catalog_(std::move(catalog)),
+      catalog_settings_(catalog_, settings),
+      settings_(std::move(settings)),
       apiclient_config_(nullptr),
       apiclient_blob_(nullptr),
       apiclient_index_(nullptr),

olp-cpp-sdk-dataservice-write/src/StreamLayerClientImpl.cpp

@@ -62,9 +62,9 @@ constexpr int64_t kTwentyMib = 20971520;  // 20 MiB
 StreamLayerClientImpl::StreamLayerClientImpl(
     client::HRN catalog, StreamLayerClientSettings client_settings,
     client::OlpClientSettings settings)
-    : catalog_(catalog),
-      settings_(settings),
-      catalog_settings_(catalog, settings),
+    : catalog_(std::move(catalog)),
+      settings_(std::move(settings)),
+      catalog_settings_(catalog_, settings_),
       cache_(settings_.cache),
       cache_mutex_(),
       stream_client_settings_(std::move(client_settings)),

olp-cpp-sdk-dataservice-write/src/VersionedLayerClientImpl.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 HERE Europe B.V.
+ * Copyright (C) 2019-2021 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.
@@ -47,9 +47,9 @@ namespace write {
 
 VersionedLayerClientImpl::VersionedLayerClientImpl(
     client::HRN catalog, client::OlpClientSettings settings)
-    : catalog_(catalog),
-      settings_(settings),
-      catalog_settings_(catalog, settings),
+    : catalog_(std::move(catalog)),
+      settings_(std::move(settings)),
+      catalog_settings_(catalog_, settings_),
       apiclient_blob_(nullptr),
       apiclient_config_(nullptr),
       apiclient_metadata_(nullptr),