diff options
author | Yaroslav Mamykin (GitHub) <ymamykin@luxoft.com> | 2019-10-11 15:18:04 +0300 |
---|---|---|
committer | Yaroslav Mamykin (GitHub) <ymamykin@luxoft.com> | 2019-10-16 11:53:29 +0300 |
commit | 4578c209665b461bb54c374fd4588a7673cf2698 (patch) | |
tree | 3c32dc1b46f22344872cb7c76d23a08ddd4050e1 | |
parent | ab061514e448bd6e1554ebe1a05c876b92bc930c (diff) | |
download | sdl_core-4578c209665b461bb54c374fd4588a7673cf2698.tar.gz |
fixup! Fix versioning appliance for vehicle data
4 files changed, 27 insertions, 29 deletions
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/custom_vehicle_data_manager_impl.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/custom_vehicle_data_manager_impl.cc index f262c95eff..bc2eb24c2b 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/custom_vehicle_data_manager_impl.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/custom_vehicle_data_manager_impl.cc @@ -322,7 +322,31 @@ void CustomVehicleDataManagerImpl::UpdateVehicleDataItems() { ); } case SMemberType::SMEMBER_HMI: { - TSchemaItemParameter<VehicleDataItem> tschema_item(item); + std::function<VehicleDataItem(const VehicleDataItem&)> remove_validation_params; + remove_validation_params = [&remove_validation_params](const VehicleDataItem& vd_item) -> VehicleDataItem { + VehicleDataItem result; + result.since = vd_item.since; + result.until = vd_item.until; + result.key = vd_item.key; + result.name = vd_item.name; + result.type = vd_item.type; + result.array = vd_item.array; + result.removed = vd_item.removed; + result.deprecated = vd_item.deprecated; + result.mark_initialized(); + + if (vd_item.params->is_initialized()) { + for (const auto& param : *vd_item.params) { + result.params->push_back(remove_validation_params(param)); + } + result.params->mark_initialized(); + } + + return result; + }; + + auto processed_item = remove_validation_params(item); + TSchemaItemParameter<VehicleDataItem> tschema_item(processed_item); auto member_schema = VehicleDataItemSchema::create( tschema_item, VehicleDataItemSchema::SchemaType::HMI); return SMember( diff --git a/src/components/application_manager/src/rpc_handler_impl.cc b/src/components/application_manager/src/rpc_handler_impl.cc index 2aea9c9487..ba61fc6163 100644 --- a/src/components/application_manager/src/rpc_handler_impl.cc +++ b/src/components/application_manager/src/rpc_handler_impl.cc @@ -294,7 +294,6 @@ void RPCHandlerImpl::GetMessageVersion( patch = sync_msg_version[strings::patch_version].asUInt(); } - message_version = utils::base_rpc_version; utils::SemanticVersion temp_version(major, minor, patch); if (temp_version.isValid()) { message_version = (temp_version >= utils::rpc_version_5) diff --git a/src/components/application_manager/src/rpc_service_impl.cc b/src/components/application_manager/src/rpc_service_impl.cc index 6a41e6bb33..a16e299f77 100644 --- a/src/components/application_manager/src/rpc_service_impl.cc +++ b/src/components/application_manager/src/rpc_service_impl.cc @@ -528,11 +528,9 @@ void RPCServiceImpl::SendMessageToMobile( allow_unknown_parameters = false; } - - LOG4CXX_ERROR(logger_, "ALLOW UNKNOWN PARAMS = " << allow_unknown_parameters); - mobile_so_factory().attachSchema(*message, !allow_unknown_parameters, app->msg_version()); + mobile_so_factory().attachSchema(*message, false, app->msg_version()); rpc::ValidationReport report("RPC"); - auto validation_result = message->validate(&report, app->msg_version(), allow_unknown_parameters); + auto validation_result = message->validate(&report, app->msg_version()); LOG4CXX_DEBUG( logger_, "Attached schema to message, result if valid: " << validation_result << "\nError report: " << rpc::PrettyFormat(report)); diff --git a/src/components/smart_objects/src/object_schema_item.cc b/src/components/smart_objects/src/object_schema_item.cc index 14d602e2c1..5b003943f6 100644 --- a/src/components/smart_objects/src/object_schema_item.cc +++ b/src/components/smart_objects/src/object_schema_item.cc @@ -32,7 +32,6 @@ #include "smart_objects/object_schema_item.h" #include <algorithm> -#include <sstream> #include "generated_msg_version.h" #include "smart_objects/always_false_schema_item.h" @@ -48,7 +47,6 @@ const utils::SemanticVersion kModuleVersion(application_manager::major_version, } // namespace namespace ns_smart_device_link { namespace ns_smart_objects { -CREATE_LOGGERPTR_LOCAL(vehicle_log, "VEHICLELOG") SMember::SMember() : mSchemaItem(CAlwaysFalseSchemaItem::create()) @@ -91,10 +89,8 @@ bool SMember::CheckHistoryFieldVersion( const utils::SemanticVersion& MessageVersion) const { if (MessageVersion.isValid()) { if (mType == Type::CUSTOM) { - LOG4CXX_ERROR(vehicle_log, "CHECKING CUSTOM DATA: "); return CheckCustomVehicleData(MessageVersion); } else { - LOG4CXX_ERROR(vehicle_log, "CHECKING API DATA: "); return CheckAPIVehicleData(MessageVersion); } } @@ -132,20 +128,6 @@ bool SMember::CheckAPIVehicleData( return true; } -std::string SMember::to_string() const { - std::ostringstream out; - - out << "Mandatory: " << mIsMandatory << "\n"; - out << "Deprecated: " << mIsDeprecated << "\n"; - out << "Removed: " << mIsRemoved << "\n"; - out << "Valid: " << mIsValid << "\n"; - out << "Type: " << (mType == Type::API ? "API" : "CUSTOM") << "\n"; - out << "Since: " << (mSince != boost::none ? mSince.get().toString() : "NONE") << "\n"; - out << "Until: " << (mUntil != boost::none ? mUntil.get().toString() : "NONE") << "\n"; - - return out.str(); -} - std::shared_ptr<CObjectSchemaItem> CObjectSchemaItem::create( const Members& members) { return std::shared_ptr<CObjectSchemaItem>(new CObjectSchemaItem(members)); @@ -173,8 +155,6 @@ errors::eType CObjectSchemaItem::validate( const SMember& member = it->second; const SMember& correct_member = GetCorrectMember(member, MessageVersion); - LOG4CXX_ERROR(vehicle_log, "" << key << " INFO: " << correct_member.to_string()); - std::set<std::string>::const_iterator key_it = object_keys.find(key); if (object_keys.end() == key_it) { if (correct_member.mIsMandatory == true && @@ -302,9 +282,6 @@ void CObjectSchemaItem::RemoveFakeParams( std::map<std::string, SMember>::const_iterator members_it = mMembers.find(key); - LOG4CXX_ERROR(vehicle_log, "PROCESSING " << key); - LOG4CXX_ERROR(vehicle_log, - "MESSAGE VERSION: " << MessageVersion.toString()); if (mMembers.end() != members_it) { const SMember& member = GetCorrectMember(members_it->second, MessageVersion); |