Removed usages of moved modules from rpc plugin, minor code improvement.

8 files changed, 16 insertions, 118 deletions

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
index 0254123b9b..3545d3243d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
@@ -148,8 +148,6 @@
 #include "sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h"
 #include "sdl_rpc_plugin/commands/hmi/vr_perform_interaction_request.h"
 #include "sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_read_did_request.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_read_did_response.h"
 #include "sdl_rpc_plugin/commands/hmi/sdl_activate_app_request.h"
 #include "sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h"
 #include "sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h"
@@ -188,20 +186,8 @@
 #include "sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h"
-#else
-#include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h"
 #endif  // #ifdef HMI_DBUS_API
 
-#include "sdl_rpc_plugin/commands/hmi/vi_get_dtcs_request.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_get_dtcs_response.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_request.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_response.h"
 #include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_request.h"
 #include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_response.h"
 #include "sdl_rpc_plugin/commands/hmi/navi_is_ready_request.h"
@@ -241,7 +227,6 @@
 #include "sdl_rpc_plugin/commands/hmi/on_button_event_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_button_press_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h"
@@ -621,11 +606,6 @@ CommandCreator& HMICommandFactory::get_creator_factory(
                  ? factory.GetCreator<commands::UIIsReadyRequest>()
                  : factory.GetCreator<commands::UIIsReadyResponse>();
     }
-    case hmi_apis::FunctionID::VehicleInfo_ReadDID: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIReadDIDRequest>()
-                 : factory.GetCreator<commands::VIReadDIDResponse>();
-    }
 #ifdef HMI_DBUS_API
     case hmi_apis::FunctionID::VehicleInfo_GetGpsData: {
       return hmi_apis::messageType::request == message_type
@@ -847,23 +827,7 @@ CommandCreator& HMICommandFactory::get_creator_factory(
                        .GetCreator<commands::VIGetVehicleDataResponseTemplate<
                            hmi_apis::FunctionID::VehicleInfo_GetMyKey> >();
     }
-#else
-    case hmi_apis::FunctionID::VehicleInfo_GetVehicleData: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequest>()
-                 : factory.GetCreator<commands::VIGetVehicleDataResponse>();
-    }
 #endif  // #ifdef HMI_DBUS_API
-    case hmi_apis::FunctionID::VehicleInfo_GetDTCs: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetDTCsRequest>()
-                 : factory.GetCreator<commands::VIGetDTCsResponse>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_DiagnosticMessage: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIDiagnosticMessageRequest>()
-                 : factory.GetCreator<commands::VIDiagnosticMessageResponse>();
-    }
     case hmi_apis::FunctionID::VehicleInfo_GetVehicleType: {
       return hmi_apis::messageType::request == message_type
                  ? factory.GetCreator<commands::VIGetVehicleTypeRequest>()
@@ -1267,15 +1231,6 @@ CommandCreator& HMICommandFactory::get_creator_factory(
                            hmi_apis::FunctionID::
                                VehicleInfo_SubscribeMyKey> >();
     }
-#else
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeVehicleData: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VISubscribeVehicleDataRequest>()
-                 : factory
-                       .GetCreator<commands::VISubscribeVehicleDataResponse>();
-    }
-#endif  // #ifdef HMI_DBUS_API
-#ifdef HMI_DBUS_API
     case hmi_apis::FunctionID::VehicleInfo_UnsubscribeGps: {
       return hmi_apis::messageType::request == message_type
                  ? factory.GetCreator <
@@ -1547,16 +1502,6 @@ CommandCreator& HMICommandFactory::get_creator_factory(
                            hmi_apis::FunctionID::
                                VehicleInfo_UnsubscribeMyKey> >();
     }
-#else
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeVehicleData: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory
-                       .GetCreator<commands::VIUnsubscribeVehicleDataRequest>()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponse>();
-    }
-#endif  // #ifdef HMI_DBUS_API
-#ifdef HMI_DBUS_API
     case hmi_apis::FunctionID::VehicleInfo_OnGpsData: {
       return factory.GetCreator<commands::OnVIGpsDataNotification>();
     }
