From 3bfff8281000a0d31bc6d96bf4793cbf4a291cb3 Mon Sep 17 00:00:00 2001 From: "Yaroslav Mamykin (GitHub)" Date: Fri, 11 Oct 2019 15:18:04 +0300 Subject: fixup! Fix versioning appliance for vehicle data --- .../src/custom_vehicle_data_manager_impl.cc | 26 +++++++++++++++++++++- .../application_manager/src/rpc_handler_impl.cc | 1 - .../application_manager/src/rpc_service_impl.cc | 6 ++--- .../smart_objects/src/object_schema_item.cc | 23 ------------------- 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 490ff7696f..9e76da328f 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 @@ -345,7 +345,31 @@ void CustomVehicleDataManagerImpl::UpdateVehicleDataItems() { ); } case SMemberType::SMEMBER_HMI: { - TSchemaItemParameter tschema_item(item); + std::function 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 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 9a1d815bb2..e8468e95cc 100644 --- a/src/components/application_manager/src/rpc_handler_impl.cc +++ b/src/components/application_manager/src/rpc_handler_impl.cc @@ -308,7 +308,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 bffb63ea72..2da2f3bb8d 100644 --- a/src/components/application_manager/src/rpc_service_impl.cc +++ b/src/components/application_manager/src/rpc_service_impl.cc @@ -535,11 +535,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 -#include #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::create( const Members& members) { return std::shared_ptr(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::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::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); -- cgit v1.2.1