From 5f00ef21ac37d831ea87b76c621869cbceed7bf3 Mon Sep 17 00:00:00 2001 From: Andy Ford Date: Sun, 14 Apr 2024 17:38:40 +0100 Subject: [PATCH] style: formatting --- .../integration/OutboundIntegrationMessageHandler.cpp | 2 +- src/utils/log/ApiLogger.cpp | 9 +++++---- test/testingutils/test/ApiTestCase.h | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/plugin/integration/OutboundIntegrationMessageHandler.cpp b/src/plugin/integration/OutboundIntegrationMessageHandler.cpp index cb4616dc..d2438343 100644 --- a/src/plugin/integration/OutboundIntegrationMessageHandler.cpp +++ b/src/plugin/integration/OutboundIntegrationMessageHandler.cpp @@ -28,7 +28,7 @@ namespace UKControllerPlugin::Integration { const auto metadata = nlohmann::json{ {"json_without_strict", - message->ToJson().dump(-1, ' ', false, nlohmann::json::error_handler_t::ignore)}, + message->ToJson().dump(-1, ' ', false, nlohmann::json::error_handler_t::replace)}, {"exception", exception.what()}}; ApiLogger().Log("INTEGRATION_INVALID_JSON", "Failed to log integration message", metadata); diff --git a/src/utils/log/ApiLogger.cpp b/src/utils/log/ApiLogger.cpp index d26a2be8..2dcf4cc6 100644 --- a/src/utils/log/ApiLogger.cpp +++ b/src/utils/log/ApiLogger.cpp @@ -7,14 +7,15 @@ namespace UKControllerPluginUtils::Log { struct ApiLogger::Impl { - [[nodiscard]] auto - CreatePayloadNoMetadata(const std::string& type, const std::string& message) const -> nlohmann::json + [[nodiscard]] + auto CreatePayloadNoMetadata(const std::string& type, const std::string& message) const -> nlohmann::json { return {{"type", type}, {"message", message}, {"metadata", PluginVersionMetadata().dump()}}; } - [[nodiscard]] auto CreatePayload( - const std::string& type, const std::string& message, const nlohmann::json& metadata) const -> nlohmann::json + [[nodiscard]] + auto CreatePayload(const std::string& type, const std::string& message, const nlohmann::json& metadata) const + -> nlohmann::json { auto metadataWithVersion = PluginVersionMetadata(); metadataWithVersion.update(metadata); diff --git a/test/testingutils/test/ApiTestCase.h b/test/testingutils/test/ApiTestCase.h index fc0cb272..5c804608 100644 --- a/test/testingutils/test/ApiTestCase.h +++ b/test/testingutils/test/ApiTestCase.h @@ -27,8 +27,8 @@ namespace UKControllerPluginTest { [[nodiscard]] auto DontExpectApiRequest() -> std::shared_ptr; void ExpectNoApiRequests(); void AwaitApiCallCompletion(); - [[nodiscard]] auto - SettingsProvider() -> testing::NiceMock&; + [[nodiscard]] + auto SettingsProvider() -> testing::NiceMock&; private: std::shared_ptr settings;