Merge remote-tracking branch 'origin/feature/remove_qt_hmi_api_dbus' into develop

# Conflicts:
#	src/components/application_manager/CMakeLists.txt
#	src/components/application_manager/include/application_manager/commands/mobile/get_vehicle_data_request.h
#	src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_request.h
#	src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_vehicle_data_request.h
#	src/components/application_manager/src/commands/mobile/get_vehicle_data_request.cc
#	src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc
#	src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_request.cc
#	src/components/application_manager/src/hmi_command_factory.cc
#	src/components/application_manager/src/message_helper/message_helper.cc
#	src/components/application_manager/test/commands/hmi/dummy_hmi_commands_test.cc
#	src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
#	src/components/application_manager/test/commands/mobile/get_vehicle_data_request_test.cc

1 files changed, 0 insertions, 857 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 83edb76264..c510315ad8 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
@@ -158,36 +158,6 @@
 #include "sdl_rpc_plugin/commands/hmi/decrypt_certificate_response.h"
 #endif  // EXTERNAL_PROPRIETARY_MODE
 
-#ifdef HMI_DBUS_API
-#include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request_template.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response_template.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request_template.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response_template.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h"
-#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"
-#endif  // #ifdef HMI_DBUS_API
-
 #include "sdl_rpc_plugin/commands/hmi/navi_is_ready_request.h"
 #include "sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_request.h"
 #include "sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h"
@@ -603,229 +573,6 @@ CommandCreator& HMICommandFactory::get_creator_factory(
                  ? factory.GetCreator<commands::UIIsReadyRequest>()
                  : factory.GetCreator<commands::UIIsReadyResponse>();
     }
