diff options
Diffstat (limited to 'src/components/formatters/include')
4 files changed, 24 insertions, 10 deletions
diff --git a/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv1.h b/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv1.h index d2fdf87957..cd3e50212a 100644 --- a/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv1.h +++ b/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv1.h @@ -126,11 +126,14 @@ class CFormatterJsonSDLRPCv1 : public CFormatterJsonBase { * * @param obj input SmartObject * @param outStr resulting JSON string + * @param remove_unknown_parameters contains true if need to remove unknown + *parameters * @return true if success, false otherwise */ static bool toString( const ns_smart_device_link::ns_smart_objects::SmartObject& obj, - std::string& outStr); + std::string& outStr, + const bool remove_unknown_parameters = true); /** * @brief Creates a SmartObject from a JSON string. @@ -151,12 +154,15 @@ class CFormatterJsonSDLRPCv1 : public CFormatterJsonBase { * @param schema Smart schema which describes 'fake' smart object to be *formatted * @param outStr Resulting JSON string + * @param remove_unknown_parameters contains true if need to remove unknown + *parameters * @return formatting error code */ static tMetaFormatterErrorCode MetaFormatToString( const ns_smart_device_link::ns_smart_objects::SmartObject& object, const ns_smart_device_link::ns_smart_objects::CSmartSchema& schema, - std::string& outStr); + std::string& outStr, + const bool remove_unknown_parameters = true); }; // ---------------------------------------------------------------------------- diff --git a/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv2.h b/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv2.h index e248954552..f86e4e51cb 100644 --- a/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv2.h +++ b/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv2.h @@ -73,11 +73,14 @@ class CFormatterJsonSDLRPCv2 : public CFormatterJsonBase { * * @param obj input SmartObject * @param outStr resulting JSON string + * @param remove_unknown_parameters contains true if need to remove unknown + *parameters * @return true if success, false otherwise */ static bool toString( const ns_smart_device_link::ns_smart_objects::SmartObject& obj, - std::string& outStr); + std::string& outStr, + const bool remove_unknown_parameters = true); /** * @brief Creates a SmartObject from a JSON string. @@ -128,12 +131,15 @@ class CFormatterJsonSDLRPCv2 : public CFormatterJsonBase { * @param schema Smart schema which describes 'fake' smart object to be *formatted * @param outStr Resulting JSON string + * @param remove_unknown_parameters contains true if need to remove unknown + *parameters * @return formatting error code */ static tMetaFormatterErrorCode MetaFormatToString( const ns_smart_device_link::ns_smart_objects::SmartObject& object, const ns_smart_device_link::ns_smart_objects::CSmartSchema& schema, - std::string& outStr); + std::string& outStr, + const bool remove_unknown_parameters = true); }; template <typename FunctionId, typename MessageType> diff --git a/src/components/formatters/include/formatters/CSmartFactory.h b/src/components/formatters/include/formatters/CSmartFactory.h index a48eab2a6b..f3c3fbe207 100644 --- a/src/components/formatters/include/formatters/CSmartFactory.h +++ b/src/components/formatters/include/formatters/CSmartFactory.h @@ -148,14 +148,14 @@ class CSmartFactory { * * @param object SmartObject to attach schema for. * - * @param RemoveFakeParameters contains true if need + * @param remove_unknown_parameters contains true if need * to remove fake parameters from smart object otherwise contains false. * * @return True if operation was successful or false otherwise. */ bool attachSchema( ns_smart_device_link::ns_smart_objects::SmartObject& object, - const bool RemoveFakeParameters, + const bool remove_unknown_parameters, const utils::SemanticVersion& MessageVersion = utils::SemanticVersion()); /** @@ -276,7 +276,7 @@ CSmartFactory<FunctionIdEnum, MessageTypeEnum, StructIdEnum>::CSmartFactory( template <class FunctionIdEnum, class MessageTypeEnum, class StructIdEnum> bool CSmartFactory<FunctionIdEnum, MessageTypeEnum, StructIdEnum>::attachSchema( ns_smart_device_link::ns_smart_objects::SmartObject& object, - const bool RemoveFakeParameters, + const bool remove_unknown_parameters, const utils::SemanticVersion& MessageVersion) { if (false == object.keyExists(strings::S_PARAMS)) return false; @@ -305,7 +305,7 @@ bool CSmartFactory<FunctionIdEnum, MessageTypeEnum, StructIdEnum>::attachSchema( object.setSchema(schemaIterator->second); schemaIterator->second.applySchema( - object, RemoveFakeParameters, MessageVersion); + object, remove_unknown_parameters, MessageVersion); return true; } diff --git a/src/components/formatters/include/formatters/formatter_json_rpc.h b/src/components/formatters/include/formatters/formatter_json_rpc.h index 842e176976..3503767988 100644 --- a/src/components/formatters/include/formatters/formatter_json_rpc.h +++ b/src/components/formatters/include/formatters/formatter_json_rpc.h @@ -105,11 +105,13 @@ class FormatterJsonRpc : public CFormatterJsonBase { * * @param obj Input SmartObject. * @param out_str Resulting JSON string. - * + * @param remove_unknown_parameters contains true if need to remove unknown + *parameters * @return true if success, false otherwise. */ static bool ToString(const ns_smart_objects::SmartObject& obj, - std::string& out_str); + std::string& out_str, + const bool remove_unknown_parameters = true); /** * @brief Creates a SmartObject from a JSON string. |