diff options
| author | Ira Lytvynenko <ILytvynenko@luxoft.com> | 2018-02-07 17:35:58 +0200 |
|---|---|---|
| committer | Ira Lytvynenko (GitHub) <ILytvynenko@luxoft.com> | 2018-06-26 12:01:43 +0300 |
| commit | 691e6018cf1a09eb6aeb5f2c4fa4b93bc3ffb429 (patch) | |
| tree | 360c950b5ace22da4ec7970bf975f95acd29fe24 /src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src | |
| parent | 0e7b196dd678ce3dbb8886633f2f918e3c0068bf (diff) | |
| download | sdl_core-691e6018cf1a09eb6aeb5f2c4fa4b93bc3ffb429.tar.gz | |
move commands factory to rpc plugin
Replace include path of the commands
Fix some things
Fixing compile of applicaiton manager
Move Commands interface part back to application_manager
Use unique ptr for plugin manager
Fix style in RPC services and factories
Remove redunsant includes of factories in application manager
Remove include of functional module
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src')
353 files changed, 3508 insertions, 549 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_request.cc index ea36cd2b0a..71b8aea206 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/activate_app_request.h" +#include "sdl_rpc_plugin/commands/hmi/activate_app_request.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_response.cc index 55e704b6c4..d0c6797fb3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/activate_app_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/activate_app_response.h" +#include "sdl_rpc_plugin/commands/hmi/activate_app_response.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/add_statistics_info_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/add_statistics_info_notification.cc index ef75eba1e2..9ffa356f07 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/add_statistics_info_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/add_statistics_info_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/add_statistics_info_notification.h" +#include "sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h" #include "application_manager/policies/policy_handler.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_request.cc index 4e096a2cda..d048e8696a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/allow_all_apps_request.h" +#include "sdl_rpc_plugin/commands/hmi/allow_all_apps_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_response.cc index ed05c3ba83..8a7b8f75d7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_all_apps_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/allow_all_apps_response.h" +#include "sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_request.cc index 5176b3b4fe..9c43299fe6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/allow_app_request.h" +#include "sdl_rpc_plugin/commands/hmi/allow_app_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_response.cc index 5fd9c702b4..8eac947391 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/allow_app_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/allow_app_response.h" +#include "sdl_rpc_plugin/commands/hmi/allow_app_response.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_on_awake_sdl.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_on_awake_sdl.cc index c6c550a474..c23a9b66b1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_on_awake_sdl.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_on_awake_sdl.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/basic_communication_on_awake_sdl.h" +#include "sdl_rpc_plugin/commands/hmi/basic_communication_on_awake_sdl.h" #include "application_manager/message_helper.h" #include "application_manager/resumption/resume_ctrl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_request.cc index 2499c21680..0e0c89fa94 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/basic_communication_system_request.h" +#include "sdl_rpc_plugin/commands/hmi/basic_communication_system_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_response.cc index 16afce92e0..dbb6e126ab 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_system_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/basic_communication_system_response.h" +#include "sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_request.cc index e6b73879e5..989ba8aa5c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/button_get_capabilities_request.h" +#include "sdl_rpc_plugin/commands/hmi/button_get_capabilities_request.h" #include "utils/logger.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc index a947fb7ba9..f9fc43bc9b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/button_get_capabilities_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/button_get_capabilities_response.h" +#include "sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h" #include "utils/logger.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_request.cc index d628475438..5b00a547e4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/close_popup_request.h" +#include "sdl_rpc_plugin/commands/hmi/close_popup_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_response.cc index 15adb2ee32..b5070153c7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/close_popup_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/close_popup_response.h" +#include "sdl_rpc_plugin/commands/hmi/close_popup_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_request.cc index a09fe71bf2..0e0b632f71 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/decrypt_certificate_request.h" +#include "sdl_rpc_plugin/commands/hmi/decrypt_certificate_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_response.cc index cea9290f7d..501f38e9df 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/decrypt_certificate_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/decrypt_certificate_response.h" +#include "sdl_rpc_plugin/commands/hmi/decrypt_certificate_response.h" #include "application_manager/policies/policy_handler.h" #ifdef EXTERNAL_PROPRIETARY_MODE diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_request.cc index b26541cb01..1211c796d3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/dial_number_request.h" +#include "sdl_rpc_plugin/commands/hmi/dial_number_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_response.cc index 5511fa98f8..4db6dfc9d8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/dial_number_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/dial_number_response.h" +#include "sdl_rpc_plugin/commands/hmi/dial_number_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_request.cc index 379027c43a..5ff9489235 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/get_system_info_request.h" +#include "sdl_rpc_plugin/commands/hmi/get_system_info_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc index be6dabb292..9a6efbe996 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/get_system_info_response.h" +#include "sdl_rpc_plugin/commands/hmi/get_system_info_response.h" #include "application_manager/message_helper.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc index a229003eed..2b1cd4e442 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/get_urls.h" +#include "sdl_rpc_plugin/commands/hmi/get_urls.h" #include "application_manager/message.h" #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc index 806c4ce8b0..40f13f87bf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/get_urls_response.h" +#include "sdl_rpc_plugin/commands/hmi/get_urls_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_request.cc index e38d1fc088..36fdfb4769 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/mixing_audio_supported_request.h" +#include "sdl_rpc_plugin/commands/hmi/mixing_audio_supported_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_response.cc index f8b58e6f35..376c07d178 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/mixing_audio_supported_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/mixing_audio_supported_response.h" +#include "sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_request.cc index 582caaa8f3..af98923ae7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_alert_maneuver_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_response.cc index 5f0422bf6a..dc03fa102f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_alert_maneuver_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_alert_maneuver_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_request.cc index 42b8c64fc0..e13697f727 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_audio_start_stream_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_request.h" #include "application_manager/message_helper.h" #include "protocol_handler/protocol_handler.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_response.cc index c7fc7365e7..2e2d5215d2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_audio_start_stream_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_request.cc index f86ee8302a..0247d0a1be 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_request.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_audio_stop_stream_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_response.cc index c669d399f9..fdb7ba2c49 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_stop_stream_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_audio_stop_stream_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_request.cc index 51f862c957..42d78e6996 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_get_way_points_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_get_way_points_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_response.cc index f295845b24..3d5331f5d8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_get_way_points_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_get_way_points_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc index 4392258a31..de24f5f574 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_is_ready_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_is_ready_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_response.cc index 7daba4258b..e31120b224 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_is_ready_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_is_ready_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_request.cc index ad878033ca..56675618db 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_send_location_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_send_location_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_response.cc index a3d9f4c9e5..598a1bebe4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_send_location_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_send_location_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_send_location_response.h" #include "application_manager/event_engine/event.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_request.cc index d19db515ab..ea98701ffd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_set_video_config_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_set_video_config_request.h" #include <string> #include <vector> diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_response.cc index 03679eb3b1..34fc56e664 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_set_video_config_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_set_video_config_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h" #include "application_manager/event_engine/event.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_request.cc index a92ef07d12..28e19b846c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_show_constant_tbt_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_response.cc index ede3272e8e..fe3244d5ed 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_show_constant_tbt_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_show_constant_tbt_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc index ffc325b5e4..112de0e4e1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_start_stream_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_start_stream_request.h" #include "application_manager/message_helper.h" #include "protocol_handler/protocol_handler.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_response.cc index b0b9e672c3..7ea082da08 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_start_stream_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_request.cc index a40ee13b68..c3d6ed6675 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_request.cc @@ -1,4 +1,4 @@ -#include "application_manager/commands/hmi/navi_stop_stream_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_stop_stream_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_response.cc index 3a7fc75260..8ba80eca2c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_stop_stream_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_stop_stream_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_request.cc index f2106c8724..6faf5cedca 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_subscribe_way_points_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_response.cc index f641051560..d2a64e3945 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_subscribe_way_points_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_subscribe_way_points_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_request.cc index e66069feef..5a1aafa0a1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_unsubscribe_way_points_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_response.cc index 61216321e8..183ad8b6f8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_unsubscribe_way_points_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_unsubscribe_way_points_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_request.cc index c37c3d12f9..809286d035 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_update_turn_list_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_update_turn_list_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_response.cc index faf5719d05..5d7baf874d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_update_turn_list_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/navi_update_turn_list_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_from_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_from_hmi.cc index 2135431f10..5e7bd7b673 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_from_hmi.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_from_hmi.cc @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/notification_from_hmi.h" +#include "sdl_rpc_plugin/commands/hmi/notification_from_hmi.h" #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" #include "smart_objects/smart_object.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_to_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_to_hmi.cc index 223111d40a..fcdee1a57b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_to_hmi.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/notification_to_hmi.cc @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/notification_to_hmi.h" +#include "sdl_rpc_plugin/commands/hmi/notification_to_hmi.h" #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_allow_sdl_functionality_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_allow_sdl_functionality_notification.cc index 70e5e7cefd..69bfb76fe9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_allow_sdl_functionality_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_allow_sdl_functionality_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_allow_sdl_functionality_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h" #include "application_manager/application_manager.h" #include "application_manager/policies/policy_handler.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_activated_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_activated_notification.cc index 76252a50fd..543f64f367 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_activated_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_activated_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_app_activated_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h" #include "application_manager/message_helper.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_deactivated_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_deactivated_notification.cc index 86ce6a830c..3665292d17 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_deactivated_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_deactivated_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_app_deactivated_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_changed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_changed_notification.cc index fa7293513a..9ddb551460 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_changed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_changed_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_app_permission_changed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc index 19577f0127..1c85e0f352 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_permission_consent_notification.cc @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_app_permission_consent_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h" #include "application_manager/application_manager.h" #include "application_manager/policies/policy_handler.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_registered_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_registered_notification.cc index a97e19b556..2f7a590260 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_registered_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_registered_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_app_registered_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_unregistered_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_unregistered_notification.cc index f64e3e111b..b7f2c47ccf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_unregistered_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_unregistered_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_app_unregistered_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h" #include "application_manager/event_engine/event.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_audio_data_streaming_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_audio_data_streaming_notification.cc index c3e81bdc30..432c78e13a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_audio_data_streaming_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_audio_data_streaming_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_audio_data_streaming_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_event_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_event_notification.cc index fc8d5989a1..22a9935fc7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_event_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_event_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_button_event_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_button_event_notification.h" #include "application_manager/application_impl.h" #include "utils/logger.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_press_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_press_notification.cc index abff87c962..024103ed81 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_press_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_press_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_button_press_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_button_press_notification.h" #include "application_manager/application_impl.h" #include "utils/logger.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_subscription_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_subscription_notification.cc index aae994ea34..12eb9550c4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_subscription_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_subscription_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_button_subscription_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_chosen_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_chosen_notification.cc index 83ec785a9d..7484b3f1fa 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_chosen_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_chosen_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_device_chosen_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc index 346c05032b..a75acebb7a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc @@ -31,7 +31,7 @@ */ #include <algorithm> -#include "application_manager/commands/hmi/on_device_state_changed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h" #include "application_manager/application_manager.h" #include "application_manager/message_helper.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc index a895d353ce..221cb34211 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc @@ -31,7 +31,7 @@ */ #include <set> -#include "application_manager/commands/hmi/on_driver_distraction_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_event_changed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_event_changed_notification.cc index c211ffde50..67f132e8e2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_event_changed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_event_changed_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_event_changed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc index c9920e5d18..07dbe93ed2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_all_applications_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_exit_all_applications_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h" #include <sys/types.h> #include <unistd.h> diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc index 96f047f12d..6c093ab2ea 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_exit_application_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h" #include "application_manager/application_impl.h" #include "application_manager/state_controller.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_file_removed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_file_removed_notification.cc index e69d111d2c..fd2a2d33ed 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_file_removed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_file_removed_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_file_removed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_find_applications.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_find_applications.cc index 9d3633ba6d..94315036e6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_find_applications.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_find_applications.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_find_applications.h" +#include "sdl_rpc_plugin/commands/hmi/on_find_applications.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc index 8c772d6dcd..ca837d0cac 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_ignition_cycle_over_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h" #include "application_manager/application_manager.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_tbt_client_state_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_tbt_client_state_notification.cc index e25de1f3a9..f4b24a242d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_tbt_client_state_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_tbt_client_state_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_navi_tbt_client_state_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_way_point_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_way_point_change_notification.cc index 17d1b420be..42a76ff153 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_way_point_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_navi_way_point_change_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_navi_way_point_change_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc index 39b179f967..f865653ca3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_policy_update.h" +#include "sdl_rpc_plugin/commands/hmi/on_policy_update.h" #include "application_manager/application_manager.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_put_file_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_put_file_notification.cc index 596b7d4549..a9ce3e0344 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_put_file_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_put_file_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_put_file_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_put_file_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ready_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ready_notification.cc index 3a45e0f934..fdb9e7aa8f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ready_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ready_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_ready_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ready_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc index 8724a072ed..2802499cf9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc @@ -31,7 +31,7 @@ */ #include <string> -#include "application_manager/commands/hmi/on_received_policy_update.h" +#include "sdl_rpc_plugin/commands/hmi/on_received_policy_update.h" #include "application_manager/application_manager.h" #include "utils/file_system.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_record_start_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_record_start_notification.cc index 4d126ac67d..012fe3c382 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_record_start_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_record_start_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_record_start_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_record_start_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_resume_audio_source_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_resume_audio_source_notification.cc index ce3c371cf8..16f55d0a4f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_resume_audio_source_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_resume_audio_source_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_resume_audio_source_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_close_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_close_notification.cc index 0517ea8d24..f86c6829d7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_close_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_close_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_sdl_close_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_consent_needed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_consent_needed_notification.cc index a9c36813f6..5bd9214396 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_consent_needed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_consent_needed_notification.cc @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_sdl_consent_needed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_persistence_complete_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_persistence_complete_notification.cc index e30a0fb902..b94f4b97ec 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_persistence_complete_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_sdl_persistence_complete_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_sdl_persistence_complete_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_start_device_discovery.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_start_device_discovery.cc index 8e94b2b004..642e29e959 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_start_device_discovery.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_start_device_discovery.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_start_device_discovery.h" +#include "sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_status_update_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_status_update_notification.cc index 78a6b68324..9b44d480a0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_status_update_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_status_update_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_status_update_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_status_update_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_context_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_context_notification.cc index 887aacf5b9..2c86931878 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_context_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_context_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_system_context_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_system_context_notification.h" #include "application_manager/application_impl.h" #include "application_manager/state_controller.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc index 4885420f1c..48bf18da90 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_system_error_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_system_error_notification.h" #include "application_manager/application_manager.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc index 00b3649284..15997a21fb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_system_info_changed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h" #include "application_manager/application_manager.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc index ea91dca5f1..9492bc8299 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc @@ -32,7 +32,7 @@ #include "application_manager/application_impl.h" -#include "application_manager/commands/hmi/on_system_request_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_system_request_notification.h" #include "application_manager/policies/policy_handler_interface.h" #include "interfaces/MOBILE_API.h" #include "utils/macro.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc index 4571cfeb5b..b053ca987c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_language_change_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_tts_language_change_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_reset_timeout_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_reset_timeout_notification.cc index 283e2056ba..ed5522a92a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_reset_timeout_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_reset_timeout_notification.cc @@ -1,4 +1,4 @@ -#include "application_manager/commands/hmi/on_tts_reset_timeout_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_started_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_started_notification.cc index 317465f354..9f9d4bc1f3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_started_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_started_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_tts_started_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_stopped_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_stopped_notification.cc index 7f763d8598..c3ae14fd96 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_stopped_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_tts_stopped_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_tts_stopped_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h" #include "application_manager/event_engine/event.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_command_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_command_notification.cc index 9f91d99a85..91ebc144af 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_command_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_command_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_ui_command_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_keyboard_input_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_keyboard_input_notification.cc index 117fec5741..58e78a41dc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_keyboard_input_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_keyboard_input_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_ui_keyboard_input_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc index 8eac4a1c80..9180be158e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_language_change_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_ui_language_change_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_reset_timeout_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_reset_timeout_notification.cc index a5fea7bf8d..e75660206f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_reset_timeout_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_reset_timeout_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_ui_reset_timeout_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_touch_event_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_touch_event_notification.cc index 7709af8720..9894cf110f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_touch_event_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ui_touch_event_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_ui_touch_event_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_update_device_list.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_update_device_list.cc index b245ea21aa..7b49e82906 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_update_device_list.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_update_device_list.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_update_device_list.h" +#include "sdl_rpc_plugin/commands/hmi/on_update_device_list.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_acc_pedal_position_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_acc_pedal_position_notification.cc index 9b10055e2c..dcd7aa99ce 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_acc_pedal_position_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_acc_pedal_position_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_belt_status_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_belt_status_notification.cc index 58f9add514..c37aa616a0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_belt_status_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_belt_status_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_belt_status_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_body_information_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_body_information_notification.cc index 33f2944c38..d61002e808 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_body_information_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_body_information_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_body_information_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_device_status_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_device_status_notification.cc index 9cbf612be1..4a84f648f6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_device_status_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_device_status_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_device_status_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_driver_braking_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_driver_braking_notification.cc index e521ac3a37..d1b6f24806 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_driver_braking_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_driver_braking_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_driver_braking_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_engine_torque_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_engine_torque_notification.cc index ebed955270..2d0d54c971 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_engine_torque_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_engine_torque_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_engine_torque_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_external_temperature_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_external_temperature_notification.cc index 9f0696fdc6..13d228c495 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_external_temperature_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_external_temperature_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_external_temperature_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_notification.cc index ef650a9f99..5f79b61261 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_fuel_level_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_state_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_state_notification.cc index a5267d8dac..057524e176 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_state_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_fuel_level_state_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_fuel_level_state_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_gps_data_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_gps_data_notification.cc index 63b95bf6dc..d393380cae 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_gps_data_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_gps_data_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_gps_data_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_head_lamp_status_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_head_lamp_status_notification.cc index 7d494f02d3..2bdf887b55 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_head_lamp_status_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_head_lamp_status_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_head_lamp_status_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc index a62f4cacea..c266201b8c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_my_key_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_my_key_notification.cc index 229d50667b..0c5136f7dd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_my_key_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_my_key_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_my_key_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_odometer_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_odometer_notification.cc index 10f236539c..a670061680 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_odometer_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_odometer_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_odometer_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_prndl_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_prndl_notification.cc index 81585eabca..441447e725 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_prndl_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_prndl_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_prndl_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_rpm_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_rpm_notification.cc index b5c0703917..7a971113f7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_rpm_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_rpm_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_rpm_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc index aacafb71c9..a5abd73b7e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_speed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc index af102ea926..932d1d6e40 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_tire_pressure_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_tire_pressure_notification.cc index 99506e6171..485cd157ea 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_tire_pressure_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_tire_pressure_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_tire_pressure_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc index bba7e2f3ff..033f40bd6a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_vehicle_data_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_vehicle_data_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vin_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vin_notification.cc index c360e41dff..4f683bba04 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vin_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_vin_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_vin_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_wiper_status_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_wiper_status_notification.cc index 08fb3f31d4..82fda0a90c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_wiper_status_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_wiper_status_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_wiper_status_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_video_data_streaming_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_video_data_streaming_notification.cc index ee0a91f5ef..0c61c45b55 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_video_data_streaming_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_video_data_streaming_notification.cc @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_video_data_streaming_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_command_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_command_notification.cc index c609e2dc0a..6f6da58399 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_command_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_command_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vr_command_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h" #include "application_manager/policies/policy_handler.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc index 740c51a211..0e78ab733d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vr_language_change_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h" #include "application_manager/application_impl.h" #include "application_manager/state_controller.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_started_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_started_notification.cc index 68942fcf01..f05554a4cd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_started_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_started_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vr_started_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_stopped_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_stopped_notification.cc index e8f9fab847..eb2e558b01 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_stopped_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_stopped_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vr_stopped_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_request.cc index 32b296a3b9..4914294e60 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/rc_get_capabilities_request.h" +#include "sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc index 82cbd7f128..4164181aa7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/rc_get_capabilities_response.h" +#include "sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc index f2a638ae33..c2245d3517 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/rc_is_ready_request.h" +#include "sdl_rpc_plugin/commands/hmi/rc_is_ready_request.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_response.cc index 6756b294f3..bd7dc62481 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_is_ready_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/rc_is_ready_response.h" +#include "sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/request_from_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/request_from_hmi.cc deleted file mode 100644 index 10e4ec5141..0000000000 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/request_from_hmi.cc +++ /dev/null @@ -1,109 +0,0 @@ -/* - Copyright (c) 2016, Ford Motor Company - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following - disclaimer in the documentation and/or other materials provided with the - distribution. - - Neither the name of the Ford Motor Company nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - */ - -#include "application_manager/commands/hmi/request_from_hmi.h" -#include "application_manager/application_manager.h" -#include "application_manager/rpc_service.h" -#include "utils/make_shared.h" - -namespace application_manager { - -namespace commands { - -RequestFromHMI::RequestFromHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager) - : CommandImpl(message, application_manager) - , EventObserver(application_manager.event_dispatcher()) { - // Replace HMI app id with Mobile connection id - ReplaceHMIWithMobileAppId(*message); -} - -RequestFromHMI::~RequestFromHMI() {} - -bool RequestFromHMI::Init() { - return true; -} - -bool RequestFromHMI::CleanUp() { - return true; -} - -void RequestFromHMI::Run() {} - -void RequestFromHMI::on_event(const event_engine::Event& event) {} - -void RequestFromHMI::SendResponse( - const bool success, - const uint32_t correlation_id, - const hmi_apis::FunctionID::eType function_id, - const hmi_apis::Common_Result::eType result_code) { - smart_objects::SmartObjectSPtr message = - ::utils::MakeShared<smart_objects::SmartObject>( - smart_objects::SmartType_Map); - FillCommonParametersOfSO(*message, correlation_id, function_id); - (*message)[strings::params][strings::message_type] = MessageType::kResponse; - (*message)[strings::params][hmi_response::code] = 0; - (*message)[strings::msg_params][strings::success] = success; - (*message)[strings::msg_params][strings::result_code] = result_code; - - application_manager_.GetRPCService().ManageHMICommand(message); -} - -void RequestFromHMI::SendErrorResponse( - const uint32_t correlation_id, - const hmi_apis::FunctionID::eType function_id, - const hmi_apis::Common_Result::eType result_code, - const std::string error_message) { - smart_objects::SmartObjectSPtr message = - ::utils::MakeShared<smart_objects::SmartObject>( - smart_objects::SmartType_Map); - FillCommonParametersOfSO(*message, correlation_id, function_id); - (*message)[strings::params][strings::message_type] = - MessageType::kErrorResponse; - (*message)[strings::params][hmi_response::code] = result_code; - (*message)[strings::params][strings::error_msg] = error_message; - - application_manager_.GetRPCService().ManageHMICommand(message); -} - -void RequestFromHMI::FillCommonParametersOfSO( - smart_objects::SmartObject& message, - const uint32_t correlation_id, - const hmi_apis::FunctionID::eType function_id) { - (message)[strings::params][strings::function_id] = function_id; - (message)[strings::params][strings::protocol_type] = hmi_protocol_type_; - (message)[strings::params][strings::protocol_version] = protocol_version_; - (message)[strings::params][strings::correlation_id] = correlation_id; -} - -} // namespace commands -} // namespace application_manager diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/request_to_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/request_to_hmi.cc deleted file mode 100644 index d7e889c352..0000000000 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/request_to_hmi.cc +++ /dev/null @@ -1,90 +0,0 @@ -/* - Copyright (c) 2014, Ford Motor Company - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following - disclaimer in the documentation and/or other materials provided with the - distribution. - - Neither the name of the Ford Motor Company nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - */ - -#include "application_manager/commands/hmi/request_to_hmi.h" -#include "application_manager/rpc_service.h" - -namespace application_manager { - -namespace commands { - -bool CheckAvailabilityHMIInterfaces(ApplicationManager& application_manager, - HmiInterfaces::InterfaceID interface) { - const HmiInterfaces::InterfaceState state = - application_manager.hmi_interfaces().GetInterfaceState(interface); - return HmiInterfaces::STATE_NOT_AVAILABLE != state; -} - -bool ChangeInterfaceState(ApplicationManager& application_manager, - const smart_objects::SmartObject& response_from_hmi, - HmiInterfaces::InterfaceID interface) { - if (response_from_hmi[strings::msg_params].keyExists(strings::available)) { - const bool is_available = - response_from_hmi[strings::msg_params][strings::available].asBool(); - const HmiInterfaces::InterfaceState interface_state = - is_available ? HmiInterfaces::STATE_AVAILABLE - : HmiInterfaces::STATE_NOT_AVAILABLE; - application_manager.hmi_interfaces().SetInterfaceState(interface, - interface_state); - return is_available; - } - return false; -} - -RequestToHMI::RequestToHMI(const MessageSharedPtr& message, - ApplicationManager& application_manager) - : CommandImpl(message, application_manager) {} - -RequestToHMI::~RequestToHMI() {} - -bool RequestToHMI::Init() { - // Replace Mobile connection id with HMI app id - return ReplaceMobileWithHMIAppId(*message_); -} - -bool RequestToHMI::CleanUp() { - return true; -} - -void RequestToHMI::Run() { - SendRequest(); -} - -void RequestToHMI::SendRequest() { - (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; - (*message_)[strings::params][strings::protocol_version] = protocol_version_; - application_manager_.GetRPCService().SendMessageToHMI(message_); -} - -} // namespace commands - -} // namespace application_manager diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_from_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_from_hmi.cc index 123789730c..7e7cb557dc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_from_hmi.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_from_hmi.cc @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/response_from_hmi.h" +#include "sdl_rpc_plugin/commands/hmi/response_from_hmi.h" #include "application_manager/rpc_service.h" #include "smart_objects/smart_object.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_to_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_to_hmi.cc index c662bd629c..149a82e971 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_to_hmi.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/response_to_hmi.cc @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/response_to_hmi.h" +#include "sdl_rpc_plugin/commands/hmi/response_to_hmi.h" #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc index 6961c15f76..36fddf2bf5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/sdl_activate_app_request.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_activate_app_request.h" #include "application_manager/state_controller.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_response.cc index e63ec0f6ee..2521dcc8e4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/sdl_activate_app_response.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc index 4b150cda60..2af0f4f38e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/sdl_get_list_of_permissions_request.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_request.h" #include "application_manager/application_manager.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_response.cc index 11a6f77ef0..9e4be91d9e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/sdl_get_list_of_permissions_response.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc index afa7569746..6c7cd1e7a5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/sdl_get_status_update_request.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_get_status_update_request.h" #include "application_manager/application_manager.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_response.cc index b1d3ffec62..85ac3de729 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/sdl_get_status_update_response.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc index ea959389ef..bc944faaa9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/sdl_get_user_friendly_message_request.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h" #include "application_manager/message_helper.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_response.cc index 5bf3527233..e8736f6260 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/sdl_get_user_friendly_message_response.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update.cc index f1fb9ccead..e06dad82b7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/sdl_policy_update.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_policy_update.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update_response.cc index 38b57a5b9f..e305b01053 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/sdl_policy_update_response.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_request.cc index bb1f29d889..3195a60393 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_change_registration_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_response.cc index e63ee5f74d..3b8e921b25 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_change_registration_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_change_registration_response.h" +#include "sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_request.cc index 4dbf5e8ee7..e70909a2a6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_get_capabilities_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_response.cc index ce629b36d7..8bbd18701d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_capabilities_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_get_capabilities_response.h" +#include "sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_request.cc index c44667a223..bd1bfe3345 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_get_language_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_get_language_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_response.cc index 37aed2c6cb..f2b381fdb5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_language_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_get_language_response.h" +#include "sdl_rpc_plugin/commands/hmi/tts_get_language_response.h" #include "application_manager/event_engine/event.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_request.cc index 941adca01d..5fa7e42fbe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_get_supported_languages_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_response.cc index 79af1d3cc2..36bb8c4669 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_get_supported_languages_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_get_supported_languages_response.h" +#include "sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc index 85a6405196..a409615bdb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_is_ready_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_is_ready_request.h" #include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_response.cc index 30e2f4816b..e103a0911b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_is_ready_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_is_ready_response.h" +#include "sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_request.cc index bf035ffe23..237b7385a6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_set_global_properties_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_response.cc index f494fb1a8e..1e21d0741d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_set_global_properties_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_set_global_properties_response.h" +#include "sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_request.cc index 2e386449d0..a561608a9a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_speak_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_speak_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_response.cc index 5cffdccf34..26e1d44ad1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_speak_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_speak_response.h" +#include "sdl_rpc_plugin/commands/hmi/tts_speak_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_request.cc index c2275dda72..107daf6f32 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_stop_speaking_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_stop_speaking_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_response.cc index 67d747f464..e6ea6647fa 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/tts_stop_speaking_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/tts_stop_speaking_response.h" +#include "sdl_rpc_plugin/commands/hmi/tts_stop_speaking_response.h" #include "application_manager/event_engine/event.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_request.cc index c0edad3f80..cd18849619 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_add_command_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_add_command_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_response.cc index a7eaabc91e..6b74f2b895 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_command_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_add_command_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_add_command_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_request.cc index f0a233853c..7490dc08fd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_add_submenu_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_response.cc index 6c6c18cbad..c57ac3c870 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_add_submenu_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_add_submenu_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_add_submenu_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_request.cc index 44673d4981..4fc3138a1f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_alert_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_alert_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_response.cc index 6d552a1eb7..f36d3e105a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_alert_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_alert_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_request.cc index dcc88125fc..57ab6c52eb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_change_registration_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_change_registration_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_response.cc index 52805a93c8..4cf839d4a2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_change_registration_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_change_registration_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_request.cc index 7bd529e8dc..815332ec8c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_delete_command_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_delete_command_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_response.cc index 74a1bd64c2..c34dd7b3e1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_command_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_delete_command_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_request.cc index 335d97eee4..5f9915f171 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_delete_submenu_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_delete_submenu_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_response.cc index 302343da5e..f243b1b3c1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_submenu_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_delete_submenu_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_request.cc index e1cd11f922..d68146a5ae 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_end_audio_pass_thru_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_response.cc index e9eb596b85..27b96379c2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_end_audio_pass_thru_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_end_audio_pass_thru_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_request.cc index 0ae4258d6b..f4cb64a8a3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_get_capabilities_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_get_capabilities_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc index 3b5aeac639..34ccd62b94 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_get_capabilities_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_request.cc index 59d9eef6e3..1e2d1fa2d1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_get_language_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_get_language_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_response.cc index dfbdb89804..f45e02b63b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_language_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_get_language_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_get_language_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_request.cc index 598ff39f79..23944edd3b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_get_supported_languages_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_response.cc index e5849f5f63..d6e068368a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_supported_languages_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_get_supported_languages_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc index 5d7f6d0f4e..8aa3af58d5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_is_ready_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_is_ready_request.h" #include "application_manager/message_helper.h" #include "application_manager/rpc_service.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_response.cc index 088baeb8b2..869b5f13cb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_is_ready_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_request.cc index a88719d303..57f852ff95 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_response.cc index 0736cca526..0a03b3b829 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_audio_pass_thru_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_request.cc index 82a900f1ae..1136987009 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_perform_interaction_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_perform_interaction_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_response.cc index ea78c0cd66..328de7e936 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_perform_interaction_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_request.cc index 006944d404..700460d2a1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_scrollable_message_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_scrollable_message_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_response.cc index c39a99fc61..ace5074b2b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_scrollable_message_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_scrollable_message_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_request.cc index 9484906a17..af85062af1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_send_haptic_data_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_response.cc index a8239a40e8..2917f0e9ef 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_send_haptic_data_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_send_haptic_data_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_request.cc index 2666eedfc8..844066087a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_set_app_icon_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_app_icon_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_response.cc index 18fc5a5761..f4c618a6eb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_app_icon_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_set_app_icon_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_app_icon_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_request.cc index cd69c9c8e6..53b7a5fdaa 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_set_display_layout_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_response.cc index c5a439636f..2ecd865aa8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_display_layout_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_set_display_layout_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_display_layout_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_request.cc index 8658a043b0..458a254033 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_set_global_properties_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_response.cc index d10c206a7c..a7da45645c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_global_properties_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_set_global_properties_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_icon_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_icon_request.cc index 1653ec0744..5f3dceed12 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_icon_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_icon_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_set_icon_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_icon_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_request.cc index 955cb1d57b..bfebb880bf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_set_media_clock_timer_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_response.cc index 32acef4994..f677675721 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_set_media_clock_timer_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_set_media_clock_timer_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_request.cc index 9c0e90feff..38d29abe9e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_show_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_show_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_response.cc index 333d9e96c5..61b9ad45fe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_show_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_show_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_show_response.h" #include "application_manager/event_engine/event.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_request.cc index 26e6ed76b0..39fff5c3ef 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_slider_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_slider_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_response.cc index 091eb50e0d..3fe65c8d21 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_slider_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_slider_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_request.cc index 286d269727..83c0fbc036 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/update_app_list_request.h" +#include "sdl_rpc_plugin/commands/hmi/update_app_list_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_response.cc index 6546d03805..9ceea3927c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_app_list_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/update_app_list_response.h" +#include "sdl_rpc_plugin/commands/hmi/update_app_list_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_request.cc index 74d104b36d..72deef28a2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/update_device_list_request.h" +#include "sdl_rpc_plugin/commands/hmi/update_device_list_request.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_response.cc index 6d9dec92f8..1730775122 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_device_list_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/update_device_list_response.h" +#include "sdl_rpc_plugin/commands/hmi/update_device_list_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc index 44f7547964..cee6b9577f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/update_sdl_request.h" +#include "sdl_rpc_plugin/commands/hmi/update_sdl_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_response.cc index f8fa188735..a211053868 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/update_sdl_response.h" +#include "sdl_rpc_plugin/commands/hmi/update_sdl_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_request.cc index 5fe81fcbd8..0e17b23ca6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vi_diagnostic_message_request.h" +#include "sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_response.cc index e19af75b54..7893671ded 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_diagnostic_message_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vi_diagnostic_message_response.h" +#include "sdl_rpc_plugin/commands/hmi/vi_diagnostic_message_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_request.cc index b373471c43..768dfeb064 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vi_get_dtcs_request.h" +#include "sdl_rpc_plugin/commands/hmi/vi_get_dtcs_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_response.cc index 3e720f9dbc..1ae1dbb17a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_dtcs_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vi_get_dtcs_response.h" +#include "sdl_rpc_plugin/commands/hmi/vi_get_dtcs_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc index 05424c4967..5c591f6c25 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vi_get_vehicle_data_request.h" +#include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc index 2794f6eddd..db26b1f1ba 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vi_get_vehicle_data_response.h" +#include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_data_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc index 64a3831e1c..96d33bbf95 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vi_get_vehicle_type_request.h" +#include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc index 2369eb7eee..ad8675c36b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vi_get_vehicle_type_response.h" +#include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc index 4d9f30baaa..4c139ff519 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vi_is_ready_request.h" +#include "sdl_rpc_plugin/commands/hmi/vi_is_ready_request.h" #include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_response.cc index 2f84190494..ed29a98b59 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_is_ready_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vi_is_ready_response.h" +#include "sdl_rpc_plugin/commands/hmi/vi_is_ready_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_request.cc index d72fcb8157..113aa1b38b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vi_read_did_request.h" +#include "sdl_rpc_plugin/commands/hmi/vi_read_did_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_response.cc index 568a573f88..bd200a9007 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_read_did_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vi_read_did_response.h" +#include "sdl_rpc_plugin/commands/hmi/vi_read_did_response.h" #include "application_manager/event_engine/event.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc index 5c953334bb..fa8bb03c42 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h" +#include "sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc index 4df2d9190a..508d99940c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h" +#include "sdl_rpc_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc index 2211cde19c..37a9597c9a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h" +#include "sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc index 5044f0ef43..0113c44145 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h" +#include "sdl_rpc_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_request.cc index 04af05d4e7..f4f04cd205 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vr_add_command_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_add_command_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_response.cc index 496bd47605..0b4a225fdd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_add_command_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vr_add_command_response.h" +#include "sdl_rpc_plugin/commands/hmi/vr_add_command_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_request.cc index e64e7cc388..4bb68fde97 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vr_change_registration_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_change_registration_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_response.cc index 8084688c15..6350190715 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_change_registration_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vr_change_registration_response.h" +#include "sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_request.cc index 1db85529da..0e9d22300e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vr_delete_command_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_delete_command_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_response.cc index 08711be2c8..c6bd8f4d81 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_delete_command_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vr_delete_command_response.h" +#include "sdl_rpc_plugin/commands/hmi/vr_delete_command_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_request.cc index 3159380c17..08a1846c09 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vr_get_capabilities_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_get_capabilities_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_response.cc index 9aa0fc6668..e226c19298 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_capabilities_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vr_get_capabilities_response.h" +#include "sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_request.cc index baf34c8017..7e020c0fd7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vr_get_language_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_get_language_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_response.cc index a55dca44a3..bd65d78405 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_language_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vr_get_language_response.h" +#include "sdl_rpc_plugin/commands/hmi/vr_get_language_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_request.cc index def4a64699..aba45a2130 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vr_get_supported_languages_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_response.cc index e5a6ed0b86..1f9a322533 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_get_supported_languages_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vr_get_supported_languages_response.h" +#include "sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h" #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc index a1509b153f..1a7bfd6e00 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vr_is_ready_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_is_ready_request.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_response.cc index 78e2dae23b..b2d1be019a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_is_ready_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vr_is_ready_response.h" +#include "sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_request.cc index c4646e59f4..ec341d2498 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vr_perform_interaction_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_perform_interaction_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_response.cc index bb5ceb3755..6d2dab9a6e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_response.cc @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/vr_perform_interaction_response.h" +#include "sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h" #include "application_manager/event_engine/event.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc index 69948b8122..3bf95dda4f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc @@ -32,7 +32,7 @@ */ #include <string> -#include "application_manager/commands/mobile/add_command_request.h" +#include "sdl_rpc_plugin/commands/mobile/add_command_request.h" #include "application_manager/application.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_response.cc index 944b2883e8..84ad5af332 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/add_command_response.h" +#include "sdl_rpc_plugin/commands/mobile/add_command_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc index fe44e5a41f..b756ff3a7b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/add_sub_menu_request.h" +#include "sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h" #include "application_manager/message_helper.h" #include "application_manager/application.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_response.cc index de8739d871..f43fa0ea73 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/add_sub_menu_response.h" +#include "sdl_rpc_plugin/commands/mobile/add_sub_menu_response.h" #include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_request.cc index dee364cb99..11473cdea7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_request.cc @@ -27,7 +27,7 @@ #include <cstring> #include <string> -#include "application_manager/commands/mobile/alert_maneuver_request.h" +#include "sdl_rpc_plugin/commands/mobile/alert_maneuver_request.h" #include "application_manager/application_impl.h" #include "application_manager/policies/policy_handler.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_response.cc index 852083e6ad..92a427a006 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_maneuver_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/alert_maneuver_response.h" +#include "sdl_rpc_plugin/commands/mobile/alert_maneuver_response.h" #include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc index e0cbe9e600..54c93c2f38 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/alert_request.h" +#include "sdl_rpc_plugin/commands/mobile/alert_request.h" #include <string.h> diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_response.cc index 3b9e67fefa..a1eed99acf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/alert_response.h" +#include "sdl_rpc_plugin/commands/mobile/alert_response.h" #include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc index 06027a42db..a82726c1fb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc @@ -33,7 +33,7 @@ #include <string.h> #include <algorithm> -#include "application_manager/commands/mobile/change_registration_request.h" +#include "sdl_rpc_plugin/commands/mobile/change_registration_request.h" #include "application_manager/application_manager.h" #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_response.cc index 77c063ac9d..0f61bbe3cf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/change_registration_response.h" +#include "sdl_rpc_plugin/commands/mobile/change_registration_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc index 20387ef230..f2d2f53d76 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_request.cc @@ -35,7 +35,7 @@ #include <cstring> #include <algorithm> #include <vector> -#include "application_manager/commands/mobile/create_interaction_choice_set_request.h" +#include "sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_response.cc index 0cc137d6a0..954eca87fd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_interaction_choice_set_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/create_interaction_choice_set_response.h" +#include "sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_response.h" #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_request.cc index f894ed452c..45d4f74f45 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/delete_command_request.h" +#include "sdl_rpc_plugin/commands/mobile/delete_command_request.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_response.cc index bbcdcfe57f..cfdb679a6a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_command_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/delete_command_response.h" +#include "sdl_rpc_plugin/commands/mobile/delete_command_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc index 984c7a1725..309a708be8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/delete_file_request.h" +#include "sdl_rpc_plugin/commands/mobile/delete_file_request.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_response.cc index 8ed6f7ba2e..cf64bed049 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/delete_file_response.h" +#include "sdl_rpc_plugin/commands/mobile/delete_file_response.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_request.cc index bfbb2429ac..048453a296 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/delete_interaction_choice_set_request.h" +#include "sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_request.h" #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_response.cc index 97e07529af..ea6800203a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_interaction_choice_set_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/delete_interaction_choice_set_response.h" +#include "sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_response.h" #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_request.cc index 09f3139245..a6ec690b8f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/delete_sub_menu_request.h" +#include "sdl_rpc_plugin/commands/mobile/delete_sub_menu_request.h" #include "application_manager/message_helper.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_response.cc index 06a63c5bf5..fd542ad50d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_sub_menu_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/delete_sub_menu_response.h" +#include "sdl_rpc_plugin/commands/mobile/delete_sub_menu_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_request.cc index 7704d700f9..839a18530a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_request.cc @@ -32,7 +32,7 @@ */ #include <algorithm> -#include "application_manager/commands/mobile/diagnostic_message_request.h" +#include "sdl_rpc_plugin/commands/mobile/diagnostic_message_request.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_response.cc index 28c8fa512c..ffa06ff0a8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/diagnostic_message_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/diagnostic_message_response.h" +#include "sdl_rpc_plugin/commands/mobile/diagnostic_message_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_request.cc index d0ab42e266..16b8516fb2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_request.cc @@ -32,7 +32,7 @@ #include <algorithm> #include <string> -#include "application_manager/commands/mobile/dial_number_request.h" +#include "sdl_rpc_plugin/commands/mobile/dial_number_request.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_response.cc index ee9bbd0e08..5979a4d704 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/dial_number_response.cc @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/dial_number_response.h" +#include "sdl_rpc_plugin/commands/mobile/dial_number_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_request.cc index fb168e4256..e6de193cca 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/end_audio_pass_thru_request.h" +#include "sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h" #include "application_manager/message_helper.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_response.cc index ca52aeee65..af15d1eee8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/end_audio_pass_thru_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/end_audio_pass_thru_response.h" +#include "sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/generic_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/generic_response.cc index 20f6931bb9..9e6b2ddc8a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/generic_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/generic_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/generic_response.h" +#include "sdl_rpc_plugin/commands/mobile/generic_response.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_request.cc index 88fd07234a..100bf52ebc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/get_dtcs_request.h" +#include "sdl_rpc_plugin/commands/mobile/get_dtcs_request.h" #include "application_manager/application_impl.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_response.cc index a8111b5e6e..32ff9b0d4f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_dtcs_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/get_dtcs_response.h" +#include "sdl_rpc_plugin/commands/mobile/get_dtcs_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc index 71cde5158d..85e6ece6a1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc @@ -1,4 +1,4 @@ -#include "application_manager/commands/mobile/get_system_capability_request.h" +#include "sdl_rpc_plugin/commands/mobile/get_system_capability_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_response.cc index 3ac0459e71..1353bd670e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_response.cc @@ -1,6 +1,6 @@ #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" -#include "application_manager/commands/mobile/get_system_capability_response.h" +#include "sdl_rpc_plugin/commands/mobile/get_system_capability_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_request.cc index f81d0a8c2a..17c89edf55 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_request.cc @@ -32,7 +32,7 @@ */ #include <string> -#include "application_manager/commands/mobile/get_vehicle_data_request.h" +#include "sdl_rpc_plugin/commands/mobile/get_vehicle_data_request.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_response.cc index 700c8adffb..b0104e0ce9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_vehicle_data_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/get_vehicle_data_response.h" +#include "sdl_rpc_plugin/commands/mobile/get_vehicle_data_response.h" #include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_request.cc index da4ce38646..56491a4643 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_request.cc @@ -1,5 +1,5 @@ #include "application_manager/application_manager.h" -#include "application_manager/commands/mobile/get_way_points_request.h" +#include "sdl_rpc_plugin/commands/mobile/get_way_points_request.h" #include "application_manager/message_helper.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_response.cc index 92e7720d8a..a78f83a4dc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_way_points_response.cc @@ -1,5 +1,5 @@ #include "application_manager/application_manager.h" -#include "application_manager/commands/mobile/get_way_points_response.h" +#include "sdl_rpc_plugin/commands/mobile/get_way_points_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc index 794fba631d..6f83eb14b2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc @@ -32,11 +32,11 @@ */ #include <string> -#include "application_manager/commands/mobile/list_files_request.h" +#include "sdl_rpc_plugin/commands/mobile/list_files_request.h" #include "application_manager/application_impl.h" -#include "application_manager/mobile_command_factory.h" +#include "sdl_rpc_plugin/mobile_command_factory.h" #include "utils/file_system.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_response.cc index 0b07605874..63408af092 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/list_files_response.h" +#include "sdl_rpc_plugin/commands/mobile/list_files_response.h" #include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_app_interface_unregistered_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_app_interface_unregistered_notification.cc index 6064374dab..fe2fda7373 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_app_interface_unregistered_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_app_interface_unregistered_notification.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/on_app_interface_unregistered_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_app_interface_unregistered_notification.h" #include "application_manager/message.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_audio_pass_thru_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_audio_pass_thru_notification.cc index d0fa3597bc..a01ef114ee 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_audio_pass_thru_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_audio_pass_thru_notification.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/on_audio_pass_thru_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_audio_pass_thru_notification.h" namespace application_manager { namespace commands { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc index 7c631d6d4b..2b9e2ba49d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/on_button_event_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_button_event_notification.h" #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_press_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_press_notification.cc index ae6658b93a..e7c267e3d4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_press_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_press_notification.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/on_button_press_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_button_press_notification.h" #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_command_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_command_notification.cc index ae8aeff771..3fbeb8f6b3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_command_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_command_notification.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/on_command_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_command_notification.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_driver_distraction_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_driver_distraction_notification.cc index 44ed2cf3b7..5d1684d5fe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_driver_distraction_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_driver_distraction_notification.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/on_driver_distraction_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_driver_distraction_notification.h" #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hash_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hash_change_notification.cc index 19b93f2cbf..b7d0a76c9b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hash_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hash_change_notification.cc @@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/on_hash_change_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_hash_change_notification.h" #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification.cc index a7453686e6..b38c992fa7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/on_hmi_status_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_hmi_status_notification.h" #include "application_manager/message_helper.h" #include "application_manager/message.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification_from_mobile.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification_from_mobile.cc index 4bb6cfe9d5..97a0e03bd2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification_from_mobile.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_hmi_status_notification_from_mobile.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/on_hmi_status_notification_from_mobile.h" +#include "sdl_rpc_plugin/commands/mobile/on_hmi_status_notification_from_mobile.h" #include "application_manager/message_helper.h" #include "application_manager/message.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_keyboard_input_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_keyboard_input_notification.cc index 427f52c12b..73e732af26 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_keyboard_input_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_keyboard_input_notification.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/on_keyboard_input_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_keyboard_input_notification.h" #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_language_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_language_change_notification.cc index 76420b85b6..0222145ea6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_language_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_language_change_notification.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/on_language_change_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_language_change_notification.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_permissions_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_permissions_change_notification.cc index 09c407b8b5..8f2f4adf82 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_permissions_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_permissions_change_notification.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/on_permissions_change_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_permissions_change_notification.h" #include "application_manager/message.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_request_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_request_notification.cc index f06012893e..3f5c2dcfd8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_request_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_request_notification.cc @@ -33,7 +33,7 @@ #include <cstring> #include <cstdio> #include <string> -#include "application_manager/commands/mobile/on_system_request_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_system_request_notification.h" #include "interfaces/MOBILE_API.h" #include "utils/file_system.h" #include "policy/policy_table/enums.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_tbt_client_state_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_tbt_client_state_notification.cc index 894469ac34..3b2268d6a2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_tbt_client_state_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_tbt_client_state_notification.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/on_tbt_client_state_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_tbt_client_state_notification.h" #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_touch_event_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_touch_event_notification.cc index 2a9969eac4..2e9b02b0e0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_touch_event_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_touch_event_notification.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/on_touch_event_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_touch_event_notification.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_vehicle_data_notification.cc index 37abbab351..55116340a0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_vehicle_data_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_vehicle_data_notification.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/on_vehicle_data_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_vehicle_data_notification.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_way_point_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_way_point_change_notification.cc index 0b24228810..58b7416d72 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_way_point_change_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_way_point_change_notification.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/on_way_point_change_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_way_point_change_notification.h" #include "application_manager/application_manager.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc index a758f04aac..f929a36b63 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc @@ -32,7 +32,7 @@ */ #include <cstring> -#include "application_manager/commands/mobile/perform_audio_pass_thru_request.h" +#include "sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_response.cc index 1bda9f5096..d0e9eabb95 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/perform_audio_pass_thru_response.h" +#include "sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc index 86ab0a97c0..e0e9eb3934 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc @@ -34,7 +34,7 @@ #include <numeric> #include <string.h> #include <string> -#include "application_manager/commands/mobile/perform_interaction_request.h" +#include "sdl_rpc_plugin/commands/mobile/perform_interaction_request.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_response.cc index 1a358e551c..24203858b6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/perform_interaction_response.h" +#include "sdl_rpc_plugin/commands/mobile/perform_interaction_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc index 8a5e10b206..23d9055c5a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc @@ -32,7 +32,7 @@ */ #include <algorithm> -#include "application_manager/commands/mobile/put_file_request.h" +#include "sdl_rpc_plugin/commands/mobile/put_file_request.h" #include "application_manager/policies/policy_handler.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_response.cc index 50c62aef7f..46f6aac2e7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/put_file_response.h" +#include "sdl_rpc_plugin/commands/mobile/put_file_response.h" #include "utils/file_system.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_request.cc index c51f545e7e..727dcb47ee 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_request.cc @@ -31,7 +31,7 @@ */ #include <string> -#include "application_manager/commands/mobile/read_did_request.h" +#include "sdl_rpc_plugin/commands/mobile/read_did_request.h" #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_response.cc index f3cdc971aa..c5218703f8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/read_did_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/read_did_response.h" +#include "sdl_rpc_plugin/commands/mobile/read_did_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc index c0e46ea4e0..ac219a0f96 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/register_app_interface_request.h" +#include "sdl_rpc_plugin/commands/mobile/register_app_interface_request.h" #include <unistd.h> #include <algorithm> diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_response.cc index 3e94e652d4..ae64e407db 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/register_app_interface_response.h" +#include "sdl_rpc_plugin/commands/mobile/register_app_interface_response.h" #include "interfaces/MOBILE_API.h" #include "application_manager/application_manager.h" #include "application_manager/policies/policy_handler_interface.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc index a7c2db0e65..97d6a6fdb9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/reset_global_properties_request.h" +#include "sdl_rpc_plugin/commands/mobile/reset_global_properties_request.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_response.cc index abee868769..4fbb564713 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/reset_global_properties_response.h" +#include "sdl_rpc_plugin/commands/mobile/reset_global_properties_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc index b0b2d5f464..4287f8cd96 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc @@ -32,7 +32,7 @@ */ #include <string.h> -#include "application_manager/commands/mobile/scrollable_message_request.h" +#include "sdl_rpc_plugin/commands/mobile/scrollable_message_request.h" #include "application_manager/application_impl.h" #include "application_manager/policies/policy_handler.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_response.cc index d6c786b1ee..180588cca9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/scrollable_message_response.h" +#include "sdl_rpc_plugin/commands/mobile/scrollable_message_response.h" #include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_request.cc index 569eba6c02..14d16e1085 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_request.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/send_haptic_data_request.h" +#include "sdl_rpc_plugin/commands/mobile/send_haptic_data_request.h" #include "interfaces/MOBILE_API.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_response.cc index 9860f89065..5997b8454e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_haptic_data_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/send_haptic_data_response.h" +#include "sdl_rpc_plugin/commands/mobile/send_haptic_data_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc index 54664a8771..12ebcb0a93 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ #include <algorithm> -#include "application_manager/commands/mobile/send_location_request.h" +#include "sdl_rpc_plugin/commands/mobile/send_location_request.h" #include "application_manager/message_helper.h" #include "utils/custom_string.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_response.cc index 3968e566e3..be12b20bdb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/send_location_response.h" +#include "sdl_rpc_plugin/commands/mobile/send_location_response.h" #include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc index a100bbb5fb..752b9f34ed 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc @@ -31,8 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/set_app_icon_request.h" - +#include "sdl_rpc_plugin/commands/mobile/set_app_icon_request.h" #include <algorithm> #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_response.cc index 57e4f5600d..1084eb10dd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/set_app_icon_response.h" +#include "sdl_rpc_plugin/commands/mobile/set_app_icon_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc index ed60ca4928..859340f91e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/set_display_layout_request.h" +#include "sdl_rpc_plugin/commands/mobile/set_display_layout_request.h" #include "application_manager/message_helper.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_response.cc index fe5c73dd7d..e50c0809c4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/set_display_layout_response.h" +#include "sdl_rpc_plugin/commands/mobile/set_display_layout_response.h" #include "application_manager/application_impl.h" #include "application_manager/rpc_service.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc index 621aa90447..b37f837e01 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc @@ -33,7 +33,7 @@ #include <string.h> #include <numeric> #include <algorithm> -#include "application_manager/commands/mobile/set_global_properties_request.h" +#include "sdl_rpc_plugin/commands/mobile/set_global_properties_request.h" #include "application_manager/message_helper.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_response.cc index cea090f35b..668308a048 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/set_global_properties_response.h" +#include "sdl_rpc_plugin/commands/mobile/set_global_properties_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_request.cc index 037de54456..31b1985086 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/set_icon_request.h" +#include "sdl_rpc_plugin/commands/mobile/set_icon_request.h" #include "application_manager/application_manager.h" #include "application_manager/application_impl.h" #include "config_profile/profile.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_response.cc index 524d4e3ad9..39446c0f68 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_icon_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/set_icon_response.h" +#include "sdl_rpc_plugin/commands/mobile/set_icon_response.h" #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_request.cc index 54727abe01..a098f56669 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/set_media_clock_timer_request.h" +#include "sdl_rpc_plugin/commands/mobile/set_media_clock_timer_request.h" #include "application_manager/message_helper.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_response.cc index d189891888..4f1c855826 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_media_clock_timer_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/set_media_clock_timer_response.h" +#include "sdl_rpc_plugin/commands/mobile/set_media_clock_timer_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_request.cc index 42bfea4864..30f6815e37 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_request.cc @@ -32,7 +32,7 @@ */ #include <cstring> -#include "application_manager/commands/mobile/show_constant_tbt_request.h" +#include "sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h" #include "application_manager/policies/policy_handler.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_response.cc index d2cdc1689a..6225c23dd4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_constant_tbt_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/show_constant_tbt_response.h" +#include "sdl_rpc_plugin/commands/mobile/show_constant_tbt_response.h" #include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc index ad598efc1d..25163af225 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ #include <string.h> -#include "application_manager/commands/mobile/show_request.h" +#include "sdl_rpc_plugin/commands/mobile/show_request.h" #include "application_manager/policies/policy_handler.h" #include "application_manager/application.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_response.cc index b3a54ee2dd..2e59b3aa07 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/show_response.h" +#include "sdl_rpc_plugin/commands/mobile/show_response.h" #include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc index f98869b08f..1f7afe96a4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/slider_request.h" +#include "sdl_rpc_plugin/commands/mobile/slider_request.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_response.cc index 4664689f0c..c19d08bc95 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/slider_response.h" +#include "sdl_rpc_plugin/commands/mobile/slider_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_request.cc index 6da6b482b3..1e9589e30a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_request.cc @@ -32,7 +32,7 @@ */ #include <string.h> -#include "application_manager/commands/mobile/speak_request.h" +#include "sdl_rpc_plugin/commands/mobile/speak_request.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_response.cc index 59b327e009..ca4f69ecd8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/speak_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/speak_response.h" +#include "sdl_rpc_plugin/commands/mobile/speak_response.h" #include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" #include "interfaces/HMI_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc index 4d11467d2d..ecf239e8e4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/subscribe_button_request.h" +#include "sdl_rpc_plugin/commands/mobile/subscribe_button_request.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_response.cc index a92e58b19a..f34046935f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/subscribe_button_response.h" +#include "sdl_rpc_plugin/commands/mobile/subscribe_button_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc index 15ba7999bd..d78f019e35 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc @@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/subscribe_vehicle_data_request.h" +#include "sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_request.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc index 2f2ddc5acf..37cb6e9f1f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/subscribe_vehicle_data_response.h" +#include "sdl_rpc_plugin/commands/mobile/subscribe_vehicle_data_response.h" #include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_request.cc index 8195697dfc..b9c1391dc8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_request.cc @@ -1,5 +1,5 @@ #include "application_manager/application_manager.h" -#include "application_manager/commands/mobile/subscribe_way_points_request.h" +#include "sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h" #include "application_manager/message_helper.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_response.cc index 8e1e203e52..39b7ddb00d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_way_points_response.cc @@ -1,6 +1,6 @@ #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" -#include "application_manager/commands/mobile/subscribe_way_points_response.h" +#include "sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc index f0331d0ced..1c612dd8c3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc @@ -31,7 +31,7 @@ Copyright (c) 2013, Ford Motor Company POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/system_request.h" +#include "sdl_rpc_plugin/commands/mobile/system_request.h" #include <vector> #include <string> diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_response.cc index 0d994bb190..094a58b1d3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/system_response.h" +#include "sdl_rpc_plugin/commands/mobile/system_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_request.cc index 08c3e228cb..cf7690c3d6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/unregister_app_interface_request.h" +#include "sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h" #include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_response.cc index 49d9276d35..d23cf6005a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unregister_app_interface_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/unregister_app_interface_response.h" +#include "sdl_rpc_plugin/commands/mobile/unregister_app_interface_response.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc index 7e798bcb4e..cc05a011d3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/unsubscribe_button_request.h" +#include "sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_response.cc index 9ac98a27f7..7a970ae2f9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/unsubscribe_button_response.h" +#include "sdl_rpc_plugin/commands/mobile/unsubscribe_button_response.h" #include "smart_objects/smart_object.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc index d6ad928bf7..69304714b2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/unsubscribe_vehicle_data_request.h" +#include "sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_request.h" #include "application_manager/commands/command_impl.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc index 986256d377..61b5dc3b5c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/unsubscribe_vehicle_data_response.h" +#include "sdl_rpc_plugin/commands/mobile/unsubscribe_vehicle_data_response.h" #include "smart_objects/smart_object.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc index dc3404c022..82d94b8a12 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_request.cc @@ -1,5 +1,5 @@ #include "application_manager/application_manager.h" -#include "application_manager/commands/mobile/unsubscribe_way_points_request.h" +#include "sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h" #include "application_manager/message_helper.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_response.cc index 843a2fd5f0..9da4b697b4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_way_points_response.cc @@ -1,5 +1,5 @@ #include "application_manager/application_manager.h" -#include "application_manager/commands/mobile/unsubscribe_way_points_response.h" +#include "sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_response.h" #include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_request.cc index 44fe9d0d07..dae8b0dc94 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_request.cc @@ -32,7 +32,7 @@ */ #include <string> -#include "application_manager/commands/mobile/update_turn_list_request.h" +#include "sdl_rpc_plugin/commands/mobile/update_turn_list_request.h" #include "application_manager/policies/policy_handler.h" #include "application_manager/application_impl.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_response.cc index ca5e8c1b34..3f1ebf32b2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/update_turn_list_response.cc @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/mobile/update_turn_list_response.h" +#include "sdl_rpc_plugin/commands/mobile/update_turn_list_response.h" #include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" 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 new file mode 100644 index 0000000000..cf73771c2a --- /dev/null +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc @@ -0,0 +1,2339 @@ +/* + Copyright (c) 2013, Ford Motor Company + All rights reserved. + + Copyright (c) 2017 Xevo Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following + disclaimer in the documentation and/or other materials provided with the + distribution. + + Neither the name of the copyright holders nor the names of their contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + */ + +#include "sdl_rpc_plugin/hmi_command_factory.h" + +#include "application_manager/message.h" +#include "interfaces/HMI_API.h" + +#include "sdl_rpc_plugin/commands/hmi/update_device_list_request.h" +#include "sdl_rpc_plugin/commands/hmi/update_device_list_response.h" +#include "sdl_rpc_plugin/commands/hmi/on_update_device_list.h" +#include "sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h" +#include "sdl_rpc_plugin/commands/hmi/update_app_list_request.h" +#include "sdl_rpc_plugin/commands/hmi/update_app_list_response.h" +#include "sdl_rpc_plugin/commands/hmi/on_find_applications.h" +#include "sdl_rpc_plugin/commands/hmi/allow_all_apps_request.h" +#include "sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h" +#include "sdl_rpc_plugin/commands/hmi/allow_app_request.h" +#include "sdl_rpc_plugin/commands/hmi/allow_app_response.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_request.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_get_status_update_request.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h" +#include "sdl_rpc_plugin/commands/hmi/on_status_update_notification.h" +#include "sdl_rpc_plugin/commands/hmi/update_sdl_request.h" +#include "sdl_rpc_plugin/commands/hmi/update_sdl_response.h" +#include "sdl_rpc_plugin/commands/hmi/activate_app_request.h" +#include "sdl_rpc_plugin/commands/hmi/activate_app_response.h" +#include "sdl_rpc_plugin/commands/hmi/mixing_audio_supported_request.h" +#include "sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h" +#include "sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_put_file_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/get_system_info_request.h" +#include "sdl_rpc_plugin/commands/hmi/get_system_info_response.h" +#include "sdl_rpc_plugin/commands/hmi/close_popup_request.h" +#include "sdl_rpc_plugin/commands/hmi/close_popup_response.h" +#include "sdl_rpc_plugin/commands/hmi/button_get_capabilities_request.h" +#include "sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_add_command_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_add_command_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_delete_command_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_add_submenu_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_delete_submenu_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_get_language_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_get_language_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_get_capabilities_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_change_registration_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_show_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_show_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_alert_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_alert_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_is_ready_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_slider_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_slider_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_scrollable_message_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_scrollable_message_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_app_icon_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_app_icon_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_perform_interaction_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h" +#include "sdl_rpc_plugin/commands/hmi/vr_is_ready_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h" +#include "sdl_rpc_plugin/commands/hmi/vr_add_command_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_add_command_response.h" +#include "sdl_rpc_plugin/commands/hmi/vr_delete_command_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_delete_command_response.h" +#include "sdl_rpc_plugin/commands/hmi/vr_change_registration_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h" +#include "sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h" +#include "sdl_rpc_plugin/commands/hmi/vr_get_language_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_get_language_response.h" +#include "sdl_rpc_plugin/commands/hmi/vr_get_capabilities_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h" +#include "sdl_rpc_plugin/commands/hmi/tts_is_ready_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h" +#include "sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h" +#include "sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h" +#include "sdl_rpc_plugin/commands/hmi/tts_get_language_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_get_language_response.h" +#include "sdl_rpc_plugin/commands/hmi/tts_stop_speaking_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_stop_speaking_response.h" +#include "sdl_rpc_plugin/commands/hmi/tts_speak_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_speak_response.h" +#include "sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h" +#include "sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h" +#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_is_ready_request.h" +#include "sdl_rpc_plugin/commands/hmi/vi_is_ready_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" +#include "sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h" + +#ifdef EXTERNAL_PROPRIETARY_MODE +#include "sdl_rpc_plugin/commands/hmi/decrypt_certificate_request.h" +#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" +#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" +#include "sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_update_turn_list_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_get_way_points_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h" +#include "sdl_rpc_plugin/commands/hmi/on_ready_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_system_time_ready_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_system_context_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h" +#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" +#include "sdl_rpc_plugin/commands/hmi/navi_set_video_config_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_start_stream_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_stop_stream_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h" +#include "sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h" +#include "sdl_rpc_plugin/commands/hmi/on_system_request_notification.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_display_layout_response.h" +#include "sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_record_start_notification.h" +#include "sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_system_error_notification.h" +#include "sdl_rpc_plugin/commands/hmi/basic_communication_system_request.h" +#include "sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h" +#include "sdl_rpc_plugin/commands/hmi/basic_communication_get_system_time_request.h" +#include "sdl_rpc_plugin/commands/hmi/basic_communication_get_system_time_response.h" +#include "sdl_rpc_plugin/commands/hmi/basic_communication_on_awake_sdl.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_policy_update.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h" +#include "sdl_rpc_plugin/commands/hmi/on_received_policy_update.h" +#include "sdl_rpc_plugin/commands/hmi/on_policy_update.h" +#include "sdl_rpc_plugin/commands/hmi/get_urls.h" +#include "sdl_rpc_plugin/commands/hmi/get_urls_response.h" +#include "sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/navi_send_location_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_send_location_response.h" +#include "sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h" +#include "sdl_rpc_plugin/commands/hmi/dial_number_request.h" +#include "sdl_rpc_plugin/commands/hmi/dial_number_response.h" +#include "sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h" + +#include "sdl_rpc_plugin/commands/hmi/rc_is_ready_request.h" +#include "sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h" +#include "sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h" +#include "sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h" + +CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationManager") +namespace application_manager { + +HMICommandFactory::HMICommandFactory(ApplicationManager& application_manager) + : application_manager_(application_manager) {} + +CommandSharedPtr HMICommandFactory::CreateCommand( + const commands::MessageSharedPtr& message, + commands::Command::CommandSource source) { + const int function_id = + (*message)[strings::params][strings::function_id].asInt(); + LOG4CXX_DEBUG( + logger_, "HMICommandFactory::CreateCommand function_id: " << function_id); + + CommandSharedPtr command(new application_manager::commands::CommandImpl( + message, application_manager_)); + + bool is_response = false; + const int msg_type = + (*message)[strings::params][strings::message_type].asInt(); + if (msg_type == + static_cast<int>(application_manager::MessageType::kResponse)) { + is_response = true; + LOG4CXX_DEBUG(logger_, "HMICommandFactory::CreateCommand response"); + } else if ((*message)[strings::params][strings::message_type] == + static_cast<int>( + application_manager::MessageType::kErrorResponse)) { + is_response = true; + LOG4CXX_DEBUG(logger_, "HMICommandFactory::CreateCommand error response"); + } else { + LOG4CXX_DEBUG(logger_, "HMICommandFactory::CreateCommand request"); + } + + switch (function_id) { + case hmi_apis::FunctionID::BasicCommunication_OnStartDeviceDiscovery: { + command.reset( + new commands::OnStartDeviceDiscovery(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_UpdateDeviceList: { + if (is_response) { + command.reset(new commands::UpdateDeviceListResponse( + message, application_manager_)); + } else { + command.reset(new commands::UpdateDeviceListRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::BasicCommunication_ActivateApp: { + if (is_response) { + command.reset( + new commands::ActivateAppResponse(message, application_manager_)); + } else { + command.reset( + new commands::ActivateAppRequest(message, application_manager_)); + } + break; + } +#ifdef EXTERNAL_PROPRIETARY_MODE + case hmi_apis::FunctionID::BasicCommunication_DecryptCertificate: { + if (is_response) { + command.reset(new commands::DecryptCertificateResponse( + message, application_manager_)); + } else { + command.reset(new commands::DecryptCertificateRequest( + message, application_manager_)); + } + break; + } +#endif // EXTERNAL_PROPRIETARY_MODE + case hmi_apis::FunctionID::BasicCommunication_GetSystemInfo: { + if (is_response) { + command.reset( + new commands::GetSystemInfoResponse(message, application_manager_)); + } else { + command.reset( + new commands::GetSystemInfoRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::SDL_ActivateApp: { + if (is_response) { + command.reset(new commands::SDLActivateAppResponse( + message, application_manager_)); + } else { + command.reset( + new commands::SDLActivateAppRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::BasicCommunication_PolicyUpdate: { + if (is_response) { + command.reset(new commands::SDLPolicyUpdateResponse( + message, application_manager_)); + } else { + command.reset( + new commands::SDLPolicyUpdate(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::SDL_GetURLS: { + if (is_response) { + command.reset( + new commands::GetUrlsResponse(message, application_manager_)); + } else { + command.reset(new commands::GetUrls(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::SDL_OnAppPermissionChanged: { + command.reset(new commands::OnAppPermissionChangedNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::SDL_GetListOfPermissions: { + if (is_response) { + command.reset(new commands::SDLGetListOfPermissionsResponse( + message, application_manager_)); + } else { + command.reset(new commands::SDLGetListOfPermissionsRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::SDL_GetUserFriendlyMessage: { + if (is_response) { + command.reset(new commands::SDLGetUserFriendlyMessageResponse( + message, application_manager_)); + } else { + command.reset(new commands::SDLGetUserFriendlyMessageRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::SDL_GetStatusUpdate: { + if (is_response) { + command.reset(new commands::SDLGetStatusUpdateResponse( + message, application_manager_)); + } else { + command.reset(new commands::SDLGetStatusUpdateRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::SDL_OnStatusUpdate: { + command.reset(new commands::OnStatusUpdateNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::SDL_OnAppPermissionConsent: { + command.reset(new commands::OnAppPermissionConsentNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_MixingAudioSupported: { + if (is_response) { + command.reset(new commands::MixingAudioSupportedResponse( + message, application_manager_)); + } else { + command.reset(new commands::MixingAudioSupportedRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnExitAllApplications: { + command.reset(new commands::OnExitAllApplicationsNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::UI_AddCommand: { + if (is_response) { + command.reset( + new commands::UIAddCommandResponse(message, application_manager_)); + } else { + command.reset( + new commands::UIAddCommandRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_DeleteCommand: { + if (is_response) { + command.reset(new commands::UIDeleteCommandResponse( + message, application_manager_)); + } else { + command.reset(new commands::UIDeleteCommandRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_AddSubMenu: { + if (is_response) { + command.reset( + new commands::UIAddSubmenuResponse(message, application_manager_)); + } else { + command.reset( + new commands::UIAddSubmenuRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_DeleteSubMenu: { + if (is_response) { + command.reset(new commands::UIDeleteSubmenuResponse( + message, application_manager_)); + } else { + command.reset(new commands::UIDeleteSubmenuRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_SetMediaClockTimer: { + if (is_response) { + command.reset(new commands::UISetMediaClockTimerResponse( + message, application_manager_)); + } else { + command.reset(new commands::UISetMediaClockTimerRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_PerformInteraction: { + if (is_response) { + command.reset(new commands::UIPerformInteractionResponse( + message, application_manager_)); + } else { + command.reset(new commands::UIPerformInteractionRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_SetGlobalProperties: { + if (is_response) { + command.reset(new commands::UISetGlobalPropertiesResponse( + message, application_manager_)); + } else { + command.reset(new commands::UISetGlobalPropertiesRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_ScrollableMessage: { + if (is_response) { + command.reset(new commands::UIScrollableMessageResponse( + message, application_manager_)); + } else { + command.reset(new commands::UIScrollableMessageRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_SetAppIcon: { + if (is_response) { + command.reset( + new commands::UISetAppIconResponse(message, application_manager_)); + } else { + command.reset( + new commands::UISetAppIconRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_GetSupportedLanguages: { + if (is_response) { + command.reset(new commands::UIGetSupportedLanguagesResponse( + message, application_manager_)); + } else { + command.reset(new commands::UIGetSupportedLanguagesRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_GetLanguage: { + if (is_response) { + command.reset( + new commands::UIGetLanguageResponse(message, application_manager_)); + } else { + command.reset( + new commands::UIGetLanguageRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_GetCapabilities: { + if (is_response) { + command.reset(new commands::UIGetCapabilitiesResponse( + message, application_manager_)); + } else { + command.reset(new commands::UIGetCapabilitiesRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_ChangeRegistration: { + if (is_response) { + command.reset(new commands::UIChangeRegistratioResponse( + message, application_manager_)); + } else { + command.reset(new commands::UIChangeRegistrationRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_PerformAudioPassThru: { + if (is_response) { + command.reset(new commands::UIPerformAudioPassThruResponse( + message, application_manager_)); + } else { + command.reset(new commands::UIPerformAudioPassThruRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_EndAudioPassThru: { + if (is_response) { + command.reset(new commands::UIEndAudioPassThruResponse( + message, application_manager_)); + } else { + command.reset(new commands::UIEndAudioPassThruRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_Alert: { + if (is_response) { + command.reset( + new commands::UIAlertResponse(message, application_manager_)); + } else { + command.reset( + new commands::UIAlertRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::VR_IsReady: { + if (is_response) { + command.reset( + new commands::VRIsReadyResponse(message, application_manager_)); + } else { + command.reset( + new commands::VRIsReadyRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::VR_AddCommand: { + if (is_response) { + command.reset( + new commands::VRAddCommandResponse(message, application_manager_)); + } else { + command.reset( + new commands::VRAddCommandRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::VR_DeleteCommand: { + if (is_response) { + command.reset(new commands::VRDeleteCommandResponse( + message, application_manager_)); + } else { + command.reset(new commands::VRDeleteCommandRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::VR_ChangeRegistration: { + if (is_response) { + command.reset(new commands::VRChangeRegistrationResponse( + message, application_manager_)); + } else { + command.reset(new commands::VRChangeRegistrationRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::VR_GetSupportedLanguages: { + if (is_response) { + command.reset(new commands::VRGetSupportedLanguagesResponse( + message, application_manager_)); + } else { + command.reset(new commands::VRGetSupportedLanguagesRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::VR_GetLanguage: { + if (is_response) { + command.reset( + new commands::VRGetLanguageResponse(message, application_manager_)); + } else { + command.reset( + new commands::VRGetLanguageRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::VR_GetCapabilities: { + if (is_response) { + command.reset(new commands::VRGetCapabilitiesResponse( + message, application_manager_)); + } else { + command.reset(new commands::VRGetCapabilitiesRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::TTS_IsReady: { + if (is_response) { + command.reset( + new commands::TTSIsReadyResponse(message, application_manager_)); + } else { + command.reset( + new commands::TTSIsReadyRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::TTS_ChangeRegistration: { + if (is_response) { + command.reset(new commands::TTSChangeRegistratioResponse( + message, application_manager_)); + } else { + command.reset(new commands::TTSChangeRegistrationRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::TTS_GetSupportedLanguages: { + if (is_response) { + command.reset(new commands::TTSGetSupportedLanguagesResponse( + message, application_manager_)); + } else { + command.reset(new commands::TTSGetSupportedLanguagesRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::TTS_StopSpeaking: { + if (is_response) { + command.reset(new commands::TTSStopSpeakingResponse( + message, application_manager_)); + } else { + command.reset(new commands::TTSStopSpeakingRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::TTS_GetLanguage: { + if (is_response) { + command.reset(new commands::TTSGetLanguageResponse( + message, application_manager_)); + } else { + command.reset( + new commands::TTSGetLanguageRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::TTS_Speak: { + if (is_response) { + command.reset( + new commands::TTSSpeakResponse(message, application_manager_)); + } else { + command.reset( + new commands::TTSSpeakRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::TTS_SetGlobalProperties: { + if (is_response) { + command.reset(new commands::TTSSetGlobalPropertiesResponse( + message, application_manager_)); + } else { + command.reset(new commands::TTSSetGlobalPropertiesRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::TTS_GetCapabilities: { + if (is_response) { + command.reset(new commands::TTSGetCapabilitiesResponse( + message, application_manager_)); + } else { + command.reset(new commands::TTSGetCapabilitiesRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::TTS_Started: { + command.reset(new commands::OnTTSStartedNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::TTS_Stopped: { + command.reset(new commands::OnTTSStoppedNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnAppActivated: { + command.reset(new commands::OnAppActivatedNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnAwakeSDL: { + command.reset( + new commands::OnAwakeSDLNotification(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnExitApplication: { + command.reset(new commands::OnExitApplicationNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::UI_Show: { + if (is_response) { + command.reset( + new commands::UIShowResponse(message, application_manager_)); + } else { + command.reset( + new commands::UIShowRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_Slider: { + if (is_response) { + command.reset( + new commands::UISliderResponse(message, application_manager_)); + } else { + command.reset( + new commands::UISliderRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_ClosePopUp: { + if (is_response) { + command.reset( + new commands::ClosePopupResponse(message, application_manager_)); + } else { + command.reset( + new commands::ClosePopupRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_IsReady: { + if (is_response) { + command.reset( + new commands::UIIsReadyResponse(message, application_manager_)); + } else { + command.reset( + new commands::UIIsReadyRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::VehicleInfo_IsReady: { + if (is_response) { + command.reset( + new commands::VIIsReadyResponse(message, application_manager_)); + } else { + command.reset( + new commands::VIIsReadyRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::VehicleInfo_ReadDID: { + if (is_response) { + command.reset( + new commands::VIReadDIDResponse(message, application_manager_)); + } else { + command.reset( + new commands::VIReadDIDRequest(message, application_manager_)); + } + break; + } +#ifdef HMI_DBUS_API + case hmi_apis::FunctionID::VehicleInfo_GetGpsData: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetGpsData>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetGpsData>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetSpeed: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetSpeed>(message, + application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetSpeed>(message, + application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetRpm: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetRpm>(message, + application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetRpm>(message, + application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetFuelLevel: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetFuelLevel>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetFuelLevel>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetFuelLevelState: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetFuelLevelState>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetFuelLevelState>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetInstantFuelConsumption: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetInstantFuelConsumption>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetInstantFuelConsumption>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetExternalTemperature: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetExternalTemperature>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetExternalTemperature>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetPrndl: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetPrndl>(message, + application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetPrndl>(message, + application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetVin: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetVin>(message, + application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetVin>(message, + application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetTirePressure: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetTirePressure>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetTirePressure>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetOdometer: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetOdometer>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetOdometer>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetBeltStatus: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetBeltStatus>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetBeltStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetBodyInformation: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetBodyInformation>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetBodyInformation>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetDeviceStatus: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetDeviceStatus>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetDeviceStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetDriverBraking: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetDriverBraking>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetDriverBraking>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetWiperStatus: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetWiperStatus>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetWiperStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetHeadLampStatus: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetHeadLampStatus>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetHeadLampStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetEngineTorque: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetEngineTorque>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetEngineTorque>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetAccPedalPosition: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetAccPedalPosition>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetAccPedalPosition>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetSteeringWheelAngle: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetSteeringWheelAngle>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetSteeringWheelAngle>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetECallInfo: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetECallInfo>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetECallInfo>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetAirbagStatus: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetAirbagStatus>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetAirbagStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetEmergencyEvent: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetEmergencyEvent>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetEmergencyEvent>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetClusterModeStatus: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetClusterModeStatus>( + message, application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetClusterModeStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetMyKey: { + if (is_response) + command.reset(new commands::VIGetVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_GetMyKey>(message, + application_manager_)); + else + command.reset(new commands::VIGetVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_GetMyKey>(message, + application_manager_)); + break; + } +#else + case hmi_apis::FunctionID::VehicleInfo_GetVehicleData: { + if (is_response) { + command.reset(new commands::VIGetVehicleDataResponse( + message, application_manager_)); + } else { + command.reset(new commands::VIGetVehicleDataRequest( + message, application_manager_)); + } + break; + } +#endif // #ifdef HMI_DBUS_API + case hmi_apis::FunctionID::VehicleInfo_GetDTCs: { + if (is_response) { + command.reset( + new commands::VIGetDTCsResponse(message, application_manager_)); + } else { + command.reset( + new commands::VIGetDTCsRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::VehicleInfo_DiagnosticMessage: { + if (is_response) { + command.reset(new commands::VIDiagnosticMessageResponse( + message, application_manager_)); + } else { + command.reset(new commands::VIDiagnosticMessageRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::VehicleInfo_GetVehicleType: { + if (is_response) { + command.reset(new commands::VIGetVehicleTypeResponse( + message, application_manager_)); + } else { + command.reset(new commands::VIGetVehicleTypeRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::Navigation_IsReady: { + if (is_response) { + command.reset( + new commands::NaviIsReadyResponse(message, application_manager_)); + } else { + command.reset( + new commands::NaviIsReadyRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::Navigation_AlertManeuver: { + if (is_response) { + command.reset(new commands::NaviAlertManeuverResponse( + message, application_manager_)); + } else { + command.reset(new commands::NaviAlertManeuverRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::Navigation_GetWayPoints: { + if (is_response) { + command.reset(new commands::NaviGetWayPointsResponse( + message, application_manager_)); + } else { + command.reset(new commands::NaviGetWayPointsRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::Navigation_UpdateTurnList: { + if (is_response) { + command.reset(new commands::NaviUpdateTurnListResponse( + message, application_manager_)); + } else { + command.reset(new commands::NaviUpdateTurnListRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::Navigation_ShowConstantTBT: { + if (is_response) { + command.reset(new commands::NaviShowConstantTBTResponse( + message, application_manager_)); + } else { + command.reset(new commands::NaviShowConstantTBTRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::Navigation_SubscribeWayPoints: { + if (is_response) { + command.reset(new commands::NaviSubscribeWayPointsResponse( + message, application_manager_)); + } else { + command.reset(new commands::NaviSubscribeWayPointsRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::Navigation_UnsubscribeWayPoints: { + if (is_response) { + command.reset(new commands::NaviUnsubscribeWayPointsResponse( + message, application_manager_)); + } else { + command.reset(new commands::NaviUnSubscribeWayPointsRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::Buttons_GetCapabilities: { + if (is_response) { + command.reset(new commands::ButtonGetCapabilitiesResponse( + message, application_manager_)); + } else { + command.reset(new commands::ButtonGetCapabilitiesRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::SDL_OnAllowSDLFunctionality: { + command.reset(new commands::OnAllowSDLFunctionalityNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::SDL_OnSDLConsentNeeded: { + command.reset(new commands::OnSDLConsentNeededNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::SDL_UpdateSDL: { + if (is_response) { + command.reset( + new commands::UpdateSDLResponse(message, application_manager_)); + } else { + command.reset( + new commands::UpdateSDLRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnIgnitionCycleOver: { + command.reset(new commands::OnIgnitionCycleOverNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnSystemInfoChanged: { + command.reset(new commands::OnSystemInfoChangedNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnReady: { + command.reset( + new commands::OnReadyNotification(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnSystemTimeReady: { + command.reset(new commands::OnSystemTimeReadyNotification( + message, application_manager)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnDeviceChosen: { + command.reset(new commands::OnDeviceChosenNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::UI_OnSystemContext: { + command.reset(new commands::OnSystemContextNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::UI_OnDriverDistraction: { + command.reset(new commands::hmi::OnDriverDistractionNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnUpdateDeviceList: { + command.reset( + new commands::OnUpdateDeviceList(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnAppRegistered: { + command.reset(new commands::OnAppRegisteredNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnAppUnregistered: { + command.reset(new commands::OnAppUnregisteredNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnFindApplications: { + command.reset( + new commands::OnFindApplications(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_UpdateAppList: { + if (is_response) { + command.reset( + new commands::UpdateAppListResponse(message, application_manager_)); + } else { + command.reset( + new commands::UpdateAppListRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::VR_Started: { + command.reset( + new commands::OnVRStartedNotification(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VR_Stopped: { + command.reset( + new commands::OnVRStoppedNotification(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VR_OnCommand: { + command.reset( + new commands::OnVRCommandNotification(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::UI_OnCommand: { + command.reset( + new commands::OnUICommandNotification(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnAppDeactivated: { + command.reset(new commands::OnAppDeactivatedNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::UI_OnLanguageChange: { + command.reset(new commands::OnUILanguageChangeNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VR_OnLanguageChange: { + command.reset(new commands::OnVRLanguageChangeNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::TTS_OnLanguageChange: { + command.reset(new commands::OnTTSLanguageChangeNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::Buttons_OnButtonEvent: { + command.reset(new commands::hmi::OnButtonEventNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::Buttons_OnButtonPress: { + command.reset(new commands::hmi::OnButtonPressNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::Buttons_OnButtonSubscription: { + command.reset(new commands::hmi::OnButtonSubscriptionNotification( + message, application_manager_)); + break; + } +#ifdef HMI_DBUS_API + case hmi_apis::FunctionID::VehicleInfo_SubscribeGps: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeGps>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeGps>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeSpeed: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeSpeed>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeSpeed>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeRpm: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeRpm>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeRpm>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeFuelLevel: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeFuelLevel>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeFuelLevel>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeFuelLevel_State: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeFuelLevel_State>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeFuelLevel_State>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeInstantFuelConsumption: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeInstantFuelConsumption>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeInstantFuelConsumption>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeExternalTemperature: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeExternalTemperature>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeExternalTemperature>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribePrndl: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribePrndl>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribePrndl>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeVin: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeVin>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeVin>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeTirePressure: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeTirePressure>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeTirePressure>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeOdometer: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeOdometer>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeOdometer>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeBeltStatus: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeBeltStatus>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeBeltStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeBodyInformation: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeBodyInformation>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeBodyInformation>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeDeviceStatus: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeDeviceStatus>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeDeviceStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeDriverBraking: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeDriverBraking>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeDriverBraking>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeWiperStatus: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeWiperStatus>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeWiperStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeHeadLampStatus: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeHeadLampStatus>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeHeadLampStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeEngineTorque: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeEngineTorque>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeEngineTorque>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeAccPedalPosition: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeAccPedalPosition>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeAccPedalPosition>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeSteeringWheelAngle: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeSteeringWheelAngle>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeSteeringWheelAngle>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeECallInfo: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeECallInfo>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeECallInfo>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeAirbagStatus: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeAirbagStatus>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeAirbagStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeEmergencyEvent: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeEmergencyEvent>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeEmergencyEvent>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeClusterModeStatus: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeClusterModeStatus>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeClusterModeStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_SubscribeMyKey: { + if (is_response) + command.reset(new commands::VISubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeMyKey>( + message, application_manager_)); + else + command.reset(new commands::VISubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_SubscribeMyKey>( + message, application_manager_)); + break; + } +#else + case hmi_apis::FunctionID::VehicleInfo_SubscribeVehicleData: { + if (is_response) { + command.reset(new commands::VISubscribeVehicleDataResponse( + message, application_manager_)); + } else { + command.reset(new commands::VISubscribeVehicleDataRequest( + message, application_manager_)); + } + break; + } +#endif // #ifdef HMI_DBUS_API +#ifdef HMI_DBUS_API + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeGps: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeGps>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeGps>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeSpeed: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeSpeed>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeSpeed>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeRpm: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeRpm>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeRpm>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeFuelLevel: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeFuelLevel>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeFuelLevel>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeFuelLevel_State: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeFuelLevel_State>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeFuelLevel_State>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeInstantFuelConsumption: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID:: + VehicleInfo_UnsubscribeInstantFuelConsumption>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID:: + VehicleInfo_UnsubscribeInstantFuelConsumption>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeExternalTemperature: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeExternalTemperature>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeExternalTemperature>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribePrndl: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribePrndl>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribePrndl>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeVin: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeVin>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeVin>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeTirePressure: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeTirePressure>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeTirePressure>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeOdometer: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeOdometer>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeOdometer>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeBeltStatus: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeBeltStatus>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeBeltStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeBodyInformation: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeBodyInformation>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeBodyInformation>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeDeviceStatus: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeDeviceStatus>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeDeviceStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeDriverBraking: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeDriverBraking>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeDriverBraking>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeWiperStatus: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeWiperStatus>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeWiperStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeHeadLampStatus: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeHeadLampStatus>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeHeadLampStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeEngineTorque: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeEngineTorque>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeEngineTorque>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeAccPedalPosition: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeAccPedalPosition>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeAccPedalPosition>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeSteeringWheelAngle: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeSteeringWheelAngle>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeSteeringWheelAngle>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeECallInfo: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeECallInfo>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeECallInfo>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeAirbagStatus: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeAirbagStatus>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeAirbagStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeEmergencyEvent: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeEmergencyEvent>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeEmergencyEvent>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeClusterModeStatus: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeClusterModeStatus>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeClusterModeStatus>( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeMyKey: { + if (is_response) + command.reset(new commands::VIUnsubscribeVehicleDataResponseTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeMyKey>( + message, application_manager_)); + else + command.reset(new commands::VIUnsubscribeVehicleDataRequestTemplate< + hmi_apis::FunctionID::VehicleInfo_UnsubscribeMyKey>( + message, application_manager_)); + break; + } +#else + case hmi_apis::FunctionID::VehicleInfo_UnsubscribeVehicleData: { + if (is_response) { + command.reset(new commands::VIUnsubscribeVehicleDataResponse( + message, application_manager_)); + } else { + command.reset(new commands::VIUnsubscribeVehicleDataRequest( + message, application_manager_)); + } + break; + } +#endif // #ifdef HMI_DBUS_API +#ifdef HMI_DBUS_API + case hmi_apis::FunctionID::VehicleInfo_OnGpsData: { + command.reset( + new commands::OnVIGpsDataNotification(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnSpeed: { + command.reset( + new commands::OnVISpeedNotification(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnRpm: { + command.reset( + new commands::OnVIRpmNotification(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnFuelLevel: { + command.reset(new commands::OnVIFuelLevelNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnFuelLevelState: { + command.reset(new commands::OnVIFuelLevelStateNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnInstantFuelConsumption: { + command.reset(new commands::OnVIInstantFuelConsumptionNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnExternalTemperature: { + command.reset(new commands::OnVIExternalTemperatureNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnVin: { + command.reset( + new commands::OnVIVinNotification(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnPrndl: { + command.reset( + new commands::OnVIPrndlNotification(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnTirePressure: { + command.reset(new commands::OnVITirePressureNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnOdometer: { + command.reset(new commands::OnVIOdometerNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnBeltStatus: { + command.reset(new commands::OnVIBeltStatusNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnBodyInformation: { + command.reset(new commands::OnVIBodyInformationNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnDeviceStatus: { + command.reset(new commands::OnVIDeviceStatusNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnDriverBraking: { + command.reset(new commands::OnVIDriverBrakingNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnWiperStatus: { + command.reset(new commands::OnVIWiperStatusNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnHeadLampStatus: { + command.reset(new commands::OnVIHeadLampStatusNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnEngineTorque: { + command.reset(new commands::OnVIEngineTorqueNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnAccPedalPosition: { + command.reset(new commands::OnVIAccPedalPositionNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnSteeringWheelAngle: { + command.reset(new commands::OnVISteeringWheelAngleNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VehicleInfo_OnMyKey: { + command.reset( + new commands::OnVIMyKeyNotification(message, application_manager_)); + break; + } +#else + case hmi_apis::FunctionID::VehicleInfo_OnVehicleData: { + command.reset(new commands::OnVIVehicleDataNotification( + message, application_manager_)); + break; + } +#endif // #ifdef HMI_DBUS_API + case hmi_apis::FunctionID::Navigation_OnTBTClientState: { + command.reset(new commands::OnNaviTBTClientStateNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::UI_OnKeyboardInput: { + command.reset(new commands::hmi::OnUIKeyBoardInputNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::UI_OnTouchEvent: { + command.reset(new commands::hmi::OnUITouchEventNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::UI_OnResetTimeout: { + command.reset(new commands::hmi::OnUIResetTimeoutNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::Navigation_SetVideoConfig: { + if (is_response) { + command.reset(new commands::NaviSetVideoConfigResponse( + message, application_manager_)); + } else { + command.reset(new commands::NaviSetVideoConfigRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::Navigation_StartStream: { + if (is_response) { + command.reset(new commands::NaviStartStreamResponse( + message, application_manager_)); + } else { + command.reset(new commands::NaviStartStreamRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::Navigation_StopStream: { + if (is_response) { + command.reset(new commands::NaviStopStreamResponse( + message, application_manager_)); + } else { + command.reset( + new commands::NaviStopStreamRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::Navigation_StartAudioStream: { + if (is_response) { + command.reset(new commands::AudioStartStreamResponse( + message, application_manager_)); + } else { + command.reset(new commands::AudioStartStreamRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::Navigation_StopAudioStream: { + if (is_response) { + command.reset(new commands::AudioStopStreamResponse( + message, application_manager_)); + } else { + command.reset(new commands::AudioStopStreamRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::Navigation_OnAudioDataStreaming: { + command.reset(new commands::OnAudioDataStreamingNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::Navigation_OnVideoDataStreaming: { + command.reset(new commands::OnVideoDataStreamingNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::VR_PerformInteraction: { + if (is_response) { + command.reset(new commands::VRPerformInteractionResponse( + message, application_manager_)); + } else { + command.reset(new commands::VRPerformInteractionRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnSystemRequest: { + command.reset(new commands::OnSystemRequestNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnPutFile: { + command.reset( + new commands::OnPutFileNotification(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnResumeAudioSource: { + command.reset(new commands::OnResumeAudioSourceNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::UI_SetDisplayLayout: { + if (is_response) { + command.reset(new commands::UiSetDisplayLayoutResponse( + message, application_manager_)); + } else { + command.reset(new commands::UiSetDisplayLayoutRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnSDLClose: { + command.reset( + new commands::OnSDLCloseNotification(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnSDLPersistenceComplete: { + command.reset(new commands::OnSDLPersistenceCompleteNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnFileRemoved: { + command.reset(new commands::OnFileRemovedNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::UI_OnRecordStart: { + command.reset(new commands::OnRecordStartdNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_SystemRequest: { + if (is_response) { + command.reset(new commands::BasicCommunicationSystemResponse( + message, application_manager_)); + } else { + command.reset(new commands::BasicCommunicationSystemRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::BasicCommunication_GetSystemTime: { + if (is_response) { + command.reset(new commands::BasicCommunicationGetSystemTimeResponse( + message, application_manager)); + } else { + command.reset(new commands::BasicCommunicationGetSystemTimeRequest( + message, application_manager)); + } + break; + } + case hmi_apis::FunctionID::Navigation_SendLocation: { + if (is_response) { + command.reset(new commands::NaviSendLocationResponse( + message, application_manager_)); + } else { + command.reset(new commands::NaviSendLocationRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::SDL_AddStatisticsInfo: { + command.reset(new commands::AddStatisticsInfoNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::SDL_OnSystemError: { + command.reset(new commands::OnSystemErrorNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::SDL_OnReceivedPolicyUpdate: { + command.reset( + new commands::OnReceivedPolicyUpdate(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::SDL_OnPolicyUpdate: { + command.reset( + new commands::OnPolicyUpdate(message, application_manager_)); + break; + } + case hmi_apis::FunctionID::SDL_OnDeviceStateChanged: { + command.reset(new commands::OnDeviceStateChangedNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::TTS_OnResetTimeout: { + command.reset(new commands::hmi::OnTTSResetTimeoutNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_OnEventChanged: { + command.reset(new commands::OnEventChangedNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::BasicCommunication_DialNumber: { + if (is_response) { + command.reset(new commands::hmi::DialNumberResponse( + message, application_manager_)); + } else { + command.reset(new commands::hmi::DialNumberRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::Navigation_OnWayPointChange: { + command.reset(new commands::OnNaviWayPointChangeNotification( + message, application_manager_)); + break; + } + case hmi_apis::FunctionID::RC_IsReady: { + if (is_response) { + command.reset( + new commands::RCIsReadyResponse(message, application_manager_)); + } else { + command.reset( + new commands::RCIsReadyRequest(message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::RC_GetCapabilities: { + if (is_response) { + command.reset(new commands::RCGetCapabilitiesResponse( + message, application_manager_)); + } else { + command.reset(new commands::RCGetCapabilitiesRequest( + message, application_manager_)); + } + break; + } + case hmi_apis::FunctionID::UI_SendHapticData: { + if (is_response) { + command.reset(new commands::UISendHapticDataResponse( + message, application_manager_)); + } else { + command.reset(new commands::UISendHapticDataRequest( + message, application_manager_)); + } + break; + } + } + return command; +} + +} // namespace application_manager 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 new file mode 100644 index 0000000000..e182d344af --- /dev/null +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc @@ -0,0 +1,743 @@ +/* + Copyright (c) 2013, Ford Motor Company + All rights reserved. + + Copyright (c) 2017 Xevo Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following + disclaimer in the documentation and/or other materials provided with the + distribution. + + Neither the name of the copyright holders nor the names of their contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + */ + +#include "sdl_rpc_plugin/mobile_command_factory.h" +#include "sdl_rpc_plugin/commands/mobile/add_command_request.h" +#include "sdl_rpc_plugin/commands/mobile/add_command_response.h" +#include "sdl_rpc_plugin/commands/mobile/delete_command_request.h" +#include "sdl_rpc_plugin/commands/mobile/delete_command_response.h" +#include "sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h" +#include "sdl_rpc_plugin/commands/mobile/add_sub_menu_response.h" +#include "sdl_rpc_plugin/commands/mobile/alert_request.h" +#include "sdl_rpc_plugin/commands/mobile/alert_response.h" +#include "sdl_rpc_plugin/commands/mobile/alert_maneuver_request.h" +#include "sdl_rpc_plugin/commands/mobile/alert_maneuver_response.h" +#include "sdl_rpc_plugin/commands/mobile/change_registration_request.h" +#include "sdl_rpc_plugin/commands/mobile/change_registration_response.h" +#include "sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h" +#include "sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_response.h" +#include "sdl_rpc_plugin/commands/mobile/delete_file_request.h" +#include "sdl_rpc_plugin/commands/mobile/delete_file_response.h" +#include "sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_request.h" +#include "sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_response.h" +#include "sdl_rpc_plugin/commands/mobile/delete_sub_menu_request.h" +#include "sdl_rpc_plugin/commands/mobile/delete_sub_menu_response.h" +#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" +#include "sdl_rpc_plugin/commands/mobile/list_files_response.h" +#include "sdl_rpc_plugin/commands/mobile/on_app_interface_unregistered_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_audio_pass_thru_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_button_event_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_button_press_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_driver_distraction_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_hmi_status_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_hmi_status_notification_from_mobile.h" +#include "sdl_rpc_plugin/commands/mobile/on_language_change_notification.h" +#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" +#include "sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_response.h" +#include "sdl_rpc_plugin/commands/mobile/perform_interaction_request.h" +#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" +#include "sdl_rpc_plugin/commands/mobile/reset_global_properties_response.h" +#include "sdl_rpc_plugin/commands/mobile/scrollable_message_request.h" +#include "sdl_rpc_plugin/commands/mobile/scrollable_message_response.h" +#include "sdl_rpc_plugin/commands/mobile/set_display_layout_request.h" +#include "sdl_rpc_plugin/commands/mobile/set_display_layout_response.h" +#include "sdl_rpc_plugin/commands/mobile/set_global_properties_request.h" +#include "sdl_rpc_plugin/commands/mobile/set_global_properties_response.h" +#include "sdl_rpc_plugin/commands/mobile/set_app_icon_request.h" +#include "sdl_rpc_plugin/commands/mobile/set_app_icon_response.h" +#include "sdl_rpc_plugin/commands/mobile/set_media_clock_timer_request.h" +#include "sdl_rpc_plugin/commands/mobile/set_media_clock_timer_response.h" +#include "sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h" +#include "sdl_rpc_plugin/commands/mobile/show_constant_tbt_response.h" +#include "sdl_rpc_plugin/commands/mobile/show_request.h" +#include "sdl_rpc_plugin/commands/mobile/show_response.h" +#include "sdl_rpc_plugin/commands/mobile/slider_request.h" +#include "sdl_rpc_plugin/commands/mobile/slider_response.h" +#include "sdl_rpc_plugin/commands/mobile/speak_request.h" +#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" +#include "sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_response.h" +#include "sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h" +#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" +#include "sdl_rpc_plugin/commands/mobile/system_response.h" +#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" +#include "sdl_rpc_plugin/commands/mobile/dial_number_response.h" +#include "sdl_rpc_plugin/commands/mobile/send_haptic_data_request.h" +#include "sdl_rpc_plugin/commands/mobile/send_haptic_data_response.h" +#include "interfaces/MOBILE_API.h" +#include "utils/make_shared.h" + +CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationManager") +namespace application_manager { + +MobileCommandFactory::MobileCommandFactory( + ApplicationManager& application_manager) + : application_manager_(application_manager) {} + +CommandSharedPtr MobileCommandFactory::CreateCommand( + const commands::MessageSharedPtr& message, + commands::Command::CommandSource source) { + CommandSharedPtr command; + const int function_id = + (*message)[strings::params][strings::function_id].asInt(); + LOG4CXX_DEBUG( + logger_, + "MobileCommandFactory::CreateCommand function_id: " << function_id); + + switch (function_id) { + case mobile_apis::FunctionID::RegisterAppInterfaceID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kRequest)) { + command.reset(new commands::RegisterAppInterfaceRequest( + message, application_manager_)); + + } else { + command.reset(new commands::RegisterAppInterfaceResponse( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::UnregisterAppInterfaceID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kRequest)) { + command.reset(new commands::UnregisterAppInterfaceRequest( + message, application_manager_)); + } else { + command.reset(new commands::UnregisterAppInterfaceResponse( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::SetGlobalPropertiesID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::SetGlobalPropertiesResponse( + message, application_manager_)); + } else { + command.reset(new commands::SetGlobalPropertiesRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::ResetGlobalPropertiesID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::ResetGlobalPropertiesResponse( + message, application_manager_)); + } else { + command.reset(new commands::ResetGlobalPropertiesRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::AddCommandID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::AddCommandResponse(message, application_manager_)); + } else { + command.reset( + new commands::AddCommandRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::DeleteCommandID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::DeleteCommandResponse(message, application_manager_)); + } else { + command.reset( + new commands::DeleteCommandRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::AddSubMenuID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::AddSubMenuResponse(message, application_manager_)); + } else { + command.reset( + new commands::AddSubMenuRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::DeleteSubMenuID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::DeleteSubMenuResponse(message, application_manager_)); + } else { + command.reset( + new commands::DeleteSubMenuRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::DeleteInteractionChoiceSetID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::DeleteInteractionChoiceSetResponse( + message, application_manager_)); + } else { + command.reset(new commands::DeleteInteractionChoiceSetRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::AlertID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::AlertResponse(message, application_manager_)); + } else { + command.reset( + new commands::AlertRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::SpeakID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::SpeakResponse(message, application_manager_)); + } else { + command.reset( + new commands::SpeakRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::SliderID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::SliderResponse(message, application_manager_)); + } else { + command.reset( + new commands::SliderRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::PerformAudioPassThruID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::PerformAudioPassThruResponse( + message, application_manager_)); + } else { + command.reset(new commands::PerformAudioPassThruRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::CreateInteractionChoiceSetID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::CreateInteractionChoiceSetResponse( + message, application_manager_)); + } else { + command.reset(new commands::CreateInteractionChoiceSetRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::PerformInteractionID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::PerformInteractionResponse( + message, application_manager_)); + } else { + command.reset(new commands::PerformInteractionRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::EndAudioPassThruID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::EndAudioPassThruResponse( + message, application_manager_)); + } else { + command.reset(new commands::EndAudioPassThruRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::PutFileID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::PutFileResponse(message, application_manager_)); + } else { + command.reset( + new commands::PutFileRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::DeleteFileID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::DeleteFileResponse(message, application_manager_)); + } else { + command.reset( + new commands::DeleteFileRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::ListFilesID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::ListFilesResponse(message, application_manager_)); + } else { + command.reset( + new commands::ListFilesRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::SubscribeButtonID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::SubscribeButtonResponse( + message, application_manager_)); + } else { + command.reset(new commands::SubscribeButtonRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::UnsubscribeButtonID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::UnsubscribeButtonResponse( + message, application_manager_)); + } else { + command.reset(new commands::UnsubscribeButtonRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::ShowConstantTBTID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::ShowConstantTBTResponse( + message, application_manager_)); + } else { + command.reset(new commands::ShowConstantTBTRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::ShowID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::ShowResponse(message, application_manager_)); + } else { + command.reset(new commands::ShowRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::GetWayPointsID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command = utils::MakeShared<commands::GetWayPointsResponse>( + message, application_manager_); + } else { + command = utils::MakeShared<commands::GetWayPointsRequest>( + message, application_manager_); + } + break; + } + case mobile_apis::FunctionID::SubscribeVehicleDataID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::SubscribeVehicleDataResponse( + message, application_manager_)); + } else { + command.reset(new commands::SubscribeVehicleDataRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::UnsubscribeVehicleDataID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::UnsubscribeVehicleDataResponse( + message, application_manager_)); + } else { + command.reset(new commands::UnsubscribeVehicleDataRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::SubscribeWayPointsID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command = utils::MakeShared<commands::SubscribeWayPointsResponse>( + message, application_manager_); + } else { + command = utils::MakeShared<commands::SubscribeWayPointsRequest>( + message, application_manager_); + } + break; + } + case mobile_apis::FunctionID::UnsubscribeWayPointsID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command = utils::MakeShared<commands::UnsubscribeWayPointsResponse>( + message, application_manager_); + } else { + command = utils::MakeShared<commands::UnSubscribeWayPointsRequest>( + message, application_manager_); + } + break; + } + case mobile_apis::FunctionID::GetSystemCapabilityID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::GetSystemCapabilityResponse( + message, application_manager_)); + } else { + command.reset(new commands::GetSystemCapabilityRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::ReadDIDID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::ReadDIDResponse(message, application_manager_)); + } else { + command.reset( + new commands::ReadDIDRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::GetVehicleDataID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::GetVehicleDataResponse( + message, application_manager_)); + } else { + command.reset( + new commands::GetVehicleDataRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::ScrollableMessageID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::ScrollableMessageResponse( + message, application_manager_)); + } else { + command.reset(new commands::ScrollableMessageRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::AlertManeuverID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::AlertManeuverResponse(message, application_manager_)); + } else { + command.reset( + new commands::AlertManeuverRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::SetAppIconID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::SetAppIconResponse(message, application_manager_)); + } else { + command.reset( + new commands::SetAppIconRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::SetDisplayLayoutID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::SetDisplayLayoutResponse( + message, application_manager_)); + } else { + command.reset(new commands::SetDisplayLayoutRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::UpdateTurnListID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::UpdateTurnListResponse( + message, application_manager_)); + } else { + command.reset( + new commands::UpdateTurnListRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::ChangeRegistrationID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::ChangeRegistrationResponse( + message, application_manager_)); + } else { + command.reset(new commands::ChangeRegistrationRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::GetDTCsID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::GetDTCsResponse(message, application_manager_)); + } else { + command.reset( + new commands::GetDTCsRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::DiagnosticMessageID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::DiagnosticMessageResponse( + message, application_manager_)); + } else { + command.reset(new commands::DiagnosticMessageRequest( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::SetMediaClockTimerID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::SetMediaClockTimerResponse( + message, application_manager_)); + } else { + command.reset( + new commands::SetMediaClockRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::SystemRequestID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::SystemResponse(message, application_manager_)); + } else { + command.reset( + new commands::SystemRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::SendLocationID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::SendLocationResponse(message, application_manager_)); + } else { + command.reset( + new commands::SendLocationRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::DialNumberID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset( + new commands::DialNumberResponse(message, application_manager_)); + } else { + command.reset( + new commands::DialNumberRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::SendHapticDataID: { + if ((*message)[strings::params][strings::message_type] == + static_cast<int>(application_manager::MessageType::kResponse)) { + command.reset(new commands::SendHapticDataResponse( + message, application_manager_)); + } else { + command.reset( + new commands::SendHapticDataRequest(message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::OnButtonEventID: { + command.reset(new commands::mobile::OnButtonEventNotification( + message, application_manager_)); + break; + } + case mobile_apis::FunctionID::OnButtonPressID: { + command.reset(new commands::mobile::OnButtonPressNotification( + message, application_manager_)); + break; + } + case mobile_apis::FunctionID::OnAudioPassThruID: { + command.reset(new commands::OnAudioPassThruNotification( + message, application_manager_)); + break; + } + case mobile_apis::FunctionID::OnVehicleDataID: { + command.reset(new commands::OnVehicleDataNotification( + message, application_manager_)); + break; + } + case mobile_apis::FunctionID::OnAppInterfaceUnregisteredID: { + command.reset(new commands::OnAppInterfaceUnregisteredNotification( + message, application_manager_)); + break; + } + case mobile_apis::FunctionID::OnCommandID: { + command.reset( + new commands::OnCommandNotification(message, application_manager_)); + break; + } + case mobile_apis::FunctionID::OnTBTClientStateID: { + command.reset(new commands::OnTBTClientStateNotification( + message, application_manager_)); + break; + } + case mobile_apis::FunctionID::OnDriverDistractionID: { + command.reset(new commands::mobile::OnDriverDistractionNotification( + message, application_manager_)); + break; + } + case mobile_apis::FunctionID::OnLanguageChangeID: { + command.reset(new commands::OnLanguageChangeNotification( + message, application_manager_)); + break; + } + case mobile_apis::FunctionID::OnPermissionsChangeID: { + command.reset(new commands::OnPermissionsChangeNotification( + message, application_manager_)); + break; + } + case mobile_apis::FunctionID::OnHMIStatusID: { + if (commands::Command::SOURCE_SDL == source) { + command.reset(new commands::OnHMIStatusNotification( + message, application_manager_)); + } else { + command.reset(new commands::OnHMIStatusNotificationFromMobile( + message, application_manager_)); + } + break; + } + case mobile_apis::FunctionID::OnKeyboardInputID: { + command.reset(new commands::mobile::OnKeyBoardInputNotification( + message, application_manager_)); + break; + } + case mobile_apis::FunctionID::OnTouchEventID: { + command.reset(new commands::mobile::OnTouchEventNotification( + message, application_manager_)); + break; + } + case mobile_apis::FunctionID::OnSystemRequestID: { + command.reset(new commands::mobile::OnSystemRequestNotification( + message, application_manager_)); + break; + } + case mobile_apis::FunctionID::OnHashChangeID: { + command.reset(new commands::mobile::OnHashChangeNotification( + message, application_manager_)); + break; + } + case mobile_apis::FunctionID::OnWayPointChangeID: { + command = utils::MakeShared<commands::OnWayPointChangeNotification>( + message, application_manager_); + break; + } + default: { + (*message)[strings::params][strings::function_id] = + static_cast<int32_t>(mobile_apis::FunctionID::GenericResponseID); + command.reset( + new commands::GenericResponse(message, application_manager_)); + } + } + return command; +} + +} // namespace application_manager diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_command_factory.cc new file mode 100644 index 0000000000..37f0360404 --- /dev/null +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_command_factory.cc @@ -0,0 +1,65 @@ +/* + Copyright (c) 2018, Ford Motor Company + All rights reserved. + + Copyright (c) 2017 Xevo Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following + disclaimer in the documentation and/or other materials provided with the + distribution. + + Neither the name of the copyright holders nor the names of their contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + */ + +#include "sdl_rpc_plugin/sdl_command_factory.h" +#include "sdl_rpc_plugin/hmi_command_factory.h" +#include "sdl_rpc_plugin/mobile_command_factory.h" + +namespace application_manager { + +SDLCommandFactory::SDLCommandFactory( + ApplicationManager& app_manager, + rpc_service::RPCService& rpc_service, + HMICapabilities& hmi_capabilities, + policy::PolicyHandlerInterface& policy_handler) + : app_manager_(app_manager) + , rpc_service_(rpc_service) + , hmi_capabilities_(hmi_capabilities) + , policy_handler_(policy_handler) { + hmi_command_factory_.reset(new HMICommandFactory(app_manager)); + mobile_command_factory_.reset(new MobileCommandFactory(app_manager)); +} + +CommandSharedPtr SDLCommandFactory::CreateCommand( + const commands::MessageSharedPtr& message, + commands::Command::CommandSource source) { + if (commands::Command::SOURCE_HMI == source) { + return hmi_command_factory_->CreateCommand(message, source); + } else { + return mobile_command_factory_->CreateCommand(message, source); + } +} + +} // namespace application_manager diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc index c0aadb516a..67fbe4e26a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc @@ -1,8 +1,16 @@ #include "sdl_rpc_plugin/sdl_rpc_plugin.h" +#include "sdl_rpc_plugin/sdl_command_factory.h" namespace sdl_rpc_plugin { namespace plugins = application_manager::plugin_manager; -bool SDLRPCPlugin::Init() { + +bool SDLRPCPlugin::Init( + application_manager::ApplicationManager& app_manager, + application_manager::rpc_service::RPCService& rpc_service, + application_manager::HMICapabilities& hmi_capabilities, + policy::PolicyHandlerInterface& policy_handler) { + command_factory_.reset(new application_manager::SDLCommandFactory( + app_manager, rpc_service, hmi_capabilities, policy_handler)); return true; } @@ -17,6 +25,10 @@ std::string SDLRPCPlugin::PluginName() { return "SDL RPC Plugin"; } +application_manager::CommandFactory& SDLRPCPlugin::GetCommandFactory() { + return *command_factory_; +} + void SDLRPCPlugin::OnPolicyEvent( application_manager::plugin_manager::PolicyEvent event) {} |