You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ph...@apache.org on 2018/10/04 16:44:16 UTC
nifi-minifi-cpp git commit: MINIFICPP-627 - Remove unnecessary
ternary operators, variable shadowing
Repository: nifi-minifi-cpp
Updated Branches:
refs/heads/master 7e802afb7 -> 8bb1ac747
MINIFICPP-627 - Remove unnecessary ternary operators, variable shadowing
This closes #408.
Signed-off-by: Marc Parisi <ph...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/8bb1ac74
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/8bb1ac74
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/8bb1ac74
Branch: refs/heads/master
Commit: 8bb1ac747e6c89b79de8c8a79d4c15f6228a2dc9
Parents: 7e802af
Author: Arpad Boda <ab...@hortonworks.com>
Authored: Wed Oct 3 11:31:10 2018 +0200
Committer: Marc Parisi <ph...@apache.org>
Committed: Thu Oct 4 12:39:03 2018 -0400
----------------------------------------------------------------------
libminifi/src/c2/C2Agent.cpp | 2 +-
libminifi/src/c2/protocols/RESTProtocol.cpp | 16 ++++++++--------
.../src/controllers/LinuxPowerManagementService.cpp | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/8bb1ac74/libminifi/src/c2/C2Agent.cpp
----------------------------------------------------------------------
diff --git a/libminifi/src/c2/C2Agent.cpp b/libminifi/src/c2/C2Agent.cpp
index 1ef8eea..10d8d29 100644
--- a/libminifi/src/c2/C2Agent.cpp
+++ b/libminifi/src/c2/C2Agent.cpp
@@ -631,7 +631,7 @@ void C2Agent::handle_update(const C2ContentResponse &resp) {
auto isPartialStr = resp.operation_arguments.find("partial");
bool partial_update = false;
if (isPartialStr != std::end(resp.operation_arguments)) {
- partial_update = utils::StringUtils::equalsIgnoreCase(isPartialStr->second.to_string(), "true") ? true : false;
+ partial_update = utils::StringUtils::equalsIgnoreCase(isPartialStr->second.to_string(), "true");
}
if (location != resp.operation_arguments.end()) {
// we will not have a raw payload
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/8bb1ac74/libminifi/src/c2/protocols/RESTProtocol.cpp
----------------------------------------------------------------------
diff --git a/libminifi/src/c2/protocols/RESTProtocol.cpp b/libminifi/src/c2/protocols/RESTProtocol.cpp
index d1e8b9a..76dbae1 100644
--- a/libminifi/src/c2/protocols/RESTProtocol.cpp
+++ b/libminifi/src/c2/protocols/RESTProtocol.cpp
@@ -160,12 +160,12 @@ rapidjson::Value RESTProtocol::getStringValue(const std::string& value, rapidjso
void RESTProtocol::mergePayloadContent(rapidjson::Value &target, const C2Payload &payload, rapidjson::Document::AllocatorType &alloc) {
const std::vector<C2ContentResponse> &content = payload.getContent();
- bool all_empty = content.size() > 0 ? true : false;
+ bool all_empty = !content.empty();
bool is_parent_array = target.IsArray();
for (const auto &payload_content : content) {
- for (auto content : payload_content.operation_arguments) {
- if (!content.second.empty()) {
+ for (const auto &op_arg : payload_content.operation_arguments) {
+ if (!op_arg.second.empty()) {
all_empty = false;
break;
}
@@ -181,9 +181,9 @@ void RESTProtocol::mergePayloadContent(rapidjson::Value &target, const C2Payload
}
rapidjson::Value arr(rapidjson::kArrayType);
for (const auto &payload_content : content) {
- for (auto content : payload_content.operation_arguments) {
+ for (const auto& op_arg : payload_content.operation_arguments) {
rapidjson::Value keyVal;
- keyVal.SetString(content.first.c_str(), content.first.length(), alloc);
+ keyVal.SetString(op_arg.first.c_str(), op_arg.first.length(), alloc);
if (is_parent_array)
target.PushBack(keyVal, alloc);
else
@@ -201,9 +201,9 @@ void RESTProtocol::mergePayloadContent(rapidjson::Value &target, const C2Payload
rapidjson::Value payload_content_values(rapidjson::kObjectType);
bool use_sub_option = true;
if (payload_content.op == payload.getOperation()) {
- for (auto content : payload_content.operation_arguments) {
- if (!content.second.empty()) {
- setJsonStr(content.first, content.second, target, alloc);
+ for (const auto& op_arg : payload_content.operation_arguments) {
+ if (!op_arg.second.empty()) {
+ setJsonStr(op_arg.first, op_arg.second, target, alloc);
}
}
} else {
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/8bb1ac74/libminifi/src/controllers/LinuxPowerManagementService.cpp
----------------------------------------------------------------------
diff --git a/libminifi/src/controllers/LinuxPowerManagementService.cpp b/libminifi/src/controllers/LinuxPowerManagementService.cpp
index a54cb7b..ae0651b 100644
--- a/libminifi/src/controllers/LinuxPowerManagementService.cpp
+++ b/libminifi/src/controllers/LinuxPowerManagementService.cpp
@@ -80,7 +80,7 @@ bool LinuxPowerManagerService::shouldReduce() {
auto prev_level = battery_level_.load();
- bool all_discharging = paths_.size() > 0 ? true : false;
+ bool all_discharging = !paths_.empty();
int battery_sum = 0;
for (const auto path_pair : paths_) {