This is an automated email from the ASF dual-hosted git repository. szaszm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 2e658d466cadf8b30592f67e6791584980fae4ca Author: Martin Zink <[email protected]> AuthorDate: Fri Apr 14 15:05:25 2023 +0200 MINIFICPP-2095 fix inconsistent naming in C2 machineArch Closes #1556 Signed-off-by: Marton Szasz <[email protected]> --- C2.md | 2 +- .../http-curl/tests/C2VerifyResourceConsumptionInHeartbeat.cpp | 7 ++++--- libminifi/include/core/state/nodes/DeviceInformation.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/C2.md b/C2.md index 71c40f192..82e31495b 100644 --- a/C2.md +++ b/C2.md @@ -134,7 +134,7 @@ configuration produces the following JSON: "deviceInfo": { "systemInfo": { "cpuUtilization": -1, - "machinearch": "x86_64", + "machineArch": "x86_64", "memoryUsage": 13103550464, "operatingSystem": "Linux", "physicalMem": 67024097280, diff --git a/extensions/http-curl/tests/C2VerifyResourceConsumptionInHeartbeat.cpp b/extensions/http-curl/tests/C2VerifyResourceConsumptionInHeartbeat.cpp index c9db85c2b..d9c5cbe82 100644 --- a/extensions/http-curl/tests/C2VerifyResourceConsumptionInHeartbeat.cpp +++ b/extensions/http-curl/tests/C2VerifyResourceConsumptionInHeartbeat.cpp @@ -18,6 +18,7 @@ #undef NDEBUG #include <functional> +#include <utility> #include "TestBase.h" #include "Catch.h" @@ -69,8 +70,8 @@ class ResourceConsumptionInHeartbeatHandler : public HeartbeatHandler { assert(system_info["cpuUtilization"].GetDouble() <= 1.0); } - assert(system_info.HasMember("machinearch")); - assert(system_info["machinearch"].GetStringLength() > 0); + assert(system_info.HasMember("machineArch")); + assert(system_info["machineArch"].GetStringLength() > 0); } static void verifyProcessResourceConsumption(const rapidjson::Document& root, bool firstCall) { @@ -119,7 +120,7 @@ class VerifyResourceConsumptionInHeartbeat : public VerifyC2Base { } void setEventToWaitFor(std::function<bool()> event_to_wait_for) { - event_to_wait_for_ = event_to_wait_for; + event_to_wait_for_ = std::move(event_to_wait_for); } std::function<bool()> event_to_wait_for_; diff --git a/libminifi/include/core/state/nodes/DeviceInformation.h b/libminifi/include/core/state/nodes/DeviceInformation.h index 6938c17ce..1faee8336 100644 --- a/libminifi/include/core/state/nodes/DeviceInformation.h +++ b/libminifi/include/core/state/nodes/DeviceInformation.h @@ -386,7 +386,7 @@ class DeviceInfoNode : public DeviceInformation { SerializedResponseNode serializeArchitectureInformation() const { SerializedResponseNode arch; - arch.name = "machinearch"; + arch.name = "machineArch"; arch.value = utils::OsUtils::getMachineArchitecture(); return arch; }
