diff options
author | JackLivio <jack@livio.io> | 2018-08-13 21:50:19 -0400 |
---|---|---|
committer | JackLivio <jack@livio.io> | 2018-08-13 21:50:19 -0400 |
commit | cd4d9c9b614719f61cf4129ed0a3d08ffbefb4d5 (patch) | |
tree | c4e8d4ec372e0ed16d596aacd061e7379d0785a3 /src/components/formatters | |
parent | 91bf82972a401fe90f0fd8d37056dc7a73d62565 (diff) | |
download | sdl_core-cd4d9c9b614719f61cf4129ed0a3d08ffbefb4d5.tar.gz |
Address Comments
Diffstat (limited to 'src/components/formatters')
-rw-r--r-- | src/components/formatters/include/formatters/CSmartFactory.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/components/formatters/include/formatters/CSmartFactory.h b/src/components/formatters/include/formatters/CSmartFactory.h index d66dc56d8b..a459f179c0 100644 --- a/src/components/formatters/include/formatters/CSmartFactory.h +++ b/src/components/formatters/include/formatters/CSmartFactory.h @@ -153,8 +153,10 @@ class CSmartFactory { * * @return True if operation was successful or false otherwise. */ - bool attachSchema(NsSmartDeviceLink::NsSmartObjects::SmartObject& object, - const bool RemoveFakeParameters); + bool attachSchema( + NsSmartDeviceLink::NsSmartObjects::SmartObject& object, + const bool RemoveFakeParameters, + const utils::SemanticVersion& MessageVersion = utils::SemanticVersion()); /** * @brief Attach schema to the struct SmartObject. @@ -273,7 +275,8 @@ CSmartFactory<FunctionIdEnum, MessageTypeEnum, StructIdEnum>::CSmartFactory( template <class FunctionIdEnum, class MessageTypeEnum, class StructIdEnum> bool CSmartFactory<FunctionIdEnum, MessageTypeEnum, StructIdEnum>::attachSchema( NsSmartDeviceLink::NsSmartObjects::SmartObject& object, - const bool RemoveFakeParameters) { + const bool RemoveFakeParameters, + const utils::SemanticVersion& MessageVersion) { if (false == object.keyExists(strings::S_PARAMS)) return false; if (false == object[strings::S_PARAMS].keyExists(strings::S_MESSAGE_TYPE)) @@ -300,17 +303,8 @@ bool CSmartFactory<FunctionIdEnum, MessageTypeEnum, StructIdEnum>::attachSchema( object.setSchema(schemaIterator->second); - // Initialize msg_version to 0.0.0, an invalid value until properly set. - utils::SemanticVersion msg_version(0, 0, 0); - if (object[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS].keyExists( - NsSmartDeviceLink::NsJSONHandler::strings::S_RPC_MSG_VERSION)) { - msg_version = - object[NsSmartDeviceLink::NsJSONHandler::strings::S_PARAMS] - [NsSmartDeviceLink::NsJSONHandler::strings::S_RPC_MSG_VERSION] - .asString(); - } - - schemaIterator->second.applySchema(object, RemoveFakeParameters, msg_version); + schemaIterator->second.applySchema( + object, RemoveFakeParameters, MessageVersion); return true; } |