diff options
author | jacobkeeler <jacob.keeler@livioradio.com> | 2017-09-29 09:49:51 -0400 |
---|---|---|
committer | jacobkeeler <jacob.keeler@livioradio.com> | 2017-09-29 09:49:51 -0400 |
commit | 18b0a605c3b665c4de6633acf4a24b7ed6ebbd90 (patch) | |
tree | c0771a7f4a9116c2d3fd66cce6ef3ed849fa02de | |
parent | 475aff970c1e4cc8797a0cc3728e496500401838 (diff) | |
download | sdl_core-18b0a605c3b665c4de6633acf4a24b7ed6ebbd90.tar.gz |
Fix build errors from merge and remove quotes from error messages
8 files changed, 33 insertions, 39 deletions
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index 4d8b0706fc..616a538f5a 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -2317,8 +2317,10 @@ MessageValidationResult ApplicationManagerImpl::ValidateMessageBySchema( if (!mobile_so_factory().attachSchema(so, true)) { return INVALID_METADATA; } - - if (so.validate() != smart_objects::Errors::OK) { + std::string errorMessage(""); + if (so.validate(errorMessage) != smart_objects::Errors::OK) { + LOG4CXX_WARN(logger_, + "validate() failed for Mobile message - " << errorMessage); return SCHEMA_MISMATCH; } break; @@ -2337,7 +2339,10 @@ MessageValidationResult ApplicationManagerImpl::ValidateMessageBySchema( return INVALID_METADATA; } - if (so.validate() != smart_objects::Errors::OK) { + std::string errorMessage(""); + if (so.validate(errorMessage) != smart_objects::Errors::OK) { + LOG4CXX_WARN(logger_, + "validate() failed for HMI message - " << errorMessage); return SCHEMA_MISMATCH; } break; diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc index 4872361af7..17e9acc81a 100644 --- a/src/components/application_manager/src/hmi_capabilities_impl.cc +++ b/src/components/application_manager/src/hmi_capabilities_impl.cc @@ -1077,7 +1077,9 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() { system_capabilities.get("navigationCapability", ""); smart_objects::SmartObject navigation_capability_so; Formatters::CFormatterJsonBase::jsonValueToObj( - navigation_capability, navigation_capability_so); + navigation_capability, + navigation_capability_so, + "navigationCapability"); set_navigation_capability(navigation_capability_so); if (!navigation_capability_so.empty()) { set_navigation_supported(true); @@ -1088,8 +1090,8 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() { Json::Value phone_capability = system_capabilities.get("phoneCapability", ""); smart_objects::SmartObject phone_capability_so; - Formatters::CFormatterJsonBase::jsonValueToObj(phone_capability, - phone_capability_so); + Formatters::CFormatterJsonBase::jsonValueToObj( + phone_capability, phone_capability_so, "phoneCapability"); set_phone_capability(phone_capability_so); if (!phone_capability_so.empty()) { set_phone_call_supported(true); @@ -1100,8 +1102,8 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() { Json::Value vs_capability = system_capabilities.get("videoStreamingCapability", ""); smart_objects::SmartObject vs_capability_so; - Formatters::CFormatterJsonBase::jsonValueToObj(vs_capability, - vs_capability_so); + Formatters::CFormatterJsonBase::jsonValueToObj( + vs_capability, vs_capability_so, "videoStreamingCapability"); if (vs_capability_so.keyExists("supportedFormats")) { smart_objects::SmartObject& supported_format_array = @@ -1150,8 +1152,8 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() { Json::Value rc_capability = system_capabilities.get("remoteControlCapability", ""); smart_objects::SmartObject rc_capability_so; - Formatters::CFormatterJsonBase::jsonValueToObj(rc_capability, - rc_capability_so); + Formatters::CFormatterJsonBase::jsonValueToObj( + rc_capability, rc_capability_so, "remoteControlCapability"); set_rc_capability(rc_capability_so); } } diff --git a/src/components/smart_objects/include/smart_objects/default_shema_item.h b/src/components/smart_objects/include/smart_objects/default_shema_item.h index 6bac513b16..a9bf5ae6da 100644 --- a/src/components/smart_objects/include/smart_objects/default_shema_item.h +++ b/src/components/smart_objects/include/smart_objects/default_shema_item.h @@ -103,8 +103,7 @@ Errors::eType CDefaultSchemaItem<Type>::validate(const SmartObject& Object, std::string& errorMessage) { if (getSmartType() != Object.getType()) { if (!Object.getKey().empty()) { - errorMessage.assign("Validation failed for \"" + Object.getKey() + - "\". "); + errorMessage.assign("Validation failed for " + Object.getKey() + ". "); } errorMessage += "Incorrect type, expected: " + SmartObject::typeToString(getSmartType()) + ", got: " + diff --git a/src/components/smart_objects/include/smart_objects/enum_schema_item.h b/src/components/smart_objects/include/smart_objects/enum_schema_item.h index 6f77856c45..1ca0fe07af 100644 --- a/src/components/smart_objects/include/smart_objects/enum_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/enum_schema_item.h @@ -211,8 +211,7 @@ Errors::eType TEnumSchemaItem<EnumType>::validate(const SmartObject& Object, std::string& errorMessage) { if (SmartType_Integer != Object.getType()) { if (!Object.getKey().empty()) { - errorMessage.assign("Validation failed for \"" + Object.getKey() + - "\". "); + errorMessage.assign("Validation failed for " + Object.getKey() + ". "); } if (SmartType_String == Object.getType()) { @@ -228,8 +227,7 @@ Errors::eType TEnumSchemaItem<EnumType>::validate(const SmartObject& Object, if (mAllowedElements.find(static_cast<EnumType>(Object.asInt())) == mAllowedElements.end()) { if (!Object.getKey().empty()) { - errorMessage.assign("Validation failed for \"" + Object.getKey() + - "\". "); + errorMessage.assign("Validation failed for " + Object.getKey() + ". "); } std::stringstream stream; stream << "Invalid enum value: " << Object.asInt(); diff --git a/src/components/smart_objects/include/smart_objects/number_schema_item.h b/src/components/smart_objects/include/smart_objects/number_schema_item.h index 70e75938ed..dc45bfb625 100644 --- a/src/components/smart_objects/include/smart_objects/number_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/number_schema_item.h @@ -131,8 +131,7 @@ Errors::eType TNumberSchemaItem<NumberType>::validate( const SmartObject& Object, std::string& errorMessage) { if (!isValidNumberType(Object.getType())) { if (!Object.getKey().empty()) { - errorMessage.assign("Validation failed for \"" + Object.getKey() + - "\". "); + errorMessage.assign("Validation failed for " + Object.getKey() + ". "); } SmartType expectedType = (typeid(double) == typeid(Object.getType())) ? SmartType_Double @@ -160,8 +159,7 @@ Errors::eType TNumberSchemaItem<NumberType>::validate( NumberType rangeLimit; if (mMinValue.getValue(rangeLimit) && (value < rangeLimit)) { if (!Object.getKey().empty()) { - errorMessage.assign("Validation failed for \"" + Object.getKey() + - "\". "); + errorMessage.assign("Validation failed for " + Object.getKey() + ". "); } std::stringstream stream; stream << "Value too small, got: " << value @@ -172,8 +170,7 @@ Errors::eType TNumberSchemaItem<NumberType>::validate( if (mMaxValue.getValue(rangeLimit) && (value > rangeLimit)) { if (!Object.getKey().empty()) { - errorMessage.assign("Validation failed for \"" + Object.getKey() + - "\". "); + errorMessage.assign("Validation failed for " + Object.getKey() + ". "); } std::stringstream stream; stream << "Value too large, got: " << value diff --git a/src/components/smart_objects/src/array_schema_item.cc b/src/components/smart_objects/src/array_schema_item.cc index ad341d9b49..4c6731c159 100644 --- a/src/components/smart_objects/src/array_schema_item.cc +++ b/src/components/smart_objects/src/array_schema_item.cc @@ -45,8 +45,7 @@ Errors::eType CArraySchemaItem::validate(const SmartObject& Object, std::string& errorMessage) { if (SmartType_Array != Object.getType()) { if (!Object.getKey().empty()) { - errorMessage.assign("Validation failed for \"" + Object.getKey() + - "\". "); + errorMessage.assign("Validation failed for " + Object.getKey() + ". "); } errorMessage += "Incorrect type, expected: " + SmartObject::typeToString(SmartType_Array) + ", got: " + @@ -58,8 +57,7 @@ Errors::eType CArraySchemaItem::validate(const SmartObject& Object, if (mMinSize.getValue(sizeLimit) && (array_len < sizeLimit)) { if (!Object.getKey().empty()) { - errorMessage.assign("Validation failed for \"" + Object.getKey() + - "\". "); + errorMessage.assign("Validation failed for " + Object.getKey() + ". "); } std::stringstream stream; stream << "Got array of size: " << array_len @@ -69,8 +67,7 @@ Errors::eType CArraySchemaItem::validate(const SmartObject& Object, } if (mMaxSize.getValue(sizeLimit) && (array_len > sizeLimit)) { if (!Object.getKey().empty()) { - errorMessage.assign("Validation failed for \"" + Object.getKey() + - "\". "); + errorMessage.assign("Validation failed for " + Object.getKey() + ". "); } std::stringstream stream; stream << "Got array of size: " << array_len diff --git a/src/components/smart_objects/src/object_schema_item.cc b/src/components/smart_objects/src/object_schema_item.cc index dae4ebbe26..997f72b6ac 100644 --- a/src/components/smart_objects/src/object_schema_item.cc +++ b/src/components/smart_objects/src/object_schema_item.cc @@ -60,8 +60,7 @@ Errors::eType CObjectSchemaItem::validate(const SmartObject& object, std::string& errorMessage) { if (SmartType_Map != object.getType()) { if (!object.getKey().empty()) { - errorMessage.assign("Validation failed for \"" + object.getKey() + - "\". "); + errorMessage.assign("Validation failed for " + object.getKey() + ". "); } errorMessage += "Incorrect type, expected: " + SmartObject::typeToString(SmartType_Map) + ", got: " + @@ -80,10 +79,10 @@ Errors::eType CObjectSchemaItem::validate(const SmartObject& object, if (object_keys.end() == key_it) { if (member.mIsMandatory) { if (!object.getKey().empty()) { - errorMessage.assign("Validation failed for \"" + object.getKey() + - "\". "); + errorMessage.assign("Validation failed for " + object.getKey() + + ". "); } - errorMessage += "Missing mandatory parameter: \"" + key + "\""; + errorMessage += "Missing mandatory parameter: " + key; return Errors::MISSING_MANDATORY_PARAMETER; } continue; diff --git a/src/components/smart_objects/src/string_schema_item.cc b/src/components/smart_objects/src/string_schema_item.cc index 88373cc172..63d01f0c18 100644 --- a/src/components/smart_objects/src/string_schema_item.cc +++ b/src/components/smart_objects/src/string_schema_item.cc @@ -49,8 +49,7 @@ Errors::eType CStringSchemaItem::validate(const SmartObject& Object, std::string& errorMessage) { if (SmartType_String != Object.getType()) { if (!Object.getKey().empty()) { - errorMessage.assign("Validation failed for \"" + Object.getKey() + - "\". "); + errorMessage.assign("Validation failed for " + Object.getKey() + ". "); } errorMessage += "Incorrect type, expected: " + SmartObject::typeToString(SmartType_String) + ", got: " + @@ -63,8 +62,7 @@ Errors::eType CStringSchemaItem::validate(const SmartObject& Object, if (mMinLength.getValue(length) && (value.size() < length)) { if (!Object.getKey().empty()) { - errorMessage.assign("Validation failed for \"" + Object.getKey() + - "\". "); + errorMessage.assign("Validation failed for " + Object.getKey() + ". "); } std::stringstream stream; stream << "Got string of size: " << value.size() @@ -74,8 +72,7 @@ Errors::eType CStringSchemaItem::validate(const SmartObject& Object, } if (mMaxLength.getValue(length) && (value.size() > length)) { if (!Object.getKey().empty()) { - errorMessage.assign("Validation failed for \"" + Object.getKey() + - "\". "); + errorMessage.assign("Validation failed for " + Object.getKey() + ". "); } std::stringstream stream; stream << "Got string of size: " << value.size() |