review changes

Author: martinzink

extension-framework/cpp-extension-lib/include/api/utils/Proxy.h

@@ -33,10 +33,10 @@ struct BasicAuthCredentials {
 };
 
 struct ProxyData {
+  ProxyType proxy_type;
   std::string host;
   uint16_t port;
   std::optional<BasicAuthCredentials> proxy_credentials;
-  ProxyType proxy_type;
 };
 
 }  // namespace org::apache::nifi::minifi::api::utils

extensions/gcp/processors/DeleteGCSObject.cpp

@@ -17,7 +17,6 @@
 
 #include "DeleteGCSObject.h"
 
-
 #include "../GCPAttributes.h"
 #include "api/core/ProcessContext.h"
 #include "api/core/ProcessSession.h"
@@ -56,7 +55,7 @@ MinifiStatus DeleteGCSObject::onTriggerImpl(api::core::ProcessContext& context,
     } else {
       logger_->log_error("Invalid generation: {}", *object_generation_str);
       session.transfer(std::move(flow_file), Failure);
-    return MINIFI_STATUS_SUCCESS;
+      return MINIFI_STATUS_SUCCESS;
     }
   }
 

extensions/gcp/processors/FetchGCSObject.cpp

@@ -82,9 +82,7 @@ class FetchFromGCSCallback {
 
 MinifiStatus FetchGCSObject::onScheduleImpl(api::core::ProcessContext& context) {
   const auto status = GCSProcessor::onScheduleImpl(context);
-  if (MINIFI_STATUS_SUCCESS != status) {
-    return status;
-  }
+  if (MINIFI_STATUS_SUCCESS != status) { return status; }
   if (auto encryption_key = context.getProperty(EncryptionKey, nullptr)) {
     try {
       encryption_key_ = gcs::EncryptionKey::FromBase64Key(*encryption_key);
@@ -121,19 +119,18 @@ MinifiStatus FetchGCSObject::onTriggerImpl(api::core::ProcessContext& context, a
   FetchFromGCSCallback callback(client, *bucket, *object_name);
   callback.setEncryptionKey(encryption_key_);
 
-  if (const auto object_generation_str =  api::utils::parseOptionalProperty(context, ObjectGeneration, &flow_file); object_generation_str && !object_generation_str->empty()) {
+  if (const auto object_generation_str = api::utils::parseOptionalProperty(context, ObjectGeneration, &flow_file); object_generation_str && !object_generation_str->empty()) {
     if (const auto geni64 = parsing::parseIntegral<int64_t>(*object_generation_str)) {
       gcs::Generation generation = gcs::Generation{*geni64};
       callback.setGeneration(generation);
 
     } else {
       logger_->log_error("Invalid generation: {}", *object_generation_str);
       session.transfer(std::move(flow_file), Failure);
-    return MINIFI_STATUS_SUCCESS;
+      return MINIFI_STATUS_SUCCESS;
     }
   }
 
-
   session.write(flow_file, std::ref(callback));
   if (!callback.getStatus().ok()) {
     session.setAttribute(flow_file, GCS_STATUS_MESSAGE, callback.getStatus().message());
@@ -144,12 +141,15 @@ MinifiStatus FetchGCSObject::onTriggerImpl(api::core::ProcessContext& context, a
     return MINIFI_STATUS_SUCCESS;
   }
 
-  if (auto generation = callback.getGeneration())
+  if (auto generation = callback.getGeneration()) {
     session.setAttribute(flow_file, GCS_GENERATION, std::to_string(*generation));
-  if (auto meta_generation = callback.getMetaGeneration())
+  }
+  if (auto meta_generation = callback.getMetaGeneration()) {
     session.setAttribute(flow_file, GCS_META_GENERATION, std::to_string(*meta_generation));
-  if (auto storage_class = callback.getStorageClass())
+  }
+  if (auto storage_class = callback.getStorageClass()) {
     session.setAttribute(flow_file, GCS_STORAGE_CLASS, *storage_class);
+  }
   session.transfer(std::move(flow_file), Success);
   return MINIFI_STATUS_SUCCESS;
 }

extensions/gcp/processors/GCSProcessor.cpp

@@ -25,8 +25,7 @@ namespace gcs = ::google::cloud::storage;
 namespace org::apache::nifi::minifi::extensions::gcp {
 
 std::shared_ptr<google::cloud::Credentials> GCSProcessor::getCredentials(const api::core::ProcessContext& context) {
-  if (const auto gcp_credentials_controller_service = api::utils::parseOptionalControllerService<GCPCredentialsControllerService>(context,
-          GCPCredentials)) {
+  if (const auto gcp_credentials_controller_service = api::utils::parseOptionalControllerService<GCPCredentialsControllerService>(context, GCPCredentials)) {
     return gcp_credentials_controller_service->getCredentials();
   }
   return nullptr;