diff options
Diffstat (limited to 'src/components/smart_objects/src')
10 files changed, 223 insertions, 148 deletions
diff --git a/src/components/smart_objects/src/always_false_schema_item.cc b/src/components/smart_objects/src/always_false_schema_item.cc index 1893ed24d1..ca247eed09 100644 --- a/src/components/smart_objects/src/always_false_schema_item.cc +++ b/src/components/smart_objects/src/always_false_schema_item.cc @@ -32,24 +32,22 @@ #include "smart_objects/always_false_schema_item.h" -namespace NsSmartDeviceLink { -namespace NsSmartObjects { +namespace ns_smart_device_link { +namespace ns_smart_objects { CAlwaysFalseSchemaItem::CAlwaysFalseSchemaItem() {} -utils::SharedPtr<CAlwaysFalseSchemaItem> CAlwaysFalseSchemaItem::create() { - return new CAlwaysFalseSchemaItem(); +std::shared_ptr<CAlwaysFalseSchemaItem> CAlwaysFalseSchemaItem::create() { + return std::shared_ptr<CAlwaysFalseSchemaItem>(new CAlwaysFalseSchemaItem()); } -Errors::eType CAlwaysFalseSchemaItem::validate(const SmartObject& object) { - rpc::ValidationReport report("RPC"); - return validate(object, &report); -} - -Errors::eType CAlwaysFalseSchemaItem::validate( - const SmartObject& object, rpc::ValidationReport* report__) { +errors::eType CAlwaysFalseSchemaItem::validate( + const SmartObject& Object, + rpc::ValidationReport* report__, + const utils::SemanticVersion& MessageVersion) { report__->set_validation_info("Generic error"); - return Errors::ERROR; + return errors::ERROR; } -} // namespace NsSmartObjects -} // namespace NsSmartDeviceLink + +} // namespace ns_smart_objects +} // namespace ns_smart_device_link diff --git a/src/components/smart_objects/src/always_true_schema_item.cc b/src/components/smart_objects/src/always_true_schema_item.cc index 1e7115316d..983733165c 100644 --- a/src/components/smart_objects/src/always_true_schema_item.cc +++ b/src/components/smart_objects/src/always_true_schema_item.cc @@ -30,23 +30,21 @@ #include "smart_objects/always_true_schema_item.h" -namespace NsSmartDeviceLink { -namespace NsSmartObjects { +namespace ns_smart_device_link { +namespace ns_smart_objects { CAlwaysTrueSchemaItem::CAlwaysTrueSchemaItem() {} -utils::SharedPtr<CAlwaysTrueSchemaItem> CAlwaysTrueSchemaItem::create() { - return new CAlwaysTrueSchemaItem(); +std::shared_ptr<CAlwaysTrueSchemaItem> CAlwaysTrueSchemaItem::create() { + return std::shared_ptr<CAlwaysTrueSchemaItem>(new CAlwaysTrueSchemaItem()); } -Errors::eType CAlwaysTrueSchemaItem::validate(const SmartObject& object) { - return Errors::OK; +errors::eType CAlwaysTrueSchemaItem::validate( + const SmartObject& Object, + rpc::ValidationReport* report__, + const utils::SemanticVersion& MessageVersion) { + return errors::OK; } -Errors::eType CAlwaysTrueSchemaItem::validate(const SmartObject& object, - rpc::ValidationReport* report__) { - return Errors::OK; -} - -} // namespace NsSmartObjects -} // namespace NsSmartDeviceLink +} // namespace ns_smart_objects +} // namespace ns_smart_device_link diff --git a/src/components/smart_objects/src/array_schema_item.cc b/src/components/smart_objects/src/array_schema_item.cc index dca0a815e0..7d5f8bcf84 100644 --- a/src/components/smart_objects/src/array_schema_item.cc +++ b/src/components/smart_objects/src/array_schema_item.cc @@ -31,30 +31,28 @@ #include "smart_objects/array_schema_item.h" #include "smart_objects/smart_object.h" -namespace NsSmartDeviceLink { -namespace NsSmartObjects { +namespace ns_smart_device_link { +namespace ns_smart_objects { -utils::SharedPtr<CArraySchemaItem> CArraySchemaItem::create( +std::shared_ptr<CArraySchemaItem> CArraySchemaItem::create( const ISchemaItemPtr ElementSchemaItem, const TSchemaItemParameter<size_t>& MinSize, const TSchemaItemParameter<size_t>& MaxSize) { - return new CArraySchemaItem(ElementSchemaItem, MinSize, MaxSize); + return std::shared_ptr<CArraySchemaItem>( + new CArraySchemaItem(ElementSchemaItem, MinSize, MaxSize)); } -Errors::eType CArraySchemaItem::validate(const SmartObject& Object) { - rpc::ValidationReport report("RPC"); - return validate(Object, &report); -} - -Errors::eType CArraySchemaItem::validate(const SmartObject& Object, - rpc::ValidationReport* report__) { +errors::eType CArraySchemaItem::validate( + const SmartObject& Object, + rpc::ValidationReport* report__, + const utils::SemanticVersion& MessageVersion) { if (SmartType_Array != Object.getType()) { std::string validation_info = "Incorrect type, expected: " + SmartObject::typeToString(SmartType_Array) + ", got: " + SmartObject::typeToString(Object.getType()); report__->set_validation_info(validation_info); - return Errors::INVALID_VALUE; + return errors::INVALID_VALUE; } size_t sizeLimit; const size_t array_len = Object.length(); @@ -65,7 +63,7 @@ Errors::eType CArraySchemaItem::validate(const SmartObject& Object, << ", minimum allowed: " << sizeLimit; std::string validation_info = stream.str(); report__->set_validation_info(validation_info); - return Errors::OUT_OF_RANGE; + return errors::OUT_OF_RANGE; } if (mMaxSize.getValue(sizeLimit) && (array_len > sizeLimit)) { std::stringstream stream; @@ -73,26 +71,31 @@ Errors::eType CArraySchemaItem::validate(const SmartObject& Object, << ", maximum allowed: " << sizeLimit; std::string validation_info = stream.str(); report__->set_validation_info(validation_info); - return Errors::OUT_OF_RANGE; + return errors::OUT_OF_RANGE; } for (size_t i = 0u; i < array_len; ++i) { std::stringstream strVal; strVal << i; - const Errors::eType result = mElementSchemaItem->validate( - Object.getElement(i), &report__->ReportSubobject(strVal.str())); - if (Errors::OK != result) { + const errors::eType result = + mElementSchemaItem->validate(Object.getElement(i), + &report__->ReportSubobject(strVal.str()), + MessageVersion); + if (errors::OK != result) { return result; } } - return Errors::OK; + return errors::OK; } -void CArraySchemaItem::applySchema(SmartObject& Object, - const bool RemoveFakeParameters) { +void CArraySchemaItem::applySchema( + SmartObject& Object, + const bool RemoveFakeParameters, + const utils::SemanticVersion& MessageVersion) { if (SmartType_Array == Object.getType()) { for (size_t i = 0U; i < Object.length(); ++i) { - mElementSchemaItem->applySchema(Object[i], RemoveFakeParameters); + mElementSchemaItem->applySchema( + Object[i], RemoveFakeParameters, MessageVersion); } } } @@ -128,5 +131,5 @@ CArraySchemaItem::CArraySchemaItem(const ISchemaItemPtr ElementSchemaItem, , mMinSize(MinSize) , mMaxSize(MaxSize) {} -} // namespace NsSmartObjects -} // namespace NsSmartDeviceLink +} // namespace ns_smart_objects +} // namespace ns_smart_device_link diff --git a/src/components/smart_objects/src/bool_schema_item.cc b/src/components/smart_objects/src/bool_schema_item.cc index c1da95528a..a4875a1b24 100644 --- a/src/components/smart_objects/src/bool_schema_item.cc +++ b/src/components/smart_objects/src/bool_schema_item.cc @@ -32,12 +32,12 @@ #include "smart_objects/bool_schema_item.h" #include "smart_objects/smart_object.h" -namespace NsSmartDeviceLink { -namespace NsSmartObjects { +namespace ns_smart_device_link { +namespace ns_smart_objects { -utils::SharedPtr<CBoolSchemaItem> CBoolSchemaItem::create( +std::shared_ptr<CBoolSchemaItem> CBoolSchemaItem::create( const TSchemaItemParameter<bool>& DefaultValue) { - return new CBoolSchemaItem(DefaultValue); + return std::shared_ptr<CBoolSchemaItem>(new CBoolSchemaItem(DefaultValue)); } CBoolSchemaItem::CBoolSchemaItem(const TSchemaItemParameter<bool>& DefaultValue) @@ -51,5 +51,5 @@ bool CBoolSchemaItem::getDefaultValue() const { return false; } -} // namespace NsSmartObjects -} // namespace NsSmartDeviceLink +} // namespace ns_smart_objects +} // namespace ns_smart_device_link diff --git a/src/components/smart_objects/src/number_schema_item.cc b/src/components/smart_objects/src/number_schema_item.cc index 78be9fe85d..c383f6ecca 100644 --- a/src/components/smart_objects/src/number_schema_item.cc +++ b/src/components/smart_objects/src/number_schema_item.cc @@ -31,8 +31,8 @@ */ #include "smart_objects/number_schema_item.h" -namespace NsSmartDeviceLink { -namespace NsSmartObjects { +namespace ns_smart_device_link { +namespace ns_smart_objects { template <> SmartType TNumberSchemaItem<int32_t>::getSmartType() const { @@ -41,7 +41,7 @@ SmartType TNumberSchemaItem<int32_t>::getSmartType() const { template <> SmartType TNumberSchemaItem<uint32_t>::getSmartType() const { - return SmartType_Integer; + return SmartType_UInteger; } template <> @@ -54,5 +54,5 @@ SmartType TNumberSchemaItem<double>::getSmartType() const { return SmartType_Double; } -} // namespace NsSmartObjects -} // namespace NsSmartDeviceLink +} // namespace ns_smart_objects +} // namespace ns_smart_device_link diff --git a/src/components/smart_objects/src/object_schema_item.cc b/src/components/smart_objects/src/object_schema_item.cc index 2bed3d9a26..742c2ec353 100644 --- a/src/components/smart_objects/src/object_schema_item.cc +++ b/src/components/smart_objects/src/object_schema_item.cc @@ -41,35 +41,83 @@ const char connection_key[] = "connection_key"; const char binary_data[] = "binary_data"; const char app_id[] = "appID"; } -namespace NsSmartDeviceLink { -namespace NsSmartObjects { +namespace ns_smart_device_link { +namespace ns_smart_objects { CObjectSchemaItem::SMember::SMember() - : mSchemaItem(CAlwaysFalseSchemaItem::create()), mIsMandatory(true) {} + : mSchemaItem(CAlwaysFalseSchemaItem::create()) + , mIsMandatory(true) + , mIsDeprecated(false) + , mIsRemoved(false) {} -CObjectSchemaItem::SMember::SMember(const ISchemaItemPtr SchemaItem, - const bool IsMandatory) - : mSchemaItem(SchemaItem), mIsMandatory(IsMandatory) {} +CObjectSchemaItem::SMember::SMember( + const ISchemaItemPtr SchemaItem, + const bool IsMandatory, + const std::string& Since, + const std::string& Until, + const bool IsDeprecated, + const bool IsRemoved, + const std::vector<CObjectSchemaItem::SMember>& history_vector) + : mSchemaItem(SchemaItem), mIsMandatory(IsMandatory) { + if (Since.size() > 0) { + utils::SemanticVersion since_struct(Since); + if (since_struct.isValid()) { + mSince = since_struct; + } + } + if (Until.size() > 0) { + utils::SemanticVersion until_struct(Until); + if (until_struct.isValid()) { + mUntil = until_struct; + } + } + mIsDeprecated = IsDeprecated; + mIsRemoved = IsRemoved; + mHistoryVector = history_vector; +} -utils::SharedPtr<CObjectSchemaItem> CObjectSchemaItem::create( - const Members& members) { - return new CObjectSchemaItem(members); +bool CObjectSchemaItem::SMember::CheckHistoryFieldVersion( + const utils::SemanticVersion& MessageVersion) const { + if (MessageVersion.isValid()) { + if (mSince != boost::none) { + if (MessageVersion < mSince.get()) { + return false; // Msg version predates `since` field + } else { + if (mUntil != boost::none && (MessageVersion >= mUntil.get())) { + return false; // Msg version newer than `until` field + } else { + return true; // Mobile msg version falls within specified version + // range + } + } + } + + if (mUntil != boost::none && (MessageVersion >= mUntil.get())) { + return false; // Msg version newer than `until` field + } else { + return true; // Mobile msg version falls within specified version range + } + } + + return true; // Not enough version information. Default true. } -Errors::eType CObjectSchemaItem::validate(const SmartObject& object) { - rpc::ValidationReport report("RPC"); - return validate(object, &report); +std::shared_ptr<CObjectSchemaItem> CObjectSchemaItem::create( + const Members& members) { + return std::shared_ptr<CObjectSchemaItem>(new CObjectSchemaItem(members)); } -Errors::eType CObjectSchemaItem::validate(const SmartObject& object, - rpc::ValidationReport* report__) { +errors::eType CObjectSchemaItem::validate( + const SmartObject& object, + rpc::ValidationReport* report__, + const utils::SemanticVersion& MessageVersion) { if (SmartType_Map != object.getType()) { std::string validation_info = "Incorrect type, expected: " + SmartObject::typeToString(SmartType_Map) + ", got: " + SmartObject::typeToString(object.getType()); report__->set_validation_info(validation_info); - return Errors::INVALID_VALUE; + return errors::INVALID_VALUE; } std::set<std::string> object_keys = object.enumerate(); @@ -78,35 +126,42 @@ Errors::eType CObjectSchemaItem::validate(const SmartObject& object, ++it) { const std::string& key = it->first; const SMember& member = it->second; + const SMember& correct_member = GetCorrectMember(member, MessageVersion); std::set<std::string>::const_iterator key_it = object_keys.find(key); if (object_keys.end() == key_it) { - if (member.mIsMandatory) { + if (correct_member.mIsMandatory == true && + correct_member.mIsRemoved == false) { std::string validation_info = "Missing mandatory parameter: " + key; report__->set_validation_info(validation_info); - return Errors::MISSING_MANDATORY_PARAMETER; + return errors::MISSING_MANDATORY_PARAMETER; } continue; } const SmartObject& field = object.getElement(key); - const Errors::eType result = - member.mSchemaItem->validate(field, &report__->ReportSubobject(key)); - if (Errors::OK != result) { + + errors::eType result = errors::OK; + // Check if MessageVersion matches schema version + result = correct_member.mSchemaItem->validate( + field, &report__->ReportSubobject(key), MessageVersion); + if (errors::OK != result) { return result; } object_keys.erase(key_it); } - return Errors::OK; + return errors::OK; } -void CObjectSchemaItem::applySchema(SmartObject& Object, - const bool RemoveFakeParameters) { +void CObjectSchemaItem::applySchema( + SmartObject& Object, + const bool RemoveFakeParameters, + const utils::SemanticVersion& MessageVersion) { if (SmartType_Map != Object.getType()) { return; } if (RemoveFakeParameters) { - RemoveFakeParams(Object); + RemoveFakeParams(Object, MessageVersion); } SmartObject default_value; @@ -117,10 +172,12 @@ void CObjectSchemaItem::applySchema(SmartObject& Object, if (!Object.keyExists(key)) { if (member.mSchemaItem->setDefaultValue(default_value)) { Object[key] = default_value; - member.mSchemaItem->applySchema(Object[key], RemoveFakeParameters); + member.mSchemaItem->applySchema( + Object[key], RemoveFakeParameters, MessageVersion); } } else { - member.mSchemaItem->applySchema(Object[key], RemoveFakeParameters); + member.mSchemaItem->applySchema( + Object[key], RemoveFakeParameters, MessageVersion); } } } @@ -173,22 +230,49 @@ size_t CObjectSchemaItem::GetMemberSize() { CObjectSchemaItem::CObjectSchemaItem(const Members& members) : mMembers(members) {} -void CObjectSchemaItem::RemoveFakeParams(SmartObject& Object) { +void CObjectSchemaItem::RemoveFakeParams( + SmartObject& Object, const utils::SemanticVersion& MessageVersion) { for (SmartMap::const_iterator it = Object.map_begin(); it != Object.map_end();) { const std::string& key = it->first; - if (mMembers.end() == mMembers.find(key) + std::map<std::string, SMember>::const_iterator members_it = + mMembers.find(key); + if (mMembers.end() == members_it // FIXME(EZamakhov): Remove illegal usage of filed in AM && key.compare(connection_key) != 0 && key.compare(binary_data) != 0 && key.compare(app_id) != 0) { ++it; Object.erase(key); + + } else if (mMembers.end() != members_it && + GetCorrectMember(members_it->second, MessageVersion) + .mIsRemoved) { + ++it; + Object.erase(key); } else { - it++; + ++it; + } + } +} + +const CObjectSchemaItem::SMember& CObjectSchemaItem::GetCorrectMember( + const SMember& member, const utils::SemanticVersion& messageVersion) { + // Check if member is the correct version + if (member.CheckHistoryFieldVersion(messageVersion)) { + return member; + } + // Check for history tag items + if (!member.mHistoryVector.empty()) { + for (uint i = 0; i < member.mHistoryVector.size(); i++) { + if (member.mHistoryVector[i].CheckHistoryFieldVersion(messageVersion)) { + return member.mHistoryVector[i]; + } } } + // Return member as default + return member; } -} // namespace NsSmartObjects -} // namespace NsSmartDeviceLink +} // namespace ns_smart_objects +} // namespace ns_smart_device_link diff --git a/src/components/smart_objects/src/schema_item.cc b/src/components/smart_objects/src/schema_item.cc index 22735d40d5..5e9358092a 100644 --- a/src/components/smart_objects/src/schema_item.cc +++ b/src/components/smart_objects/src/schema_item.cc @@ -32,16 +32,14 @@ #include "smart_objects/schema_item.h" -namespace NsSmartDeviceLink { -namespace NsSmartObjects { +namespace ns_smart_device_link { +namespace ns_smart_objects { -Errors::eType ISchemaItem::validate(const SmartObject& Object) { - return Errors::ERROR; -} - -Errors::eType ISchemaItem::validate(const SmartObject& object, - rpc::ValidationReport* report__) { - return Errors::ERROR; +errors::eType ISchemaItem::validate( + const SmartObject& object, + rpc::ValidationReport* report__, + const utils::SemanticVersion& MessageVersion) { + return errors::ERROR; } bool ISchemaItem::setDefaultValue(SmartObject& Object) { @@ -53,7 +51,8 @@ bool ISchemaItem::hasDefaultValue(SmartObject& Object) { } void ISchemaItem::applySchema(SmartObject& Object, - const bool RemoveFakeParameters) {} + const bool RemoveFakeParameters, + const utils::SemanticVersion& MessageVersion) {} void ISchemaItem::unapplySchema(SmartObject& Object) {} @@ -64,5 +63,5 @@ size_t ISchemaItem::GetMemberSize() { return 0; } -} // namespace NsSmartObjects -} // namespace NsSmartDeviceLink +} // namespace ns_smart_objects +} // namespace ns_smart_device_link diff --git a/src/components/smart_objects/src/smart_object.cc b/src/components/smart_objects/src/smart_object.cc index a0925eef05..1322757ab1 100644 --- a/src/components/smart_objects/src/smart_object.cc +++ b/src/components/smart_objects/src/smart_object.cc @@ -42,8 +42,8 @@ #include <iterator> #include <limits> -namespace NsSmartDeviceLink { -namespace NsSmartObjects { +namespace ns_smart_device_link { +namespace ns_smart_objects { /** * @brief Value that is used as invalid value for string type @@ -491,7 +491,7 @@ std::string SmartObject::convert_string() const { default: break; } - return NsSmartDeviceLink::NsSmartObjects::invalid_cstr_value; + return ns_smart_device_link::ns_smart_objects::invalid_cstr_value; } custom_str::CustomString SmartObject::convert_custom_string() const { @@ -870,16 +870,13 @@ bool SmartObject::erase(const std::string& Key) { bool SmartObject::isValid() const { rpc::ValidationReport report("RPC"); - return (Errors::OK == m_schema.validate(*this, &report)); + return (errors::OK == m_schema.validate(*this, &report)); } -Errors::eType SmartObject::validate() { - rpc::ValidationReport report("RPC"); - return validate(&report); -} - -Errors::eType SmartObject::validate(rpc::ValidationReport* report__) { - return m_schema.validate(*this, report__); +errors::eType SmartObject::validate( + rpc::ValidationReport* report__, + const utils::SemanticVersion& MessageVersion) { + return m_schema.validate(*this, report__, MessageVersion); } void SmartObject::setSchema(const CSmartSchema& schema) { @@ -890,5 +887,5 @@ CSmartSchema SmartObject::getSchema() { return m_schema; } -} // namespace NsSmartObjects -} // namespace NsSmartDeviceLink +} // namespace ns_smart_objects +} // namespace ns_smart_device_link diff --git a/src/components/smart_objects/src/smart_schema.cc b/src/components/smart_objects/src/smart_schema.cc index 7509ea80f1..f7cd22c4bc 100644 --- a/src/components/smart_objects/src/smart_schema.cc +++ b/src/components/smart_objects/src/smart_schema.cc @@ -32,22 +32,19 @@ #include "smart_objects/smart_schema.h" #include "smart_objects/always_true_schema_item.h" -namespace NsSmartDeviceLink { -namespace NsSmartObjects { +namespace ns_smart_device_link { +namespace ns_smart_objects { CSmartSchema::CSmartSchema() : mSchemaItem(CAlwaysTrueSchemaItem::create()) {} CSmartSchema::CSmartSchema(const ISchemaItemPtr SchemaItem) : mSchemaItem(SchemaItem) {} -Errors::eType CSmartSchema::validate(const SmartObject& Object) const { - rpc::ValidationReport report("RPC"); - return validate(Object, &report); -} - -Errors::eType CSmartSchema::validate(const SmartObject& object, - rpc::ValidationReport* report__) const { - return mSchemaItem->validate(object, report__); +errors::eType CSmartSchema::validate( + const SmartObject& object, + rpc::ValidationReport* report__, + const utils::SemanticVersion& MessageVersion) const { + return mSchemaItem->validate(object, report__, MessageVersion); } void CSmartSchema::setSchemaItem(const ISchemaItemPtr schemaItem) { @@ -55,8 +52,9 @@ void CSmartSchema::setSchemaItem(const ISchemaItemPtr schemaItem) { } void CSmartSchema::applySchema(SmartObject& Object, - const bool RemoveFakeParameters) { - mSchemaItem->applySchema(Object, RemoveFakeParameters); + const bool RemoveFakeParameters, + const utils::SemanticVersion& MessageVersion) { + mSchemaItem->applySchema(Object, RemoveFakeParameters, MessageVersion); } void CSmartSchema::unapplySchema(SmartObject& Object) { @@ -68,5 +66,5 @@ void CSmartSchema::BuildObjectBySchema(const SmartObject& pattern_object, mSchemaItem->BuildObjectBySchema(pattern_object, result_object); } -} // namespace NsSmartObjects -} // namespace NsSmartDeviceLink +} // namespace ns_smart_objects +} // namespace ns_smart_device_link diff --git a/src/components/smart_objects/src/string_schema_item.cc b/src/components/smart_objects/src/string_schema_item.cc index 1e4c8372f0..0288ad85e8 100644 --- a/src/components/smart_objects/src/string_schema_item.cc +++ b/src/components/smart_objects/src/string_schema_item.cc @@ -33,32 +33,30 @@ #include "smart_objects/string_schema_item.h" #include "utils/custom_string.h" -namespace NsSmartDeviceLink { -namespace NsSmartObjects { +namespace ns_smart_device_link { +namespace ns_smart_objects { namespace custom_str = utils::custom_string; -utils::SharedPtr<CStringSchemaItem> CStringSchemaItem::create( +std::shared_ptr<CStringSchemaItem> CStringSchemaItem::create( const TSchemaItemParameter<size_t>& MinLength, const TSchemaItemParameter<size_t>& MaxLength, const TSchemaItemParameter<std::string>& DefaultValue) { - return new CStringSchemaItem(MinLength, MaxLength, DefaultValue); + return std::shared_ptr<CStringSchemaItem>( + new CStringSchemaItem(MinLength, MaxLength, DefaultValue)); } -Errors::eType CStringSchemaItem::validate(const SmartObject& Object) { - rpc::ValidationReport report("RPC"); - return validate(Object, &report); -} - -Errors::eType CStringSchemaItem::validate(const SmartObject& Object, - rpc::ValidationReport* report__) { +errors::eType CStringSchemaItem::validate( + const SmartObject& Object, + rpc::ValidationReport* report__, + const utils::SemanticVersion& MessageVersion) { if (SmartType_String != Object.getType()) { std::string validation_info = "Incorrect type, expected: " + SmartObject::typeToString(SmartType_String) + ", got: " + SmartObject::typeToString(Object.getType()); report__->set_validation_info(validation_info); - return Errors::INVALID_VALUE; + return errors::INVALID_VALUE; } const custom_str::CustomString value = Object.asCustomString(); @@ -70,7 +68,7 @@ Errors::eType CStringSchemaItem::validate(const SmartObject& Object, << ", minimum allowed: " << length; std::string validation_info = stream.str(); report__->set_validation_info(validation_info); - return Errors::OUT_OF_RANGE; + return errors::OUT_OF_RANGE; } if (mMaxLength.getValue(length) && (value.size() > length)) { std::stringstream stream; @@ -78,9 +76,9 @@ Errors::eType CStringSchemaItem::validate(const SmartObject& Object, << ", maximum allowed: " << length; std::string validation_info = stream.str(); report__->set_validation_info(validation_info); - return Errors::OUT_OF_RANGE; + return errors::OUT_OF_RANGE; } - return Errors::OK; + return errors::OK; } SmartType CStringSchemaItem::getSmartType() const { @@ -99,5 +97,5 @@ CStringSchemaItem::CStringSchemaItem( , mMinLength(MinLength) , mMaxLength(MaxLength) {} -} // namespace NsSmartObjects -} // namespace NsSmartDeviceLink +} // namespace ns_smart_objects +} // namespace ns_smart_device_link |