@@ -1622,10 +1567,6 @@ CommandCreator& HMICommandFactory::get_creator_factory(
     case hmi_apis::FunctionID::VehicleInfo_OnMyKey: {
       return factory.GetCreator<commands::OnVIMyKeyNotification>();
     }
-#else
-    case hmi_apis::FunctionID::VehicleInfo_OnVehicleData: {
-      return factory.GetCreator<commands::OnVIVehicleDataNotification>();
-    }
 #endif  // #ifdef HMI_DBUS_API
     case hmi_apis::FunctionID::Navigation_OnTBTClientState: {
       return factory.GetCreator<commands::OnNaviTBTClientStateNotification>();
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc
index 3ddfcf8710..d27161ff77 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc
@@ -54,12 +54,8 @@
 #include "sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h"
 #include "sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_response.h"
 #include "sdl_rpc_plugin/commands/mobile/generic_response.h"
-#include "sdl_rpc_plugin/commands/mobile/get_dtcs_request.h"
-#include "sdl_rpc_plugin/commands/mobile/get_dtcs_response.h"
 #include "sdl_rpc_plugin/commands/mobile/get_system_capability_request.h"
 #include "sdl_rpc_plugin/commands/mobile/get_system_capability_response.h"
-#include "sdl_rpc_plugin/commands/mobile/get_vehicle_data_request.h"
-#include "sdl_rpc_plugin/commands/mobile/get_vehicle_data_response.h"
 #include "sdl_rpc_plugin/commands/mobile/get_way_points_request.h"
 #include "sdl_rpc_plugin/commands/mobile/get_way_points_response.h"
 #include "sdl_rpc_plugin/commands/mobile/list_files_request.h"
@@ -75,7 +71,6 @@
 #include "sdl_rpc_plugin/commands/mobile/on_command_notification.h"
 #include "sdl_rpc_plugin/commands/mobile/on_permissions_change_notification.h"
 #include "sdl_rpc_plugin/commands/mobile/on_tbt_client_state_notification.h"
-#include "sdl_rpc_plugin/commands/mobile/on_vehicle_data_notification.h"
 #include "sdl_rpc_plugin/commands/mobile/on_hash_change_notification.h"
 #include "sdl_rpc_plugin/commands/mobile/on_way_point_change_notification.h"
 #include "sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h"
@@ -84,8 +79,6 @@
 #include "sdl_rpc_plugin/commands/mobile/perform_interaction_response.h"
 #include "sdl_rpc_plugin/commands/mobile/put_file_request.h"
 #include "sdl_rpc_plugin/commands/mobile/put_file_response.h"
-#include "sdl_rpc_plugin/commands/mobile/read_did_request.h"
-#include "sdl_rpc_plugin/commands/mobile/read_did_response.h"
 #include "sdl_rpc_plugin/commands/mobile/register_app_interface_request.h"
 #include "sdl_rpc_plugin/commands/mobile/register_app_interface_response.h"
 #include "sdl_rpc_plugin/commands/mobile/reset_global_properties_request.h"
@@ -110,8 +103,6 @@
 #include "sdl_rpc_plugin/commands/mobile/speak_response.h"
 #include "sdl_rpc_plugin/commands/mobile/subscribe_button_request.h"
 #include "sdl_rpc_plugin/commands/mobile/subscribe_button_response.h"
-#include "sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h"
-#include "sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_response.h"
 #include "sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h"
 #include "sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h"
 #include "sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h"
@@ -120,8 +111,6 @@
 #include "sdl_rpc_plugin/commands/mobile/unregister_app_interface_response.h"
 #include "sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h"
 #include "sdl_rpc_plugin/commands/mobile/unsubscribe_button_response.h"
-#include "sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_request.h"
-#include "sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_response.h"
 #include "sdl_rpc_plugin/commands/mobile/update_turn_list_request.h"
 #include "sdl_rpc_plugin/commands/mobile/update_turn_list_response.h"
 #include "sdl_rpc_plugin/commands/mobile/system_request.h"
@@ -129,8 +118,6 @@
 #include "sdl_rpc_plugin/commands/mobile/on_keyboard_input_notification.h"
 #include "sdl_rpc_plugin/commands/mobile/on_touch_event_notification.h"
 #include "sdl_rpc_plugin/commands/mobile/on_system_request_notification.h"
-#include "sdl_rpc_plugin/commands/mobile/diagnostic_message_request.h"
-#include "sdl_rpc_plugin/commands/mobile/diagnostic_message_response.h"
 #include "sdl_rpc_plugin/commands/mobile/send_location_request.h"
 #include "sdl_rpc_plugin/commands/mobile/send_location_response.h"
 #include "sdl_rpc_plugin/commands/mobile/dial_number_request.h"
@@ -280,17 +267,6 @@ CommandCreator& MobileCommandFactory::get_creator_factory(
                  ? factory.GetCreator<commands::ShowConstantTBTRequest>()
                  : factory.GetCreator<commands::GetWayPointsResponse>();
     }
-    case mobile_apis::FunctionID::SubscribeVehicleDataID: {
-      return mobile_api::messageType::request == message_type
-                 ? factory.GetCreator<commands::SubscribeVehicleDataRequest>()
-                 : factory.GetCreator<commands::SubscribeVehicleDataResponse>();
-    }
-    case mobile_apis::FunctionID::UnsubscribeVehicleDataID: {
-      return mobile_api::messageType::request == message_type
-                 ? factory.GetCreator<commands::UnsubscribeVehicleDataRequest>()
-                 : factory
-                       .GetCreator<commands::UnsubscribeVehicleDataResponse>();
-    }
     case mobile_apis::FunctionID::SubscribeWayPointsID: {
       return mobile_api::messageType::request == message_type
                  ? factory.GetCreator<commands::SubscribeWayPointsRequest>()
@@ -306,16 +282,6 @@ CommandCreator& MobileCommandFactory::get_creator_factory(
                  ? factory.GetCreator<commands::GetSystemCapabilityRequest>()
                  : factory.GetCreator<commands::GetSystemCapabilityResponse>();
     }
-    case mobile_apis::FunctionID::ReadDIDID: {
-      return mobile_api::messageType::request == message_type
-                 ? factory.GetCreator<commands::ReadDIDRequest>()
-                 : factory.GetCreator<commands::ReadDIDResponse>();
-    }
-    case mobile_apis::FunctionID::GetVehicleDataID: {
-      return mobile_api::messageType::request == message_type
-                 ? factory.GetCreator<commands::GetVehicleDataRequest>()
-                 : factory.GetCreator<commands::GetVehicleDataResponse>();
-    }
     case mobile_apis::FunctionID::ScrollableMessageID: {
       return mobile_api::messageType::request == message_type
                  ? factory.GetCreator<commands::ScrollableMessageRequest>()
@@ -347,16 +313,6 @@ CommandCreator& MobileCommandFactory::get_creator_factory(
                  ? factory.GetCreator<commands::ChangeRegistrationRequest>()
                  : factory.GetCreator<commands::ChangeRegistrationResponse>();
     }
-    case mobile_apis::FunctionID::GetDTCsID: {
-      return mobile_api::messageType::request == message_type
-                 ? factory.GetCreator<commands::GetDTCsRequest>()
-                 : factory.GetCreator<commands::GetDTCsResponse>();
-    }
-    case mobile_apis::FunctionID::DiagnosticMessageID: {
-      return mobile_api::messageType::request == message_type
-                 ? factory.GetCreator<commands::DiagnosticMessageRequest>()
-                 : factory.GetCreator<commands::DiagnosticMessageResponse>();
-    }
     case mobile_apis::FunctionID::SetMediaClockTimerID: {
       return mobile_api::messageType::request == message_type
                  ? factory.GetCreator<commands::SetMediaClockRequest>()
@@ -391,9 +347,6 @@ CommandCreator& MobileCommandFactory::get_creator_factory(
     case mobile_apis::FunctionID::OnAudioPassThruID: {
       return factory.GetCreator<commands::OnAudioPassThruNotification>();
     }
-    case mobile_apis::FunctionID::OnVehicleDataID: {
-      return factory.GetCreator<commands::OnVehicleDataNotification>();
-    }
     case mobile_apis::FunctionID::OnAppInterfaceUnregisteredID: {
       return factory
           .GetCreator<commands::OnAppInterfaceUnregisteredNotification>();
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h
index 21d6afa768..3919328d3b 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h
@@ -70,6 +70,8 @@ private:
   policy::PolicyHandlerInterface& policy_handler_;
   std::unique_ptr<app_mngr::CommandFactory> hmi_command_factory_;
   std::unique_ptr<app_mngr::CommandFactory> mob_command_factory_;
+  // std::unique_ptr<VehicleInfoHmiCommandFactory> hmi_command_factory_;
+  // std::unique_ptr<VehicleInfoMobileCommandFactory> mob_command_factory_;
 };
 
 }
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_hmi_command_factory.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_hmi_command_factory.h
index 36fdd3c25f..8e0242eafd 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_hmi_command_factory.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_hmi_command_factory.h
@@ -41,7 +41,7 @@ namespace app_mngr = application_manager;
 /**
  * @brief The vehicle info hmi command factory.
  */
-class VehicleInfoHmiCommandFactory : app_mngr::CommandFactory {
+class VehicleInfoHmiCommandFactory : public app_mngr::CommandFactory {
 public:
   VehicleInfoHmiCommandFactory(
     app_mngr::ApplicationManager& application_manager,
@@ -64,7 +64,8 @@ private:
   app_mngr::HMICapabilities& hmi_capabilities_;
   policy::PolicyHandlerInterface& policy_handler_;
 
-  app_mngr::CommandCreator& buildCommandCreator(int32_t function_id, int32_t message_type);
+  app_mngr::CommandCreator& buildCommandCreator(
+      const int32_t function_id, const int32_t message_type) const;
 
   DISALLOW_COPY_AND_ASSIGN(VehicleInfoHmiCommandFactory);
 };
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_mobile_command_factory.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_mobile_command_factory.h
index cd90219fc1..890ed3220a 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_mobile_command_factory.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_mobile_command_factory.h
@@ -41,7 +41,7 @@ namespace app_mngr = application_manager;
 /**
  * @brief The vehicle info mobile command factory.
  */
-class VehicleInfoMobileCommandFactory : app_mngr::CommandFactory {
+class VehicleInfoMobileCommandFactory : public app_mngr::CommandFactory {
 public:
   VehicleInfoMobileCommandFactory(
     app_mngr::ApplicationManager& application_manager,
@@ -64,7 +64,8 @@ private:
   app_mngr::HMICapabilities& hmi_capabilities_;
   policy::PolicyHandlerInterface& policy_handler_;
 
-  app_mngr::CommandCreator& buildCommandCreator(int32_t function_id, int32_t message_type);
+  app_mngr::CommandCreator& buildCommandCreator(
+      const int32_t function_id, const int32_t message_type) const;
 
   DISALLOW_COPY_AND_ASSIGN(VehicleInfoMobileCommandFactory);
 };
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc
index edc80951e3..e969dcbf1d 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc
@@ -45,10 +45,10 @@ VehicleInfoCommandFactory::VehicleInfoCommandFactory(
     rpc_service_(rpc_service),
     hmi_capabilities_(hmi_capabilities),
     policy_handler_(policy_handler),
-    hmi_command_factory_(std::make_shared(new VehicleInfoHmiCommandFactory(
-      application_manager, rpc_service, hmi_capabilities, policy_handler))),
-    mob_command_factory_(std::make_shared(new VehicleInfoMobileCommandFactory(
-      application_manager, rpc_service, hmi_capabilities, policy_handler))) {
+    hmi_command_factory_(new VehicleInfoHmiCommandFactory(
+      application_manager, rpc_service, hmi_capabilities, policy_handler)),
+    mob_command_factory_(new VehicleInfoMobileCommandFactory(
+      application_manager, rpc_service, hmi_capabilities, policy_handler)) {
   LOG4CXX_AUTO_TRACE(logger_);
 }
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_hmi_command_factory.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_hmi_command_factory.cc
index c98ea0c222..f15107dd97 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_hmi_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_hmi_command_factory.cc
@@ -105,7 +105,7 @@ bool VehicleInfoHmiCommandFactory::IsAbleToProcess(
 }
 
 app_mngr::CommandCreator& VehicleInfoHmiCommandFactory::buildCommandCreator(
-      int32_t function_id, int32_t message_type) {
+      const int32_t function_id, const int32_t message_type) const {
   UNUSED(message_type);
 
   auto factory =
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_mobile_command_factory.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_mobile_command_factory.cc
index c2e4a26745..f237617630 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_mobile_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_mobile_command_factory.cc
@@ -72,11 +72,11 @@ app_mngr::CommandSharedPtr VehicleInfoMobileCommandFactory::CreateCommand(
   UNUSED(source);
 
   const mobile_apis::FunctionID::eType function_id =
-      static_cast<hmi_apis::FunctionID::eType>(
+      static_cast<mobile_apis::FunctionID::eType>(
         (*message)[strings::params][strings::function_id].asInt());
 
   const mobile_apis::messageType::eType message_type =
-      static_cast<hmi_apis::messageType::eType>(
+      static_cast<mobile_apis::messageType::eType>(
         (*message)[strings::params][strings::message_type].asInt());
 
   auto message_type_str = "";
@@ -104,7 +104,7 @@ bool VehicleInfoMobileCommandFactory::IsAbleToProcess(
 }
 
 app_mngr::CommandCreator& VehicleInfoMobileCommandFactory::buildCommandCreator(
-      int32_t function_id, int32_t message_type) {
+      const int32_t function_id, const int32_t message_type) const {
   auto factory =
       app_mngr::CommandCreatorFactory(application_manager_, rpc_service_, hmi_capabilities_, policy_handler_);
   auto &creator = factory.GetCreator<app_mngr::InvalidCommand>();