From 1c7736b8376a97853ea59748e4feb6b9999f25b0 Mon Sep 17 00:00:00 2001 From: John Turner <7strbass@gmail.com> Date: Wed, 11 Dec 2024 09:32:09 -0500 Subject: [PATCH] --update method name for SensorAttributesManager --- .../managers/SensorAttributesManager.cpp | 2 +- .../managers/SensorAttributesManager.h | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/esp/metadata/managers/SensorAttributesManager.cpp b/src/esp/metadata/managers/SensorAttributesManager.cpp index 6df662eac3..a2ce85abc1 100644 --- a/src/esp/metadata/managers/SensorAttributesManager.cpp +++ b/src/esp/metadata/managers/SensorAttributesManager.cpp @@ -158,7 +158,7 @@ AbstractSensorAttributes::ptr SensorAttributesManager::buildObjectFromJSONDoc( return sensorAttributes; } // SensorAttributesManager::buildObjectFromJSONDoc -void SensorAttributesManager::setValsFromJSONDoc( +void SensorAttributesManager::setValsFromJSONDocInternal( AbstractSensorAttributes::ptr attribs, const io::JsonGenericValue& jsonConfig) { // TODO support loading values from JSON docs for each type of diff --git a/src/esp/metadata/managers/SensorAttributesManager.h b/src/esp/metadata/managers/SensorAttributesManager.h index 3c40bb58cc..296d3c58e4 100644 --- a/src/esp/metadata/managers/SensorAttributesManager.h +++ b/src/esp/metadata/managers/SensorAttributesManager.h @@ -98,15 +98,6 @@ class SensorAttributesManager const std::string& filename, const io::JsonGenericValue& jsonConfig) override; - /** - * @brief Method to take an existing attributes and set its values from passed - * json config file. - * @param attribs (out) an existing attributes to be modified. - * @param jsonConfig json document to parse - */ - void setValsFromJSONDoc(attributes::AbstractSensorAttributes::ptr attribs, - const io::JsonGenericValue& jsonConfig) override; - /** * @brief This function will be called to finalize attributes' paths before * registration, moving fully qualified paths to the appropriate hidden @@ -119,6 +110,16 @@ class SensorAttributesManager attributes) const override {} protected: + /** + * @brief Internally accessed from AbstractAttributesManager. Method to take + * an existing attributes and set its values from passed json config file. + * @param attribs (out) an existing attributes to be modified. + * @param jsonConfig json document to parse + */ + void setValsFromJSONDocInternal( + attributes::AbstractSensorAttributes::ptr attribs, + const io::JsonGenericValue& jsonConfig) override; + /** * @brief Internal only. Create an attributes from a SensorSpec. *