-#ifdef HMI_DBUS_API
-    case hmi_apis::FunctionID::VehicleInfo_GetGpsData: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_GetGpsData> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_GetGpsData> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetSpeed: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetSpeed> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_GetSpeed> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetRpm: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehitcleInfo_GetRpm> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_GetRpm> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetFuelLevel: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetFuelLevel> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_GetFuelLevel> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetFuelLevelState: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetFuelLevelState> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_GetFuelLevelState> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetInstantFuelConsumption: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::
-                           VehicleInfo_GetInstantFuelConsumption> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_GetInstantFuelConsumption> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetExternalTemperature: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::
-                           VehicleInfo_GetExternalTemperature> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_GetExternalTemperature> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetPrndl: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetPrndl> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_GetPrndl> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetVin: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetVin> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_GetVin> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetTirePressure: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetTirePressure> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_GetTirePressure> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetOdometer: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetOdometer> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_GetOdometer> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetBeltStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetBeltStatus> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_GetBeltStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetBodyInformation: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetBodyInformation> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_GetBodyInformation> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetDeviceStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetDeviceStatus> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_GetDeviceStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetDriverBraking: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetDriverBraking> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_GetDriverBraking> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetWiperStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetWiperStatus> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_GetWiperStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetHeadLampStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetHeadLampStatus> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_GetHeadLampStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetEngineTorque: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetEngineTorque> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_GetEngineTorque> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetAccPedalPosition: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::
-                           VehicleInfo_GetAccPedalPosition> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_GetAccPedalPosition> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetSteeringWheelAngle: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::
-                           VehicleInfo_GetSteeringWheelAngle> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_GetSteeringWheelAngle> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetECallInfo: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetECallInfo> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_GetECallInfo> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetAirbagStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetAirbagStatus> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_GetAirbagStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetEmergencyEvent: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetEmergencyEvent> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_GetEmergencyEvent> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetClusterModeStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::
-                           VehicleInfo_GetClusterModeStatus> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_GetClusterModeStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_GetMyKey: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::VIGetVehicleDataRequestTemplate<
-                       hmi_apis::FunctionID::VehicleInfo_GetMyKey> >()
-                 : factory
-                       .GetCreator<commands::VIGetVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_GetMyKey> >();
-    }
-#endif  // #ifdef HMI_DBUS_API
     case hmi_apis::FunctionID::Navigation_IsReady: {
       return hmi_apis::messageType::request == message_type
                  ? factory.GetCreator<commands::NaviIsReadyRequest>()
@@ -955,610 +702,6 @@ CommandCreator& HMICommandFactory::get_creator_factory(
       return factory
           .GetCreator<commands::hmi::OnButtonSubscriptionNotification>();
     }
-#ifdef HMI_DBUS_API
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeGps: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_SubscribeGps> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_SubscribeGps> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeSpeed: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_SubscribeSpeed> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeSpeed> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeRpm: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_SubscribeRpm> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_SubscribeRpm> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeFuelLevel: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeFuelLevel> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeFuelLevel> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeFuelLevel_State: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeFuelLevel_State> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeFuelLevel_State> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeInstantFuelConsumption: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeInstantFuelConsumption> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeInstantFuelConsumption> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeExternalTemperature: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeExternalTemperature> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeExternalTemperature> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribePrndl: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_SubscribePrndl> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribePrndl> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeVin: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_SubscribeVin> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_SubscribeVin> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeTirePressure: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeTirePressure> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeTirePressure> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeOdometer: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeOdometer> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeOdometer> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeBeltStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeBeltStatus> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeBeltStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeBodyInformation: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeBodyInformation> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeBodyInformation> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeDeviceStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeDeviceStatus> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeDeviceStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeDriverBraking: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeDriverBraking> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeDriverBraking> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeWiperStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeWiperStatus> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeWiperStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeHeadLampStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeHeadLampStatus> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeHeadLampStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeEngineTorque: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeEngineTorque> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeEngineTorque> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeAccPedalPosition: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeAccPedalPosition> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeAccPedalPosition> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeSteeringWheelAngle: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeSteeringWheelAngle> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeSteeringWheelAngle> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeECallInfo: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeECallInfo> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeECallInfo> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeAirbagStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeAirbagStatus> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeAirbagStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeEmergencyEvent: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeEmergencyEvent> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeEmergencyEvent> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeClusterModeStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeClusterModeStatus> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeClusterModeStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_SubscribeMyKey: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VISubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_SubscribeMyKey> >()
-                 : factory.GetCreator<
-                       commands::VISubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_SubscribeMyKey> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeGps: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator <
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_UnsubscribeGps>()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeGps> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeSpeed: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeSpeed> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeSpeed> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeRpm: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_UnsubscribeRpm> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeRpm> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeFuelLevel: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeFuelLevel> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeFuelLevel> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeFuelLevel_State: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeFuelLevel_State> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeFuelLevel_State> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeInstantFuelConsumption: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeInstantFuelConsumption> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeInstantFuelConsumption> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeExternalTemperature: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeExternalTemperature> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeExternalTemperature> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribePrndl: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribePrndl> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribePrndl> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeVin: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_UnsubscribeVin> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeVin> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeTirePressure: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeTirePressure> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeTirePressure> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeOdometer: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeOdometer> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeOdometer> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeBeltStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeBeltStatus> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeBeltStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeBodyInformation: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeBodyInformation> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeBodyInformation> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeDeviceStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeDeviceStatus> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeDeviceStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeDriverBraking: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeDriverBraking> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeDriverBraking> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeWiperStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeWiperStatus> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeWiperStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeHeadLampStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeHeadLampStatus> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeHeadLampStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeEngineTorque: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeEngineTorque> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeEngineTorque> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeAccPedalPosition: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeAccPedalPosition> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeAccPedalPosition> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeSteeringWheelAngle: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeSteeringWheelAngle> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeSteeringWheelAngle> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeECallInfo: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeECallInfo> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeECallInfo> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeAirbagStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeAirbagStatus> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeAirbagStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeEmergencyEvent: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeEmergencyEvent> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeEmergencyEvent> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeClusterModeStatus: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeClusterModeStatus> >()
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeClusterModeStatus> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_UnsubscribeMyKey: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::>(
-                       VIUnsubscribeVehicleDataRequestTemplate<
-                           hmi_apis::FunctionID::VehicleInfo_UnsubscribeMyKey>)
-                 : factory.GetCreator<
-                       commands::VIUnsubscribeVehicleDataResponseTemplate<
-                           hmi_apis::FunctionID::
-                               VehicleInfo_UnsubscribeMyKey> >();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnGpsData: {
-      return factory.GetCreator<commands::OnVIGpsDataNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnSpeed: {
-      return factory.GetCreator<commands::OnVISpeedNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnRpm: {
-      return factory.GetCreator<commands::OnVIRpmNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnFuelLevel: {
-      return factory.GetCreator<commands::OnVifuelLevelNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnFuelLevelState: {
-      return factory.GetCreator<commands::OnVifuelLevelStateNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnInstantFuelConsumption: {
-      return factory
-          .GetCreator<commands::OnVIInstantFuelConsumptionNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnExternalTemperature: {
-      return factory
-          .GetCreator<commands::OnVIExternalTemperatureNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnVin: {
-      return factory.GetCreator<commands::OnVIVinNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnPrndl: {
-      return factory.GetCreator<commands::OnVIPrndlNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnTirePressure: {
-      return factory.GetCreator<commands::OnVITirePressureNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnOdometer: {
-      return factory.GetCreator<commands::OnVIOdometerNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnBeltStatus: {
-      return factory.GetCreator<commands::OnVIBeltStatusNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnBodyInformation: {
-      return factory.GetCreator<commands::OnVIBodyInformationNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnDeviceStatus: {
-      return factory.GetCreator<commands::OnVIDeviceStatusNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnDriverBraking: {
-      return factory.GetCreator<commands::OnVIDriverBrakingNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnWiperStatus: {
-      return factory.GetCreator<commands::OnVIWiperStatusNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnHeadLampStatus: {
-      return factory.GetCreator<commands::OnVIHeadLampStatusNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnEngineTorque: {
-      return factory.GetCreator<commands::OnVIEngineTorqueNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnAccPedalPosition: {
-      return factory.GetCreator<commands::OnVIAccPedalPositionNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnSteeringWheelAngle: {
-      return factory.GetCreator<commands::OnVISteeringWheelAngleNotification>();
-    }
-    case hmi_apis::FunctionID::VehicleInfo_OnMyKey: {
-      return factory.GetCreator<commands::OnVIMyKeyNotification>();
-    }
-#endif  // #ifdef HMI_DBUS_API
     case hmi_apis::FunctionID::Navigation_OnTBTClientState: {
       return factory.GetCreator<commands::OnNaviTBTClientStateNotification>();
     }