From dc906fbd1b3609c049d96d82f443fb678dd84d6f Mon Sep 17 00:00:00 2001 From: jacobkeeler Date: Mon, 29 Apr 2019 17:23:29 -0400 Subject: Update style script --- .travis.yml | 2 +- tools/infrastructure/check_style.sh | 2 +- tools/infrastructure/git-hooks/pre-commit | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7060f4f33f..643597354c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ addons: before_install: - sudo apt-get update - sudo apt-get install libssl-dev libbluetooth3 libbluetooth-dev libudev-dev cmake html2text lcov git cmake automake1.11 build-essential libavahi-client-dev sqlite3 libsqlite3-dev libgtest-dev bluez-tools libpulse-dev libusb-1.0.0-dev cppcheck - - sudo apt-get install -f clang-format-3.6 + - sudo apt-get install -f clang-format-6.0 script: - cppcheck --force -isrc/3rd_party -isrc/3rd_party-static --quiet --error-exitcode=1 src diff --git a/tools/infrastructure/check_style.sh b/tools/infrastructure/check_style.sh index 08ae1b9860..006dd340d9 100755 --- a/tools/infrastructure/check_style.sh +++ b/tools/infrastructure/check_style.sh @@ -27,7 +27,7 @@ # 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. -FORMATER=clang-format-3.6 +FORMATER=clang-format-6.0 INSTALL_CMD="sudo apt-get install -f $FORMATER" if [ "$1" = "--help" ] diff --git a/tools/infrastructure/git-hooks/pre-commit b/tools/infrastructure/git-hooks/pre-commit index 9c46f195f3..710f0656c3 100755 --- a/tools/infrastructure/git-hooks/pre-commit +++ b/tools/infrastructure/git-hooks/pre-commit @@ -72,10 +72,10 @@ if [ "$?" -ne "0" ]; then exit 1 fi -# Auto update c++ files with clang-format-3.6 -CLANG_FORMAT=clang-format-3.6 +# Auto update c++ files with clang-format-6.0 +CLANG_FORMAT=clang-format-6.0 # Verify clang-format -CLANG_FORMAT_REQUIRED_VERSION=3.6 +CLANG_FORMAT_REQUIRED_VERSION=6.0 CLANG_FORMAT_CURRENT_VERSION=$($CLANG_FORMAT -version) if [[ $CLANG_FORMAT_CURRENT_VERSION != *$CLANG_FORMAT_REQUIRED_VERSION* ]] then -- cgit v1.2.1 From 09a161ba3e35c10b3f1b5d6c8a2d17943dbf516a Mon Sep 17 00:00:00 2001 From: jacobkeeler Date: Mon, 29 Apr 2019 17:24:27 -0400 Subject: Run updated style script --- src/appMain/life_cycle.h | 60 ++-- src/appMain/life_cycle_impl.cc | 68 ++--- src/appMain/life_cycle_impl.h | 64 ++-- src/appMain/low_voltage_signals_handler.cc | 6 +- src/appMain/low_voltage_signals_handler.h | 2 +- src/appMain/main.cc | 14 +- src/appMain/signal_handlers.cc | 60 ++-- src/appMain/signal_handlers.h | 60 ++-- .../test/low_voltage_signals_handler_test.cc | 66 ++--- src/appMain/test/mock_life_cycle.h | 60 ++-- .../include/application_manager/app_extension.h | 2 +- .../app_launch/app_launch_ctrl.h | 22 +- .../app_launch/app_launch_ctrl_impl.h | 4 +- .../app_launch/app_launch_data.h | 4 +- .../app_launch/app_launch_data_db.h | 12 +- .../app_launch/app_launch_data_impl.h | 2 +- .../app_launch/app_launch_data_json.h | 4 +- .../application_manager/app_launch/apps_launcher.h | 2 +- .../app_launch/device_apps_launcher.h | 6 +- .../include/application_manager/application.h | 46 +-- .../application_manager/application_data_impl.h | 6 +- .../include/application_manager/application_impl.h | 36 +-- .../application_manager/application_manager_impl.h | 84 +++--- .../application_manager/application_state.h | 14 +- .../include/application_manager/command_factory.h | 12 +- .../application_manager/command_holder_impl.h | 2 +- .../include/application_manager/commands/command.h | 14 +- .../application_manager/commands/command_impl.h | 21 +- .../commands/command_request_impl.h | 16 +- .../commands/command_request_to_mobile.h | 2 +- .../commands/command_response_from_mobile.h | 2 +- .../include/application_manager/commands/pending.h | 4 +- .../application_manager/commands/request_to_hmi.h | 2 +- .../commands/response_from_hmi.h | 62 ++-- .../application_manager/event_engine/event.h | 2 +- .../event_engine/event_dispatcher_impl.h | 2 +- .../application_manager/help_prompt_manager.h | 2 +- .../application_manager/help_prompt_manager_impl.h | 16 +- .../application_manager/hmi_capabilities_impl.h | 6 +- .../application_manager/hmi_interfaces_impl.h | 2 +- .../application_manager/hmi_language_handler.h | 8 +- .../include/application_manager/hmi_state.h | 10 +- .../include/application_manager/message.h | 2 +- .../include/application_manager/message_helper.h | 136 ++++----- .../application_manager/mobile_message_handler.h | 4 +- .../plugin_manager/plugin_keys.h | 2 +- .../plugin_manager/rpc_plugin.h | 20 +- .../plugin_manager/rpc_plugin_manager.h | 4 +- .../plugin_manager/rpc_plugin_manager_impl.h | 4 +- .../external/delegates/app_permission_delegate.h | 10 +- .../external/delegates/statistics_delegate.h | 4 +- .../policies/external/policy_event_observer.h | 2 +- .../application_manager/policies/policy_handler.h | 34 +-- .../regular/delegates/app_permission_delegate.h | 10 +- .../regular/delegates/statistics_delegate.h | 4 +- .../policies/regular/policy_handler_observer.h | 4 +- .../application_manager/request_controller.h | 168 +++++------ .../include/application_manager/request_info.h | 12 +- .../include/application_manager/request_tracker.h | 56 ++-- .../application_manager/resumption/resume_ctrl.h | 2 +- .../resumption/resume_ctrl_impl.h | 18 +- .../resumption/resumption_data.h | 2 +- .../include/application_manager/rpc_handler_impl.h | 14 +- .../include/application_manager/rpc_service_impl.h | 16 +- .../application_manager/smart_object_keys.h | 2 +- .../application_manager/state_controller_impl.h | 10 +- .../system_time/system_time_handler_impl.h | 4 +- .../application_manager/telemetry_observer.h | 4 +- .../include/application_manager/usage_statistics.h | 4 +- .../app_service_app_extension.h | 2 +- .../src/app_service_app_extension.cc | 2 +- .../src/app_service_command_factory.cc | 2 +- .../src/app_service_hmi_command_factory.cc | 8 +- .../src/app_service_mobile_command_factory.cc | 8 +- .../src/app_service_rpc_plugin.cc | 6 +- ...on_as_app_service_data_notification_from_hmi.cc | 6 +- .../mobile/on_app_service_data_notification.cc | 12 +- ...on_app_service_data_notification_from_mobile.cc | 6 +- .../commands/mobile/publish_app_service_request.cc | 9 +- .../test/commands/hmi/dummy_hmi_commands_test.cc | 12 +- .../commands/mobile/dummy_mobile_commands_test.cc | 17 +- .../on_app_service_data_notification_test.cc | 32 +- .../commands/hmi/rc_button_press_request.h | 2 +- .../commands/hmi/rc_button_press_response.h | 2 +- .../rc_get_interior_vehicle_data_consent_request.h | 62 ++-- ...rc_get_interior_vehicle_data_consent_response.h | 2 +- .../hmi/rc_get_interior_vehicle_data_request.h | 2 +- .../hmi/rc_get_interior_vehicle_data_response.h | 2 +- .../hmi/rc_on_interior_vehicle_data_notification.h | 2 +- .../hmi/rc_set_interior_vehicle_data_request.h | 2 +- .../hmi/rc_set_interior_vehicle_data_response.h | 2 +- .../commands/mobile/button_press_response.h | 2 +- .../mobile/get_interior_vehicle_data_request.h | 8 +- .../mobile/get_interior_vehicle_data_response.h | 2 +- .../mobile/on_interior_vehicle_data_notification.h | 4 +- .../mobile/set_interior_vehicle_data_response.h | 4 +- .../rc_rpc_plugin/commands/rc_command_params.h | 4 +- .../rc_rpc_plugin/commands/rc_command_request.h | 10 +- .../include/rc_rpc_plugin/interior_data_cache.h | 2 +- .../rc_rpc_plugin/interior_data_cache_impl.h | 6 +- .../include/rc_rpc_plugin/interior_data_manager.h | 22 +- .../rc_rpc_plugin/interior_data_manager_impl.h | 5 +- .../include/rc_rpc_plugin/rc_app_extension.h | 6 +- .../include/rc_rpc_plugin/rc_command_factory.h | 15 +- .../include/rc_rpc_plugin/rc_helpers.h | 21 +- .../include/rc_rpc_plugin/rc_module_constants.h | 8 +- .../include/rc_rpc_plugin/rc_rpc_plugin.h | 34 +-- .../rc_rpc_plugin/resource_allocation_manager.h | 4 +- .../resource_allocation_manager_impl.h | 18 +- .../hmi/rc_get_interior_vehicle_data_response.cc | 7 +- .../rc_on_interior_vehicle_data_notification.cc | 7 +- .../rc_on_remote_control_settings_notification.cc | 7 +- .../src/commands/mobile/button_press_request.cc | 24 +- .../mobile/get_interior_vehicle_data_request.cc | 16 +- .../on_interior_vehicle_data_notification.cc | 4 +- .../mobile/set_interior_vehicle_data_request.cc | 20 +- .../src/commands/rc_command_request.cc | 10 +- .../rc_rpc_plugin/src/interior_data_cache_impl.cc | 33 +-- .../src/interior_data_manager_impl.cc | 4 +- .../rc_rpc_plugin/src/rc_command_factory.cc | 36 +-- .../rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc | 8 +- .../rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc | 12 +- .../src/resource_allocation_manager_impl.cc | 24 +- .../test/commands/button_press_request_test.cc | 49 ++-- .../get_interior_vehicle_data_request_test.cc | 106 +++---- .../on_interior_vehicle_data_notification_test.cc | 26 +- .../commands/on_remote_control_settings_test.cc | 32 +- .../rc_get_interior_vehicle_data_consent_test.cc | 61 ++-- .../set_interior_vehicle_data_request_test.cc | 41 +-- .../mock/mock_resource_allocation_manager.h | 2 +- .../rc_rpc_plugin/test/interior_data_cache_test.cc | 2 +- .../test/resource_allocation_manager_impl_test.cc | 24 +- .../commands/hmi/activate_app_request.h | 2 +- .../commands/hmi/activate_app_response.h | 2 +- .../hmi/add_statistics_info_notification.h | 2 +- .../commands/hmi/allow_all_apps_request.h | 2 +- .../commands/hmi/allow_all_apps_response.h | 2 +- .../commands/hmi/allow_app_request.h | 2 +- .../commands/hmi/allow_app_response.h | 2 +- .../basic_communication_get_system_time_response.h | 2 +- .../hmi/basic_communication_on_awake_sdl.h | 2 +- .../hmi/basic_communication_system_request.h | 2 +- .../hmi/basic_communication_system_response.h | 2 +- .../commands/hmi/button_get_capabilities_request.h | 2 +- .../hmi/button_get_capabilities_response.h | 2 +- .../commands/hmi/close_popup_request.h | 2 +- .../commands/hmi/close_popup_response.h | 2 +- .../commands/hmi/decrypt_certificate_request.h | 2 +- .../commands/hmi/decrypt_certificate_response.h | 2 +- .../commands/hmi/dial_number_request.h | 2 +- .../commands/hmi/dial_number_response.h | 2 +- .../commands/hmi/get_system_info_request.h | 2 +- .../commands/hmi/get_system_info_response.h | 4 +- .../include/sdl_rpc_plugin/commands/hmi/get_urls.h | 2 +- .../commands/hmi/get_urls_response.h | 2 +- .../commands/hmi/mixing_audio_supported_request.h | 2 +- .../commands/hmi/mixing_audio_supported_response.h | 2 +- .../commands/hmi/navi_alert_maneuver_request.h | 2 +- .../commands/hmi/navi_alert_maneuver_response.h | 2 +- .../commands/hmi/navi_audio_start_stream_request.h | 12 +- .../hmi/navi_audio_start_stream_response.h | 2 +- .../commands/hmi/navi_audio_stop_stream_request.h | 2 +- .../commands/hmi/navi_audio_stop_stream_response.h | 2 +- .../commands/hmi/navi_get_way_points_request.h | 2 +- .../commands/hmi/navi_get_way_points_response.h | 2 +- .../commands/hmi/navi_is_ready_request.h | 2 +- .../commands/hmi/navi_is_ready_response.h | 2 +- .../commands/hmi/navi_send_location_request.h | 2 +- .../commands/hmi/navi_send_location_response.h | 2 +- .../commands/hmi/navi_set_video_config_request.h | 2 +- .../commands/hmi/navi_set_video_config_response.h | 2 +- .../commands/hmi/navi_show_constant_tbt_request.h | 2 +- .../commands/hmi/navi_show_constant_tbt_response.h | 2 +- .../commands/hmi/navi_start_stream_request.h | 16 +- .../commands/hmi/navi_start_stream_response.h | 2 +- .../commands/hmi/navi_stop_stream_request.h | 2 +- .../commands/hmi/navi_stop_stream_response.h | 2 +- .../hmi/navi_subscribe_way_points_request.h | 2 +- .../hmi/navi_subscribe_way_points_response.h | 2 +- .../hmi/navi_unsubscribe_way_points_request.h | 2 +- .../hmi/navi_unsubscribe_way_points_response.h | 2 +- .../commands/hmi/navi_update_turn_list_request.h | 2 +- .../commands/hmi/navi_update_turn_list_response.h | 2 +- .../hmi/on_allow_sdl_functionality_notification.h | 2 +- .../commands/hmi/on_app_activated_notification.h | 2 +- .../commands/hmi/on_app_deactivated_notification.h | 2 +- .../hmi/on_app_permission_changed_notification.h | 2 +- .../hmi/on_app_permission_consent_notification.h | 2 +- .../commands/hmi/on_app_registered_notification.h | 2 +- .../hmi/on_app_unregistered_notification.h | 16 +- .../hmi/on_audio_data_streaming_notification.h | 2 +- .../on_bc_system_capability_updated_notification.h | 2 +- .../commands/hmi/on_button_event_notification.h | 2 +- .../commands/hmi/on_button_press_notification.h | 2 +- .../hmi/on_button_subscription_notification.h | 2 +- .../commands/hmi/on_device_chosen_notification.h | 2 +- .../hmi/on_device_state_changed_notification.h | 2 +- .../hmi/on_driver_distraction_notification.h | 2 +- .../commands/hmi/on_event_changed_notification.h | 2 +- .../hmi/on_exit_all_applications_notification.h | 2 +- .../hmi/on_exit_application_notification.h | 2 +- .../commands/hmi/on_file_removed_notification.h | 2 +- .../commands/hmi/on_find_applications.h | 2 +- .../hmi/on_ignition_cycle_over_notification.h | 4 +- .../hmi/on_navi_tbt_client_state_notification.h | 4 +- .../hmi/on_navi_way_point_change_notification.h | 4 +- .../sdl_rpc_plugin/commands/hmi/on_policy_update.h | 2 +- .../commands/hmi/on_put_file_notification.h | 4 +- .../commands/hmi/on_ready_notification.h | 4 +- .../commands/hmi/on_received_policy_update.h | 10 +- .../commands/hmi/on_record_start_notification.h | 2 +- .../hmi/on_resume_audio_source_notification.h | 4 +- .../commands/hmi/on_sdl_close_notification.h | 2 +- .../hmi/on_sdl_consent_needed_notification.h | 2 +- .../hmi/on_sdl_persistence_complete_notification.h | 2 +- .../commands/hmi/on_start_device_discovery.h | 2 +- .../commands/hmi/on_status_update_notification.h | 2 +- .../commands/hmi/on_system_context_notification.h | 4 +- .../commands/hmi/on_system_error_notification.h | 2 +- .../hmi/on_system_info_changed_notification.h | 2 +- .../commands/hmi/on_system_request_notification.h | 4 +- .../hmi/on_system_time_ready_notification.h | 2 +- .../hmi/on_tts_language_change_notification.h | 2 +- .../hmi/on_tts_reset_timeout_notification.h | 2 +- .../commands/hmi/on_tts_started_notification.h | 2 +- .../commands/hmi/on_tts_stopped_notification.h | 2 +- .../commands/hmi/on_ui_command_notification.h | 2 +- .../hmi/on_ui_keyboard_input_notification.h | 4 +- .../hmi/on_ui_language_change_notification.h | 2 +- .../hmi/on_ui_reset_timeout_notification.h | 2 +- .../commands/hmi/on_ui_touch_event_notification.h | 4 +- .../commands/hmi/on_update_device_list.h | 2 +- .../hmi/on_vi_acc_pedal_position_notification.h | 4 +- .../commands/hmi/on_vi_belt_status_notification.h | 4 +- .../hmi/on_vi_body_information_notification.h | 4 +- .../hmi/on_vi_device_status_notification.h | 4 +- .../hmi/on_vi_driver_braking_notification.h | 4 +- .../hmi/on_vi_engine_torque_notification.h | 4 +- .../hmi/on_vi_external_temperature_notification.h | 4 +- .../commands/hmi/on_vi_fuel_level_notification.h | 4 +- .../hmi/on_vi_fuel_level_state_notification.h | 4 +- .../commands/hmi/on_vi_gps_data_notification.h | 4 +- .../hmi/on_vi_head_lamp_status_notification.h | 4 +- .../on_vi_instant_fuel_consumption_notification.h | 4 +- .../commands/hmi/on_vi_my_key_notification.h | 4 +- .../commands/hmi/on_vi_odometer_notification.h | 4 +- .../commands/hmi/on_vi_prndl_notification.h | 4 +- .../commands/hmi/on_vi_rpm_notification.h | 4 +- .../commands/hmi/on_vi_speed_notification.h | 4 +- .../hmi/on_vi_steering_wheel_angle_notification.h | 4 +- .../hmi/on_vi_tire_pressure_notification.h | 4 +- .../commands/hmi/on_vi_vin_notification.h | 4 +- .../commands/hmi/on_vi_wiper_status_notification.h | 4 +- .../hmi/on_video_data_streaming_notification.h | 2 +- .../commands/hmi/on_vr_command_notification.h | 4 +- .../hmi/on_vr_language_change_notification.h | 2 +- .../commands/hmi/on_vr_started_notification.h | 2 +- .../commands/hmi/on_vr_stopped_notification.h | 2 +- .../commands/hmi/rc_get_capabilities_request.h | 2 +- .../commands/hmi/rc_get_capabilities_response.h | 2 +- .../commands/hmi/rc_is_ready_request.h | 2 +- .../commands/hmi/rc_is_ready_response.h | 2 +- .../commands/hmi/sdl_activate_app_request.h | 4 +- .../commands/hmi/sdl_activate_app_response.h | 2 +- .../hmi/sdl_get_list_of_permissions_request.h | 2 +- .../hmi/sdl_get_list_of_permissions_response.h | 2 +- .../commands/hmi/sdl_get_status_update_request.h | 2 +- .../commands/hmi/sdl_get_status_update_response.h | 2 +- .../hmi/sdl_get_user_friendly_message_request.h | 4 +- .../hmi/sdl_get_user_friendly_message_response.h | 2 +- .../commands/hmi/sdl_policy_update.h | 10 +- .../commands/hmi/sdl_policy_update_response.h | 2 +- .../commands/hmi/tts_change_registration_request.h | 2 +- .../hmi/tts_change_registration_response.h | 2 +- .../commands/hmi/tts_get_capabilities_request.h | 2 +- .../commands/hmi/tts_get_capabilities_response.h | 2 +- .../commands/hmi/tts_get_language_request.h | 2 +- .../commands/hmi/tts_get_language_response.h | 2 +- .../hmi/tts_get_supported_languages_request.h | 2 +- .../hmi/tts_get_supported_languages_response.h | 2 +- .../commands/hmi/tts_is_ready_request.h | 2 +- .../commands/hmi/tts_is_ready_response.h | 2 +- .../hmi/tts_set_global_properties_request.h | 2 +- .../hmi/tts_set_global_properties_response.h | 2 +- .../commands/hmi/tts_speak_request.h | 2 +- .../commands/hmi/tts_speak_response.h | 2 +- .../commands/hmi/tts_stop_speaking_request.h | 2 +- .../commands/hmi/tts_stop_speaking_response.h | 2 +- .../commands/hmi/ui_add_command_request.h | 2 +- .../commands/hmi/ui_add_command_response.h | 2 +- .../commands/hmi/ui_add_submenu_request.h | 2 +- .../commands/hmi/ui_add_submenu_response.h | 2 +- .../sdl_rpc_plugin/commands/hmi/ui_alert_request.h | 2 +- .../commands/hmi/ui_alert_response.h | 2 +- .../commands/hmi/ui_change_registration_request.h | 2 +- .../commands/hmi/ui_change_registration_response.h | 2 +- .../commands/hmi/ui_delete_command_request.h | 2 +- .../commands/hmi/ui_delete_command_response.h | 2 +- .../commands/hmi/ui_delete_submenu_request.h | 2 +- .../commands/hmi/ui_delete_submenu_response.h | 2 +- .../commands/hmi/ui_end_audio_pass_thru_request.h | 2 +- .../commands/hmi/ui_end_audio_pass_thru_response.h | 2 +- .../commands/hmi/ui_get_capabilities_request.h | 2 +- .../commands/hmi/ui_get_capabilities_response.h | 2 +- .../commands/hmi/ui_get_language_request.h | 2 +- .../commands/hmi/ui_get_language_response.h | 2 +- .../hmi/ui_get_supported_languages_request.h | 2 +- .../hmi/ui_get_supported_languages_response.h | 2 +- .../commands/hmi/ui_is_ready_request.h | 2 +- .../commands/hmi/ui_is_ready_response.h | 2 +- .../hmi/ui_perform_audio_pass_thru_request.h | 2 +- .../hmi/ui_perform_audio_pass_thru_response.h | 2 +- .../commands/hmi/ui_perform_interaction_request.h | 2 +- .../commands/hmi/ui_perform_interaction_response.h | 2 +- .../commands/hmi/ui_scrollable_message_request.h | 2 +- .../commands/hmi/ui_scrollable_message_response.h | 2 +- .../commands/hmi/ui_send_haptic_data_request.h | 2 +- .../commands/hmi/ui_send_haptic_data_response.h | 2 +- .../commands/hmi/ui_set_app_icon_request.h | 2 +- .../commands/hmi/ui_set_app_icon_response.h | 2 +- .../commands/hmi/ui_set_display_layout_request.h | 2 +- .../commands/hmi/ui_set_display_layout_response.h | 2 +- .../hmi/ui_set_global_properties_request.h | 2 +- .../hmi/ui_set_global_properties_response.h | 2 +- .../hmi/ui_set_media_clock_timer_request.h | 2 +- .../hmi/ui_set_media_clock_timer_response.h | 2 +- .../sdl_rpc_plugin/commands/hmi/ui_show_request.h | 2 +- .../sdl_rpc_plugin/commands/hmi/ui_show_response.h | 2 +- .../commands/hmi/ui_slider_request.h | 2 +- .../commands/hmi/ui_slider_response.h | 2 +- .../commands/hmi/update_app_list_request.h | 2 +- .../commands/hmi/update_app_list_response.h | 2 +- .../commands/hmi/update_device_list_request.h | 4 +- .../commands/hmi/update_device_list_response.h | 2 +- .../commands/hmi/update_sdl_request.h | 4 +- .../commands/hmi/update_sdl_response.h | 2 +- .../commands/hmi/vr_add_command_request.h | 2 +- .../commands/hmi/vr_add_command_response.h | 2 +- .../commands/hmi/vr_change_registration_request.h | 2 +- .../commands/hmi/vr_change_registration_response.h | 2 +- .../commands/hmi/vr_delete_command_request.h | 2 +- .../commands/hmi/vr_delete_command_response.h | 2 +- .../commands/hmi/vr_get_capabilities_request.h | 2 +- .../commands/hmi/vr_get_capabilities_response.h | 2 +- .../commands/hmi/vr_get_language_request.h | 2 +- .../commands/hmi/vr_get_language_response.h | 2 +- .../hmi/vr_get_supported_languages_request.h | 2 +- .../hmi/vr_get_supported_languages_response.h | 2 +- .../commands/hmi/vr_is_ready_request.h | 2 +- .../commands/hmi/vr_is_ready_response.h | 2 +- .../commands/hmi/vr_perform_interaction_request.h | 2 +- .../commands/hmi/vr_perform_interaction_response.h | 2 +- .../commands/mobile/add_command_request.h | 2 +- .../commands/mobile/add_command_response.h | 2 +- .../commands/mobile/add_sub_menu_request.h | 2 +- .../commands/mobile/add_sub_menu_response.h | 2 +- .../commands/mobile/alert_maneuver_request.h | 2 +- .../commands/mobile/alert_maneuver_response.h | 2 +- .../sdl_rpc_plugin/commands/mobile/alert_request.h | 2 +- .../commands/mobile/alert_response.h | 2 +- .../commands/mobile/change_registration_request.h | 14 +- .../commands/mobile/change_registration_response.h | 2 +- .../mobile/create_interaction_choice_set_request.h | 36 +-- .../create_interaction_choice_set_response.h | 2 +- .../commands/mobile/delete_command_request.h | 2 +- .../commands/mobile/delete_command_response.h | 2 +- .../commands/mobile/delete_file_request.h | 2 +- .../commands/mobile/delete_file_response.h | 2 +- .../mobile/delete_interaction_choice_set_request.h | 4 +- .../delete_interaction_choice_set_response.h | 2 +- .../commands/mobile/delete_sub_menu_request.h | 4 +- .../commands/mobile/delete_sub_menu_response.h | 2 +- .../commands/mobile/dial_number_request.h | 8 +- .../commands/mobile/dial_number_response.h | 2 +- .../commands/mobile/end_audio_pass_thru_request.h | 2 +- .../commands/mobile/end_audio_pass_thru_response.h | 2 +- .../commands/mobile/generic_response.h | 2 +- .../mobile/get_system_capability_request.h | 4 +- .../mobile/get_system_capability_response.h | 4 +- .../commands/mobile/get_way_points_request.h | 2 +- .../commands/mobile/get_way_points_response.h | 2 +- .../commands/mobile/list_files_request.h | 2 +- .../commands/mobile/list_files_response.h | 2 +- .../on_app_interface_unregistered_notification.h | 2 +- .../mobile/on_audio_pass_thru_notification.h | 2 +- .../commands/mobile/on_button_event_notification.h | 4 +- .../commands/mobile/on_button_press_notification.h | 4 +- .../commands/mobile/on_command_notification.h | 2 +- .../mobile/on_driver_distraction_notification.h | 2 +- .../commands/mobile/on_hash_change_notification.h | 2 +- .../commands/mobile/on_hmi_status_notification.h | 2 +- .../on_hmi_status_notification_from_mobile.h | 4 +- .../mobile/on_keyboard_input_notification.h | 2 +- .../mobile/on_language_change_notification.h | 2 +- .../mobile/on_permissions_change_notification.h | 2 +- .../on_system_capability_updated_notification.h | 4 +- .../mobile/on_system_request_notification.h | 4 +- .../mobile/on_tbt_client_state_notification.h | 2 +- .../commands/mobile/on_touch_event_notification.h | 2 +- .../mobile/on_way_point_change_notification.h | 2 +- .../mobile/perform_audio_pass_thru_request.h | 4 +- .../mobile/perform_audio_pass_thru_response.h | 2 +- .../commands/mobile/perform_interaction_request.h | 4 +- .../commands/mobile/perform_interaction_response.h | 2 +- .../commands/mobile/put_file_request.h | 4 +- .../commands/mobile/put_file_response.h | 2 +- .../mobile/register_app_interface_request.h | 14 +- .../mobile/register_app_interface_response.h | 2 +- .../mobile/reset_global_properties_request.h | 4 +- .../mobile/reset_global_properties_response.h | 2 +- .../commands/mobile/scrollable_message_request.h | 2 +- .../commands/mobile/scrollable_message_response.h | 2 +- .../commands/mobile/send_haptic_data_request.h | 4 +- .../commands/mobile/send_haptic_data_response.h | 2 +- .../commands/mobile/send_location_request.h | 10 +- .../commands/mobile/send_location_response.h | 2 +- .../commands/mobile/set_app_icon_request.h | 2 +- .../commands/mobile/set_app_icon_response.h | 2 +- .../commands/mobile/set_display_layout_request.h | 2 +- .../commands/mobile/set_display_layout_response.h | 2 +- .../mobile/set_global_properties_request.h | 4 +- .../mobile/set_global_properties_response.h | 2 +- .../mobile/set_media_clock_timer_request.h | 2 +- .../mobile/set_media_clock_timer_response.h | 2 +- .../commands/mobile/show_constant_tbt_request.h | 2 +- .../commands/mobile/show_constant_tbt_response.h | 2 +- .../sdl_rpc_plugin/commands/mobile/show_request.h | 2 +- .../sdl_rpc_plugin/commands/mobile/show_response.h | 2 +- .../commands/mobile/slider_request.h | 2 +- .../commands/mobile/slider_response.h | 2 +- .../sdl_rpc_plugin/commands/mobile/speak_request.h | 2 +- .../commands/mobile/speak_response.h | 2 +- .../commands/mobile/subscribe_button_request.h | 4 +- .../commands/mobile/subscribe_button_response.h | 2 +- .../commands/mobile/subscribe_way_points_request.h | 4 +- .../mobile/subscribe_way_points_response.h | 4 +- .../commands/mobile/system_request.h | 4 +- .../commands/mobile/system_response.h | 2 +- .../mobile/unregister_app_interface_request.h | 2 +- .../mobile/unregister_app_interface_response.h | 2 +- .../commands/mobile/unsubscribe_button_request.h | 2 +- .../commands/mobile/unsubscribe_button_response.h | 2 +- .../mobile/unsubscribe_way_points_request.h | 4 +- .../mobile/unsubscribe_way_points_response.h | 4 +- .../commands/mobile/update_turn_list_request.h | 2 +- .../commands/mobile/update_turn_list_response.h | 2 +- .../extensions/system_capability_app_extension.h | 2 +- .../include/sdl_rpc_plugin/hmi_command_factory.h | 4 +- .../sdl_rpc_plugin/mobile_command_factory.h | 4 +- .../include/sdl_rpc_plugin/sdl_command_factory.h | 8 +- .../include/sdl_rpc_plugin/sdl_rpc_plugin.h | 4 +- .../src/commands/hmi/activate_app_request.cc | 2 +- .../src/commands/hmi/activate_app_response.cc | 2 +- .../hmi/add_statistics_info_notification.cc | 2 +- .../src/commands/hmi/allow_all_apps_request.cc | 2 +- .../src/commands/hmi/allow_all_apps_response.cc | 2 +- .../src/commands/hmi/allow_app_request.cc | 2 +- .../src/commands/hmi/allow_app_response.cc | 2 +- ...basic_communication_get_system_time_response.cc | 2 +- .../hmi/basic_communication_on_awake_sdl.cc | 2 +- .../hmi/basic_communication_system_request.cc | 2 +- .../hmi/basic_communication_system_response.cc | 2 +- .../src/commands/hmi/bc_get_file_path_response.cc | 2 +- .../hmi/button_get_capabilities_request.cc | 2 +- .../hmi/button_get_capabilities_response.cc | 2 +- .../src/commands/hmi/close_popup_request.cc | 2 +- .../src/commands/hmi/close_popup_response.cc | 2 +- .../commands/hmi/decrypt_certificate_request.cc | 2 +- .../commands/hmi/decrypt_certificate_response.cc | 2 +- .../src/commands/hmi/dial_number_request.cc | 2 +- .../src/commands/hmi/dial_number_response.cc | 2 +- .../src/commands/hmi/get_system_info_request.cc | 2 +- .../src/commands/hmi/get_system_info_response.cc | 2 +- .../sdl_rpc_plugin/src/commands/hmi/get_urls.cc | 6 +- .../src/commands/hmi/get_urls_response.cc | 2 +- .../commands/hmi/mixing_audio_supported_request.cc | 2 +- .../hmi/mixing_audio_supported_response.cc | 2 +- .../commands/hmi/navi_alert_maneuver_request.cc | 2 +- .../commands/hmi/navi_alert_maneuver_response.cc | 2 +- .../hmi/navi_audio_start_stream_request.cc | 6 +- .../hmi/navi_audio_start_stream_response.cc | 2 +- .../commands/hmi/navi_audio_stop_stream_request.cc | 2 +- .../hmi/navi_audio_stop_stream_response.cc | 2 +- .../commands/hmi/navi_get_way_points_request.cc | 2 +- .../commands/hmi/navi_get_way_points_response.cc | 2 +- .../src/commands/hmi/navi_is_ready_request.cc | 2 +- .../src/commands/hmi/navi_is_ready_response.cc | 2 +- .../src/commands/hmi/navi_send_location_request.cc | 2 +- .../commands/hmi/navi_send_location_response.cc | 2 +- .../commands/hmi/navi_set_video_config_request.cc | 14 +- .../commands/hmi/navi_set_video_config_response.cc | 2 +- .../commands/hmi/navi_show_constant_tbt_request.cc | 2 +- .../hmi/navi_show_constant_tbt_response.cc | 2 +- .../src/commands/hmi/navi_start_stream_request.cc | 8 +- .../src/commands/hmi/navi_start_stream_response.cc | 2 +- .../src/commands/hmi/navi_stop_stream_request.cc | 2 +- .../src/commands/hmi/navi_stop_stream_response.cc | 2 +- .../hmi/navi_subscribe_way_points_request.cc | 2 +- .../hmi/navi_subscribe_way_points_response.cc | 2 +- .../hmi/navi_unsubscribe_way_points_request.cc | 2 +- .../hmi/navi_unsubscribe_way_points_response.cc | 4 +- .../commands/hmi/navi_update_turn_list_request.cc | 2 +- .../commands/hmi/navi_update_turn_list_response.cc | 2 +- .../hmi/on_allow_sdl_functionality_notification.cc | 2 +- .../commands/hmi/on_app_activated_notification.cc | 2 +- .../hmi/on_app_deactivated_notification.cc | 2 +- .../hmi/on_app_permission_changed_notification.cc | 2 +- .../hmi/on_app_permission_consent_notification.cc | 10 +- .../commands/hmi/on_app_registered_notification.cc | 2 +- .../hmi/on_app_unregistered_notification.cc | 2 +- .../hmi/on_audio_data_streaming_notification.cc | 2 +- ...on_bc_system_capability_updated_notification.cc | 28 +- .../commands/hmi/on_button_event_notification.cc | 2 +- .../commands/hmi/on_button_press_notification.cc | 4 +- .../hmi/on_button_subscription_notification.cc | 2 +- .../commands/hmi/on_device_chosen_notification.cc | 2 +- .../hmi/on_device_state_changed_notification.cc | 8 +- .../hmi/on_driver_distraction_notification.cc | 8 +- .../commands/hmi/on_event_changed_notification.cc | 2 +- .../hmi/on_exit_all_applications_notification.cc | 6 +- .../hmi/on_exit_application_notification.cc | 6 +- .../commands/hmi/on_file_removed_notification.cc | 2 +- .../src/commands/hmi/on_find_applications.cc | 2 +- .../hmi/on_ignition_cycle_over_notification.cc | 2 +- .../hmi/on_navi_tbt_client_state_notification.cc | 2 +- .../hmi/on_navi_way_point_change_notification.cc | 2 +- .../src/commands/hmi/on_policy_update.cc | 2 +- .../src/commands/hmi/on_put_file_notification.cc | 2 +- .../src/commands/hmi/on_ready_notification.cc | 2 +- .../src/commands/hmi/on_received_policy_update.cc | 4 +- .../commands/hmi/on_record_start_notification.cc | 2 +- .../hmi/on_resume_audio_source_notification.cc | 2 +- .../src/commands/hmi/on_sdl_close_notification.cc | 2 +- .../hmi/on_sdl_consent_needed_notification.cc | 2 +- .../on_sdl_persistence_complete_notification.cc | 2 +- .../src/commands/hmi/on_start_device_discovery.cc | 2 +- .../commands/hmi/on_status_update_notification.cc | 2 +- .../commands/hmi/on_system_context_notification.cc | 4 +- .../commands/hmi/on_system_error_notification.cc | 2 +- .../hmi/on_system_info_changed_notification.cc | 2 +- .../commands/hmi/on_system_request_notification.cc | 4 +- .../hmi/on_system_time_ready_notification.cc | 2 +- .../hmi/on_tts_language_change_notification.cc | 2 +- .../hmi/on_tts_reset_timeout_notification.cc | 2 +- .../commands/hmi/on_tts_started_notification.cc | 2 +- .../commands/hmi/on_tts_stopped_notification.cc | 2 +- .../src/commands/hmi/on_ui_command_notification.cc | 2 +- .../hmi/on_ui_keyboard_input_notification.cc | 2 +- .../hmi/on_ui_language_change_notification.cc | 2 +- .../hmi/on_ui_reset_timeout_notification.cc | 2 +- .../commands/hmi/on_ui_touch_event_notification.cc | 2 +- .../src/commands/hmi/on_update_device_list.cc | 2 +- .../hmi/on_vi_acc_pedal_position_notification.cc | 2 +- .../commands/hmi/on_vi_belt_status_notification.cc | 2 +- .../hmi/on_vi_body_information_notification.cc | 2 +- .../hmi/on_vi_device_status_notification.cc | 2 +- .../hmi/on_vi_driver_braking_notification.cc | 2 +- .../hmi/on_vi_engine_torque_notification.cc | 2 +- .../hmi/on_vi_external_temperature_notification.cc | 2 +- .../commands/hmi/on_vi_fuel_level_notification.cc | 2 +- .../hmi/on_vi_fuel_level_state_notification.cc | 2 +- .../commands/hmi/on_vi_gps_data_notification.cc | 2 +- .../hmi/on_vi_head_lamp_status_notification.cc | 2 +- .../on_vi_instant_fuel_consumption_notification.cc | 2 +- .../src/commands/hmi/on_vi_my_key_notification.cc | 2 +- .../commands/hmi/on_vi_odometer_notification.cc | 2 +- .../src/commands/hmi/on_vi_prndl_notification.cc | 2 +- .../src/commands/hmi/on_vi_rpm_notification.cc | 2 +- .../src/commands/hmi/on_vi_speed_notification.cc | 2 +- .../hmi/on_vi_steering_wheel_angle_notification.cc | 2 +- .../hmi/on_vi_tire_pressure_notification.cc | 2 +- .../src/commands/hmi/on_vi_vin_notification.cc | 2 +- .../hmi/on_vi_wiper_status_notification.cc | 2 +- .../hmi/on_video_data_streaming_notification.cc | 2 +- .../src/commands/hmi/on_vr_command_notification.cc | 8 +- .../hmi/on_vr_language_change_notification.cc | 4 +- .../src/commands/hmi/on_vr_started_notification.cc | 2 +- .../src/commands/hmi/on_vr_stopped_notification.cc | 2 +- .../commands/hmi/rc_get_capabilities_request.cc | 2 +- .../commands/hmi/rc_get_capabilities_response.cc | 2 +- .../src/commands/hmi/rc_is_ready_request.cc | 2 +- .../src/commands/hmi/rc_is_ready_response.cc | 2 +- .../src/commands/hmi/sdl_activate_app_request.cc | 9 +- .../src/commands/hmi/sdl_activate_app_response.cc | 2 +- .../hmi/sdl_get_list_of_permissions_request.cc | 2 +- .../hmi/sdl_get_list_of_permissions_response.cc | 2 +- .../commands/hmi/sdl_get_status_update_request.cc | 2 +- .../commands/hmi/sdl_get_status_update_response.cc | 2 +- .../hmi/sdl_get_user_friendly_message_request.cc | 2 +- .../hmi/sdl_get_user_friendly_message_response.cc | 2 +- .../src/commands/hmi/sdl_policy_update.cc | 2 +- .../src/commands/hmi/sdl_policy_update_response.cc | 2 +- .../hmi/tts_change_registration_request.cc | 2 +- .../hmi/tts_change_registration_response.cc | 2 +- .../commands/hmi/tts_get_capabilities_request.cc | 2 +- .../commands/hmi/tts_get_capabilities_response.cc | 2 +- .../src/commands/hmi/tts_get_language_request.cc | 2 +- .../src/commands/hmi/tts_get_language_response.cc | 2 +- .../hmi/tts_get_supported_languages_request.cc | 2 +- .../hmi/tts_get_supported_languages_response.cc | 2 +- .../src/commands/hmi/tts_is_ready_request.cc | 4 +- .../src/commands/hmi/tts_is_ready_response.cc | 2 +- .../hmi/tts_set_global_properties_request.cc | 2 +- .../hmi/tts_set_global_properties_response.cc | 2 +- .../src/commands/hmi/tts_speak_request.cc | 2 +- .../src/commands/hmi/tts_speak_response.cc | 4 +- .../src/commands/hmi/tts_stop_speaking_request.cc | 2 +- .../src/commands/hmi/tts_stop_speaking_response.cc | 2 +- .../src/commands/hmi/ui_add_command_request.cc | 2 +- .../src/commands/hmi/ui_add_command_response.cc | 2 +- .../src/commands/hmi/ui_add_submenu_request.cc | 2 +- .../src/commands/hmi/ui_add_submenu_response.cc | 2 +- .../src/commands/hmi/ui_alert_request.cc | 2 +- .../src/commands/hmi/ui_alert_response.cc | 2 +- .../commands/hmi/ui_change_registration_request.cc | 2 +- .../hmi/ui_change_registration_response.cc | 2 +- .../src/commands/hmi/ui_delete_command_request.cc | 2 +- .../src/commands/hmi/ui_delete_command_response.cc | 2 +- .../src/commands/hmi/ui_delete_submenu_request.cc | 2 +- .../src/commands/hmi/ui_delete_submenu_response.cc | 2 +- .../commands/hmi/ui_end_audio_pass_thru_request.cc | 2 +- .../hmi/ui_end_audio_pass_thru_response.cc | 2 +- .../commands/hmi/ui_get_capabilities_request.cc | 2 +- .../commands/hmi/ui_get_capabilities_response.cc | 2 +- .../src/commands/hmi/ui_get_language_request.cc | 2 +- .../src/commands/hmi/ui_get_language_response.cc | 2 +- .../hmi/ui_get_supported_languages_request.cc | 2 +- .../hmi/ui_get_supported_languages_response.cc | 2 +- .../src/commands/hmi/ui_is_ready_request.cc | 2 +- .../src/commands/hmi/ui_is_ready_response.cc | 2 +- .../hmi/ui_perform_audio_pass_thru_request.cc | 2 +- .../hmi/ui_perform_audio_pass_thru_response.cc | 2 +- .../commands/hmi/ui_perform_interaction_request.cc | 2 +- .../hmi/ui_perform_interaction_response.cc | 2 +- .../commands/hmi/ui_scrollable_message_request.cc | 2 +- .../commands/hmi/ui_scrollable_message_response.cc | 2 +- .../commands/hmi/ui_send_haptic_data_request.cc | 2 +- .../commands/hmi/ui_send_haptic_data_response.cc | 2 +- .../src/commands/hmi/ui_set_app_icon_request.cc | 2 +- .../src/commands/hmi/ui_set_app_icon_response.cc | 2 +- .../commands/hmi/ui_set_display_layout_request.cc | 2 +- .../commands/hmi/ui_set_display_layout_response.cc | 2 +- .../hmi/ui_set_global_properties_request.cc | 2 +- .../hmi/ui_set_global_properties_response.cc | 2 +- .../hmi/ui_set_media_clock_timer_request.cc | 2 +- .../hmi/ui_set_media_clock_timer_response.cc | 2 +- .../src/commands/hmi/ui_show_request.cc | 2 +- .../src/commands/hmi/ui_show_response.cc | 2 +- .../src/commands/hmi/ui_slider_request.cc | 2 +- .../src/commands/hmi/ui_slider_response.cc | 2 +- .../src/commands/hmi/update_app_list_request.cc | 2 +- .../src/commands/hmi/update_app_list_response.cc | 2 +- .../src/commands/hmi/update_device_list_request.cc | 2 +- .../commands/hmi/update_device_list_response.cc | 2 +- .../src/commands/hmi/update_sdl_request.cc | 2 +- .../src/commands/hmi/update_sdl_response.cc | 2 +- .../src/commands/hmi/vr_add_command_request.cc | 2 +- .../src/commands/hmi/vr_add_command_response.cc | 2 +- .../commands/hmi/vr_change_registration_request.cc | 2 +- .../hmi/vr_change_registration_response.cc | 2 +- .../src/commands/hmi/vr_delete_command_request.cc | 2 +- .../src/commands/hmi/vr_delete_command_response.cc | 2 +- .../commands/hmi/vr_get_capabilities_request.cc | 2 +- .../commands/hmi/vr_get_capabilities_response.cc | 2 +- .../src/commands/hmi/vr_get_language_request.cc | 2 +- .../src/commands/hmi/vr_get_language_response.cc | 2 +- .../hmi/vr_get_supported_languages_request.cc | 2 +- .../hmi/vr_get_supported_languages_response.cc | 4 +- .../src/commands/hmi/vr_is_ready_request.cc | 2 +- .../src/commands/hmi/vr_is_ready_response.cc | 2 +- .../commands/hmi/vr_perform_interaction_request.cc | 2 +- .../hmi/vr_perform_interaction_response.cc | 2 +- .../src/commands/mobile/add_command_request.cc | 24 +- .../src/commands/mobile/add_command_response.cc | 2 +- .../src/commands/mobile/add_sub_menu_request.cc | 4 +- .../src/commands/mobile/add_sub_menu_response.cc | 4 +- .../src/commands/mobile/alert_maneuver_request.cc | 12 +- .../src/commands/mobile/alert_maneuver_response.cc | 2 +- .../src/commands/mobile/alert_request.cc | 12 +- .../src/commands/mobile/alert_response.cc | 6 +- .../commands/mobile/change_registration_request.cc | 26 +- .../mobile/change_registration_response.cc | 2 +- .../create_interaction_choice_set_request.cc | 20 +- .../create_interaction_choice_set_response.cc | 2 +- .../src/commands/mobile/delete_command_request.cc | 9 +- .../src/commands/mobile/delete_command_response.cc | 2 +- .../src/commands/mobile/delete_file_request.cc | 2 +- .../src/commands/mobile/delete_file_response.cc | 2 +- .../delete_interaction_choice_set_request.cc | 12 +- .../delete_interaction_choice_set_response.cc | 4 +- .../src/commands/mobile/delete_sub_menu_request.cc | 4 +- .../commands/mobile/delete_sub_menu_response.cc | 2 +- .../src/commands/mobile/dial_number_request.cc | 4 +- .../src/commands/mobile/dial_number_response.cc | 2 +- .../commands/mobile/end_audio_pass_thru_request.cc | 2 +- .../mobile/end_audio_pass_thru_response.cc | 2 +- .../src/commands/mobile/generic_response.cc | 2 +- .../mobile/get_cloud_app_properties_response.cc | 4 +- .../src/commands/mobile/get_file_request.cc | 24 +- .../mobile/get_system_capability_request.cc | 13 +- .../mobile/get_system_capability_response.cc | 4 +- .../src/commands/mobile/get_way_points_request.cc | 4 +- .../src/commands/mobile/get_way_points_response.cc | 4 +- .../src/commands/mobile/list_files_request.cc | 4 +- .../src/commands/mobile/list_files_response.cc | 4 +- .../on_app_interface_unregistered_notification.cc | 2 +- .../mobile/on_audio_pass_thru_notification.cc | 2 +- .../mobile/on_button_event_notification.cc | 7 +- .../mobile/on_button_press_notification.cc | 7 +- .../src/commands/mobile/on_command_notification.cc | 2 +- .../mobile/on_driver_distraction_notification.cc | 2 +- .../commands/mobile/on_hash_change_notification.cc | 4 +- .../commands/mobile/on_hmi_status_notification.cc | 4 +- .../on_hmi_status_notification_from_mobile.cc | 4 +- .../mobile/on_keyboard_input_notification.cc | 2 +- .../mobile/on_language_change_notification.cc | 2 +- .../mobile/on_permissions_change_notification.cc | 2 +- .../on_system_capability_updated_notification.cc | 34 ++- .../mobile/on_system_request_notification.cc | 22 +- .../mobile/on_tbt_client_state_notification.cc | 2 +- .../commands/mobile/on_touch_event_notification.cc | 2 +- .../mobile/on_way_point_change_notification.cc | 2 +- .../mobile/perform_audio_pass_thru_request.cc | 10 +- .../mobile/perform_audio_pass_thru_response.cc | 2 +- .../commands/mobile/perform_interaction_request.cc | 30 +- .../mobile/perform_interaction_response.cc | 2 +- .../src/commands/mobile/put_file_request.cc | 16 +- .../src/commands/mobile/put_file_response.cc | 4 +- .../mobile/register_app_interface_request.cc | 67 +++-- .../mobile/register_app_interface_response.cc | 5 +- .../mobile/reset_global_properties_request.cc | 4 +- .../mobile/reset_global_properties_response.cc | 2 +- .../commands/mobile/scrollable_message_request.cc | 8 +- .../commands/mobile/scrollable_message_response.cc | 2 +- .../commands/mobile/send_haptic_data_request.cc | 2 +- .../commands/mobile/send_haptic_data_response.cc | 2 +- .../src/commands/mobile/send_location_request.cc | 4 +- .../src/commands/mobile/send_location_response.cc | 4 +- .../src/commands/mobile/set_app_icon_request.cc | 31 +- .../src/commands/mobile/set_app_icon_response.cc | 2 +- .../mobile/set_cloud_app_properties_response.cc | 4 +- .../commands/mobile/set_display_layout_request.cc | 10 +- .../commands/mobile/set_display_layout_response.cc | 2 +- .../mobile/set_global_properties_request.cc | 29 +- .../mobile/set_global_properties_response.cc | 2 +- .../mobile/set_media_clock_timer_request.cc | 6 +- .../mobile/set_media_clock_timer_response.cc | 2 +- .../commands/mobile/show_constant_tbt_request.cc | 11 +- .../commands/mobile/show_constant_tbt_response.cc | 2 +- .../src/commands/mobile/show_request.cc | 12 +- .../src/commands/mobile/show_response.cc | 4 +- .../src/commands/mobile/slider_request.cc | 4 +- .../src/commands/mobile/slider_response.cc | 2 +- .../src/commands/mobile/speak_request.cc | 10 +- .../src/commands/mobile/speak_response.cc | 4 +- .../commands/mobile/subscribe_button_request.cc | 2 +- .../commands/mobile/subscribe_button_response.cc | 2 +- .../mobile/subscribe_way_points_request.cc | 4 +- .../mobile/subscribe_way_points_response.cc | 4 +- .../src/commands/mobile/system_request.cc | 57 ++-- .../src/commands/mobile/system_response.cc | 2 +- .../mobile/unregister_app_interface_request.cc | 4 +- .../mobile/unregister_app_interface_response.cc | 2 +- .../commands/mobile/unsubscribe_button_request.cc | 2 +- .../commands/mobile/unsubscribe_button_response.cc | 2 +- .../mobile/unsubscribe_way_points_request.cc | 4 +- .../mobile/unsubscribe_way_points_response.cc | 4 +- .../commands/mobile/update_turn_list_request.cc | 8 +- .../commands/mobile/update_turn_list_response.cc | 2 +- .../extensions/system_capability_app_extension.cc | 8 +- .../sdl_rpc_plugin/src/hmi_command_factory.cc | 288 +++++++++--------- .../sdl_rpc_plugin/src/mobile_command_factory.cc | 63 ++-- .../sdl_rpc_plugin/src/sdl_command_factory.cc | 2 +- .../sdl_rpc_plugin/src/sdl_rpc_plugin.cc | 4 +- .../test/commands/hmi/activate_app_request_test.cc | 6 +- .../hmi/add_statistics_info_notification_test.cc | 12 +- .../commands/hmi/allow_all_apps_response_test.cc | 6 +- .../test/commands/hmi/allow_app_response_test.cc | 4 +- ...c_communication_get_system_time_request_test.cc | 2 +- ..._communication_get_system_time_response_test.cc | 4 +- .../hmi/button_get_capabilities_response_test.cc | 9 +- .../test/commands/hmi/close_popup_response_test.cc | 10 +- .../test/commands/hmi/dummy_hmi_commands_test.cc | 324 +++++++++++---------- .../commands/hmi/get_system_info_request_test.cc | 10 +- .../commands/hmi/get_system_info_response_test.cc | 18 +- .../test/commands/hmi/get_urls_response_test.cc | 14 +- .../test/commands/hmi/get_urls_test.cc | 38 +-- .../test/commands/hmi/hmi_notifications_test.cc | 131 +++++---- .../hmi/mixing_audio_supported_request_test.cc | 10 +- .../hmi/mixing_audio_supported_response_test.cc | 20 +- .../hmi/navi_audio_start_stream_request_test.cc | 10 +- .../commands/hmi/navi_is_ready_request_test.cc | 14 +- .../commands/hmi/navi_is_ready_response_test.cc | 6 +- .../hmi/navi_set_video_config_request_test.cc | 12 +- .../hmi/navi_set_video_config_response_test.cc | 6 +- .../commands/hmi/navi_start_stream_request_test.cc | 8 +- .../commands/hmi/navi_stop_stream_requests_test.cc | 11 +- .../hmi/on_driver_distraction_notification_test.cc | 14 +- .../hmi/on_system_time_ready_notification_test.cc | 4 +- .../hmi/rc_get_capabilities_response_test.cc | 10 +- .../test/commands/hmi/rc_is_ready_request_test.cc | 12 +- .../test/commands/hmi/rc_is_ready_response_test.cc | 4 +- .../test/commands/hmi/response_from_hmi_test.cc | 12 +- .../commands/hmi/sdl_activate_app_request_test.cc | 27 +- .../commands/hmi/sdl_activate_app_response_test.cc | 10 +- .../sdl_get_list_of_permisssions_request_test.cc | 8 +- .../hmi/sdl_get_status_update_request_test.cc | 6 +- .../sdl_get_user_friendly_message_request_test.cc | 14 +- .../test/commands/hmi/simple_notifications_test.cc | 4 +- .../commands/hmi/simple_request_from_hmi_test.cc | 18 +- .../commands/hmi/simple_requests_to_hmi_test.cc | 56 ++-- .../commands/hmi/simple_response_from_hmi_test.cc | 56 ++-- .../commands/hmi/simple_response_to_hmi_test.cc | 13 +- .../hmi/tts_get_capabilities_response_test.cc | 4 +- .../commands/hmi/tts_get_language_response_test.cc | 7 +- .../tts_get_supported_languages_response_test.cc | 21 +- .../commands/hmi/tts_is_ready_response_test.cc | 20 +- .../hmi/ui_get_capabilities_response_test.cc | 22 +- .../commands/hmi/ui_get_language_response_test.cc | 10 +- .../ui_get_supported_languages_response_test.cc | 15 +- .../test/commands/hmi/ui_is_ready_request_test.cc | 18 +- .../test/commands/hmi/ui_is_ready_response_test.cc | 8 +- .../hmi/update_device_list_request_test.cc | 28 +- .../test/commands/hmi/update_sdl_request_test.cc | 10 +- .../test/commands/hmi/update_sdl_response_test.cc | 10 +- .../hmi/vr_get_capabilities_response_test.cc | 12 +- .../commands/hmi/vr_get_language_response_test.cc | 10 +- .../vr_get_supported_languages_response_test.cc | 15 +- .../test/commands/hmi/vr_is_ready_request_test.cc | 12 +- .../test/commands/hmi/vr_is_ready_response_test.cc | 8 +- .../commands/mobile/add_command_request_test.cc | 28 +- .../commands/mobile/add_sub_menu_request_test.cc | 12 +- .../commands/mobile/alert_maneuver_request_test.cc | 22 +- .../test/commands/mobile/alert_request_test.cc | 40 +-- .../commands/mobile/change_registration_test.cc | 28 +- .../mobile/create_interaction_choice_set_test.cc | 32 +- .../commands/mobile/delete_command_request_test.cc | 18 +- .../test/commands/mobile/delete_file_test.cc | 36 +-- .../mobile/delete_interaction_choice_set_test.cc | 16 +- .../test/commands/mobile/delete_sub_menu_test.cc | 16 +- .../commands/mobile/dial_number_request_test.cc | 16 +- .../commands/mobile/dummy_mobile_commands_test.cc | 20 +- .../mobile/end_audio_pass_thru_request_test.cc | 18 +- .../commands/mobile/get_way_points_request_test.cc | 23 +- .../commands/mobile/list_files_request_test.cc | 16 +- .../mobile/on_button_notification_commands_test.cc | 10 +- .../mobile/on_command_notification_test.cc | 6 +- .../mobile/on_hash_change_notification_test.cc | 10 +- .../on_hmi_status_notification_from_mobile_test.cc | 12 +- .../mobile/on_hmi_status_notification_test.cc | 12 +- .../mobile/on_keyboard_input_notification_test.cc | 12 +- .../mobile/on_system_request_notification_test.cc | 17 +- .../on_tbt_client_state_notification_test.cc | 6 +- .../mobile/on_touch_event_notification_test.cc | 6 +- .../on_way_point_change_notification_test.cc | 6 +- .../mobile/perform_audio_pass_thru_test.cc | 28 +- .../commands/mobile/perform_interaction_test.cc | 26 +- .../test/commands/mobile/put_file_test.cc | 21 +- .../mobile/register_app_interface_request_test.cc | 79 ++--- .../mobile/reset_global_properties_test.cc | 85 +++--- .../commands/mobile/scrollable_message_test.cc | 16 +- .../test/commands/mobile/send_haptic_data_test.cc | 6 +- .../commands/mobile/send_location_request_test.cc | 8 +- .../test/commands/mobile/set_app_icon_test.cc | 18 +- .../commands/mobile/set_display_layout_test.cc | 16 +- .../commands/mobile/set_global_properties_test.cc | 33 ++- .../commands/mobile/set_media_clock_timer_test.cc | 12 +- .../test/commands/mobile/show_test.cc | 14 +- .../mobile/simple_notification_commands_test.cc | 8 +- .../mobile/simple_response_commands_test.cc | 44 +-- .../test/commands/mobile/slider_test.cc | 14 +- .../test/commands/mobile/speak_request_test.cc | 26 +- .../mobile/subscribe_button_request_test.cc | 22 +- .../mobile/subscribe_way_points_request_test.cc | 21 +- .../test/commands/mobile/system_request_test.cc | 12 +- .../unregister_app_interface_request_test.cc | 2 +- .../mobile/unsubscribe_button_request_test.cc | 4 +- .../mobile/unsubscribe_way_points_request_test.cc | 14 +- .../mobile/update_turn_list_request_test.cc | 42 +-- .../commands/hmi/on_vi_vehicle_data_notification.h | 4 +- .../commands/hmi/vi_diagnostic_message_request.h | 2 +- .../commands/hmi/vi_diagnostic_message_response.h | 2 +- .../commands/hmi/vi_get_dtcs_request.h | 2 +- .../commands/hmi/vi_get_dtcs_response.h | 2 +- .../commands/hmi/vi_get_vehicle_data_request.h | 2 +- .../commands/hmi/vi_get_vehicle_data_response.h | 4 +- .../commands/hmi/vi_get_vehicle_type_request.h | 2 +- .../commands/hmi/vi_get_vehicle_type_response.h | 2 +- .../commands/hmi/vi_is_ready_request.h | 2 +- .../commands/hmi/vi_is_ready_response.h | 4 +- .../commands/hmi/vi_read_did_request.h | 2 +- .../commands/hmi/vi_read_did_response.h | 2 +- .../hmi/vi_subscribe_vehicle_data_request.h | 2 +- .../hmi/vi_subscribe_vehicle_data_response.h | 2 +- .../hmi/vi_unsubscribe_vehicle_data_request.h | 2 +- .../hmi/vi_unsubscribe_vehicle_data_response.h | 2 +- .../commands/mobile/diagnostic_message_request.h | 2 +- .../commands/mobile/diagnostic_message_response.h | 2 +- .../commands/mobile/get_dtcs_request.h | 2 +- .../commands/mobile/get_dtcs_response.h | 2 +- .../commands/mobile/get_vehicle_data_request.h | 2 +- .../commands/mobile/get_vehicle_data_response.h | 2 +- .../commands/mobile/on_vehicle_data_notification.h | 4 +- .../commands/mobile/read_did_request.h | 2 +- .../commands/mobile/read_did_response.h | 2 +- .../mobile/subscribe_vehicle_data_request.h | 4 +- .../mobile/subscribe_vehicle_data_response.h | 2 +- .../mobile/unsubscribe_vehicle_data_request.h | 4 +- .../mobile/unsubscribe_vehicle_data_response.h | 2 +- .../vehicle_info_app_extension.h | 12 +- .../vehicle_info_command_factory.h | 2 +- .../vehicle_info_hmi_command_factory.h | 2 +- .../vehicle_info_mobile_command_factory.h | 2 +- .../vehicle_info_plugin/vehicle_info_plugin.h | 2 +- .../hmi/on_vi_vehicle_data_notification.cc | 2 +- .../commands/hmi/vi_diagnostic_message_request.cc | 2 +- .../commands/hmi/vi_diagnostic_message_response.cc | 2 +- .../src/commands/hmi/vi_get_dtcs_request.cc | 2 +- .../src/commands/hmi/vi_get_dtcs_response.cc | 2 +- .../commands/hmi/vi_get_vehicle_data_request.cc | 2 +- .../commands/hmi/vi_get_vehicle_data_response.cc | 2 +- .../commands/hmi/vi_get_vehicle_type_request.cc | 2 +- .../commands/hmi/vi_get_vehicle_type_response.cc | 2 +- .../src/commands/hmi/vi_is_ready_request.cc | 4 +- .../src/commands/hmi/vi_is_ready_response.cc | 2 +- .../src/commands/hmi/vi_read_did_request.cc | 2 +- .../src/commands/hmi/vi_read_did_response.cc | 2 +- .../hmi/vi_subscribe_vehicle_data_request.cc | 2 +- .../hmi/vi_subscribe_vehicle_data_response.cc | 2 +- .../hmi/vi_unsubscribe_vehicle_data_request.cc | 2 +- .../hmi/vi_unsubscribe_vehicle_data_response.cc | 2 +- .../commands/mobile/diagnostic_message_request.cc | 6 +- .../commands/mobile/diagnostic_message_response.cc | 2 +- .../src/commands/mobile/get_dtcs_request.cc | 4 +- .../src/commands/mobile/get_dtcs_response.cc | 2 +- .../commands/mobile/get_vehicle_data_request.cc | 6 +- .../commands/mobile/get_vehicle_data_response.cc | 2 +- .../mobile/on_vehicle_data_notification.cc | 6 +- .../src/commands/mobile/read_did_request.cc | 8 +- .../src/commands/mobile/read_did_response.cc | 2 +- .../mobile/subscribe_vehicle_data_request.cc | 7 +- .../mobile/subscribe_vehicle_data_response.cc | 4 +- .../mobile/unsubscribe_vehicle_data_request.cc | 6 +- .../mobile/unsubscribe_vehicle_data_response.cc | 2 +- .../src/vehicle_info_app_extension.cc | 2 +- .../src/vehicle_info_command_factory.cc | 2 +- .../src/vehicle_info_hmi_command_factory.cc | 6 +- .../src/vehicle_info_mobile_command_factory.cc | 2 +- .../vehicle_info_plugin/src/vehicle_info_plugin.cc | 9 +- .../hmi/vi_get_vehicle_data_response_test.cc | 12 +- .../test/commands/hmi/vi_is_ready_request_test.cc | 16 +- .../mobile/diagnostic_message_request_test.cc | 14 +- .../test/commands/mobile/get_dtcs_request_test.cc | 18 +- .../mobile/get_vehicle_data_request_test.cc | 16 +- .../mobile/on_vehicle_data_notification_test.cc | 10 +- .../test/commands/mobile/read_did_request_test.cc | 16 +- .../mobile/unsubscribe_vehicle_request_test.cc | 7 +- .../mobile/unsubscribe_vehicle_response_test.cc | 4 +- .../src/app_launch/app_launch_ctrl_impl.cc | 6 +- .../src/app_launch/app_launch_data_db.cc | 14 +- .../src/app_launch/app_launch_data_json.cc | 6 +- .../src/app_launch/app_launch_sql_queries.cc | 2 +- .../src/app_launch/apps_launcher.cc | 4 +- .../src/app_launch/device_apps_launcher.cc | 12 +- .../application_manager/src/application_impl.cc | 21 +- .../src/application_manager_impl.cc | 103 +++---- .../application_manager/src/application_state.cc | 2 +- .../application_manager/src/command_holder_impl.cc | 2 +- .../src/commands/command_impl.cc | 2 +- .../command_notification_from_mobile_impl.cc | 2 +- .../src/commands/command_notification_impl.cc | 2 +- .../src/event_engine/event_dispatcher_impl.cc | 9 +- .../src/help_prompt_manager_impl.cc | 8 +- .../src/helpers/application_helper.cc | 6 +- .../src/hmi_capabilities_impl.cc | 38 ++- .../src/hmi_language_handler.cc | 17 +- .../application_manager/src/hmi_state.cc | 2 +- src/components/application_manager/src/message.cc | 2 +- .../src/message_helper/message_helper.cc | 184 ++++++------ .../src/mobile_message_handler.cc | 8 +- .../src/plugin_manager/plugin_keys.cc | 2 +- .../src/plugin_manager/rpc_plugin_manager_impl.cc | 12 +- .../src/policies/policy_event_observer.cc | 4 +- .../src/policies/policy_handler.cc | 146 +++++----- .../application_manager/src/request_controller.cc | 2 +- .../application_manager/src/request_tracker.cc | 4 +- .../src/resumption/resume_ctrl_impl.cc | 35 +-- .../src/resumption/resumption_data.cc | 4 +- .../src/resumption/resumption_data_db.cc | 8 +- .../src/resumption/resumption_data_json.cc | 12 +- .../application_manager/src/rpc_handler_impl.cc | 10 +- .../application_manager/src/rpc_passing_handler.cc | 12 +- .../application_manager/src/rpc_service_impl.cc | 6 +- .../src/state_controller_impl.cc | 4 +- .../application_manager/src/usage_statistics.cc | 4 +- .../test/app_launch/app_launch_ctrl_test.cc | 16 +- .../test/app_launch/app_launch_data_db_test.cc | 12 +- .../test/app_launch/app_launch_data_json_test.cc | 20 +- .../test/app_service_manager_test.cc | 40 ++- .../test/application_helper_test.cc | 20 +- .../test/application_impl_test.cc | 42 +-- .../test/application_manager_impl_mock_hmi_test.cc | 14 +- .../test/application_manager_impl_test.cc | 15 +- .../test/application_state_test.cc | 12 +- .../test/command_holder_test.cc | 8 +- .../test/commands/command_impl_test.cc | 20 +- .../test/commands/command_request_impl_test.cc | 34 +-- .../test/commands/command_response_impl_test.cc | 8 +- .../application_manager/test/event_engine_test.cc | 6 +- .../test/hmi_capabilities_test.cc | 34 ++- .../test/hmi_language_handler_test.cc | 16 +- .../commands/command_request_test.h | 10 +- .../application_manager/commands/commands_test.h | 59 ++-- .../application_manager/mock_app_launch_data.h | 2 +- .../include/application_manager/mock_application.h | 64 ++-- .../application_manager/mock_event_observer.h | 2 +- .../application_manager/mock_help_prompt_manager.h | 58 ++-- .../application_manager/mock_message_helper.h | 6 +- .../include/application_manager/mock_request.h | 2 +- .../include/application_manager/mock_resume_ctrl.h | 4 +- .../application_manager/mock_resumption_data.h | 66 ++--- .../application_manager/mock_telemetry_observer.h | 2 +- .../application_manager/resumption_data_test.h | 18 +- .../application_manager/test_resumption_data_db.h | 6 +- .../test/message_helper/message_helper_test.cc | 25 +- .../test/mobile_message_handler_test.cc | 18 +- .../test/mobile_message_handler_v1_test.cc | 10 +- .../test/mock_application_helper.cc | 11 +- .../test/mock_hmi_command_factory.cc | 13 +- .../test/mock_message_helper.cc | 6 +- .../test/policy_event_observer_test.cc | 2 +- .../test/policy_handler_test.cc | 43 +-- .../test/rc_policy_handler_test.cc | 28 +- .../request_controller/request_controller_test.cc | 21 +- .../application_manager/test/request_info_test.cc | 4 +- .../test/request_tracker_test.cc | 8 +- .../test/resumption/resume_ctrl_test.cc | 25 +- .../test/resumption/resumption_data_db_test.cc | 69 ++--- .../test/resumption/resumption_data_json_test.cc | 6 +- .../test/resumption/resumption_data_test.cc | 39 ++- .../test/resumption_sql_queries_test.cc | 244 ++++++++++------ .../test/state_controller/state_controller_test.cc | 42 +-- .../test/usage_statistics_test.cc | 4 +- .../test/zero_request_amount_test.cc | 10 +- .../include/config_profile/profile.h | 106 +++---- src/components/config_profile/src/ini_file.cc | 10 +- src/components/config_profile/src/profile.cc | 10 +- .../config_profile/test/ini_file_test.cc | 2 +- src/components/config_profile/test/profile_test.cc | 2 +- .../include/connection_handler/connection.h | 4 +- .../connection_handler/connection_handler_impl.h | 16 +- .../include/connection_handler/device.h | 8 +- .../include/connection_handler/heartbeat_monitor.h | 8 +- .../connection_handler/src/connection.cc | 21 +- .../src/connection_handler_impl.cc | 60 ++-- src/components/connection_handler/src/device.cc | 6 +- .../connection_handler/src/heartbeat_monitor.cc | 14 +- .../test/connection_handler_impl_test.cc | 40 ++- .../connection_handler/test/connection_test.cc | 6 +- .../connection_handler/test/device_test.cc | 4 +- .../test/heart_beat_monitor_test.cc | 10 +- .../include/formatters/CFormatterJsonBase.h | 48 +-- .../include/formatters/CFormatterJsonSDLRPCv1.h | 8 +- .../include/formatters/CFormatterJsonSDLRPCv2.h | 6 +- .../formatters/include/formatters/CSmartFactory.h | 18 +- .../include/formatters/formatter_json_rpc.h | 6 +- .../formatters/include/formatters/meta_formatter.h | 40 +-- .../formatters/src/CFormatterJsonBase.cc | 2 +- .../formatters/src/CFormatterJsonSDLRPCv1.cc | 6 +- .../formatters/src/CFormatterJsonSDLRPCv2.cc | 6 +- .../formatters/test/CFormatterJsonBase_test.cc | 8 +- .../formatters/test/CSmartFactory_test.cc | 2 +- .../formatters/test/cFormatterJsonSDLRPCv2_test.cc | 4 +- .../formatters/test/formatter_json_rpc_test.cc | 12 +- .../formatters/test/generic_json_formatter_test.cc | 8 +- .../include/formatters/SmartFactoryTestHelper.h | 9 +- .../test/include/formatters/create_smartSchema.h | 2 +- .../formatters/meta_formatter_test_helper.h | 4 +- .../formatters/test/meta_formatter_test.cc | 5 +- .../test/src/meta_formatter_test_helper.cc | 2 +- .../hmi_message_handler/hmi_message_handler_impl.h | 14 +- .../include/hmi_message_handler/mb_controller.h | 19 +- .../hmi_message_handler/messagebroker_adapter.h | 2 +- .../hmi_message_handler/websocket_session.h | 35 ++- .../hmi_message_handler/src/mb_controller.cc | 14 +- .../hmi_message_handler/src/websocket_session.cc | 4 +- .../test/hmi_message_adapter_test.cc | 4 +- .../test/hmi_message_handler_impl_test.cc | 10 +- .../mock_hmi_message_adapter_impl.h | 60 ++-- .../application_manager/app_launch_settings.h | 2 +- .../application_manager/application_manager.h | 53 ++-- .../application_manager_settings.h | 4 +- .../include/application_manager/hmi_capabilities.h | 14 +- .../policies/policy_handler_interface.h | 42 +-- .../policies/policy_handler_observer.h | 2 +- .../include/application_manager/rpc_handler.h | 6 +- .../include/application_manager/rpc_service.h | 6 +- .../include/application_manager/state_controller.h | 6 +- .../connection_handler/connection_handler.h | 26 +- .../connection_handler_observer.h | 2 +- .../hmi_message_handler/hmi_message_handler.h | 4 +- .../hmi_message_handler/hmi_message_observer.h | 2 +- .../hmi_message_handler/hmi_message_sender.h | 2 +- .../include/media_manager/media_manager.h | 2 +- .../include/media_manager/media_manager_settings.h | 2 +- .../policy/policy_external/policy/policy_manager.h | 28 +- .../policy_external/policy/policy_settings.h | 10 +- .../policy/policy_regular/policy/policy_listener.h | 12 +- .../policy/policy_regular/policy/policy_manager.h | 24 +- .../policy/policy_regular/policy/policy_settings.h | 10 +- src/components/include/protocol/common.h | 18 +- src/components/include/protocol/raw_message.h | 4 +- .../include/protocol_handler/protocol_handler.h | 28 +- .../include/protocol_handler/telemetry_observer.h | 2 +- .../include/rpc_base/validation_report.h | 2 +- .../include/security_manager/crypto_manager.h | 22 +- .../include/security_manager/security_manager.h | 2 +- .../include/security_manager/security_query.h | 8 +- .../include/security_manager/ssl_context.h | 14 +- .../test/application_manager/mock_app_extension.h | 2 +- .../application_manager/mock_app_launch_settings.h | 2 +- .../application_manager/mock_application_manager.h | 7 +- .../mock_application_manager_settings.h | 2 +- .../mock_request_controller_settings.h | 2 +- .../test/application_manager/mock_rpc_plugin.h | 2 +- .../application_manager/mock_rpc_plugin_manager.h | 2 +- .../test/application_manager/mock_rpc_service.h | 8 +- .../application_manager/mock_state_controller.h | 3 +- .../policies/mock_policy_handler_interface.h | 2 +- .../policies/mock_policy_handler_observer.h | 2 +- .../connection_handler/mock_connection_handler.h | 8 +- .../mock_connection_handler_observer.h | 2 +- .../mock_connection_handler_settings.h | 2 +- .../mock_hmi_message_observer.h | 2 +- .../policy_external/policy/mock_policy_listener.h | 4 +- .../policy_external/policy/mock_policy_manager.h | 4 +- .../policy_external/policy/mock_policy_settings.h | 4 +- .../policy_regular/policy/mock_policy_listener.h | 2 +- .../policy_regular/policy/mock_policy_manager.h | 2 +- .../policy_regular/policy/mock_policy_settings.h | 4 +- .../test/protocol_handler/mock_protocol_handler.h | 2 +- .../test/protocol_handler/mock_protocol_observer.h | 2 +- .../test/protocol_handler/mock_session_observer.h | 2 +- .../test/security_manager/mock_security_manager.h | 4 +- .../telemetry_monitor/mock_telemetry_observable.h | 2 +- .../transport_manager/mock_transport_manager.h | 12 +- .../mock_transport_manager_settings.h | 2 +- .../transport_adapter/mock_device.h | 2 +- .../transport_adapter/mock_transport_adapter.h | 2 +- .../include/test/utils/test_async_waiter.h | 2 +- src/components/include/transport_manager/common.h | 4 +- src/components/include/transport_manager/error.h | 2 +- .../transport_manager/transport_adapter/device.h | 2 +- .../transport_adapter/transport_adapter.h | 8 +- .../transport_adapter/transport_adapter_event.h | 2 +- .../include/transport_manager/transport_manager.h | 12 +- .../transport_manager/transport_manager_listener.h | 8 +- .../transport_manager_listener_empty.h | 2 +- .../transport_manager_mme_settings.h | 2 +- src/components/include/utils/custom_string.h | 4 +- src/components/include/utils/logger.h | 24 +- src/components/include/utils/macro.h | 14 +- src/components/include/utils/message_queue.h | 15 +- src/components/include/utils/prioritized_queue.h | 4 +- src/components/include/utils/rwlock.h | 24 +- src/components/include/utils/scope_guard.h | 2 +- src/components/include/utils/semantic_version.h | 2 +- .../include/utils/threads/async_runner.h | 6 +- .../include/utils/threads/message_loop_thread.h | 2 +- src/components/include/utils/threads/thread.h | 4 +- src/components/include/utils/typed_enum_print.h | 2 +- .../audio/a2dp_source_player_adapter.h | 4 +- .../audio/audio_stream_sender_thread.h | 6 +- .../audio/from_mic_to_file_recorder_thread.h | 2 +- .../include/media_manager/file_streamer_adapter.h | 2 +- .../include/media_manager/media_manager_impl.h | 8 +- .../include/media_manager/streamer_adapter.h | 4 +- .../video/socket_video_streamer_adapter.h | 2 +- .../src/audio/a2dp_source_player_adapter.cc | 24 +- .../src/audio/audio_stream_sender_thread.cc | 16 +- .../src/audio/from_mic_recorder_adapter.cc | 6 +- .../src/audio/from_mic_recorder_listener.cc | 10 +- .../src/audio/from_mic_to_file_recorder_thread.cc | 6 +- .../src/audio/socket_audio_streamer_adapter.cc | 2 +- .../media_manager/src/file_streamer_adapter.cc | 4 +- .../media_manager/src/media_manager_impl.cc | 26 +- .../media_manager/src/pipe_streamer_adapter.cc | 10 +- .../media_manager/src/socket_streamer_adapter.cc | 10 +- .../src/video/video_stream_to_file_adapter.cc | 6 +- .../include/media_manager/mock_media_adapter.h | 2 +- .../media_manager/test/media_manager_impl_test.cc | 22 +- .../policy_external/include/policy/access_remote.h | 2 +- .../policy_external/include/policy/cache_manager.h | 53 ++-- .../include/policy/cache_manager_interface.h | 65 +++-- .../policy_external/include/policy/policy_helper.h | 14 +- .../include/policy/policy_manager_impl.h | 38 +-- .../policy_external/include/policy/policy_table.h | 2 +- .../policy_external/include/policy/policy_types.h | 16 +- .../include/policy/pt_ext_representation.h | 8 +- .../include/policy/pt_representation.h | 14 +- .../include/policy/sql_pt_ext_representation.h | 2 +- .../include/policy/sql_pt_representation.h | 2 +- .../policy/policy_external/include/policy/status.h | 88 +++--- .../include/policy/update_status_manager.h | 9 +- .../include/policy/usage_statistics/counter.h | 4 +- .../policy/policy_external/src/cache_manager.cc | 41 +-- .../policy/policy_external/src/policy_helper.cc | 20 +- .../policy_external/src/policy_manager_impl.cc | 30 +- .../policy_external/src/policy_table/types.cc | 2 +- .../policy_external/src/policy_table/validation.cc | 12 +- .../src/sql_pt_ext_representation.cc | 12 +- .../policy_external/src/sql_pt_representation.cc | 42 +-- .../src/usage_statistics/counter.cc | 2 +- .../policy/policy_external/test/counter_test.cc | 8 +- .../include/policy/mock_pt_ext_representation.h | 4 +- .../test/include/policy/mock_pt_representation.h | 2 +- .../include/policy/policy_manager_impl_test_base.h | 4 +- .../test/policy_manager_impl_ptu_test.cc | 6 +- .../test/policy_manager_impl_snapshot_test.cc | 7 +- .../test/policy_manager_impl_stress_test.cc | 6 +- .../test/policy_manager_impl_test.cc | 8 +- .../test/policy_manager_impl_test_base.cc | 10 +- .../test/policy_manager_impl_user_consent_test.cc | 2 +- .../test/sql_pt_ext_representation_test.cc | 24 +- .../test/sql_pt_representation_test.cc | 34 +-- .../test/update_status_manager_test.cc | 8 +- .../policy_regular/include/policy/access_remote.h | 2 +- .../policy_regular/include/policy/cache_manager.h | 8 +- .../include/policy/cache_manager_interface.h | 14 +- .../policy_regular/include/policy/policy_helper.h | 2 +- .../include/policy/policy_manager_impl.h | 28 +- .../policy_regular/include/policy/policy_types.h | 16 +- .../include/policy/pt_representation.h | 16 +- .../include/policy/sql_pt_representation.h | 2 +- .../policy/policy_regular/include/policy/status.h | 88 +++--- .../include/policy/update_status_manager.h | 9 +- .../include/policy/usage_statistics/counter.h | 4 +- .../policy/policy_regular/src/cache_manager.cc | 17 +- .../policy/policy_regular/src/policy_helper.cc | 22 +- .../policy_regular/src/policy_manager_impl.cc | 19 +- .../policy_regular/src/policy_table/validation.cc | 2 +- .../policy_regular/src/sql_pt_representation.cc | 38 +-- .../policy_regular/src/usage_statistics/counter.cc | 2 +- .../policy_regular/test/access_remote_impl_test.cc | 2 +- .../policy/policy_regular/test/counter_test.cc | 4 +- .../test/include/policy/driver_dbms.h | 2 +- .../test/include/policy/mock_pt_representation.h | 2 +- .../test/policy_manager_impl_test.cc | 39 ++- .../test/sql_pt_representation_test.cc | 28 +- .../test/update_status_manager_test.cc | 2 +- .../protocol_handler/incoming_data_handler.h | 2 +- .../include/protocol_handler/multiframe_builder.h | 38 +-- .../protocol_handler/protocol_handler_impl.h | 60 ++-- .../include/protocol_handler/protocol_packet.h | 20 +- .../protocol_handler/src/handshake_handler.cc | 2 +- .../protocol_handler/src/incoming_data_handler.cc | 2 +- .../protocol_handler/src/multiframe_builder.cc | 2 +- .../protocol_handler/src/protocol_handler_impl.cc | 53 ++-- .../protocol_handler/src/protocol_packet.cc | 20 +- .../protocol_handler/src/protocol_payload.cc | 2 +- .../protocol_handler/control_message_matcher.h | 6 +- .../test/incoming_data_handler_test.cc | 18 +- .../test/multiframe_builder_test.cc | 8 +- .../test/protocol_handler_tm_test.cc | 12 +- .../test/protocol_header_validator_test.cc | 4 +- .../protocol_handler/test/protocol_packet_test.cc | 38 +-- .../protocol_handler/test/protocol_payload_test.cc | 6 +- src/components/resumption/src/last_state_impl.cc | 2 +- .../rpc_base/include/rpc_base/rpc_base.h | 2 +- .../rpc_base/include/rpc_base/rpc_base_inl.h | 27 +- .../rpc_base/include/rpc_base/rpc_base_json_inl.h | 2 +- src/components/rpc_base/test/rpc_base_test.cc | 2 +- .../rpc_base/test/validation_report_test.cc | 2 +- .../include/security_manager/crypto_manager_impl.h | 10 +- .../crypto_manager_settings_impl.h | 2 +- .../security_manager/security_manager_impl.h | 8 +- .../security_manager/src/crypto_manager_impl.cc | 26 +- .../security_manager/src/security_manager_impl.cc | 12 +- .../security_manager/src/security_query.cc | 2 +- .../security_manager/src/ssl_context_impl.cc | 12 +- .../test/crypto_manager_impl_test.cc | 6 +- .../security_manager/test/security_manager_test.cc | 52 ++-- .../test/security_query_matcher.cc | 2 +- .../security_manager/test/security_query_test.cc | 6 +- .../security_manager/test/ssl_context_test.cc | 16 +- .../include/smart_objects/array_schema_item.h | 2 +- .../include/smart_objects/default_shema_item.h | 8 +- .../include/smart_objects/enum_schema_item.h | 10 +- .../include/smart_objects/number_schema_item.h | 11 +- .../include/smart_objects/object_schema_item.h | 4 +- .../include/smart_objects/smart_object.h | 10 +- .../include/smart_objects/smart_schema.h | 2 +- .../smart_objects/src/array_schema_item.cc | 8 +- .../smart_objects/src/object_schema_item.cc | 13 +- src/components/smart_objects/src/smart_object.cc | 3 +- .../smart_objects/src/string_schema_item.cc | 10 +- .../test/AlwaysFalseSchemaItem_test.cc | 2 +- .../test/AlwaysTrueSchemaItem_test.cc | 2 +- .../smart_objects/test/ArraySchemaItem_test.cc | 2 +- .../smart_objects/test/BoolSchemaItem_test.cc | 2 +- .../smart_objects/test/CObjectSchemaItem_test.cc | 14 +- .../smart_objects/test/EnumSchemaItem_test.cc | 6 +- .../smart_objects/test/NumberSchemaItem_test.cc | 2 +- .../test/SmartObjectConvertionTime_test.cc | 18 +- .../smart_objects/test/SmartObjectDraft_test.cc | 2 +- .../smart_objects/test/map_performance_test.cc | 4 +- .../test/smart_object_performance_test.cc | 4 +- .../application_manager_metric_wrapper.h | 4 +- .../application_manager_observer.h | 4 +- .../include/telemetry_monitor/json_keys.h | 4 +- .../include/telemetry_monitor/metric_wrapper.h | 2 +- .../protocol_handler_metric_wrapper.h | 2 +- .../include/telemetry_monitor/telemetry_monitor.h | 27 +- .../telemetry_monitor/transport_manager_observer.h | 2 +- .../src/application_manager_metric_wrapper.cc | 2 +- .../src/application_manager_observer.cc | 2 +- .../telemetry_monitor/src/metric_wrapper.cc | 2 +- .../src/protocol_handler_observer.cc | 2 +- .../telemetry_monitor/src/telemetry_monitor.cc | 8 +- .../src/transport_manager_metric_wrapper.cc | 2 +- .../src/transport_manager_observer.cc | 2 +- .../test/application_manager_metric_test.cc | 4 +- .../test/application_manager_observer_test.cc | 6 +- .../telemetry_monitor/mock_telemetry_monitor.h | 4 +- .../telemetry_monitor/test/metric_wrapper_test.cc | 4 +- .../test/protocol_handler_metric_test.cc | 6 +- .../test/protocol_handler_observer_test.cc | 4 +- .../test/telemetry_monitor_test.cc | 14 +- .../test/transport_manager_metric_test.cc | 6 +- .../test/transport_manager_observer_test.cc | 4 +- src/components/test_main.cc | 4 +- .../bluetooth/bluetooth_device_scanner.h | 2 +- .../cloud/websocket_client_connection.h | 10 +- .../iap2_emulation/iap2_transport_adapter.h | 6 +- .../tcp/network_interface_listener_impl.h | 4 +- .../transport_manager/tcp/tcp_client_listener.h | 2 +- .../include/transport_manager/tcp/tcp_device.h | 10 +- .../include/transport_manager/telemetry_observer.h | 4 +- .../transport_adapter/threaded_socket_connection.h | 6 +- .../transport_adapter_controller.h | 16 +- .../transport_adapter/transport_adapter_impl.h | 8 +- .../transport_adapter/transport_adapter_listener.h | 6 +- .../transport_adapter_listener_impl.h | 2 +- .../transport_manager/transport_manager_default.h | 2 +- .../transport_manager/transport_manager_impl.h | 62 ++-- .../include/transport_manager/usb/common.h | 4 +- .../usb/libusb/platform_usb_device.h | 2 +- .../transport_manager/usb/libusb/usb_connection.h | 2 +- .../transport_manager/usb/libusb/usb_handler.h | 2 +- .../usb/qnx/platform_usb_device.h | 2 +- .../transport_manager/usb/qnx/usb_connection.h | 2 +- .../transport_manager/usb/qnx/usb_handler.h | 2 +- .../transport_manager/usb/usb_control_transfer.h | 4 +- .../transport_manager/usb/usb_device_scanner.h | 6 +- .../src/bluetooth/bluetooth_connection_factory.cc | 2 +- .../src/bluetooth/bluetooth_device.cc | 4 +- .../src/bluetooth/bluetooth_device_scanner.cc | 8 +- .../src/bluetooth/bluetooth_socket_connection.cc | 10 +- .../src/bluetooth/bluetooth_transport_adapter.cc | 8 +- .../cloud/cloud_websocket_connection_factory.cc | 2 +- .../src/cloud/cloud_websocket_transport_adapter.cc | 10 +- .../src/cloud/websocket_client_connection.cc | 12 +- .../src/iap2_emulation/iap2_transport_adapter.cc | 12 +- ...platform_specific_network_interface_listener.cc | 12 +- .../src/tcp/tcp_client_listener.cc | 32 +- .../src/tcp/tcp_connection_factory.cc | 8 +- .../transport_manager/src/tcp/tcp_device.cc | 8 +- .../tcp/tcp_server_originated_socket_connection.cc | 6 +- .../src/tcp/tcp_transport_adapter.cc | 6 +- .../threaded_socket_connection.cc | 12 +- .../transport_adapter/transport_adapter_impl.cc | 66 ++--- .../transport_adapter_listener_impl.cc | 2 +- .../src/transport_manager_impl.cc | 52 ++-- .../src/usb/libusb/platform_usb_device.cc | 4 +- .../src/usb/libusb/usb_connection.cc | 2 +- .../src/usb/libusb/usb_handler.cc | 6 +- .../src/usb/qnx/platform_usb_device.cc | 4 +- .../src/usb/qnx/usb_connection.cc | 2 +- .../transport_manager/src/usb/qnx/usb_handler.cc | 8 +- .../transport_manager/src/usb/usb_aoa_adapter.cc | 4 +- .../src/usb/usb_connection_factory.cc | 2 +- .../src/usb/usb_device_scanner.cc | 8 +- .../mock_transport_manager_impl.h | 4 +- .../mock_transport_manager_listener.h | 4 +- .../transport_manager/raw_message_matcher.h | 2 +- .../mock_transport_adapter_impl.h | 18 +- .../test/network_interface_listener_test.cc | 4 +- .../linux/linux_network_interface_listener_test.cc | 59 ++-- .../test/tcp_client_listener_test.cc | 36 ++- .../transport_manager/test/tcp_device_test.cc | 2 +- .../test/tcp_transport_adapter_test.cc | 14 +- .../test/transport_adapter_listener_test.cc | 9 +- .../test/transport_adapter_test.cc | 12 +- .../test/transport_manager_default_test.cc | 8 +- .../test/transport_manager_impl_test.cc | 19 +- src/components/utils/include/utils/back_trace.h | 2 +- src/components/utils/include/utils/file_system.h | 2 +- src/components/utils/include/utils/helpers.h | 2 +- .../utils/include/utils/log_message_loop_thread.h | 4 +- src/components/utils/include/utils/optional.h | 2 +- .../utils/include/utils/qdb_wrapper/sql_query.h | 4 +- .../utils/include/utils/resource_usage.h | 6 +- src/components/utils/include/utils/singleton.h | 2 +- .../include/utils/sqlite_wrapper/sql_database.h | 2 +- .../utils/include/utils/sqlite_wrapper/sql_query.h | 2 +- src/components/utils/include/utils/system.h | 2 +- .../include/utils/threads/pulse_thread_delegate.h | 22 +- .../utils/include/utils/threads/thread_manager.h | 10 +- src/components/utils/include/utils/timer.h | 6 +- .../utils/include/utils/timer_task_impl.h | 2 +- src/components/utils/src/back_trace.cc | 4 +- .../utils/src/conditional_variable_boost.cc | 2 +- src/components/utils/src/convert_utils.cc | 2 +- src/components/utils/src/custom_string.cc | 10 +- src/components/utils/src/gen_hash.cc | 2 +- src/components/utils/src/logger.cc | 2 +- .../utils/src/qdb_wrapper/sql_database.cc | 2 +- src/components/utils/src/qdb_wrapper/sql_query.cc | 4 +- src/components/utils/src/resource_usage.cc | 4 +- src/components/utils/src/rwlock_posix.cc | 2 +- src/components/utils/src/signals_posix.cc | 2 +- src/components/utils/src/system.cc | 12 +- src/components/utils/src/threads/async_runner.cc | 2 +- .../utils/src/threads/pulse_thread_delegate.cc | 2 +- .../utils/src/threads/thread_delegate.cc | 2 +- src/components/utils/src/threads/thread_manager.cc | 8 +- src/components/utils/src/threads/thread_posix.cc | 14 +- .../utils/src/threads/thread_validator.cc | 17 +- src/components/utils/src/timer.cc | 8 +- src/components/utils/test/async_runner_test.cc | 10 +- src/components/utils/test/auto_trace_test.cc | 14 +- src/components/utils/test/back_trace_test.cc | 2 +- src/components/utils/test/bitstream_test.cc | 2 +- src/components/utils/test/custom_string_test.cc | 2 +- src/components/utils/test/data_accessor_test.cc | 2 +- src/components/utils/test/date_time_test.cc | 2 +- src/components/utils/test/file_system_test.cc | 4 +- .../utils/test/generated_code_with_sqlite_test.cc | 2 +- .../utils/generated_code_with_sqlite_test.h | 2 +- .../utils/test/include/utils/mock_signals_posix.h | 4 +- .../utils/test/log_message_loop_thread_test.cc | 4 +- src/components/utils/test/message_queue_test.cc | 2 +- src/components/utils/test/messagemeter_test.cc | 64 ++-- src/components/utils/test/mock_signals_posix.cc | 4 +- src/components/utils/test/posix_thread_test.cc | 2 +- .../utils/test/prioritized_queue_test.cc | 2 +- .../utils/test/qdb_wrapper/sql_database_test.cc | 4 +- .../utils/test/qdb_wrapper/sql_query_test.cc | 4 +- src/components/utils/test/resource_usage_test.cc | 4 +- src/components/utils/test/scope_guard_test.cc | 10 +- src/components/utils/test/singleton_test.cc | 2 +- .../utils/test/sqlite_wrapper/sql_database_test.cc | 62 ++-- .../utils/test/sqlite_wrapper/sql_query_test.cc | 6 +- src/components/utils/test/stl_utils_test.cc | 4 +- src/components/utils/test/system_test.cc | 2 +- .../test_generator/generated_msg_version_test.cc | 4 +- src/components/utils/test/timer_test.cc | 4 +- 1457 files changed, 6940 insertions(+), 6685 deletions(-) diff --git a/src/appMain/life_cycle.h b/src/appMain/life_cycle.h index ff8fa2cc40..b2e3c39f37 100644 --- a/src/appMain/life_cycle.h +++ b/src/appMain/life_cycle.h @@ -1,34 +1,34 @@ /* -* Copyright (c) 2018, 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. -*/ + * Copyright (c) 2018, 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. + */ #ifndef SRC_APPMAIN_LIFE_CYCLE_H_ #define SRC_APPMAIN_LIFE_CYCLE_H_ diff --git a/src/appMain/life_cycle_impl.cc b/src/appMain/life_cycle_impl.cc index efc627f33a..10f0fc0d52 100644 --- a/src/appMain/life_cycle_impl.cc +++ b/src/appMain/life_cycle_impl.cc @@ -1,46 +1,46 @@ /* -* Copyright (c) 2018, 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. -*/ + * Copyright (c) 2018, 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 "appMain/life_cycle_impl.h" -#include "utils/signals.h" -#include "config_profile/profile.h" #include "application_manager/system_time/system_time_handler_impl.h" +#include "config_profile/profile.h" #include "resumption/last_state_impl.h" +#include "utils/signals.h" #ifdef ENABLE_SECURITY -#include "security_manager/security_manager_impl.h" +#include "application_manager/policies/policy_handler.h" #include "security_manager/crypto_manager_impl.h" #include "security_manager/crypto_manager_settings_impl.h" -#include "application_manager/policies/policy_handler.h" +#include "security_manager/security_manager_impl.h" #endif // ENABLE_SECURITY #ifdef ENABLE_LOG diff --git a/src/appMain/life_cycle_impl.h b/src/appMain/life_cycle_impl.h index 5dfc4641ab..5bddf6bff9 100644 --- a/src/appMain/life_cycle_impl.h +++ b/src/appMain/life_cycle_impl.h @@ -1,34 +1,34 @@ /* -* Copyright (c) 2018, 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. -*/ + * Copyright (c) 2018, 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. + */ #ifndef SRC_APPMAIN_LIFE_CYCLE_IMPL_H_ #define SRC_APPMAIN_LIFE_CYCLE_IMPL_H_ @@ -36,8 +36,8 @@ #include "appMain/life_cycle.h" #include -#include #include +#include #include "utils/macro.h" #include "config_profile/profile.h" @@ -47,10 +47,10 @@ #endif // #if ( defined (MESSAGEBROKER_HMIADAPTER) || defined(PASA_HMI) ) #include "application_manager/application_manager_impl.h" #include "connection_handler/connection_handler_impl.h" +#include "media_manager/media_manager_impl.h" #include "protocol_handler/protocol_handler_impl.h" #include "transport_manager/transport_manager.h" #include "transport_manager/transport_manager_default.h" -#include "media_manager/media_manager_impl.h" #ifdef TELEMETRY_MONITOR #include "telemetry_monitor/telemetry_monitor.h" #endif diff --git a/src/appMain/low_voltage_signals_handler.cc b/src/appMain/low_voltage_signals_handler.cc index 936d91ba18..bb7bbfbac7 100644 --- a/src/appMain/low_voltage_signals_handler.cc +++ b/src/appMain/low_voltage_signals_handler.cc @@ -32,17 +32,17 @@ #include "appMain/low_voltage_signals_handler.h" -#include #include +#include #include #include #include #include #include "appMain/life_cycle.h" -#include "utils/signals.h" +#include "config_profile/profile.h" #include "utils/logger.h" +#include "utils/signals.h" #include "utils/typed_enum_print.h" -#include "config_profile/profile.h" namespace main_namespace { diff --git a/src/appMain/low_voltage_signals_handler.h b/src/appMain/low_voltage_signals_handler.h index 8c139c6836..bedde38c5c 100644 --- a/src/appMain/low_voltage_signals_handler.h +++ b/src/appMain/low_voltage_signals_handler.h @@ -35,8 +35,8 @@ #include #include -#include "utils/threads/thread_delegate.h" #include "utils/threads/thread.h" +#include "utils/threads/thread_delegate.h" namespace main_namespace { diff --git a/src/appMain/main.cc b/src/appMain/main.cc index 4e91b91216..cb59f63b1d 100644 --- a/src/appMain/main.cc +++ b/src/appMain/main.cc @@ -30,16 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include -#include #include #include +#include // cpplint: Streams are highly discouraged. +#include // cpplint: Streams are highly discouraged. #include -#include #include -#include // cpplint: Streams are highly discouraged. -#include // cpplint: Streams are highly discouraged. +#include // ---------------------------------------------------------------------------- @@ -51,10 +51,10 @@ #include "appMain/life_cycle_impl.h" #include "signal_handlers.h" -#include "utils/signals.h" -#include "utils/system.h" #include "config_profile/profile.h" #include "utils/appenders_loader.h" +#include "utils/signals.h" +#include "utils/system.h" #if defined(EXTENDED_MEDIA_MODE) #include @@ -88,7 +88,7 @@ bool InitHmi(std::string hmi_link) { .Execute(); } #endif // WEB_HMI -} +} // namespace /** * \brief Entry point of the program. diff --git a/src/appMain/signal_handlers.cc b/src/appMain/signal_handlers.cc index 649f162ec6..c9c09d10a2 100644 --- a/src/appMain/signal_handlers.cc +++ b/src/appMain/signal_handlers.cc @@ -1,34 +1,34 @@ /* -* 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. -*/ + * 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 "appMain/signal_handlers.h" #include "appMain/life_cycle.h" diff --git a/src/appMain/signal_handlers.h b/src/appMain/signal_handlers.h index f3adefb929..458a121d42 100644 --- a/src/appMain/signal_handlers.h +++ b/src/appMain/signal_handlers.h @@ -1,34 +1,34 @@ /* -* 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. -*/ + * 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. + */ #ifndef SRC_APPMAIN_SIGNAL_HANDLERS_H_ #define SRC_APPMAIN_SIGNAL_HANDLERS_H_ diff --git a/src/appMain/test/low_voltage_signals_handler_test.cc b/src/appMain/test/low_voltage_signals_handler_test.cc index 2dea9447c6..3dec0cc96d 100644 --- a/src/appMain/test/low_voltage_signals_handler_test.cc +++ b/src/appMain/test/low_voltage_signals_handler_test.cc @@ -1,48 +1,48 @@ /* -* Copyright (c) 2018, 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. -*/ + * Copyright (c) 2018, 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 "appMain/low_voltage_signals_handler.h" #include -#include "gtest/gtest.h" #include "appMain/test/mock_life_cycle.h" -#include "utils/mock_signals_posix.h" +#include "gtest/gtest.h" #include "utils/macro.h" +#include "utils/mock_signals_posix.h" namespace test { using ::testing::_; -using ::testing::Return; using ::testing::InSequence; +using ::testing::Return; const int kLowVoltageSignalOffset = 1; const int kWakeUpSignalOffset = 2; diff --git a/src/appMain/test/mock_life_cycle.h b/src/appMain/test/mock_life_cycle.h index fc24b26080..98973bd153 100644 --- a/src/appMain/test/mock_life_cycle.h +++ b/src/appMain/test/mock_life_cycle.h @@ -1,34 +1,34 @@ /* -* Copyright (c) 2018, 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. -*/ + * Copyright (c) 2018, 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. + */ #ifndef SRC_APPMAIN_TEST_MOCK_LIFE_CYCLE_H_ #define SRC_APPMAIN_TEST_MOCK_LIFE_CYCLE_H_ diff --git a/src/components/application_manager/include/application_manager/app_extension.h b/src/components/application_manager/include/application_manager/app_extension.h index e3231de347..d6d5cbba64 100644 --- a/src/components/application_manager/include/application_manager/app_extension.h +++ b/src/components/application_manager/include/application_manager/app_extension.h @@ -37,7 +37,7 @@ namespace ns_smart_device_link { namespace ns_smart_objects { class SmartObject; } -} +} // namespace ns_smart_device_link namespace application_manager { diff --git a/src/components/application_manager/include/application_manager/app_launch/app_launch_ctrl.h b/src/components/application_manager/include/application_manager/app_launch/app_launch_ctrl.h index a10963ad82..2dd64a2941 100644 --- a/src/components/application_manager/include/application_manager/app_launch/app_launch_ctrl.h +++ b/src/components/application_manager/include/application_manager/app_launch/app_launch_ctrl.h @@ -32,8 +32,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APP_LAUNCH_CTRL_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APP_LAUNCH_CTRL_H_ -#include #include +#include namespace application_manager { class Application; @@ -49,22 +49,22 @@ namespace app_launch { class AppLaunchCtrl { public: /** - * @brief OnAppRegistered should be called when application registered - * Save application parameters to database - * @param app application to save - */ + * @brief OnAppRegistered should be called when application registered + * Save application parameters to database + * @param app application to save + */ virtual void OnAppRegistered(const application_manager::Application& app) = 0; /** - * @brief OnDeviceConnected shoudl be called on device connected event - * Start launching saaved applications on ios device - * @param device_mac - */ + * @brief OnDeviceConnected shoudl be called on device connected event + * Start launching saaved applications on ios device + * @param device_mac + */ virtual void OnDeviceConnected(const std::string& device_mac) = 0; /** - * @brief OnMasterReset clear database of saved applications - */ + * @brief OnMasterReset clear database of saved applications + */ virtual void OnMasterReset() = 0; virtual ~AppLaunchCtrl() {} }; diff --git a/src/components/application_manager/include/application_manager/app_launch/app_launch_ctrl_impl.h b/src/components/application_manager/include/application_manager/app_launch/app_launch_ctrl_impl.h index 61f3480f77..986f4ad4ff 100644 --- a/src/components/application_manager/include/application_manager/app_launch/app_launch_ctrl_impl.h +++ b/src/components/application_manager/include/application_manager/app_launch/app_launch_ctrl_impl.h @@ -41,11 +41,11 @@ namespace connection_handler { class ConnectionHandler; -} // connection_handler +} // namespace connection_handler namespace resumption { class ResumeCtrl; -} // resumption +} // namespace resumption namespace app_launch { // TODO(AK) Use unique pointer diff --git a/src/components/application_manager/include/application_manager/app_launch/app_launch_data.h b/src/components/application_manager/include/application_manager/app_launch/app_launch_data.h index 73e9623b62..c1ad8d4003 100644 --- a/src/components/application_manager/include/application_manager/app_launch/app_launch_data.h +++ b/src/components/application_manager/include/application_manager/app_launch/app_launch_data.h @@ -34,9 +34,9 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APP_LAUNCH_DATA_H_ #include -#include -#include #include +#include +#include namespace app_launch { diff --git a/src/components/application_manager/include/application_manager/app_launch/app_launch_data_db.h b/src/components/application_manager/include/application_manager/app_launch/app_launch_data_db.h index ccbf4c7c01..b232d1874c 100644 --- a/src/components/application_manager/include/application_manager/app_launch/app_launch_data_db.h +++ b/src/components/application_manager/include/application_manager/app_launch/app_launch_data_db.h @@ -104,8 +104,8 @@ class AppLaunchDataDB : public AppLaunchDataImpl { bool IsAppDataAlreadyExisted(const ApplicationData& app_data) const OVERRIDE; /** - * @brief returns pointer to data base - */ + * @brief returns pointer to data base + */ utils::dbms::SQLDatabase* db() const; enum ApplicationDataDBIndexes { @@ -151,13 +151,13 @@ class AppLaunchDataDB : public AppLaunchDataImpl { bool WriteDb(); /** - * @brief returns pointer to data base - */ + * @brief returns pointer to data base + */ std::unique_ptr db_; /** - * @brief indicate initializing status of DB - */ + * @brief indicate initializing status of DB + */ bool init_successeful_; DISALLOW_COPY_AND_ASSIGN(AppLaunchDataDB); diff --git a/src/components/application_manager/include/application_manager/app_launch/app_launch_data_impl.h b/src/components/application_manager/include/application_manager/app_launch/app_launch_data_impl.h index a2b8630bcc..b28c7fdd3d 100644 --- a/src/components/application_manager/include/application_manager/app_launch/app_launch_data_impl.h +++ b/src/components/application_manager/include/application_manager/app_launch/app_launch_data_impl.h @@ -33,10 +33,10 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APP_LAUNCH_DATA_IMPL_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APP_LAUNCH_DATA_IMPL_H_ +#include #include "application_manager/app_launch/app_launch_data.h" #include "application_manager/app_launch_settings.h" #include "utils/macro.h" -#include namespace app_launch { diff --git a/src/components/application_manager/include/application_manager/app_launch/app_launch_data_json.h b/src/components/application_manager/include/application_manager/app_launch/app_launch_data_json.h index a292b84fc0..9463a349d9 100644 --- a/src/components/application_manager/include/application_manager/app_launch/app_launch_data_json.h +++ b/src/components/application_manager/include/application_manager/app_launch/app_launch_data_json.h @@ -33,12 +33,12 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APP_LAUNCH_DATA_JSON_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APP_LAUNCH_DATA_JSON_H_ +#include #include "application_manager/app_launch/app_launch_data_impl.h" -#include "smart_objects/smart_object.h" #include "resumption/last_state.h" +#include "smart_objects/smart_object.h" #include "utils/lock.h" #include "utils/macro.h" -#include namespace app_launch { diff --git a/src/components/application_manager/include/application_manager/app_launch/apps_launcher.h b/src/components/application_manager/include/application_manager/app_launch/apps_launcher.h index 6285514be9..7e360aa460 100644 --- a/src/components/application_manager/include/application_manager/app_launch/apps_launcher.h +++ b/src/components/application_manager/include/application_manager/app_launch/apps_launcher.h @@ -1,9 +1,9 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APPS_LAUNCHER_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_APPS_LAUNCHER_H_ +#include #include "application_manager/app_launch/app_launch_data.h" #include "connection_handler/connection_handler.h" #include "utils/timer.h" -#include namespace app_launch { class AppLaunchCtrlImpl; diff --git a/src/components/application_manager/include/application_manager/app_launch/device_apps_launcher.h b/src/components/application_manager/include/application_manager/app_launch/device_apps_launcher.h index f156654215..f27e4569fc 100644 --- a/src/components/application_manager/include/application_manager/app_launch/device_apps_launcher.h +++ b/src/components/application_manager/include/application_manager/app_launch/device_apps_launcher.h @@ -1,12 +1,12 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_DEVICE_APPS_LAUNCHER_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_DEVICE_APPS_LAUNCHER_H_ #include -#include -#include #include +#include +#include #include "application_manager/app_launch/app_launch_data.h" -#include "application_manager/application_manager.h" #include "application_manager/app_launch_settings.h" +#include "application_manager/application_manager.h" namespace app_launch { class AppLaunchCtrlImpl; diff --git a/src/components/application_manager/include/application_manager/application.h b/src/components/application_manager/include/application_manager/application.h index b4d8ca857e..72122ff3ec 100644 --- a/src/components/application_manager/include/application_manager/application.h +++ b/src/components/application_manager/include/application_manager/application.h @@ -33,23 +33,23 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_H_ -#include +#include #include +#include #include -#include +#include #include -#include -#include "utils/data_accessor.h" -#include "interfaces/MOBILE_API.h" -#include "connection_handler/device.h" #include "application_manager/app_extension.h" -#include "application_manager/message.h" -#include "application_manager/hmi_state.h" #include "application_manager/application_state.h" #include "application_manager/help_prompt_manager.h" +#include "application_manager/hmi_state.h" +#include "application_manager/message.h" +#include "connection_handler/device.h" +#include "interfaces/MOBILE_API.h" #include "protocol_handler/protocol_handler.h" #include "smart_objects/smart_object.h" +#include "utils/data_accessor.h" #include "utils/macro.h" #include "utils/semantic_version.h" @@ -236,8 +236,8 @@ class DynamicApplicationData { virtual bool is_audio() const = 0; /* - * @brief Adds a command to the in application menu - */ + * @brief Adds a command to the in application menu + */ virtual void AddCommand(uint32_t cmd_id, const smart_objects::SmartObject& command) = 0; @@ -353,10 +353,10 @@ class DynamicApplicationData { virtual uint32_t is_perform_interaction_active() const = 0; /* - * @brief Set perform interaction layout - * - * @param Current Interaction layout of the perform interaction - */ + * @brief Set perform interaction layout + * + * @param Current Interaction layout of the perform interaction + */ virtual void set_perform_interaction_layout( mobile_api::LayoutMode::eType layout) = 0; @@ -366,10 +366,10 @@ class DynamicApplicationData { virtual mobile_api::LayoutMode::eType perform_interaction_layout() const = 0; /* - * @brief Sets the mode for perform interaction: UI/VR/BOTH - * - * @param mode Mode that was selected (MENU; VR; BOTH) - */ + * @brief Sets the mode for perform interaction: UI/VR/BOTH + * + * @param mode Mode that was selected (MENU; VR; BOTH) + */ virtual void set_perform_interaction_mode(int32_t mode) = 0; /* @@ -706,11 +706,11 @@ class Application : public virtual InitialApplicationData, virtual void SetRegularState(HmiStatePtr state) = 0; /** - * @brief SetPostponedState sets postponed state to application. - * This state could be set as regular later - * - * @param state state to setup - */ + * @brief SetPostponedState sets postponed state to application. + * This state could be set as regular later + * + * @param state state to setup + */ virtual void SetPostponedState(HmiStatePtr state) = 0; virtual void RemovePostponedState() = 0; diff --git a/src/components/application_manager/include/application_manager/application_data_impl.h b/src/components/application_manager/include/application_manager/application_data_impl.h index 8f24f124f9..7852d6805b 100644 --- a/src/components/application_manager/include/application_manager/application_data_impl.h +++ b/src/components/application_manager/include/application_manager/application_data_impl.h @@ -34,11 +34,11 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_DATA_IMPL_H_ #include -#include "utils/lock.h" -#include "utils/semantic_version.h" -#include "smart_objects/smart_object.h" #include "application_manager/application.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/lock.h" +#include "utils/semantic_version.h" namespace application_manager { diff --git a/src/components/application_manager/include/application_manager/application_impl.h b/src/components/application_manager/include/application_manager/application_impl.h index ff34d2a96a..fd9b77eb0f 100644 --- a/src/components/application_manager/include/application_manager/application_impl.h +++ b/src/components/application_manager/include/application_manager/application_impl.h @@ -33,28 +33,28 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_IMPL_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_IMPL_H_ +#include +#include +#include #include #include -#include #include -#include -#include -#include +#include #include "application_manager/application.h" #include "application_manager/application_data_impl.h" -#include "application_manager/usage_statistics.h" #include "application_manager/help_prompt_manager_impl.h" #include "application_manager/hmi_state.h" +#include "application_manager/usage_statistics.h" #include "protocol_handler/protocol_handler.h" -#include "connection_handler/device.h" -#include "utils/lock.h" #include +#include "connection_handler/device.h" #include "utils/custom_string.h" -#include "utils/timer.h" -#include "utils/macro.h" #include "utils/date_time.h" +#include "utils/lock.h" +#include "utils/macro.h" +#include "utils/timer.h" namespace usage_statistics { @@ -304,18 +304,18 @@ class ApplicationImpl : public virtual Application, void SetInitialState(HmiStatePtr state) FINAL; /** - * @brief SetRegularState set permanent state of application - * - * @param state state to setup - */ + * @brief SetRegularState set permanent state of application + * + * @param state state to setup + */ virtual void SetRegularState(HmiStatePtr state); /** - * @brief SetPostponedState sets postponed state to application. - * This state could be set as regular later - * - * @param state state to setup - */ + * @brief SetPostponedState sets postponed state to application. + * This state could be set as regular later + * + * @param state state to setup + */ virtual void SetPostponedState(HmiStatePtr state); virtual void RemovePostponedState(); diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h index 738458ef26..c34affbf13 100644 --- a/src/components/application_manager/include/application_manager/application_manager_impl.h +++ b/src/components/application_manager/include/application_manager/application_manager_impl.h @@ -34,41 +34,41 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_MANAGER_IMPL_H_ #include -#include -#include -#include -#include #include +#include +#include #include +#include +#include -#include "application_manager/application_manager.h" +#include "application_manager/app_launch/app_launch_data.h" #include "application_manager/app_service_manager.h" +#include "application_manager/application_manager.h" +#include "application_manager/application_manager_settings.h" +#include "application_manager/command_factory.h" +#include "application_manager/command_holder.h" +#include "application_manager/event_engine/event_dispatcher_impl.h" #include "application_manager/hmi_capabilities.h" +#include "application_manager/hmi_interfaces_impl.h" #include "application_manager/message.h" #include "application_manager/message_helper.h" #include "application_manager/request_controller.h" #include "application_manager/resumption/resume_ctrl.h" -#include "application_manager/state_controller_impl.h" -#include "application_manager/app_launch/app_launch_data.h" -#include "application_manager/application_manager_settings.h" -#include "application_manager/event_engine/event_dispatcher_impl.h" -#include "application_manager/hmi_interfaces_impl.h" -#include "application_manager/command_holder.h" -#include "application_manager/command_factory.h" -#include "application_manager/rpc_service.h" #include "application_manager/rpc_handler.h" +#include "application_manager/rpc_service.h" +#include "application_manager/state_controller_impl.h" -#include "protocol_handler/protocol_observer.h" -#include "protocol_handler/protocol_handler.h" -#include "hmi_message_handler/hmi_message_observer.h" -#include "hmi_message_handler/hmi_message_sender.h" #include "application_manager/policies/policy_handler_interface.h" #include "application_manager/policies/policy_handler_observer.h" #include "connection_handler/connection_handler.h" #include "connection_handler/connection_handler_observer.h" #include "connection_handler/device.h" #include "formatters/CSmartFactory.h" +#include "hmi_message_handler/hmi_message_observer.h" +#include "hmi_message_handler/hmi_message_sender.h" #include "policies/policy_handler.h" +#include "protocol_handler/protocol_handler.h" +#include "protocol_handler/protocol_observer.h" #include "interfaces/HMI_API.h" #include "interfaces/HMI_API_schema.h" @@ -88,14 +88,14 @@ #include "utils/macro.h" +#include "smart_objects/smart_object.h" +#include "utils/data_accessor.h" +#include "utils/lock.h" #include "utils/message_queue.h" #include "utils/prioritized_queue.h" -#include "utils/threads/thread.h" #include "utils/threads/message_loop_thread.h" -#include "utils/lock.h" -#include "utils/data_accessor.h" +#include "utils/threads/thread.h" #include "utils/timer.h" -#include "smart_objects/smart_object.h" struct BsonObject; @@ -134,14 +134,14 @@ class ApplicationManagerImpl public connection_handler::ConnectionHandlerObserver, public policy::PolicyHandlerObserver #ifdef ENABLE_SECURITY - , + , public security_manager::SecurityManagerListener #endif // ENABLE_SECURITY #ifdef TELEMETRY_MONITOR - , + , public telemetry_monitor::TelemetryObservable #endif // TELEMETRY_MONITOR - { +{ friend class ResumeCtrl; friend class CommandImpl; @@ -324,8 +324,9 @@ class ApplicationManagerImpl void SetTelemetryObserver(AMTelemetryObserver* observer) OVERRIDE; #endif // TELEMETRY_MONITOR - ApplicationSharedPtr RegisterApplication(const std::shared_ptr< - smart_objects::SmartObject>& request_for_registration) OVERRIDE; + ApplicationSharedPtr RegisterApplication( + const std::shared_ptr& + request_for_registration) OVERRIDE; /* * @brief Closes application by id * @@ -342,9 +343,9 @@ class ApplicationManagerImpl bool is_unexpected_disconnect = false) OVERRIDE; /** - * @brief Handle sequence for unauthorized application - * @param app_id Application id - */ + * @brief Handle sequence for unauthorized application + * @param app_id Application id + */ void OnAppUnauthorized(const uint32_t& app_id) OVERRIDE; /* @@ -827,9 +828,9 @@ class ApplicationManagerImpl ApplicationConstSharedPtr application) const; /** - * Getter for resume_controller - * @return Resume Controller - */ + * Getter for resume_controller + * @return Resume Controller + */ resumption::ResumeCtrl& resume_controller() OVERRIDE { return *resume_ctrl_.get(); } @@ -998,8 +999,7 @@ class ApplicationManagerImpl AppV4DevicePredicate(const connection_handler::DeviceHandle handle) : handle_(handle) {} bool operator()(const ApplicationSharedPtr app) const { - return app - ? handle_ == app->device() && + return app ? handle_ == app->device() && Message::is_sufficient_version( protocol_handler::MajorProtocolVersion:: PROTOCOL_VERSION_4, @@ -1075,14 +1075,14 @@ class ApplicationManagerImpl } /** - * @brief ProcessReconnection handles reconnection flow for application on - * transport switch - * @param application Pointer to switched application, must be validated - * before passing - * @param connection_key Connection key from registration request of - * switched - * application - */ + * @brief ProcessReconnection handles reconnection flow for application on + * transport switch + * @param application Pointer to switched application, must be validated + * before passing + * @param connection_key Connection key from registration request of + * switched + * application + */ void ProcessReconnection(ApplicationSharedPtr application, const uint32_t connection_key) FINAL; diff --git a/src/components/application_manager/include/application_manager/application_state.h b/src/components/application_manager/include/application_manager/application_state.h index bf894eaf94..d708a6188d 100644 --- a/src/components/application_manager/include/application_manager/application_state.h +++ b/src/components/application_manager/include/application_manager/application_state.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_STATE_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_STATE_H_ #include +#include "application_manager/hmi_state.h" #include "utils/lock.h" #include "utils/macro.h" -#include "application_manager/hmi_state.h" namespace application_manager { @@ -119,11 +119,11 @@ class ApplicationState { void SetRegularState(HmiStatePtr state); /** - * @brief Sets postponed state of application. - * This state could be set as regular later on - * - * @param state state to setup - */ + * @brief Sets postponed state of application. + * This state could be set as regular later on + * + * @param state state to setup + */ void SetPostponedState(HmiStatePtr state); /** @@ -154,6 +154,6 @@ class ApplicationState { DISALLOW_COPY_AND_ASSIGN(ApplicationState); }; -} +} // namespace application_manager #endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_STATE_H_ diff --git a/src/components/application_manager/include/application_manager/command_factory.h b/src/components/application_manager/include/application_manager/command_factory.h index 7dc8a0cfc1..261d0e1e10 100644 --- a/src/components/application_manager/include/application_manager/command_factory.h +++ b/src/components/application_manager/include/application_manager/command_factory.h @@ -33,10 +33,10 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMAND_FACTORY_H #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMAND_FACTORY_H -#include "application_manager/commands/command.h" #include "application_manager/application_manager.h" -#include "application_manager/rpc_service.h" +#include "application_manager/commands/command.h" #include "application_manager/policies/policy_handler_interface.h" +#include "application_manager/rpc_service.h" #include "utils/macro.h" namespace application_manager { @@ -63,10 +63,10 @@ class CommandFactory { const commands::MessageSharedPtr& message, commands::Command::CommandSource source) = 0; /** - * @param int32_t command id - * @param CommandSource source - * @return return true if command can be create, else return false - **/ + * @param int32_t command id + * @param CommandSource source + * @return return true if command can be create, else return false + **/ virtual bool IsAbleToProcess( const int32_t, const application_manager::commands::Command::CommandSource source) diff --git a/src/components/application_manager/include/application_manager/command_holder_impl.h b/src/components/application_manager/include/application_manager/command_holder_impl.h index 18a1de7526..8867336b3e 100644 --- a/src/components/application_manager/include/application_manager/command_holder_impl.h +++ b/src/components/application_manager/include/application_manager/command_holder_impl.h @@ -35,9 +35,9 @@ #include "application_manager/command_holder.h" +#include #include #include -#include #include "application_manager/application.h" #include "application_manager/rpc_service.h" #include "smart_objects/smart_object.h" diff --git a/src/components/application_manager/include/application_manager/commands/command.h b/src/components/application_manager/include/application_manager/commands/command.h index d832995b8d..0693f9868d 100644 --- a/src/components/application_manager/include/application_manager/commands/command.h +++ b/src/components/application_manager/include/application_manager/commands/command.h @@ -100,16 +100,16 @@ class Command { virtual void onTimeOut() = 0; /** - * @brief AllowedToTerminate tells if request controller is allowed - * to terminate this command - * @return - */ + * @brief AllowedToTerminate tells if request controller is allowed + * to terminate this command + * @return + */ virtual bool AllowedToTerminate() = 0; /** - * @brief SetAllowedToTerminate set up allowed to terminate flag. - * If true, request controller will terminate request on response - */ + * @brief SetAllowedToTerminate set up allowed to terminate flag. + * If true, request controller will terminate request on response + */ virtual void SetAllowedToTerminate(const bool allowed) = 0; enum CommandSource { diff --git a/src/components/application_manager/include/application_manager/commands/command_impl.h b/src/components/application_manager/include/application_manager/commands/command_impl.h index dd1592c4aa..4e52ac23ce 100644 --- a/src/components/application_manager/include/application_manager/commands/command_impl.h +++ b/src/components/application_manager/include/application_manager/commands/command_impl.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_COMMAND_IMPL_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_COMMAND_IMPL_H_ +#include "application_manager/application_manager.h" #include "application_manager/commands/command.h" #include "application_manager/event_engine/event_observer.h" -#include "application_manager/application_manager.h" #include "application_manager/smart_object_keys.h" #include "policy/policy_types.h" #include "utils/logger.h" @@ -125,18 +125,19 @@ class CommandImpl : public Command { void onTimeOut() OVERRIDE; /** - * @brief AllowedToTerminate tells request Controller if it can terminate this - * request by response. - * By default, RequestCtrl should terminate all requests by their responses. - * If request need to terminate itself, it should override this function false - * @return allowed_to_terminate_ value - */ + * @brief AllowedToTerminate tells request Controller if it can terminate this + * request by response. + * By default, RequestCtrl should terminate all requests by their responses. + * If request need to terminate itself, it should override this function + * false + * @return allowed_to_terminate_ value + */ bool AllowedToTerminate() OVERRIDE; /** - * @brief SetAllowedToTerminate set up allowed to terminate flag. - * If true, request controller will terminate request on response - */ + * @brief SetAllowedToTerminate set up allowed to terminate flag. + * If true, request controller will terminate request on response + */ void SetAllowedToTerminate(const bool allowed) OVERRIDE; // members diff --git a/src/components/application_manager/include/application_manager/commands/command_request_impl.h b/src/components/application_manager/include/application_manager/commands/command_request_impl.h index e12c6de3ab..b5a330d907 100644 --- a/src/components/application_manager/include/application_manager/commands/command_request_impl.h +++ b/src/components/application_manager/include/application_manager/commands/command_request_impl.h @@ -34,10 +34,10 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_COMMAND_REQUEST_IMPL_H_ #include "application_manager/commands/command_impl.h" -#include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -#include "utils/lock.h" +#include "interfaces/MOBILE_API.h" #include "smart_objects/smart_object.h" +#include "utils/lock.h" namespace application_manager { namespace commands { @@ -335,7 +335,7 @@ class CommandRequestImpl : public CommandImpl, * @param interface_id interface which SDL awaits for response in given time * @return true if SDL awaits for response from given interface in * interface_id - */ + */ bool IsInterfaceAwaited(const HmiInterfaces::InterfaceID& interface_id) const; /** @@ -346,7 +346,7 @@ class CommandRequestImpl : public CommandImpl, void EndAwaitForInterface(const HmiInterfaces::InterfaceID& interface_id); /** - * @brief This set stores all the interfaces which are awaited by SDL to + * @brief This set stores all the interfaces which are awaited by SDL to * return a response on some request */ std::set awaiting_response_interfaces_; @@ -387,10 +387,10 @@ class CommandRequestImpl : public CommandImpl, const hmi_apis::FunctionID::eType& function_id); /** - * @brief UpdateHash updates hash field for application and sends - * OnHashChanged notification to mobile side in case of approriate hash mode - * is set - */ + * @brief UpdateHash updates hash field for application and sends + * OnHashChanged notification to mobile side in case of approriate hash mode + * is set + */ void UpdateHash(); /** diff --git a/src/components/application_manager/include/application_manager/commands/command_request_to_mobile.h b/src/components/application_manager/include/application_manager/commands/command_request_to_mobile.h index a1e63561bf..430e549523 100644 --- a/src/components/application_manager/include/application_manager/commands/command_request_to_mobile.h +++ b/src/components/application_manager/include/application_manager/commands/command_request_to_mobile.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_COMMAND_REQUEST_TO_MOBILE_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_COMMAND_REQUEST_TO_MOBILE_H_ -#include "application_manager/commands/command_impl.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" #include "interfaces/MOBILE_API.h" #include "smart_objects/smart_object.h" diff --git a/src/components/application_manager/include/application_manager/commands/command_response_from_mobile.h b/src/components/application_manager/include/application_manager/commands/command_response_from_mobile.h index 65983d82f8..1401888890 100644 --- a/src/components/application_manager/include/application_manager/commands/command_response_from_mobile.h +++ b/src/components/application_manager/include/application_manager/commands/command_response_from_mobile.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_COMMAND_RESPONSE_TO_MOBILE_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_COMMAND_RESPONSE_TO_MOBILE_H_ -#include "application_manager/commands/command_impl.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" #include "interfaces/MOBILE_API.h" #include "smart_objects/smart_object.h" diff --git a/src/components/application_manager/include/application_manager/commands/pending.h b/src/components/application_manager/include/application_manager/commands/pending.h index bbfc246659..9083d81d73 100644 --- a/src/components/application_manager/include/application_manager/commands/pending.h +++ b/src/components/application_manager/include/application_manager/commands/pending.h @@ -35,9 +35,9 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_PENDING_H_ #include -#include "utils/macro.h" -#include "utils/lock.h" #include "interfaces/HMI_API.h" +#include "utils/lock.h" +#include "utils/macro.h" namespace application_manager { diff --git a/src/components/application_manager/include/application_manager/commands/request_to_hmi.h b/src/components/application_manager/include/application_manager/commands/request_to_hmi.h index 91586a74ce..e8850fbe8d 100644 --- a/src/components/application_manager/include/application_manager/commands/request_to_hmi.h +++ b/src/components/application_manager/include/application_manager/commands/request_to_hmi.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_REQUEST_TO_HMI_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_REQUEST_TO_HMI_H_ -#include "application_manager/commands/command_impl.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" namespace application_manager { diff --git a/src/components/application_manager/include/application_manager/commands/response_from_hmi.h b/src/components/application_manager/include/application_manager/commands/response_from_hmi.h index 605d04067e..6c00957d3f 100644 --- a/src/components/application_manager/include/application_manager/commands/response_from_hmi.h +++ b/src/components/application_manager/include/application_manager/commands/response_from_hmi.h @@ -1,40 +1,40 @@ /* -* Copyright (c) 2018, 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. -*/ + * Copyright (c) 2018, 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. + */ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_RESPONSE_FROM_HMI_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_RESPONSE_FROM_HMI_H_ -#include "application_manager/commands/command_impl.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/command_impl.h" #include "interfaces/HMI_API.h" namespace application_manager { diff --git a/src/components/application_manager/include/application_manager/event_engine/event.h b/src/components/application_manager/include/application_manager/event_engine/event.h index 14595cd293..e7382e01a4 100644 --- a/src/components/application_manager/include/application_manager/event_engine/event.h +++ b/src/components/application_manager/include/application_manager/event_engine/event.h @@ -36,8 +36,8 @@ #include #include -#include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" namespace application_manager { namespace event_engine { diff --git a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h index 75e77e603c..3644299499 100644 --- a/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h +++ b/src/components/application_manager/include/application_manager/event_engine/event_dispatcher_impl.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_EVENT_ENGINE_EVENT_DISPATCHER_IMPL_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_EVENT_ENGINE_EVENT_DISPATCHER_IMPL_H_ -#include #include +#include #include "utils/lock.h" diff --git a/src/components/application_manager/include/application_manager/help_prompt_manager.h b/src/components/application_manager/include/application_manager/help_prompt_manager.h index a0c34e77d7..eb45705d9f 100644 --- a/src/components/application_manager/include/application_manager/help_prompt_manager.h +++ b/src/components/application_manager/include/application_manager/help_prompt_manager.h @@ -28,7 +28,7 @@ * 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. -*/ + */ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HELP_PROMPT_MANAGER_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HELP_PROMPT_MANAGER_H_ diff --git a/src/components/application_manager/include/application_manager/help_prompt_manager_impl.h b/src/components/application_manager/include/application_manager/help_prompt_manager_impl.h index 81754a60b0..3cd22a6afc 100644 --- a/src/components/application_manager/include/application_manager/help_prompt_manager_impl.h +++ b/src/components/application_manager/include/application_manager/help_prompt_manager_impl.h @@ -28,7 +28,7 @@ * 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. -*/ + */ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HELP_PROMPT_MANAGER_IMPL_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HELP_PROMPT_MANAGER_IMPL_H_ @@ -56,7 +56,7 @@ class HelpPromptManagerImpl : public HelpPromptManager { public: /** * @brief Container for buffering VR help commands - */ + */ typedef std::pair VRCommandPair; typedef std::vector VRCommandPairs; @@ -94,12 +94,12 @@ class HelpPromptManagerImpl : public HelpPromptManager { const bool is_resumption) OVERRIDE; /** - * @brief Stop constructing vrHelp and/or helpPrompt if they are present in - * message - * @param msg containing GlobalProperties - * @param is_response determines is the request or response for the for - * the SetGlobalPropertiesRequest - */ + * @brief Stop constructing vrHelp and/or helpPrompt if they are present in + * message + * @param msg containing GlobalProperties + * @param is_response determines is the request or response for the for + * the SetGlobalPropertiesRequest + */ void OnSetGlobalPropertiesReceived(const smart_objects::SmartObject& msg, const bool is_response) OVERRIDE; diff --git a/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h b/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h index 9380fb41ac..94fc293c3e 100644 --- a/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h +++ b/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h @@ -28,18 +28,18 @@ * 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. -*/ + */ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HMI_CAPABILITIES_IMPL_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HMI_CAPABILITIES_IMPL_H_ #include "application_manager/hmi_capabilities.h" +#include "application_manager/hmi_language_handler.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" #include "json/json.h" -#include "utils/macro.h" -#include "application_manager/hmi_language_handler.h" #include "smart_objects/smart_object.h" +#include "utils/macro.h" namespace resumption { class LastState; diff --git a/src/components/application_manager/include/application_manager/hmi_interfaces_impl.h b/src/components/application_manager/include/application_manager/hmi_interfaces_impl.h index 2b2d1e1361..3202d44e1e 100644 --- a/src/components/application_manager/include/application_manager/hmi_interfaces_impl.h +++ b/src/components/application_manager/include/application_manager/hmi_interfaces_impl.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HMI_INTERFACES_IMPL_H_ #include #include "application_manager/hmi_interfaces.h" -#include "utils/macro.h" #include "utils/lock.h" +#include "utils/macro.h" /** * @brief The HmiInterfacesImpl class handles * hmi interfaces states diff --git a/src/components/application_manager/include/application_manager/hmi_language_handler.h b/src/components/application_manager/include/application_manager/hmi_language_handler.h index 6158cb4585..edf0759114 100644 --- a/src/components/application_manager/include/application_manager/hmi_language_handler.h +++ b/src/components/application_manager/include/application_manager/hmi_language_handler.h @@ -28,15 +28,15 @@ * 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. -*/ + */ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HMI_LANGUAGE_HANDLER_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_HMI_LANGUAGE_HANDLER_H_ #include "application_manager/event_engine/event_observer.h" -#include "utils/lock.h" #include "interfaces/HMI_API.h" #include "smart_objects/smart_object.h" +#include "utils/lock.h" namespace resumption { class LastState; @@ -56,8 +56,8 @@ class HMILanguageHandler : public event_engine::EventObserver { typedef std::map Apps; /** - * @brief System interfaces - */ + * @brief System interfaces + */ enum Interface { INTERFACE_UI, INTERFACE_VR, INTERFACE_TTS }; /** diff --git a/src/components/application_manager/include/application_manager/hmi_state.h b/src/components/application_manager/include/application_manager/hmi_state.h index 774376b249..b6a4c180e6 100644 --- a/src/components/application_manager/include/application_manager/hmi_state.h +++ b/src/components/application_manager/include/application_manager/hmi_state.h @@ -48,11 +48,11 @@ class Application; typedef std::shared_ptr HmiStatePtr; /** -* @brief The HmiState class -* Handle Hmi state of application (hmi level, -* audio streaming state, system context) -* -*/ + * @brief The HmiState class + * Handle Hmi state of application (hmi level, + * audio streaming state, system context) + * + */ class HmiState { friend std::ostream& operator<<(std::ostream& os, const HmiState& src); diff --git a/src/components/application_manager/include/application_manager/message.h b/src/components/application_manager/include/application_manager/message.h index 1c319cf204..7525ff1aa3 100644 --- a/src/components/application_manager/include/application_manager/message.h +++ b/src/components/application_manager/include/application_manager/message.h @@ -36,9 +36,9 @@ #include #include +#include "protocol/common.h" #include "protocol/message_priority.h" #include "protocol/rpc_type.h" -#include "protocol/common.h" #include "smart_objects/smart_object.h" namespace application_manager { diff --git a/src/components/application_manager/include/application_manager/message_helper.h b/src/components/application_manager/include/application_manager/message_helper.h index ac84bcfaa5..0642dd3cd1 100644 --- a/src/components/application_manager/include/application_manager/message_helper.h +++ b/src/components/application_manager/include/application_manager/message_helper.h @@ -37,20 +37,20 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_MESSAGE_HELPER_H_ #include -#include #include +#include -#include "interfaces/MOBILE_API.h" -#include "interfaces/HMI_API.h" -#include "utils/macro.h" -#include "connection_handler/device.h" +#include #include "application_manager/application.h" +#include "application_manager/policies/policy_handler_interface.h" +#include "connection_handler/device.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" #include "policy/policy_types.h" #include "protocol_handler/session_observer.h" -#include "application_manager/policies/policy_handler_interface.h" #include "smart_objects/smart_object.h" #include "transport_manager/common.h" -#include +#include "utils/macro.h" namespace policy { class PolicyHandlerInterface; @@ -73,18 +73,18 @@ typedef std::map VehicleData; class MessageHelper { public: /** - * @brief CreateNotification creates basic mobile notification smart object - * @param function_id Notification function ID - * @param app_id application to send notification - * @return basic mobile notification smart object - */ + * @brief CreateNotification creates basic mobile notification smart object + * @param function_id Notification function ID + * @param app_id application to send notification + * @return basic mobile notification smart object + */ static smart_objects::SmartObjectSPtr CreateNotification( mobile_apis::FunctionID::eType function_id, uint32_t app_id); /** - * @brief CreateHMINotification creates basic hmi notification smart object - * @param function_id Notification function ID - * @return basic hmi notification smart object - */ + * @brief CreateHMINotification creates basic hmi notification smart object + * @param function_id Notification function ID + * @return basic hmi notification smart object + */ static smart_objects::SmartObjectSPtr CreateHMINotification( hmi_apis::FunctionID::eType function_id); @@ -118,18 +118,18 @@ class MessageHelper { static void SendOnLanguageChangeToMobile(uint32_t connection_key); /** - * @brief Sends DecryptCertificate request to HMI - * @param file_name path to file containing encrypted certificate - */ + * @brief Sends DecryptCertificate request to HMI + * @param file_name path to file containing encrypted certificate + */ static void SendDecryptCertificateToHMI(const std::string& file_name, ApplicationManager& app_mngr); /** - * @brief SendGetSystemTimeRequest sends mentioned request to HMI. - * @param correlation_id the message correlation id, required for proper - * response processing. - * @param app_mngr - */ + * @brief SendGetSystemTimeRequest sends mentioned request to HMI. + * @param correlation_id the message correlation id, required for proper + * response processing. + * @param app_mngr + */ static void SendGetSystemTimeRequest(const uint32_t correlation_id, ApplicationManager& app_mngr); @@ -205,17 +205,17 @@ class MessageHelper { const std::string& hmi_level); /* - * @brief Used to obtain string representation of app's - * HMI Level. - * @param hmi_level Desired HMI Level - */ + * @brief Used to obtain string representation of app's + * HMI Level. + * @param hmi_level Desired HMI Level + */ static std::string StringifiedHMILevel( const mobile_apis::HMILevel::eType hmi_level); /* - * @brief Used to obtain function name by its id - * @param function_id Function ID - */ + * @brief Used to obtain function name by its id + * @param function_id Function ID + */ static std::string StringifiedFunctionID( mobile_apis::FunctionID::eType function_id); @@ -361,27 +361,27 @@ class MessageHelper { ApplicationManager& app_mngr); /** - * @brief Send SDL_ActivateApp response to HMI - * @param permissions response parameters - */ + * @brief Send SDL_ActivateApp response to HMI + * @param permissions response parameters + */ static void SendSDLActivateAppResponse(policy::AppPermissions& permissions, uint32_t correlation_id, ApplicationManager& app_mngr); /** - * @brief Send OnSDLConsentNeeded to HMI for device data consent by user - * @param device_info Device info, e.g. mac, handle, name - */ + * @brief Send OnSDLConsentNeeded to HMI for device data consent by user + * @param device_info Device info, e.g. mac, handle, name + */ static void SendOnSDLConsentNeeded(const policy::DeviceParams& device_info, ApplicationManager& app_man); /** - * @brief Send request to SyncP process to read file and send - * Policy Table Snapshot using Retry Strategy - * @param file_path Path to file with PTS - * @param timeout Timeout to wait for PTU in seconds - * @param retries Seconds between retries - */ + * @brief Send request to SyncP process to read file and send + * Policy Table Snapshot using Retry Strategy + * @param file_path Path to file with PTS + * @param timeout Timeout to wait for PTU in seconds + * @param retries Seconds between retries + */ static void SendPolicyUpdate(const std::string& file_path, const uint32_t timeout, const std::vector& retries, @@ -445,13 +445,13 @@ class MessageHelper { static void SendNaviStopStream(int32_t app_id, ApplicationManager& app_mngr); /* - * @brief Send notification for Update of Policy Table - * with PT Snapshot. - * @param connection_key Id of application to send message to - * @param policy_data PT Snapshot - * @param url If empty string, no URL is provided - * @param timeout If -1 no timeout is provdied - */ + * @brief Send notification for Update of Policy Table + * with PT Snapshot. + * @param connection_key Id of application to send message to + * @param policy_data PT Snapshot + * @param url If empty string, no URL is provided + * @param timeout If -1 no timeout is provdied + */ static void SendPolicySnapshotNotification( uint32_t connection_key, const std::vector& policy_data, @@ -485,20 +485,20 @@ class MessageHelper { ApplicationManager& app_man); /* - * @brief Send notification to mobile on application permissions update - * @param connection_key Id of application to send message to - * @param permissions updated permissions for application - */ + * @brief Send notification to mobile on application permissions update + * @param connection_key Id of application to send message to + * @param permissions updated permissions for application + */ static void SendOnPermissionsChangeNotification( uint32_t connection_key, const policy::Permissions& permissions, ApplicationManager& app_mngr); /* - * @brief Send notification to HMI on application permissions update - * @param connection_key Id of application to send message to - * @param permissions updated permissions for application - */ + * @brief Send notification to HMI on application permissions update + * @param connection_key Id of application to send message to + * @param permissions updated permissions for application + */ static void SendOnAppPermissionsChangedNotification( uint32_t connection_key, const policy::AppPermissions& permissions, @@ -610,12 +610,12 @@ class MessageHelper { ApplicationManager& app_mngr); /** - * @brief Verify image and add image file full path - * and add path, although the image doesn't exist - * @param SmartObject with image - * @param app current application - * @return verification result - */ + * @brief Verify image and add image file full path + * and add path, although the image doesn't exist + * @param SmartObject with image + * @param app current application + * @return verification result + */ static void ApplyImagePath(smart_objects::SmartObject& image, ApplicationConstSharedPtr app, ApplicationManager& app_mngr); @@ -636,10 +636,10 @@ class MessageHelper { ApplicationManager& app_mngr); /** - * @brief Stores whether each choice in a set has the vrCommands parameter - * MIXED means some choices have vrCommands and others don't - * ALL means all do, NONE means none do - */ + * @brief Stores whether each choice in a set has the vrCommands parameter + * MIXED means some choices have vrCommands and others don't + * ALL means all do, NONE means none do + */ enum ChoiceSetVRCommandsStatus { MIXED, ALL, NONE }; /** diff --git a/src/components/application_manager/include/application_manager/mobile_message_handler.h b/src/components/application_manager/include/application_manager/mobile_message_handler.h index b2ad963f46..3b02424e1f 100644 --- a/src/components/application_manager/include/application_manager/mobile_message_handler.h +++ b/src/components/application_manager/include/application_manager/mobile_message_handler.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_MOBILE_MESSAGE_HANDLER_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_MOBILE_MESSAGE_HANDLER_H_ -#include "utils/macro.h" -#include "protocol/common.h" #include "application_manager/message.h" +#include "protocol/common.h" +#include "utils/macro.h" namespace application_manager { typedef std::shared_ptr MobileMessage; diff --git a/src/components/application_manager/include/application_manager/plugin_manager/plugin_keys.h b/src/components/application_manager/include/application_manager/plugin_manager/plugin_keys.h index 11a7d353f6..96a7f27064 100644 --- a/src/components/application_manager/include/application_manager/plugin_manager/plugin_keys.h +++ b/src/components/application_manager/include/application_manager/plugin_manager/plugin_keys.h @@ -41,7 +41,7 @@ extern const char* vehicle_info_rpc_plugin; extern const char* app_service_rpc_plugin; extern const char* rc_rpc_plugin; extern const char* sdl_rpc_plugin; -} +} // namespace plugin_names } // namespace plugin_manager } // namespace application_manager diff --git a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h index 09a412b2ac..aea0361f19 100644 --- a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h +++ b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h @@ -33,12 +33,12 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_PLUGIN_MANAGER_RPC_PLUGIN_H #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_PLUGIN_MANAGER_RPC_PLUGIN_H #include -#include "utils/macro.h" -#include "application_manager/commands/command.h" #include "application_manager/application.h" -#include "application_manager/rpc_service.h" +#include "application_manager/commands/command.h" #include "application_manager/hmi_capabilities.h" #include "application_manager/policies/policy_handler_interface.h" +#include "application_manager/rpc_service.h" +#include "utils/macro.h" namespace application_manager { class CommandFactory; @@ -68,13 +68,13 @@ class RPCPlugin { virtual ~RPCPlugin() {} /** - * @brief Command initialization function - * @param app_manager ApplicationManager - * @param rpc_service RPCService - * @param hmi_capabilities HMICapabilities - * @param policy_handler PolicyHandlerInterface - * @return true in case initialization was succesful, false otherwise. - **/ + * @brief Command initialization function + * @param app_manager ApplicationManager + * @param rpc_service RPCService + * @param hmi_capabilities HMICapabilities + * @param policy_handler PolicyHandlerInterface + * @return true in case initialization was succesful, false otherwise. + **/ virtual bool Init(ApplicationManager& app_manager, rpc_service::RPCService& rpc_service, HMICapabilities& hmi_capabilities, diff --git a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager.h b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager.h index 692d296607..b658e40b1c 100644 --- a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager.h +++ b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager.h @@ -33,10 +33,10 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_PLUGIN_MANAGER_RPC_PLUGIN_MANAGER_H #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_PLUGIN_MANAGER_RPC_PLUGIN_MANAGER_H #include -#include +#include #include +#include #include -#include #include "application_manager/plugin_manager/rpc_plugin.h" #include "utils/optional.h" diff --git a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h index 5f85d45b6e..885181e9c4 100644 --- a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h +++ b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h @@ -32,11 +32,11 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_PLUGIN_MANAGER_RPC_PLUGIN_MANAGER_IMPL_H #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_PLUGIN_MANAGER_RPC_PLUGIN_MANAGER_IMPL_H -#include "application_manager/plugin_manager/rpc_plugin_manager.h" #include "application_manager/application_manager.h" -#include "application_manager/rpc_service.h" #include "application_manager/hmi_capabilities.h" +#include "application_manager/plugin_manager/rpc_plugin_manager.h" #include "application_manager/policies/policy_handler_interface.h" +#include "application_manager/rpc_service.h" #include "utils/optional.h" namespace application_manager { diff --git a/src/components/application_manager/include/application_manager/policies/external/delegates/app_permission_delegate.h b/src/components/application_manager/include/application_manager/policies/external/delegates/app_permission_delegate.h index f501598e0f..114b4e2d77 100644 --- a/src/components/application_manager/include/application_manager/policies/external/delegates/app_permission_delegate.h +++ b/src/components/application_manager/include/application_manager/policies/external/delegates/app_permission_delegate.h @@ -33,19 +33,19 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICIES_DELEGATES_APP_PERMISSION_DELEGATE_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICIES_DELEGATES_APP_PERMISSION_DELEGATE_H_ +#include "utils/conditional_variable.h" #include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" -#include "utils/conditional_variable.h" -#include "policy/policy_types.h" #include "application_manager/policies/policy_handler_interface.h" +#include "policy/policy_types.h" namespace policy { class PolicyHandler; /** -*@brief The AppPermissionDelegate class allows to call OnAppPermissionConsent -*in async way. -*/ + *@brief The AppPermissionDelegate class allows to call OnAppPermissionConsent + *in async way. + */ class AppPermissionDelegate : public threads::ThreadDelegate { public: /** diff --git a/src/components/application_manager/include/application_manager/policies/external/delegates/statistics_delegate.h b/src/components/application_manager/include/application_manager/policies/external/delegates/statistics_delegate.h index 2fe4265f54..38a60b29c4 100644 --- a/src/components/application_manager/include/application_manager/policies/external/delegates/statistics_delegate.h +++ b/src/components/application_manager/include/application_manager/policies/external/delegates/statistics_delegate.h @@ -35,10 +35,10 @@ #include +#include "application_manager/usage_statistics.h" +#include "utils/conditional_variable.h" #include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" -#include "utils/conditional_variable.h" -#include "application_manager/usage_statistics.h" namespace policy { diff --git a/src/components/application_manager/include/application_manager/policies/external/policy_event_observer.h b/src/components/application_manager/include/application_manager/policies/external/policy_event_observer.h index 3168b80b5a..7d71611a3c 100644 --- a/src/components/application_manager/include/application_manager/policies/external/policy_event_observer.h +++ b/src/components/application_manager/include/application_manager/policies/external/policy_event_observer.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICIES_POLICY_EVENT_OBSERVER_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICIES_POLICY_EVENT_OBSERVER_H_ -#include "smart_objects/smart_object.h" #include "application_manager/event_engine/event_observer.h" +#include "smart_objects/smart_object.h" #include "utils/lock.h" namespace policy { diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h index a33bb640ad..abffd3eebb 100644 --- a/src/components/application_manager/include/application_manager/policies/policy_handler.h +++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h @@ -33,28 +33,28 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICIES_POLICY_HANDLER_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICIES_POLICY_HANDLER_H_ -#include +#include +#include #include #include +#include #include -#include -#include -#include "policy/policy_manager.h" #include "application_manager/application.h" -#include "application_manager/policies/policy_handler_interface.h" -#include "application_manager/policies/policy_event_observer.h" #include "application_manager/policies/delegates/statistics_delegate.h" +#include "application_manager/policies/policy_event_observer.h" +#include "application_manager/policies/policy_handler_interface.h" #include "application_manager/policies/policy_handler_observer.h" -#include "utils/logger.h" -#include "utils/threads/thread.h" -#include "utils/threads/thread_delegate.h" +#include "policy/policy_manager.h" +#include "policy/policy_settings.h" +#include "policy/usage_statistics/statistics_manager.h" #include "utils/conditional_variable.h" -#include "utils/rwlock.h" #include "utils/custom_string.h" -#include "policy/usage_statistics/statistics_manager.h" +#include "utils/logger.h" +#include "utils/rwlock.h" #include "utils/threads/async_runner.h" -#include "policy/policy_settings.h" +#include "utils/threads/thread.h" +#include "utils/threads/thread_delegate.h" namespace Json { class Value; @@ -478,7 +478,7 @@ class PolicyHandler : public PolicyHandlerInterface, * @brief Check if an app can send unknown rpc requests to an app service * provider * @param policy_app_id Unique application id - */ + */ bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const OVERRIDE; @@ -811,10 +811,10 @@ class PolicyHandler : public PolicyHandlerInterface, static const std::string kLibrary; /** - * @brief Collects currently registered applications ids linked to their - * device id - * @param out_links Collection of device_id-to-app_id links - */ + * @brief Collects currently registered applications ids linked to their + * device id + * @param out_links Collection of device_id-to-app_id links + */ void GetRegisteredLinks(std::map& out_links) const; private: diff --git a/src/components/application_manager/include/application_manager/policies/regular/delegates/app_permission_delegate.h b/src/components/application_manager/include/application_manager/policies/regular/delegates/app_permission_delegate.h index 6913f5038e..7e83aefe81 100644 --- a/src/components/application_manager/include/application_manager/policies/regular/delegates/app_permission_delegate.h +++ b/src/components/application_manager/include/application_manager/policies/regular/delegates/app_permission_delegate.h @@ -33,18 +33,18 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_APP_PERMISSION_DELEGATE_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DELEGATES_APP_PERMISSION_DELEGATE_H_ +#include "utils/conditional_variable.h" #include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" -#include "utils/conditional_variable.h" -#include "policy/policy_types.h" #include "application_manager/policies/policy_handler_interface.h" +#include "policy/policy_types.h" namespace policy { /** -*@brief The AppPermissionDelegate class allows to call OnAppPermissionConsent -*in async way. -*/ + *@brief The AppPermissionDelegate class allows to call OnAppPermissionConsent + *in async way. + */ class AppPermissionDelegate : public threads::ThreadDelegate { public: /** diff --git a/src/components/application_manager/include/application_manager/policies/regular/delegates/statistics_delegate.h b/src/components/application_manager/include/application_manager/policies/regular/delegates/statistics_delegate.h index 3dc9ad925c..74d88fac69 100644 --- a/src/components/application_manager/include/application_manager/policies/regular/delegates/statistics_delegate.h +++ b/src/components/application_manager/include/application_manager/policies/regular/delegates/statistics_delegate.h @@ -35,10 +35,10 @@ #include +#include "application_manager/usage_statistics.h" +#include "utils/conditional_variable.h" #include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" -#include "utils/conditional_variable.h" -#include "application_manager/usage_statistics.h" namespace policy { diff --git a/src/components/application_manager/include/application_manager/policies/regular/policy_handler_observer.h b/src/components/application_manager/include/application_manager/policies/regular/policy_handler_observer.h index 68e7511b43..3c4dce2fbc 100644 --- a/src/components/application_manager/include/application_manager/policies/regular/policy_handler_observer.h +++ b/src/components/application_manager/include/application_manager/policies/regular/policy_handler_observer.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICY_HANDLER_OBSERVER_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICY_HANDLER_OBSERVER_H_ -#include -#include #include +#include +#include namespace policy { diff --git a/src/components/application_manager/include/application_manager/request_controller.h b/src/components/application_manager/include/application_manager/request_controller.h index ea8d95a92a..8a3c90061e 100644 --- a/src/components/application_manager/include/application_manager/request_controller.h +++ b/src/components/application_manager/include/application_manager/request_controller.h @@ -34,21 +34,21 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_REQUEST_CONTROLLER_H_ #include -#include #include +#include #include "utils/lock.h" -#include "utils/threads/thread.h" #include "utils/conditional_variable.h" +#include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" #include "utils/timer.h" -#include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" -#include "application_manager/request_info.h" #include "application_manager/request_controller_settings.h" +#include "application_manager/request_info.h" #include "application_manager/request_tracker.h" namespace application_manager { @@ -56,14 +56,14 @@ namespace application_manager { namespace request_controller { /** -* @brief RequestController class is used to control currently active mobile -* requests. -*/ + * @brief RequestController class is used to control currently active mobile + * requests. + */ class RequestController { public: /** - * @brief Result code for addRequest - */ + * @brief Result code for addRequest + */ enum TResult { SUCCESS = 0, TOO_MANY_REQUESTS, @@ -73,8 +73,8 @@ class RequestController { }; /** - * @brief Thread pool state - */ + * @brief Thread pool state + */ enum TPoolState { UNDEFINED = 0, STARTED, @@ -84,121 +84,121 @@ class RequestController { // Methods /** - * @brief Class constructor - * - */ + * @brief Class constructor + * + */ RequestController(const RequestControlerSettings& settings); /** - * @brief Class destructor - * - */ + * @brief Class destructor + * + */ virtual ~RequestController(); /** - * @brief Initialize thread pool - * - */ + * @brief Initialize thread pool + * + */ void InitializeThreadpool(); /** - * @brief Destroy thread pool - * - */ + * @brief Destroy thread pool + * + */ void DestroyThreadpool(); /** - * @brief Check if max request amount wasn't exceed and adds request to queue. - * - * @param request Active mobile request - * @param hmi_level Current application hmi_level - * - * @return Result code - * - */ + * @brief Check if max request amount wasn't exceed and adds request to queue. + * + * @param request Active mobile request + * @param hmi_level Current application hmi_level + * + * @return Result code + * + */ TResult addMobileRequest(const RequestPtr request, const mobile_apis::HMILevel::eType& hmi_level); /** - * @brief Store HMI request until response or timeout won't remove it - * - * @param request Active hmi request - * @return Result code - * - */ + * @brief Store HMI request until response or timeout won't remove it + * + * @param request Active hmi request + * @return Result code + * + */ TResult addHMIRequest(const RequestPtr request); /** - * @ Add notification to collection - * - * @param ptr Reference to shared pointer that point on hmi notification - */ + * @ Add notification to collection + * + * @param ptr Reference to shared pointer that point on hmi notification + */ void addNotification(const RequestPtr ptr); /** - * @brief Removes request from queue - * - * @param correlation_id Active request correlation ID, - * @param connection_key Active request connection key (0 for HMI requersts) - * @param function_id Active request function id - * @param force_terminate if true, request controller will terminate - * even if not allowed by request - */ + * @brief Removes request from queue + * + * @param correlation_id Active request correlation ID, + * @param connection_key Active request connection key (0 for HMI requersts) + * @param function_id Active request function id + * @param force_terminate if true, request controller will terminate + * even if not allowed by request + */ void TerminateRequest(const uint32_t correlation_id, const uint32_t connection_key, const int32_t function_id, bool force_terminate = false); /** - * @brief Removes request from queue - * - * @param mobile_correlation_id Active mobile request correlation ID - * - */ + * @brief Removes request from queue + * + * @param mobile_correlation_id Active mobile request correlation ID + * + */ void OnMobileResponse(const uint32_t mobile_correlation_id, const uint32_t connection_key, const int32_t function_id); /** - * @brief Removes request from queue - * - * @param mobile_correlation_id Active mobile request correlation ID - * - */ + * @brief Removes request from queue + * + * @param mobile_correlation_id Active mobile request correlation ID + * + */ void OnHMIResponse(const uint32_t correlation_id, const int32_t function_id); /** - * @ Add notification to collection - * - * @param ptr Reference to shared pointer that point on hmi notification - */ + * @ Add notification to collection + * + * @param ptr Reference to shared pointer that point on hmi notification + */ void removeNotification(const commands::Command* notification); /** - * @brief Removes all requests from queue for specified application - * - * @param app_id Mobile application ID (app_id) - * - */ + * @brief Removes all requests from queue for specified application + * + * @param app_id Mobile application ID (app_id) + * + */ void terminateAppRequests(const uint32_t& app_id); /** - * @brief Terminates all requests from HMI - */ + * @brief Terminates all requests from HMI + */ void terminateAllHMIRequests(); /** - * @brief Terminates all requests from Mobile - */ + * @brief Terminates all requests from Mobile + */ void terminateAllMobileRequests(); /** - * @brief Updates request timeout - * - * @param app_id Connection key of application - * @param mobile_correlation_id Correlation ID of the mobile request - * @param new_timeout_value New timeout to be set in milliseconds - */ + * @brief Updates request timeout + * + * @param app_id Connection key of application + * @param mobile_correlation_id Correlation ID of the mobile request + * @param new_timeout_value New timeout to be set in milliseconds + */ void updateRequestTimeout(const uint32_t& app_id, const uint32_t& mobile_correlation_id, const uint32_t& new_timeout); @@ -217,13 +217,13 @@ class RequestController { protected: /** - * @brief Timer callback which handles all request timeouts - */ + * @brief Timer callback which handles all request timeouts + */ void TimeoutThread(); /** - * @brief Signal timer condition variable - */ + * @brief Signal timer condition variable + */ void NotifyTimer(); void terminateWaitingForExecutionAppRequests(const uint32_t& app_id); @@ -285,8 +285,8 @@ class RequestController { RequestTracker request_tracker_; /** - * @brief Set of HMI notifications with timeout. - */ + * @brief Set of HMI notifications with timeout. + */ std::list notification_list_; /** diff --git a/src/components/application_manager/include/application_manager/request_info.h b/src/components/application_manager/include/application_manager/request_info.h index be28bad63c..1b140e2108 100644 --- a/src/components/application_manager/include/application_manager/request_info.h +++ b/src/components/application_manager/include/application_manager/request_info.h @@ -29,9 +29,9 @@ * 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. -*/ + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_REQUEST_INFO_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_REQUEST_INFO_H_ @@ -268,9 +268,9 @@ class RequestInfoSet { }; /** -* @brief Structure used in std algorithms to determine amount of request -* during time scale -*/ + * @brief Structure used in std algorithms to determine amount of request + * during time scale + */ struct TimeScale { TimeScale(const date_time::TimeDuration& start, const date_time::TimeDuration& end, diff --git a/src/components/application_manager/include/application_manager/request_tracker.h b/src/components/application_manager/include/application_manager/request_tracker.h index b351e716a7..72d04abf4a 100644 --- a/src/components/application_manager/include/application_manager/request_tracker.h +++ b/src/components/application_manager/include/application_manager/request_tracker.h @@ -1,39 +1,39 @@ /* - * Copyright (c) 2017, 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) + * Copyright (c) 2017, 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. */ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_REQUEST_TRACKER_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_REQUEST_TRACKER_H_ -#include #include +#include #include #include "application_manager/request_controller_settings.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h b/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h index f9a60c862b..0b744eec7f 100644 --- a/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h +++ b/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h @@ -42,7 +42,7 @@ class ApplicationManager; class Application; typedef std::shared_ptr ApplicationSharedPtr; typedef std::shared_ptr ApplicationConstSharedPtr; -} +} // namespace application_manager namespace app_mngr = application_manager; namespace resumption { diff --git a/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h b/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h index e749118140..a70e2453de 100644 --- a/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h +++ b/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h @@ -36,18 +36,18 @@ #include "application_manager/resumption/resume_ctrl.h" #include -#include +#include #include #include -#include +#include +#include "application_manager/application.h" +#include "application_manager/event_engine/event_observer.h" +#include "application_manager/resumption/resumption_data.h" #include "interfaces/HMI_API.h" #include "interfaces/HMI_API_schema.h" #include "interfaces/MOBILE_API_schema.h" -#include "application_manager/event_engine/event_observer.h" #include "smart_objects/smart_object.h" -#include "application_manager/application.h" -#include "application_manager/resumption/resumption_data.h" #include "utils/timer.h" namespace resumption { @@ -322,10 +322,10 @@ class ResumeCtrlImpl : public ResumeCtrl, #endif // BUILD_TESTS private: /** - * @brief Returns Low Voltage signal timestamp - * @return Low Voltage event timestamp if event LOW VOLTAGE event occures - * otherwise 0 - */ + * @brief Returns Low Voltage signal timestamp + * @return Low Voltage event timestamp if event LOW VOLTAGE event occures + * otherwise 0 + */ time_t LowVoltageTime() const; /** diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data.h b/src/components/application_manager/include/application_manager/resumption/resumption_data.h index c2634173a5..7db7a09cb4 100644 --- a/src/components/application_manager/include/application_manager/resumption/resumption_data.h +++ b/src/components/application_manager/include/application_manager/resumption/resumption_data.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_RESUMPTION_RESUMPTION_DATA_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_RESUMPTION_RESUMPTION_DATA_H_ -#include "smart_objects/smart_object.h" #include "application_manager/application.h" #include "application_manager/application_manager.h" +#include "smart_objects/smart_object.h" #include "utils/macro.h" namespace application_manager { diff --git a/src/components/application_manager/include/application_manager/rpc_handler_impl.h b/src/components/application_manager/include/application_manager/rpc_handler_impl.h index e1dc9e6c5d..2909a38cf7 100644 --- a/src/components/application_manager/include/application_manager/rpc_handler_impl.h +++ b/src/components/application_manager/include/application_manager/rpc_handler_impl.h @@ -35,18 +35,18 @@ #include "application_manager/application_manager.h" #include "application_manager/message_helper.h" -#include "application_manager/rpc_handler.h" -#include "application_manager/rpc_service.h" #include "application_manager/mobile_message_handler.h" #include "application_manager/policies/policy_handler_observer.h" +#include "application_manager/rpc_handler.h" +#include "application_manager/rpc_service.h" -#include "protocol_handler/protocol_observer.h" #include "hmi_message_handler/hmi_message_observer.h" #include "hmi_message_handler/hmi_message_sender.h" +#include "protocol_handler/protocol_observer.h" -#include "formatters/formatter_json_rpc.h" -#include "formatters/CFormatterJsonSDLRPCv2.h" #include "formatters/CFormatterJsonSDLRPCv1.h" +#include "formatters/CFormatterJsonSDLRPCv2.h" +#include "formatters/formatter_json_rpc.h" #include "interfaces/HMI_API_schema.h" #include "interfaces/MOBILE_API_schema.h" #ifdef TELEMETRY_MONITOR @@ -56,8 +56,8 @@ #include "interfaces/v4_protocol_v1_2_no_extra.h" #include "interfaces/v4_protocol_v1_2_no_extra_schema.h" -#include "utils/threads/message_loop_thread.h" #include "utils/semantic_version.h" +#include "utils/threads/message_loop_thread.h" namespace application_manager { namespace rpc_handler { @@ -87,7 +87,7 @@ typedef threads::MessageLoopThread > FromMobileQueue; typedef threads::MessageLoopThread > FromHmiQueue; -} +} // namespace impl class RPCHandlerImpl : public RPCHandler, public impl::FromMobileQueue::Handler, diff --git a/src/components/application_manager/include/application_manager/rpc_service_impl.h b/src/components/application_manager/include/application_manager/rpc_service_impl.h index 98aad1a90e..ab71729b3f 100644 --- a/src/components/application_manager/include/application_manager/rpc_service_impl.h +++ b/src/components/application_manager/include/application_manager/rpc_service_impl.h @@ -34,24 +34,24 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_RPC_SERVICE_IMPL_H #include "application_manager/application_manager.h" -#include "application_manager/rpc_service.h" -#include "application_manager/request_controller.h" +#include "application_manager/command_holder_impl.h" #include "application_manager/message_helper.h" -#include "application_manager/usage_statistics.h" #include "application_manager/mobile_message_handler.h" -#include "application_manager/command_holder_impl.h" +#include "application_manager/request_controller.h" +#include "application_manager/rpc_service.h" +#include "application_manager/usage_statistics.h" -#include "formatters/formatter_json_rpc.h" -#include "formatters/CFormatterJsonSDLRPCv2.h" #include "formatters/CFormatterJsonSDLRPCv1.h" +#include "formatters/CFormatterJsonSDLRPCv2.h" +#include "formatters/formatter_json_rpc.h" #include "interfaces/HMI_API_schema.h" #include "interfaces/MOBILE_API_schema.h" #include "interfaces/v4_protocol_v1_2_no_extra.h" #include "interfaces/v4_protocol_v1_2_no_extra_schema.h" -#include "utils/threads/message_loop_thread.h" #include "utils/logger.h" +#include "utils/threads/message_loop_thread.h" namespace application_manager { namespace rpc_service { @@ -85,7 +85,7 @@ typedef threads::MessageLoopThread > ToMobileQueue; typedef threads::MessageLoopThread > ToHmiQueue; -} +} // namespace impl class RPCServiceImpl : public RPCService, public impl::ToMobileQueue::Handler, diff --git a/src/components/application_manager/include/application_manager/smart_object_keys.h b/src/components/application_manager/include/application_manager/smart_object_keys.h index 67c849c8fc..c5c50e5da1 100644 --- a/src/components/application_manager/include/application_manager/smart_object_keys.h +++ b/src/components/application_manager/include/application_manager/smart_object_keys.h @@ -452,7 +452,7 @@ extern const char* instance_follow_redirect; extern const char* charset; extern const char* content_lenght; extern const char* GET; -} // http_request +} // namespace http_request namespace mobile_notification { extern const char* state; diff --git a/src/components/application_manager/include/application_manager/state_controller_impl.h b/src/components/application_manager/include/application_manager/state_controller_impl.h index 8270e9b807..f3b2966fca 100644 --- a/src/components/application_manager/include/application_manager/state_controller_impl.h +++ b/src/components/application_manager/include/application_manager/state_controller_impl.h @@ -35,15 +35,15 @@ #include #include -#include "application_manager/hmi_state.h" #include "application_manager/application.h" #include "application_manager/application_manager.h" -#include "event_engine/event_observer.h" -#include "application_manager/state_controller.h" +#include "application_manager/hmi_state.h" #include "application_manager/message_helper.h" +#include "application_manager/state_controller.h" +#include "event_engine/event_observer.h" #include "interfaces/MOBILE_API.h" -#include "utils/lock.h" #include "utils/helpers.h" +#include "utils/lock.h" namespace application_manager { @@ -452,6 +452,6 @@ class StateControllerImpl : public event_engine::EventObserver, std::map waiting_for_activate_; ApplicationManager& app_mngr_; }; -} +} // namespace application_manager #endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_STATE_CONTROLLER_IMPL_H_ diff --git a/src/components/application_manager/include/application_manager/system_time/system_time_handler_impl.h b/src/components/application_manager/include/application_manager/system_time/system_time_handler_impl.h index 05565861f6..46aa98e6c1 100644 --- a/src/components/application_manager/include/application_manager/system_time/system_time_handler_impl.h +++ b/src/components/application_manager/include/application_manager/system_time/system_time_handler_impl.h @@ -36,11 +36,11 @@ #include #include +#include "application_manager/application_manager.h" +#include "application_manager/event_engine/event_observer.h" #include "utils/lock.h" #include "utils/macro.h" #include "utils/system_time_handler.h" -#include "application_manager/application_manager.h" -#include "application_manager/event_engine/event_observer.h" namespace application_manager { diff --git a/src/components/application_manager/include/application_manager/telemetry_observer.h b/src/components/application_manager/include/application_manager/telemetry_observer.h index 49f15165db..afd5397db9 100644 --- a/src/components/application_manager/include/application_manager/telemetry_observer.h +++ b/src/components/application_manager/include/application_manager/telemetry_observer.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_TELEMETRY_OBSERVER_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_TELEMETRY_OBSERVER_H_ -#include "smart_objects/smart_object.h" #include "application_manager/smart_object_keys.h" #include "json/json.h" +#include "smart_objects/smart_object.h" #include "utils/date_time.h" @@ -53,5 +53,5 @@ class AMTelemetryObserver { virtual void OnMessage(MessageMetricSharedPtr) = 0; virtual ~AMTelemetryObserver() {} }; -} // application_manager +} // namespace application_manager #endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_TELEMETRY_OBSERVER_H_ diff --git a/src/components/application_manager/include/application_manager/usage_statistics.h b/src/components/application_manager/include/application_manager/usage_statistics.h index 6d0b5cd6bd..ebd8e4729b 100644 --- a/src/components/application_manager/include/application_manager/usage_statistics.h +++ b/src/components/application_manager/include/application_manager/usage_statistics.h @@ -33,10 +33,10 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_USAGE_STATISTICS_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_USAGE_STATISTICS_H_ -#include #include -#include "policy/usage_statistics/counter.h" +#include #include "policy/usage_statistics/app_stopwatch.h" +#include "policy/usage_statistics/counter.h" #include "utils/macro.h" #include "interfaces/MOBILE_API.h" diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_app_extension.h b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_app_extension.h index 9be93f5c9e..b04edbe2f4 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_app_extension.h +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_app_extension.h @@ -126,6 +126,6 @@ class AppServiceAppExtension : public app_mngr::AppExtension { AppServiceRpcPlugin& plugin_; app_mngr::Application& app_; }; -} +} // namespace app_service_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_APP_SERVICE_PLUGIN_INCLUDE_APP_SERVICE_PLUGIN_APP_SERVICE_APP_EXTENSION_H diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_app_extension.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_app_extension.cc index 6d8b0c08cc..91d57cb952 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_app_extension.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_app_extension.cc @@ -119,4 +119,4 @@ AppServiceAppExtension& AppServiceAppExtension::ExtractASExtension( DCHECK(vi_app_extension); return *vi_app_extension; } -} +} // namespace app_service_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_command_factory.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_command_factory.cc index f0a0698bb7..8ce4d10b6e 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_command_factory.cc @@ -74,4 +74,4 @@ bool AppServiceCommandFactory::IsAbleToProcess( ? hmi_command_factory_->IsAbleToProcess(function_id, source) : mobile_command_factory_->IsAbleToProcess(function_id, source); } -} // namespace service_plugin +} // namespace app_service_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_hmi_command_factory.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_hmi_command_factory.cc index 7cfbdd22d0..1cec2ccdce 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_hmi_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_hmi_command_factory.cc @@ -106,9 +106,9 @@ bool AppServiceHmiCommandFactory::IsAbleToProcess( LOG4CXX_DEBUG(logger_, "HMI App Service Plugin IsAbleToProcess: " << function_id); UNUSED(source); - return buildCommandCreator(function_id, - hmi_apis::messageType::INVALID_ENUM, - source).CanBeCreated(); + return buildCommandCreator( + function_id, hmi_apis::messageType::INVALID_ENUM, source) + .CanBeCreated(); } app_mngr::CommandCreator& AppServiceHmiCommandFactory::buildCommandCreator( @@ -188,4 +188,4 @@ app_mngr::CommandCreator& AppServiceHmiCommandFactory::buildCommandCreator( } return factory.GetCreator(); } -} +} // namespace app_service_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_mobile_command_factory.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_mobile_command_factory.cc index 4b4da5e3e9..7a62f7a4c7 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_mobile_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_mobile_command_factory.cc @@ -97,9 +97,9 @@ bool AppServiceMobileCommandFactory::IsAbleToProcess( const int32_t function_id, const app_mngr::commands::Command::CommandSource source) const { UNUSED(source); - return buildCommandCreator(function_id, - mobile_apis::messageType::INVALID_ENUM, - source).CanBeCreated(); + return buildCommandCreator( + function_id, mobile_apis::messageType::INVALID_ENUM, source) + .CanBeCreated(); } app_mngr::CommandCreator& AppServiceMobileCommandFactory::buildCommandCreator( @@ -156,4 +156,4 @@ app_mngr::CommandCreator& AppServiceMobileCommandFactory::buildCommandCreator( } return factory.GetCreator(); } -} // namespace vehicle_info_plugin +} // namespace app_service_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_rpc_plugin.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_rpc_plugin.cc index b96e5c199d..3b1b0715d4 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_rpc_plugin.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_rpc_plugin.cc @@ -30,12 +30,12 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/message_helper.h" -#include "application_manager/smart_object_keys.h" +#include "app_service_rpc_plugin/app_service_rpc_plugin.h" #include "app_service_rpc_plugin/app_service_app_extension.h" #include "app_service_rpc_plugin/app_service_command_factory.h" -#include "app_service_rpc_plugin/app_service_rpc_plugin.h" +#include "application_manager/message_helper.h" #include "application_manager/plugin_manager/plugin_keys.h" +#include "application_manager/smart_object_keys.h" namespace app_service_rpc_plugin { CREATE_LOGGERPTR_GLOBAL(logger_, "AppServiceRpcPlugin") diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/on_as_app_service_data_notification_from_hmi.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/on_as_app_service_data_notification_from_hmi.cc index 575aa5ca28..1c73fc73f4 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/on_as_app_service_data_notification_from_hmi.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/on_as_app_service_data_notification_from_hmi.cc @@ -59,7 +59,8 @@ void OnASAppServiceDataNotificationFromHMI::Run() { std::string service_id = (*message_)[strings::msg_params][strings::service_data] - [strings::service_id].asString(); + [strings::service_id] + .asString(); AppService* service = application_manager_.GetAppServiceManager().FindServiceByID(service_id); if (!service) { @@ -76,7 +77,8 @@ void OnASAppServiceDataNotificationFromHMI::Run() { std::string service_type = (*message_)[strings::msg_params][strings::service_data] - [strings::service_type].asString(); + [strings::service_type] + .asString(); std::string published_service_type = service->record[strings::service_manifest][strings::service_type] .asString(); diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/on_app_service_data_notification.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/on_app_service_data_notification.cc index fd3891e0e8..1ffe99462d 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/on_app_service_data_notification.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/on_app_service_data_notification.cc @@ -66,15 +66,18 @@ void OnAppServiceDataNotification::Run() { std::string service_id = (*message_)[strings::msg_params][strings::service_data] - [strings::service_id].asString(); + [strings::service_id] + .asString(); auto service = application_manager_.GetAppServiceManager().FindServiceByID(service_id); if (!service) { LOG4CXX_ERROR(logger_, "Service sending OnAppServiceData is not published"); return; - } else if (!service->record[strings::service_manifest] - [strings::allow_app_consumers].asBool()) { + } else if (!service + ->record[strings::service_manifest] + [strings::allow_app_consumers] + .asBool()) { LOG4CXX_ERROR(logger_, "Service does not allow for app consumers, skipping mobile " "OnAppServiceData notification"); @@ -83,7 +86,8 @@ void OnAppServiceDataNotification::Run() { std::string service_type = (*message_)[strings::msg_params][strings::service_data] - [strings::service_type].asString(); + [strings::service_type] + .asString(); auto subscribed_to_app_service_predicate = [service_type](const ApplicationSharedPtr app) { diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/on_app_service_data_notification_from_mobile.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/on_app_service_data_notification_from_mobile.cc index 2e92bd19bb..5caacc9801 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/on_app_service_data_notification_from_mobile.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/on_app_service_data_notification_from_mobile.cc @@ -64,7 +64,8 @@ void OnAppServiceDataNotificationFromMobile::Run() { uint32_t app_connection_key = connection_key(); std::string service_type = (*message_)[strings::msg_params][strings::service_data] - [strings::service_type].asString(); + [strings::service_type] + .asString(); ApplicationSharedPtr app = application_manager_.application(app_connection_key); @@ -81,7 +82,8 @@ void OnAppServiceDataNotificationFromMobile::Run() { std::string service_id = (*message_)[strings::msg_params][strings::service_data] - [strings::service_id].asString(); + [strings::service_id] + .asString(); AppService* service = application_manager_.GetAppServiceManager().FindServiceByID(service_id); if (!service) { diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc index 86819b44ad..c168b4bf2f 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/publish_app_service_request.cc @@ -75,19 +75,22 @@ void PublishAppServiceRequest::Run() { strings::service_name)) { requested_service_name = (*message_)[strings::msg_params][strings::app_service_manifest] - [strings::service_name].asString(); + [strings::service_name] + .asString(); } std::string requested_service_type = (*message_)[strings::msg_params][strings::app_service_manifest] - [strings::service_type].asString(); + [strings::service_type] + .asString(); smart_objects::SmartArray* requested_handled_rpcs = NULL; if ((*message_)[strings::msg_params][strings::app_service_manifest].keyExists( strings::handled_rpcs)) { requested_handled_rpcs = (*message_)[strings::msg_params][strings::app_service_manifest] - [strings::handled_rpcs].asArray(); + [strings::handled_rpcs] + .asArray(); } bool result = diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc index 8ef87b6de9..f64f353767 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc @@ -72,16 +72,16 @@ namespace dummy_hmi_commands_test { namespace commands = app_service_rpc_plugin::commands; -using ::testing::_; -using ::testing::NotNull; -using ::testing::Types; +using ::application_manager::ApplicationSharedPtr; using application_manager::commands::MessageSharedPtr; -using ::test::components::event_engine_test::MockEventDispatcher; +using ::test::components::application_manager_test::MockApplication; using ::test::components::application_manager_test::MockApplicationManager; using ::test::components::application_manager_test:: MockApplicationManagerSettings; -using ::application_manager::ApplicationSharedPtr; -using ::test::components::application_manager_test::MockApplication; +using ::test::components::event_engine_test::MockEventDispatcher; +using ::testing::_; +using ::testing::NotNull; +using ::testing::Types; template class HMICommandsTest : public components::commands_test::CommandRequestTest< diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/commands/mobile/dummy_mobile_commands_test.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/commands/mobile/dummy_mobile_commands_test.cc index 3c8a780128..e77b21ca6d 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/commands/mobile/dummy_mobile_commands_test.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/commands/mobile/dummy_mobile_commands_test.cc @@ -52,8 +52,8 @@ #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "test/application_manager/mock_application_manager_settings.h" #include "application_manager/mock_event_dispatcher.h" +#include "test/application_manager/mock_application_manager_settings.h" namespace am = application_manager; @@ -64,16 +64,16 @@ namespace mobile_commands_test { namespace dummy_mobile_commands_test { namespace commands = app_service_rpc_plugin::commands; -using ::testing::_; -using ::testing::NotNull; -using ::testing::Types; using am::commands::MessageSharedPtr; -using ::test::components::event_engine_test::MockEventDispatcher; +using ::application_manager::ApplicationSharedPtr; +using ::test::components::application_manager_test::MockApplication; using ::test::components::application_manager_test::MockApplicationManager; using ::test::components::application_manager_test:: MockApplicationManagerSettings; -using ::application_manager::ApplicationSharedPtr; -using ::test::components::application_manager_test::MockApplication; +using ::test::components::event_engine_test::MockEventDispatcher; +using ::testing::_; +using ::testing::NotNull; +using ::testing::Types; namespace { const std::string kEmptyString_ = ""; @@ -118,7 +118,8 @@ typedef Types MobileCommandsListFirst; + commands::PublishAppServiceResponse> + MobileCommandsListFirst; TYPED_TEST_CASE(MobileCommandsTestFirst, MobileCommandsListFirst); diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/commands/mobile/on_app_service_data_notification_test.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/commands/mobile/on_app_service_data_notification_test.cc index 47358ef631..3e88d4eaf3 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/commands/mobile/on_app_service_data_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/commands/mobile/on_app_service_data_notification_test.cc @@ -30,41 +30,41 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/application.h" -#include "application_manager/mock_application.h" -#include "application_manager/mock_app_service_manager.h" -#include "application_manager/commands/commands_test.h" #include "app_service_rpc_plugin/commands/mobile/on_app_service_data_notification.h" -#include "app_service_rpc_plugin/app_service_rpc_plugin.h" #include "app_service_rpc_plugin/app_service_app_extension.h" +#include "app_service_rpc_plugin/app_service_rpc_plugin.h" +#include "application_manager/application.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/mock_app_service_manager.h" +#include "application_manager/mock_application.h" #include "gtest/gtest.h" #include "interfaces/MOBILE_API.h" -#include "application_manager/commands/command_impl.h" #include "resumption/last_state_impl.h" namespace am = application_manager; -using ::testing::_; -using ::testing::Return; -using ::testing::ReturnRef; -using ::testing::ReturnNull; -using ::testing::NiceMock; -using ::testing::SaveArg; -using ::testing::Mock; using am::ApplicationSet; using am::commands::MessageSharedPtr; +using app_service_rpc_plugin::commands::OnAppServiceDataNotification; using test::components::application_manager_test::MockApplication; using test::components::application_manager_test::MockApplicationManager; using test::components::application_manager_test::MockAppServiceManager; using test::components::commands_test::CommandsTest; using test::components::commands_test::CommandsTestMocks; -using app_service_rpc_plugin::commands::OnAppServiceDataNotification; +using ::testing::_; +using ::testing::Mock; +using ::testing::NiceMock; +using ::testing::Return; +using ::testing::ReturnNull; +using ::testing::ReturnRef; +using ::testing::SaveArg; namespace { const uint32_t kAppId = 0u; const uint32_t kConnectionKey = 1u; const std::string kPolicyAppId = "Test"; const int kModuleId = 153u; -} +} // namespace namespace app_service_plugin_test { using namespace app_service_rpc_plugin; @@ -214,4 +214,4 @@ TEST_F(OnAppServiceDataNotificationTest, Run_NoSubscribedApps) { Mock::VerifyAndClearExpectations(&app_mngr_); } -} // namespace rc_rpc_plugin_test +} // namespace app_service_plugin_test diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_button_press_request.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_button_press_request.h index 3bc34be8d1..08082d98bb 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_button_press_request.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_button_press_request.h @@ -35,8 +35,8 @@ #include "application_manager/commands/request_to_hmi.h" #include "rc_rpc_plugin/commands/rc_command_request.h" -#include "rc_rpc_plugin/resource_allocation_manager.h" #include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" #include "utils/macro.h" namespace rc_rpc_plugin { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_button_press_response.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_button_press_response.h index 939d5fa468..5ed2236d9c 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_button_press_response.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_button_press_response.h @@ -35,8 +35,8 @@ #include "application_manager/commands/response_from_hmi.h" #include "rc_rpc_plugin/commands/rc_command_request.h" -#include "rc_rpc_plugin/resource_allocation_manager.h" #include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" #include "utils/macro.h" namespace rc_rpc_plugin { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_consent_request.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_consent_request.h index 97df5e8390..9a6cf9e290 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_consent_request.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_consent_request.h @@ -1,42 +1,42 @@ /* -* Copyright (c) 2018, 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. -*/ + * Copyright (c) 2018, 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. + */ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_HMI_RC_GET_INTERIOR_VEHICLE_DATA_CONSENT_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_HMI_RC_GET_INTERIOR_VEHICLE_DATA_CONSENT_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" #include "rc_rpc_plugin/commands/rc_command_request.h" -#include "rc_rpc_plugin/resource_allocation_manager.h" #include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" #include "utils/macro.h" namespace rc_rpc_plugin { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_consent_response.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_consent_response.h index 46232987a5..677e3ad1f0 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_consent_response.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_consent_response.h @@ -35,8 +35,8 @@ #include "application_manager/commands/response_from_hmi.h" #include "rc_rpc_plugin/commands/rc_command_request.h" -#include "rc_rpc_plugin/resource_allocation_manager.h" #include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" #include "utils/macro.h" namespace rc_rpc_plugin { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_request.h index a88a39aa7a..a75020956c 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_request.h @@ -35,8 +35,8 @@ #include "application_manager/commands/request_to_hmi.h" #include "rc_rpc_plugin/commands/rc_command_request.h" -#include "rc_rpc_plugin/resource_allocation_manager.h" #include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" #include "utils/macro.h" namespace rc_rpc_plugin { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_response.h index c9e5d39d1d..059164dc9f 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_response.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_response.h @@ -35,8 +35,8 @@ #include "application_manager/commands/response_from_hmi.h" #include "rc_rpc_plugin/commands/rc_command_request.h" -#include "rc_rpc_plugin/resource_allocation_manager.h" #include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" #include "utils/macro.h" namespace rc_rpc_plugin { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_on_interior_vehicle_data_notification.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_on_interior_vehicle_data_notification.h index aeb0a06d22..2a15f3816a 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_on_interior_vehicle_data_notification.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_on_interior_vehicle_data_notification.h @@ -35,8 +35,8 @@ #include "application_manager/commands/notification_from_hmi.h" #include "rc_rpc_plugin/commands/rc_command_request.h" -#include "rc_rpc_plugin/resource_allocation_manager.h" #include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" #include "utils/macro.h" namespace rc_rpc_plugin { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_set_interior_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_set_interior_vehicle_data_request.h index 69b48bfecf..aeba2f1440 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_set_interior_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_set_interior_vehicle_data_request.h @@ -35,8 +35,8 @@ #include "application_manager/commands/request_to_hmi.h" #include "rc_rpc_plugin/commands/rc_command_request.h" -#include "rc_rpc_plugin/resource_allocation_manager.h" #include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" #include "utils/macro.h" namespace rc_rpc_plugin { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_set_interior_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_set_interior_vehicle_data_response.h index 8a63503220..8369941c30 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_set_interior_vehicle_data_response.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_set_interior_vehicle_data_response.h @@ -35,8 +35,8 @@ #include "application_manager/commands/response_from_hmi.h" #include "rc_rpc_plugin/commands/rc_command_request.h" -#include "rc_rpc_plugin/resource_allocation_manager.h" #include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" #include "utils/macro.h" namespace rc_rpc_plugin { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/button_press_response.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/button_press_response.h index 0f3964494e..69122c19f3 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/button_press_response.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/button_press_response.h @@ -34,9 +34,9 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_MOBILE_BUTTON_PRESS_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" -#include "rc_rpc_plugin/resource_allocation_manager.h" #include "rc_rpc_plugin/commands/rc_command_request.h" #include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" #include "utils/macro.h" namespace rc_rpc_plugin { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_request.h index 01588cc6b7..cfb5e72c95 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_request.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_MOBILE_GET_INTERIOR_VEHICLE_DATA_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_MOBILE_GET_INTERIOR_VEHICLE_DATA_REQUEST_H_ -#include "rc_rpc_plugin/commands/rc_command_request.h" #include +#include "rc_rpc_plugin/commands/rc_command_request.h" namespace rc_rpc_plugin { namespace app_mngr = application_manager; @@ -76,9 +76,9 @@ class GetInteriorVehicleDataRequest : public RCCommandRequest { bool HasRequestExcessiveSubscription(); /** - * @brief Handle subscription to vehicle data - * @param hmi_response json message with response from HMI - */ + * @brief Handle subscription to vehicle data + * @param hmi_response json message with response from HMI + */ void ProccessSubscription(const smart_objects::SmartObject& hmi_response); /** diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_response.h index bf8208edc2..58dac85633 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_response.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_response.h @@ -35,8 +35,8 @@ #include "application_manager/commands/command_response_impl.h" #include "rc_rpc_plugin/commands/rc_command_request.h" -#include "rc_rpc_plugin/resource_allocation_manager.h" #include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" #include "utils/macro.h" namespace rc_rpc_plugin { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/on_interior_vehicle_data_notification.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/on_interior_vehicle_data_notification.h index 931e79366c..2a7362510d 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/on_interior_vehicle_data_notification.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/on_interior_vehicle_data_notification.h @@ -35,9 +35,9 @@ #include #include "application_manager/commands/command_notification_impl.h" -#include "rc_rpc_plugin/resource_allocation_manager.h" -#include "rc_rpc_plugin/interior_data_cache.h" #include "rc_rpc_plugin/commands/rc_command_request.h" +#include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" #include "utils/macro.h" namespace rc_rpc_plugin { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_response.h index 1ab5ccc6bc..f54418fc08 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_response.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_response.h @@ -34,9 +34,9 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_MOBILE_SET_INTERIOR_VEHICLE_DATA_RESPONSE_H_ #include "application_manager/commands/command_response_impl.h" -#include "rc_rpc_plugin/resource_allocation_manager.h" -#include "rc_rpc_plugin/interior_data_cache.h" #include "rc_rpc_plugin/commands/rc_command_request.h" +#include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" #include "utils/macro.h" namespace rc_rpc_plugin { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/rc_command_params.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/rc_command_params.h index 8e7ed9c667..0ca7789791 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/rc_command_params.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/rc_command_params.h @@ -39,7 +39,7 @@ namespace rpc_service { class RPCService; } class HMICapabilities; -} +} // namespace application_manager namespace policy { class PolicyHandlerInterface; @@ -60,5 +60,5 @@ struct RCCommandParams { rc_rpc_plugin::InteriorDataCache& interior_data_cache_; rc_rpc_plugin::InteriorDataManager& interior_data_manager_; }; -} +} // namespace rc_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_RC_COMMAND_PARAMS_H_ diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/rc_command_request.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/rc_command_request.h index ce95617b6c..b4e34c083e 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/rc_command_request.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/rc_command_request.h @@ -33,11 +33,11 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_RC_COMMAND_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_RC_COMMAND_REQUEST_H_ -#include "rc_rpc_plugin/resource_allocation_manager.h" -#include "rc_rpc_plugin/rc_app_extension.h" #include "application_manager/commands/command_request_impl.h" -#include "rc_rpc_plugin/interior_data_cache.h" #include "rc_rpc_plugin/commands/rc_command_params.h" +#include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/rc_app_extension.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" namespace rc_rpc_plugin { namespace app_mngr = application_manager; @@ -166,7 +166,7 @@ class RCCommandRequest : public app_mngr::commands::CommandRequestImpl { std::string disallowed_info_; }; -} -} +} // namespace commands +} // namespace rc_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_RC_COMMAND_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_cache.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_cache.h index bb45247fae..c7dda761bf 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_cache.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_cache.h @@ -81,6 +81,6 @@ class InteriorDataCache { */ virtual void Clear() = 0; }; -} // rc_rpc_plugin +} // namespace rc_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_INTERIOR_DATA_CACHE_H_ diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_cache_impl.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_cache_impl.h index f2971e3d72..b40ce4eb4b 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_cache_impl.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_cache_impl.h @@ -35,9 +35,9 @@ #include -#include "utils/macro.h" -#include "utils/lock.h" #include "rc_rpc_plugin/interior_data_cache.h" +#include "utils/lock.h" +#include "utils/macro.h" namespace rc_rpc_plugin { class InteriorDataCacheImpl : public InteriorDataCache { @@ -59,6 +59,6 @@ class InteriorDataCacheImpl : public InteriorDataCache { mutable sync_primitives::Lock cached_data_lock_; }; -} // rc_rpc_plugin +} // namespace rc_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_INTERIOR_DATA_CACHE_IMPL_H_ diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager.h index f28c388055..157e031869 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager.h @@ -50,10 +50,10 @@ class InteriorDataManager { virtual void OnPolicyEvent(app_mngr::plugin_manager::PolicyEvent event) = 0; /** - * @brief OnApplicationEvent Notifies modules on certain application events - * @param event Event - * @param application Pointer to application struct - */ + * @brief OnApplicationEvent Notifies modules on certain application events + * @param event Event + * @param application Pointer to application struct + */ virtual void OnApplicationEvent( plugins::ApplicationEvent event, app_mngr::ApplicationSharedPtr application) = 0; @@ -71,13 +71,13 @@ class InteriorDataManager { virtual void StoreRequestToHMITime(const std::string& module_type) = 0; /** - * @brief CheckRequestsToHMIFrequency check that rate limits are not allowed of - * bounce during current time frame. - * calculate amount of requests per module type in time frame and checks if it - * bigger then allowed by ini file - * @param module_type moduletype to calculate frequency on - * @return true if amount of requests was not exceeded, otherwise return false. - */ + * @brief CheckRequestsToHMIFrequency check that rate limits are not allowed + * of bounce during current time frame. calculate amount of requests per + * module type in time frame and checks if it bigger then allowed by ini file + * @param module_type moduletype to calculate frequency on + * @return true if amount of requests was not exceeded, otherwise return + * false. + */ virtual bool CheckRequestsToHMIFrequency(const std::string& module_type) = 0; }; diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager_impl.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager_impl.h index 9b16a2c4da..b98ba596fb 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager_impl.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager_impl.h @@ -40,7 +40,7 @@ class ApplicationManager; namespace rpc_service { class RPCService; } -} +} // namespace application_manager namespace rc_rpc_plugin { class InteriorDataCache; @@ -94,7 +94,8 @@ class InteriorDataManagerImpl : public InteriorDataManager { * @brief AppsModules mapping from applications to list of modules */ typedef std::map > AppsModules; + std::vector > + AppsModules; /** * @brief AppsSubscribedModules get mapping of application to list of diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_app_extension.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_app_extension.h index e36968fc4b..36fe9f5bdb 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_app_extension.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_app_extension.h @@ -33,11 +33,11 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_RC_APP_EXTENSION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_RC_APP_EXTENSION_H_ -#include -#include #include -#include "utils/macro.h" +#include +#include #include "application_manager/app_extension.h" +#include "utils/macro.h" namespace rc_rpc_plugin { class RCAppExtension : public application_manager::AppExtension { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_command_factory.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_command_factory.h index 56be342b56..0cae8dd4de 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_command_factory.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_command_factory.h @@ -34,15 +34,14 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_RC_COMMAND_FACTORY_H_ #include -#include "application_manager/command_factory.h" #include "application_manager/application_manager.h" #include "application_manager/command_factory.h" -#include "application_manager/rpc_service.h" #include "application_manager/hmi_capabilities.h" #include "application_manager/policies/policy_handler_interface.h" -#include "rc_rpc_plugin/resource_allocation_manager.h" -#include "rc_rpc_plugin/interior_data_cache.h" +#include "application_manager/rpc_service.h" #include "rc_rpc_plugin/commands/rc_command_params.h" +#include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" #include "utils/macro.h" namespace rc_rpc_plugin { @@ -64,10 +63,10 @@ class RCCommandFactory : public application_manager::CommandFactory { app_mngr::commands::Command::CommandSource source) OVERRIDE; /** - * @param int32_t command id - * @param CommandSource source - * @return return true if command can be create, else return false - **/ + * @param int32_t command id + * @param CommandSource source + * @return return true if command can be create, else return false + **/ virtual bool IsAbleToProcess( const int32_t, const application_manager::commands::Command::CommandSource) diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_helpers.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_helpers.h index cf3c6cd5e4..cd87ad326e 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_helpers.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_helpers.h @@ -49,18 +49,18 @@ class RCRPCPlugin; class RCHelpers { public: /** - * @brief GetModuleTypeToDataMapping get mapping of module type enum naming to - * actual module data filed name - * @return module mapping from enum naming to filed name - */ + * @brief GetModuleTypeToDataMapping get mapping of module type enum naming to + * actual module data filed name + * @return module mapping from enum naming to filed name + */ static const std::function GetModuleTypeToDataMapping(); /** - * @brief GetModuleTypeToDataMapping get mapping of module type enum naming to - * actual module capabilities key - * @return module mapping from enum naming to capabilities key - */ + * @brief GetModuleTypeToDataMapping get mapping of module type enum naming to + * actual module capabilities key + * @return module mapping from enum naming to capabilities key + */ static const std::function GetModuleTypeToCapabilitiesMapping(); @@ -87,10 +87,11 @@ class RCHelpers { const std::string& module_type); typedef std::map > AppsModules; + std::vector > + AppsModules; static AppsModules GetApplicationsAllowedModules( application_manager::ApplicationManager& app_mngr); }; -} // rc_rpc_plugin +} // namespace rc_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_RC_HELPERS_H_ diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h index 18014e6270..92ff7e5f01 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h @@ -58,7 +58,7 @@ const char kRGBColorSpaceAvailable[] = "rgbColorSpaceAvailable"; // RadioControlCapabilities const char kSiriusxmRadioAvailable[] = "siriusxmRadioAvailable"; -} // strings +} // namespace strings namespace result_codes { const char kSuccess[] = "SUCCESS"; @@ -84,7 +84,7 @@ const char kWrongLanguage[] = "WRONG_LANGUAGE"; const char kGenericError[] = "GENERIC_ERROR"; const char kUserDisallowed[] = "USER_DISALLOWED"; const char kReadOnly[] = "READ_ONLY"; -} // result_codes +} // namespace result_codes namespace json_keys { const char kParams[] = "params"; @@ -100,7 +100,7 @@ const char kMessage[] = "message"; const char kData[] = "data"; const char kAppId[] = "appID"; const char kCode[] = "code"; -} // json_keys +} // namespace json_keys namespace message_params { const char kName[] = "name"; @@ -274,6 +274,6 @@ const char kAskDriver[] = "ASK_DRIVER"; } // namespace enums_value -} // namespace remote_control +} // namespace rc_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_RC_MODULE_CONSTANTS_H_ diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_plugin.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_plugin.h index ae88ed9cc0..303b31f857 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_plugin.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_plugin.h @@ -35,11 +35,11 @@ #include -#include "application_manager/plugin_manager/rpc_plugin.h" #include "application_manager/command_factory.h" -#include "rc_rpc_plugin/resource_allocation_manager.h" +#include "application_manager/plugin_manager/rpc_plugin.h" #include "rc_rpc_plugin/interior_data_cache.h" #include "rc_rpc_plugin/interior_data_manager.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" namespace rc_rpc_plugin { namespace plugins = application_manager::plugin_manager; @@ -48,22 +48,22 @@ namespace app_mngr = application_manager; class RCRPCPlugin : public plugins::RPCPlugin { public: /** - * @brief Command initialization function - * @param app_manager ApplicationManager - * @param rpc_service RPCService - * @param hmi_capabilities HMICapabilities - * @param policy_handler PolicyHandlerInterface - * @return true in case initialization was succesful, false otherwise. - **/ + * @brief Command initialization function + * @param app_manager ApplicationManager + * @param rpc_service RPCService + * @param hmi_capabilities HMICapabilities + * @param policy_handler PolicyHandlerInterface + * @return true in case initialization was succesful, false otherwise. + **/ bool Init(app_mngr::ApplicationManager& app_manager, app_mngr::rpc_service::RPCService& rpc_service, app_mngr::HMICapabilities& hmi_capabilities, policy::PolicyHandlerInterface& policy_handler) OVERRIDE; /** - * @param int32_t command id - * @param CommandSource source - * @return return true if command can be create, else return false - **/ + * @param int32_t command id + * @param CommandSource source + * @return return true if command can be create, else return false + **/ bool IsAbleToProcess( const int32_t function_id, const app_mngr::commands::Command::CommandSource message_source) OVERRIDE; @@ -85,10 +85,10 @@ class RCRPCPlugin : public plugins::RPCPlugin { */ void OnPolicyEvent(app_mngr::plugin_manager::PolicyEvent event) OVERRIDE; /** - * @brief OnApplicationEvent Notifies modules on certain application events - * @param event Event - * @param application Pointer to application struct - */ + * @brief OnApplicationEvent Notifies modules on certain application events + * @param event Event + * @param application Pointer to application struct + */ void OnApplicationEvent(plugins::ApplicationEvent event, app_mngr::ApplicationSharedPtr application) OVERRIDE; diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h index 67598b667b..6dfc794648 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h @@ -35,8 +35,8 @@ #include #include "utils/macro.h" -#include "interfaces/HMI_API.h" #include "application_manager/plugin_manager/rpc_plugin.h" +#include "interfaces/HMI_API.h" #include "rc_rpc_plugin/rc_app_extension.h" namespace rc_rpc_plugin { @@ -66,7 +66,7 @@ namespace NotificationTrigger { * MODULE_ALLOCATION module allocation/deallocation event */ enum eType { APP_REGISTRATION = 0, MODULE_ALLOCATION, RC_STATE_CHANGING }; -} +} // namespace NotificationTrigger /** * @brief Resources defines list of resources diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h index b359ee4d29..c0ef971235 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h @@ -32,11 +32,11 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_RESOURCE_ALLOCATION_MANAGER_IMPL_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_RESOURCE_ALLOCATION_MANAGER_IMPL_H_ -#include "rc_rpc_plugin/resource_allocation_manager.h" #include "application_manager/application_impl.h" #include "rc_rpc_plugin/rc_app_extension.h" -#include "utils/macro.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" #include "utils/lock.h" +#include "utils/macro.h" namespace rc_rpc_plugin { @@ -67,12 +67,12 @@ class ResourceAllocationManagerImpl : public ResourceAllocationManager { const uint32_t app_id) FINAL; /** - * @brief SetResourceState changes resource state. Resource must be acquired - * beforehand. - * @param module_type Resource to change its state - * @param app_id Application aquired resource before - * @param state State to set for resource - */ + * @brief SetResourceState changes resource state. Resource must be acquired + * beforehand. + * @param module_type Resource to change its state + * @param app_id Application aquired resource before + * @param state State to set for resource + */ void SetResourceState(const std::string& module_type, const uint32_t app_id, const ResourceState::eType state) FINAL; @@ -219,6 +219,6 @@ class ResourceAllocationManagerImpl : public ResourceAllocationManager { application_manager::rpc_service::RPCService& rpc_service_; bool is_rc_enabled_; }; -} // rc_rpc_plugin +} // namespace rc_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_RESOURCE_ALLOCATION_MANAGER_IMPL_H_ diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_get_interior_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_get_interior_vehicle_data_response.cc index e56f9088bc..a366aa65fa 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_get_interior_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_get_interior_vehicle_data_response.cc @@ -31,8 +31,8 @@ */ #include "rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_response.h" -#include "rc_rpc_plugin/rc_module_constants.h" #include "application_manager/event_engine/event.h" +#include "rc_rpc_plugin/rc_module_constants.h" namespace rc_rpc_plugin { namespace commands { @@ -53,8 +53,9 @@ void RCGetInteriorVehicleDataResponse::Run() { app_mngr::event_engine::Event event( hmi_apis::FunctionID::RC_GetInteriorVehicleData); - smart_objects::SmartObject& module_data = (*message_) - [application_manager::strings::msg_params][message_params::kModuleData]; + smart_objects::SmartObject& module_data = + (*message_)[application_manager::strings::msg_params] + [message_params::kModuleData]; if (module_data.keyExists(message_params::kAudioControlData)) { smart_objects::SmartObject& audio_control_data = module_data[message_params::kAudioControlData]; diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_interior_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_interior_vehicle_data_notification.cc index 0117003f11..c6cf1b0d5a 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_interior_vehicle_data_notification.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_interior_vehicle_data_notification.cc @@ -30,8 +30,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "rc_rpc_plugin/rc_module_constants.h" #include "rc_rpc_plugin/commands/hmi/rc_on_interior_vehicle_data_notification.h" +#include "rc_rpc_plugin/rc_module_constants.h" #include "utils/macro.h" namespace rc_rpc_plugin { @@ -54,8 +54,9 @@ void RCOnInteriorVehicleDataNotification::Run() { (*message_)[app_mngr::strings::params][app_mngr::strings::function_id] = static_cast(mobile_apis::FunctionID::eType::OnInteriorVehicleDataID); - smart_objects::SmartObject& module_data = (*message_) - [application_manager::strings::msg_params][message_params::kModuleData]; + smart_objects::SmartObject& module_data = + (*message_)[application_manager::strings::msg_params] + [message_params::kModuleData]; if (module_data.keyExists(rc_rpc_plugin::message_params::kAudioControlData)) { smart_objects::SmartObject& audio_control_data = module_data[message_params::kAudioControlData]; diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc index 91cb6cb7ee..643e98213c 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc @@ -31,10 +31,10 @@ */ #include "rc_rpc_plugin/commands/hmi/rc_on_remote_control_settings_notification.h" -#include "rc_rpc_plugin/rc_rpc_plugin.h" #include "rc_rpc_plugin/interior_data_manager.h" -#include "rc_rpc_plugin/rc_module_constants.h" #include "rc_rpc_plugin/rc_helpers.h" +#include "rc_rpc_plugin/rc_module_constants.h" +#include "rc_rpc_plugin/rc_rpc_plugin.h" #include "utils/macro.h" namespace rc_rpc_plugin { @@ -115,7 +115,8 @@ void RCOnRemoteControlSettingsNotification::Run() { message_params::kAccessMode)) { access_mode = static_cast( (*message_)[app_mngr::strings::msg_params] - [message_params::kAccessMode].asUInt()); + [message_params::kAccessMode] + .asUInt()); LOG4CXX_DEBUG( logger_, "Setting up access mode : " << AccessModeToString(access_mode)); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/button_press_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/button_press_request.cc index 5ce047071c..b85f092252 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/button_press_request.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/button_press_request.cc @@ -31,12 +31,12 @@ */ #include "rc_rpc_plugin/commands/mobile/button_press_request.h" +#include "interfaces/MOBILE_API.h" +#include "json/json.h" #include "rc_rpc_plugin/rc_module_constants.h" #include "smart_objects/enum_schema_item.h" -#include "utils/macro.h" -#include "json/json.h" #include "utils/helpers.h" -#include "interfaces/MOBILE_API.h" +#include "utils/macro.h" namespace rc_rpc_plugin { namespace commands { @@ -130,9 +130,9 @@ bool CheckIfButtonExistInRCCaps( const mobile_apis::ButtonName::eType current_button = static_cast(current_id); if (current_button == button) { - LOG4CXX_TRACE(logger_, - "Button id " << current_button - << " exist in capabilities"); + LOG4CXX_TRACE( + logger_, + "Button id " << current_button << " exist in capabilities"); return true; } } @@ -177,7 +177,8 @@ void ButtonPressRequest::Execute() { EnumConversionHelper::EnumToCString( static_cast( (*message_)[app_mngr::strings::msg_params] - [message_params::kButtonName].asUInt()), + [message_params::kButtonName] + .asUInt()), &button_name); const std::string module_type = ModuleType(); @@ -276,10 +277,11 @@ void ButtonPressRequest::on_event(const app_mngr::event_engine::Event& event) { } std::string ButtonPressRequest::ModuleType() { - mobile_apis::ModuleType::eType module_type = static_cast< - mobile_apis::ModuleType::eType>( - (*message_)[app_mngr::strings::msg_params][message_params::kModuleType] - .asUInt()); + mobile_apis::ModuleType::eType module_type = + static_cast( + (*message_)[app_mngr::strings::msg_params] + [message_params::kModuleType] + .asUInt()); const char* str; const bool ok = ns_smart_device_link::ns_smart_objects::EnumConversionHelper< mobile_apis::ModuleType::eType>::EnumToCString(module_type, &str); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc index 4d12b4f375..47363bddcd 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc @@ -31,12 +31,12 @@ */ #include "rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_request.h" -#include "rc_rpc_plugin/rc_module_constants.h" +#include "interfaces/MOBILE_API.h" #include "rc_rpc_plugin/rc_helpers.h" +#include "rc_rpc_plugin/rc_module_constants.h" #include "rc_rpc_plugin/rc_rpc_plugin.h" #include "smart_objects/enum_schema_item.h" #include "utils/macro.h" -#include "interfaces/MOBILE_API.h" namespace rc_rpc_plugin { namespace commands { @@ -297,7 +297,8 @@ void GetInteriorVehicleDataRequest::ProccessSubscription( static_cast( hmi_response[app_mngr::strings::msg_params] [message_params::kModuleData] - [message_params::kModuleType].asUInt()), + [message_params::kModuleType] + .asUInt()), &module_type); if (excessive_subscription_occured_) { is_subscribed = extension->IsSubscibedToInteriorVehicleData(module_type); @@ -390,10 +391,11 @@ void GetInteriorVehicleDataRequest::RemoveExcessiveSubscription() { } std::string GetInteriorVehicleDataRequest::ModuleType() { - mobile_apis::ModuleType::eType module_type = static_cast< - mobile_apis::ModuleType::eType>( - (*message_)[app_mngr::strings::msg_params][message_params::kModuleType] - .asUInt()); + mobile_apis::ModuleType::eType module_type = + static_cast( + (*message_)[app_mngr::strings::msg_params] + [message_params::kModuleType] + .asUInt()); const char* str; const bool ok = ns_smart_device_link::ns_smart_objects::EnumConversionHelper< mobile_apis::ModuleType::eType>::EnumToCString(module_type, &str); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc index 37890b7979..53b04ce3ef 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc @@ -31,9 +31,9 @@ */ #include "rc_rpc_plugin/commands/mobile/on_interior_vehicle_data_notification.h" -#include "rc_rpc_plugin/rc_rpc_plugin.h" -#include "rc_rpc_plugin/rc_module_constants.h" #include "rc_rpc_plugin/rc_helpers.h" +#include "rc_rpc_plugin/rc_module_constants.h" +#include "rc_rpc_plugin/rc_rpc_plugin.h" #include "smart_objects/enum_schema_item.h" #include "utils/macro.h" diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc index edc45670ce..2bf8fbbe92 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc @@ -31,14 +31,14 @@ */ #include "rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_request.h" +#include "interfaces/MOBILE_API.h" +#include "json/json.h" +#include "rc_rpc_plugin/rc_helpers.h" #include "rc_rpc_plugin/rc_module_constants.h" #include "rc_rpc_plugin/rc_rpc_plugin.h" -#include "rc_rpc_plugin/rc_helpers.h" #include "smart_objects/enum_schema_item.h" -#include "utils/macro.h" -#include "json/json.h" #include "utils/helpers.h" -#include "interfaces/MOBILE_API.h" +#include "utils/macro.h" namespace rc_rpc_plugin { namespace commands { @@ -175,9 +175,9 @@ capabilitiesStatus GetItemCapability( const auto it = mapping.find(request_parameter); if (it == mapping.end()) { - LOG4CXX_DEBUG(logger_, - "Parameter " << request_parameter - << " doesn't exist in capabilities."); + LOG4CXX_DEBUG( + logger_, + "Parameter " << request_parameter << " doesn't exist in capabilities."); return capabilitiesStatus::missedParam; } @@ -525,9 +525,9 @@ void SetInteriorVehicleDataRequest::Execute() { return; } else if (module_data[message_params::kAudioControlData].keyExists( message_params::kKeepContext)) { - app->set_keep_context( - module_data[message_params::kAudioControlData] - [message_params::kKeepContext].asBool()); + app->set_keep_context(module_data[message_params::kAudioControlData] + [message_params::kKeepContext] + .asBool()); } } diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/rc_command_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/rc_command_request.cc index c24529d720..065425dd02 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/rc_command_request.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/rc_command_request.cc @@ -31,11 +31,11 @@ */ #include "rc_rpc_plugin/commands/rc_command_request.h" -#include "rc_rpc_plugin/rc_module_constants.h" -#include "application_manager/message_helper.h" #include "application_manager/hmi_interfaces.h" -#include "smart_objects/enum_schema_item.h" +#include "application_manager/message_helper.h" #include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/rc_module_constants.h" +#include "smart_objects/enum_schema_item.h" CREATE_LOGGERPTR_GLOBAL(logger_, "RemoteControlModule") @@ -264,5 +264,5 @@ void RCCommandRequest::SendGetUserConsent(const std::string& module_type) { &msg_params, true); } -} -} +} // namespace commands +} // namespace rc_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_cache_impl.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_cache_impl.cc index 780aab537b..2c8683f84a 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_cache_impl.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_cache_impl.cc @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "rc_rpc_plugin/interior_data_cache_impl.h" +#include #include #include -#include -#include "rc_rpc_plugin/interior_data_cache_impl.h" #include "application_manager/smart_object_keys.h" #include "utils/date_time.h" #include "utils/logger.h" @@ -110,17 +110,16 @@ smart_objects::SmartObject MergeArray(const smart_objects::SmartObject& data1, smart_objects::SmartArray* result_array = result.asArray(); smart_objects::SmartArray* data_array = data2.asArray(); auto data_it = data_array->begin(); - auto find_by_id = - [](smart_objects::SmartArray* array, const smart_objects::SmartObject& id) - -> smart_objects::SmartArray::iterator { - auto it = std::find_if( - array->begin(), - array->end(), - [&id](smart_objects::SmartObject& obj) -> bool { - return obj[application_manager::strings::id] == id; - }); - return it; - }; + auto find_by_id = [](smart_objects::SmartArray* array, + const smart_objects::SmartObject& id) + -> smart_objects::SmartArray::iterator { + auto it = std::find_if(array->begin(), + array->end(), + [&id](smart_objects::SmartObject& obj) -> bool { + return obj[application_manager::strings::id] == id; + }); + return it; + }; for (; data_it != data_array->end(); ++data_it) { const smart_objects::SmartObject element_id = @@ -167,9 +166,9 @@ bool InteriorDataCacheImpl::Contains(const std::string& module_type) const { sync_primitives::AutoLock autolock(cached_data_lock_); auto it = cached_data_.find(module_type); const bool contains = it != cached_data_.end(); - LOG4CXX_TRACE(logger_, - "module_type : " << module_type << " " - << (contains ? "true" : "false")); + LOG4CXX_TRACE( + logger_, + "module_type : " << module_type << " " << (contains ? "true" : "false")); return contains; } @@ -189,4 +188,4 @@ void InteriorDataCacheImpl::Clear() { sync_primitives::AutoLock autolock(cached_data_lock_); cached_data_.clear(); } -} +} // namespace rc_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_manager_impl.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_manager_impl.cc index 0c42f6e3de..cb800a6081 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_manager_impl.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_manager_impl.cc @@ -1,8 +1,8 @@ #include "rc_rpc_plugin/interior_data_manager_impl.h" -#include "rc_rpc_plugin/rc_helpers.h" -#include "rc_rpc_plugin/rc_rpc_plugin.h" #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" +#include "rc_rpc_plugin/rc_helpers.h" +#include "rc_rpc_plugin/rc_rpc_plugin.h" namespace rc_rpc_plugin { CREATE_LOGGERPTR_GLOBAL(logger_, "RemoteControlModule"); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_command_factory.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_command_factory.cc index d49f3e9e36..67329f2a31 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_command_factory.cc @@ -31,36 +31,36 @@ */ #include -#include "rc_rpc_plugin/rc_command_factory.h" -#include "rc_rpc_plugin/commands/mobile/button_press_request.h" -#include "rc_rpc_plugin/commands/mobile/button_press_response.h" -#include "rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_request.h" -#include "rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_response.h" -#include "rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_consent_request.h" -#include "rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_consent_response.h" -#include "rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_request.h" -#include "rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_response.h" -#include "rc_rpc_plugin/commands/mobile/on_interior_vehicle_data_notification.h" #include "rc_rpc_plugin/commands/hmi/rc_button_press_request.h" #include "rc_rpc_plugin/commands/hmi/rc_button_press_response.h" +#include "rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_consent_request.h" +#include "rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_consent_response.h" #include "rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_request.h" #include "rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_response.h" #include "rc_rpc_plugin/commands/hmi/rc_on_interior_vehicle_data_notification.h" #include "rc_rpc_plugin/commands/hmi/rc_on_remote_control_settings_notification.h" #include "rc_rpc_plugin/commands/hmi/rc_set_interior_vehicle_data_request.h" #include "rc_rpc_plugin/commands/hmi/rc_set_interior_vehicle_data_response.h" +#include "rc_rpc_plugin/commands/mobile/button_press_request.h" +#include "rc_rpc_plugin/commands/mobile/button_press_response.h" +#include "rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_request.h" +#include "rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_response.h" +#include "rc_rpc_plugin/commands/mobile/on_interior_vehicle_data_notification.h" +#include "rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_request.h" +#include "rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_response.h" +#include "rc_rpc_plugin/rc_command_factory.h" -#include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" -#include "rc_rpc_plugin/resource_allocation_manager.h" #include "rc_rpc_plugin/interior_data_cache.h" +#include "rc_rpc_plugin/resource_allocation_manager.h" CREATE_LOGGERPTR_GLOBAL(logger_, "RemoteControlModule") namespace application_manager { -using rc_rpc_plugin::ResourceAllocationManager; using rc_rpc_plugin::InteriorDataCache; using rc_rpc_plugin::RCCommandParams; +using rc_rpc_plugin::ResourceAllocationManager; template class RCCommandCreator : public CommandCreator { @@ -113,7 +113,7 @@ struct RCCommandCreatorFactory { } const RCCommandParams params_; }; -} +} // namespace application_manager namespace rc_rpc_plugin { using namespace application_manager; @@ -158,11 +158,13 @@ bool RCCommandFactory::IsAbleToProcess( Command::SOURCE_SDL_TO_HMI == message_source) { return get_hmi_creator_factory( static_cast(function_id), - hmi_apis::messageType::INVALID_ENUM).CanBeCreated(); + hmi_apis::messageType::INVALID_ENUM) + .CanBeCreated(); } else { return get_mobile_creator_factory( static_cast(function_id), - mobile_api::messageType::INVALID_ENUM).CanBeCreated(); + mobile_api::messageType::INVALID_ENUM) + .CanBeCreated(); } } @@ -249,4 +251,4 @@ CommandCreator& RCCommandFactory::get_hmi_creator_factory( default: { return rc_factory.GetCreator(); } } } -} +} // namespace rc_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc index 0bdec55733..b39b67d669 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc @@ -1,9 +1,9 @@ #include "rc_rpc_plugin/rc_helpers.h" -#include "rc_rpc_plugin/rc_module_constants.h" -#include "rc_rpc_plugin/rc_rpc_plugin.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_impl.h" #include "application_manager/message.h" +#include "application_manager/smart_object_keys.h" +#include "rc_rpc_plugin/rc_module_constants.h" +#include "rc_rpc_plugin/rc_rpc_plugin.h" namespace rc_rpc_plugin { CREATE_LOGGERPTR_GLOBAL(logger_, "RemoteControlModule"); @@ -115,4 +115,4 @@ RCHelpers::AppsModules RCHelpers::GetApplicationsAllowedModules( } return result; } -} +} // namespace rc_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc index 3bc1106573..026e03eeff 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc @@ -29,16 +29,16 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/plugin_manager/plugin_keys.h" #include "rc_rpc_plugin/rc_rpc_plugin.h" -#include "rc_rpc_plugin/rc_command_factory.h" -#include "rc_rpc_plugin/rc_app_extension.h" -#include "rc_rpc_plugin/resource_allocation_manager_impl.h" +#include +#include "application_manager/plugin_manager/plugin_keys.h" #include "rc_rpc_plugin/interior_data_cache_impl.h" #include "rc_rpc_plugin/interior_data_manager_impl.h" +#include "rc_rpc_plugin/rc_app_extension.h" +#include "rc_rpc_plugin/rc_command_factory.h" #include "rc_rpc_plugin/rc_helpers.h" +#include "rc_rpc_plugin/resource_allocation_manager_impl.h" #include "utils/helpers.h" -#include namespace rc_rpc_plugin { CREATE_LOGGERPTR_GLOBAL(logger_, "RemoteControlModule"); @@ -121,8 +121,8 @@ void RCRPCPlugin::OnApplicationEvent( RCRPCPlugin::Apps RCRPCPlugin::GetRCApplications( application_manager::ApplicationManager& app_mngr) { - using application_manager::ApplicationSharedPtr; using application_manager::ApplicationSet; + using application_manager::ApplicationSharedPtr; ApplicationSet accessor = app_mngr.applications().GetData(); std::vector result; diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc index ecd263b77a..cf1df2cb68 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc @@ -33,14 +33,14 @@ #include "rc_rpc_plugin/resource_allocation_manager_impl.h" #include "application_manager/application.h" #include "application_manager/application_manager.h" +#include "application_manager/message_helper.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" -#include "smart_objects/enum_schema_item.h" -#include "application_manager/message_helper.h" -#include "rc_rpc_plugin/rc_rpc_plugin.h" -#include "rc_rpc_plugin/rc_module_constants.h" -#include "rc_rpc_plugin/rc_helpers.h" #include "json/json.h" +#include "rc_rpc_plugin/rc_helpers.h" +#include "rc_rpc_plugin/rc_module_constants.h" +#include "rc_rpc_plugin/rc_rpc_plugin.h" +#include "smart_objects/enum_schema_item.h" #include "utils/helpers.h" namespace rc_rpc_plugin { @@ -80,16 +80,16 @@ AcquireResult::eType ResourceAllocationManagerImpl::AcquireResource( } if (app_id == allocated_resources_[module_type]) { - LOG4CXX_DEBUG(logger_, - "App: " << app_id << " is already acquired resource " - << module_type); + LOG4CXX_DEBUG( + logger_, + "App: " << app_id << " is already acquired resource " << module_type); return AcquireResult::ALLOWED; } if (IsModuleTypeRejected(module_type, app_id)) { - LOG4CXX_DEBUG(logger_, - "Driver disallowed app: " << app_id << " to acquire " - << module_type); + LOG4CXX_DEBUG( + logger_, + "Driver disallowed app: " << app_id << " to acquire " << module_type); return AcquireResult::REJECTED; } @@ -196,8 +196,8 @@ void ConstructOnRCStatusNotificationParams( namespace strings = application_manager::strings; namespace message_params = rc_rpc_plugin::message_params; using smart_objects::SmartObject; - using smart_objects::SmartType_Map; using smart_objects::SmartType_Array; + using smart_objects::SmartType_Map; LOG4CXX_AUTO_TRACE(logger_); auto modules_inserter = [](SmartObject& result_modules) { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc index e9d1063648..f2b86f43da 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc @@ -30,22 +30,26 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "rc_rpc_plugin/commands/mobile/button_press_request.h" -#include "rc_rpc_plugin/rc_command_factory.h" -#include "rc_rpc_plugin/rc_app_extension.h" -#include "rc_rpc_plugin/rc_rpc_plugin.h" -#include "rc_rpc_plugin/rc_module_constants.h" -#include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h" -#include "rc_rpc_plugin/mock/mock_interior_data_cache.h" -#include "rc_rpc_plugin/mock/mock_interior_data_manager.h" +#include "application_manager/commands/command_request_test.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/commands/command_request_test.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "gtest/gtest.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" +#include "rc_rpc_plugin/mock/mock_interior_data_cache.h" +#include "rc_rpc_plugin/mock/mock_interior_data_manager.h" +#include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h" +#include "rc_rpc_plugin/rc_app_extension.h" +#include "rc_rpc_plugin/rc_command_factory.h" +#include "rc_rpc_plugin/rc_module_constants.h" +#include "rc_rpc_plugin/rc_rpc_plugin.h" +using ::application_manager::Message; +using ::application_manager::MessageType; +using application_manager::commands::MessageSharedPtr; +using ::protocol_handler::MessagePriority; using test::components::application_manager_test::MockApplication; using test::components::commands_test::CommandRequestTest; using test::components::commands_test::CommandsTestMocks; @@ -57,17 +61,13 @@ using ::testing::NiceMock; using ::testing::Return; using ::testing::ReturnRef; using ::testing::SaveArg; -using ::application_manager::Message; -using ::application_manager::MessageType; -using application_manager::commands::MessageSharedPtr; -using ::protocol_handler::MessagePriority; namespace { const int kModuleId = 153u; const uint32_t kConnectionKey = 1u; const uint32_t kAppId = 0u; const std::string kPolicyAppId = "Test"; -} +} // namespace namespace rc_rpc_plugin_test { @@ -129,7 +129,8 @@ class ButtonPressRequestTest ON_CALL(mock_policy_handler_, CheckHMIType(kPolicyAppId, mobile_apis::AppHMIType::eType::REMOTE_CONTROL, - nullptr)).WillByDefault(Return(true)); + nullptr)) + .WillByDefault(Return(true)); ON_CALL(mock_allocation_manager_, is_rc_enabled()) .WillByDefault(Return(true)); } @@ -194,10 +195,11 @@ TEST_F(ButtonPressRequestTest, EXPECT_CALL( mock_allocation_manager_, SetResourceState(resource, kAppId, rc_rpc_plugin::ResourceState::BUSY)); - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand( - HMIResultCodeIs(hmi_apis::FunctionID::Buttons_ButtonPress), - _)).WillOnce(Return(true)); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand( + HMIResultCodeIs(hmi_apis::FunctionID::Buttons_ButtonPress), _)) + .WillOnce(Return(true)); // Act std::shared_ptr command = @@ -229,10 +231,11 @@ TEST_F( EXPECT_CALL(mock_allocation_manager_, SetResourceState(resource, kAppId, _)) .Times(2); - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand( - HMIResultCodeIs(hmi_apis::FunctionID::Buttons_ButtonPress), - _)).Times(0); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand( + HMIResultCodeIs(hmi_apis::FunctionID::Buttons_ButtonPress), _)) + .Times(0); MessageSharedPtr command_result; EXPECT_CALL(mock_rpc_service_, ManageMobileCommand( diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc index 4e74e74ef8..9549830cec 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc @@ -31,42 +31,42 @@ */ #include "rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_request.h" -#include "gtest/gtest.h" +#include "application_manager/commands/command_request_test.h" +#include "application_manager/event_engine/event_dispatcher.h" +#include "application_manager/message_helper.h" #include "application_manager/mock_application.h" +#include "gtest/gtest.h" +#include "rc_rpc_plugin/mock/mock_interior_data_cache.h" +#include "rc_rpc_plugin/mock/mock_interior_data_manager.h" +#include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h" #include "rc_rpc_plugin/rc_app_extension.h" +#include "rc_rpc_plugin/rc_command_factory.h" #include "rc_rpc_plugin/rc_module_constants.h" #include "rc_rpc_plugin/rc_rpc_plugin.h" -#include "application_manager/message_helper.h" -#include "rc_rpc_plugin/rc_command_factory.h" -#include "application_manager/event_engine/event_dispatcher.h" -#include "application_manager/commands/command_request_test.h" -#include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h" -#include "rc_rpc_plugin/mock/mock_interior_data_cache.h" -#include "rc_rpc_plugin/mock/mock_interior_data_manager.h" -#include #include +#include -using ::testing::_; -using ::testing::Mock; -using ::testing::NiceMock; -using ::testing::StrictMock; -using ::testing::Return; -using ::testing::ReturnRef; -using ::testing::SaveArg; +using application_manager::ApplicationSet; +using ::application_manager::ApplicationSharedPtr; using ::application_manager::Message; using ::application_manager::MessageType; -using application_manager::ApplicationSet; using application_manager::commands::MessageSharedPtr; -using ::application_manager::ApplicationSharedPtr; using ::protocol_handler::MessagePriority; using test::components::application_manager_test::MockApplication; using test::components::application_manager_test::MockApplicationManager; -using test::components::commands_test::MockApplicationManager; using test::components::commands_test::CommandRequestTest; using test::components::commands_test::CommandsTestMocks; using test::components::commands_test::HMIResultCodeIs; using test::components::commands_test::MobileResultCodeIs; +using test::components::commands_test::MockApplicationManager; +using ::testing::_; +using ::testing::Mock; +using ::testing::NiceMock; +using ::testing::Return; +using ::testing::ReturnRef; +using ::testing::SaveArg; +using ::testing::StrictMock; namespace { const int32_t kConnectionKey = 5u; @@ -76,7 +76,7 @@ const int kModuleId = 153u; const auto module_type = mobile_apis::ModuleType::RADIO; const int32_t time_frame_of_allowed_requests = 1; const uint32_t max_request_in_time_frame = 5u; -} +} // namespace namespace rc_rpc_plugin_test { @@ -193,9 +193,9 @@ TEST_F(GetInteriorVehicleDataRequestTest, .WillByDefault(Return(false)); ON_CALL(mock_interior_data_manager_, CheckRequestsToHMIFrequency(_)) .WillByDefault(Return(true)); - std::shared_ptr< - rc_rpc_plugin::commands::GetInteriorVehicleDataRequest> command = - CreateRCCommand( + std::shared_ptr + command = CreateRCCommand< + rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>( mobile_message); // Expectations @@ -220,9 +220,9 @@ TEST_F(GetInteriorVehicleDataRequestTest, .WillByDefault(Return(false)); ON_CALL(mock_interior_data_manager_, CheckRequestsToHMIFrequency(_)) .WillByDefault(Return(true)); - std::shared_ptr< - rc_rpc_plugin::commands::GetInteriorVehicleDataRequest> command = - CreateRCCommand( + std::shared_ptr + command = CreateRCCommand< + rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>( mobile_message); // Expectations @@ -245,9 +245,9 @@ TEST_F( [message_params::kModuleType] = module_type; smart_objects::SmartObject radio_data; radio_data[message_params::kBand] = enums_value::kAM; - std::shared_ptr< - rc_rpc_plugin::commands::GetInteriorVehicleDataRequest> command = - CreateRCCommand( + std::shared_ptr + command = CreateRCCommand< + rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>( mobile_message); // Expectations @@ -310,9 +310,9 @@ TEST_F( EXPECT_CALL(mock_interior_data_cache_, Remove(enums_value::kRadio)); // Act - std::shared_ptr< - rc_rpc_plugin::commands::GetInteriorVehicleDataRequest> command = - CreateRCCommand( + std::shared_ptr + command = CreateRCCommand< + rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>( mobile_message); command->Run(); application_manager::event_engine::Event event( @@ -339,9 +339,9 @@ TEST_F(GetInteriorVehicleDataRequestTest, radio_data[message_params::kBand] = enums_value::kAM; ON_CALL(app_mngr_, applications()).WillByDefault(Return(apps_da_)); - std::shared_ptr< - rc_rpc_plugin::commands::GetInteriorVehicleDataRequest> command = - CreateRCCommand( + std::shared_ptr + command = CreateRCCommand< + rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>( mobile_message); // Expectations @@ -377,9 +377,9 @@ TEST_F( ns_smart_device_link::ns_smart_objects::SmartObject& msg_params = (*mobile_message)[application_manager::strings::msg_params]; msg_params[message_params::kModuleType] = mobile_apis::ModuleType::RADIO; - std::shared_ptr< - rc_rpc_plugin::commands::GetInteriorVehicleDataRequest> command = - CreateRCCommand( + std::shared_ptr + command = CreateRCCommand< + rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>( mobile_message); smart_objects::SmartObject rc_capabilities; ON_CALL(mock_hmi_capabilities_, rc_capability()) @@ -387,10 +387,11 @@ TEST_F( // Expectations EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _)).Times(0); - EXPECT_CALL(mock_rpc_service_, - ManageMobileCommand( - MobileResultCodeIs(mobile_apis::Result::UNSUPPORTED_RESOURCE), - _)).WillOnce((Return(true))); + EXPECT_CALL( + mock_rpc_service_, + ManageMobileCommand( + MobileResultCodeIs(mobile_apis::Result::UNSUPPORTED_RESOURCE), _)) + .WillOnce((Return(true))); // Act command->Run(); } @@ -403,9 +404,9 @@ TEST_F( ns_smart_device_link::ns_smart_objects::SmartObject& msg_params = (*mobile_message)[application_manager::strings::msg_params]; msg_params[message_params::kModuleType] = mobile_apis::ModuleType::RADIO; - std::shared_ptr< - rc_rpc_plugin::commands::GetInteriorVehicleDataRequest> command = - CreateRCCommand( + std::shared_ptr + command = CreateRCCommand< + rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>( mobile_message); ON_CALL(mock_policy_handler_, CheckModule(_, _)).WillByDefault(Return(false)); @@ -537,9 +538,9 @@ TEST_F(GetInteriorVehicleDataRequestTest, EXPECT_CALL(mock_interior_data_cache_, Clear()).Times(0); // Act - std::shared_ptr< - rc_rpc_plugin::commands::GetInteriorVehicleDataRequest> command = - CreateRCCommand( + std::shared_ptr + command = CreateRCCommand< + rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>( mobile_message); command->Run(); application_manager::event_engine::Event event( @@ -561,9 +562,9 @@ TEST_F(GetInteriorVehicleDataRequestTest, [message_params::kModuleType] = module_type; smart_objects::SmartObject radio_data; radio_data[message_params::kBand] = enums_value::kAM; - std::shared_ptr< - rc_rpc_plugin::commands::GetInteriorVehicleDataRequest> command = - CreateRCCommand( + std::shared_ptr + command = CreateRCCommand< + rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>( mobile_message); size_t i = 0; for (; i <= max_request_in_time_frame; ++i) { @@ -579,7 +580,8 @@ TEST_F(GetInteriorVehicleDataRequestTest, mock_rpc_service_, ManageHMICommand( HMIResultCodeIs(hmi_apis::FunctionID::RC_GetInteriorVehicleData), - _)).WillRepeatedly(Return(true)); + _)) + .WillRepeatedly(Return(true)); // Act command->Run(); } diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc index b344471254..dcf36a34a0 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc @@ -30,36 +30,36 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "rc_rpc_plugin/commands/mobile/on_interior_vehicle_data_notification.h" #include "application_manager/application.h" -#include "application_manager/mock_application.h" #include "application_manager/commands/commands_test.h" -#include "rc_rpc_plugin/commands/mobile/on_interior_vehicle_data_notification.h" -#include "rc_rpc_plugin/rc_rpc_plugin.h" -#include "rc_rpc_plugin/rc_module_constants.h" -#include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h" -#include "rc_rpc_plugin/mock/mock_interior_data_cache.h" -#include "rc_rpc_plugin/mock/mock_interior_data_manager.h" +#include "application_manager/mock_application.h" #include "gtest/gtest.h" #include "interfaces/MOBILE_API.h" +#include "rc_rpc_plugin/mock/mock_interior_data_cache.h" +#include "rc_rpc_plugin/mock/mock_interior_data_manager.h" +#include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h" +#include "rc_rpc_plugin/rc_module_constants.h" +#include "rc_rpc_plugin/rc_rpc_plugin.h" -using ::testing::_; -using ::testing::Return; -using ::testing::NiceMock; -using ::testing::SaveArg; -using ::testing::Mock; using application_manager::ApplicationSet; using application_manager::commands::MessageSharedPtr; using test::components::application_manager_test::MockApplication; using test::components::application_manager_test::MockApplicationManager; using test::components::commands_test::CommandsTest; using test::components::commands_test::CommandsTestMocks; +using ::testing::_; +using ::testing::Mock; +using ::testing::NiceMock; +using ::testing::Return; +using ::testing::SaveArg; namespace { const uint32_t kAppId = 0u; const uint32_t kConnectionKey = 1u; const std::string kPolicyAppId = "Test"; const int kModuleId = 153u; -} +} // namespace namespace rc_rpc_plugin_test { using namespace rc_rpc_plugin; diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc index b95725e0b4..6fbff118a4 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc @@ -32,34 +32,34 @@ #include "application_manager/application.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application.h" #include "application_manager/commands/commands_test.h" +#include "application_manager/mock_application.h" +#include "gtest/gtest.h" +#include "interfaces/MOBILE_API.h" #include "rc_rpc_plugin/commands/hmi/rc_on_remote_control_settings_notification.h" -#include "rc_rpc_plugin/rc_rpc_plugin.h" -#include "rc_rpc_plugin/rc_module_constants.h" -#include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h" #include "rc_rpc_plugin/mock/mock_interior_data_cache.h" #include "rc_rpc_plugin/mock/mock_interior_data_manager.h" -#include "gtest/gtest.h" -#include "interfaces/MOBILE_API.h" +#include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h" +#include "rc_rpc_plugin/rc_module_constants.h" +#include "rc_rpc_plugin/rc_rpc_plugin.h" -using ::testing::_; -using ::testing::Return; -using ::testing::NiceMock; -using ::testing::SaveArg; -using ::testing::Mock; using application_manager::ApplicationSet; using application_manager::commands::MessageSharedPtr; using test::components::application_manager_test::MockApplication; using test::components::application_manager_test::MockApplicationManager; using test::components::commands_test::CommandsTest; using test::components::commands_test::CommandsTestMocks; +using ::testing::_; +using ::testing::Mock; +using ::testing::NiceMock; +using ::testing::Return; +using ::testing::SaveArg; namespace { const uint32_t kAppId = 0u; const uint32_t kConnectionKey = 1u; const std::string kPolicyAppId = "Test"; -} +} // namespace namespace rc_rpc_plugin_test { using namespace rc_rpc_plugin; @@ -124,8 +124,8 @@ TEST_F(RCOnRemoteControlSettingsNotificationTest, SetAccessMode(hmi_apis::Common_RCAccessMode::ASK_DRIVER)); // Act std::shared_ptr< - rc_rpc_plugin::commands::RCOnRemoteControlSettingsNotification> command = - CreateRCCommand< + rc_rpc_plugin::commands::RCOnRemoteControlSettingsNotification> + command = CreateRCCommand< rc_rpc_plugin::commands::RCOnRemoteControlSettingsNotification>( mobile_message); @@ -144,8 +144,8 @@ TEST_F(RCOnRemoteControlSettingsNotificationTest, // Act std::shared_ptr< - rc_rpc_plugin::commands::RCOnRemoteControlSettingsNotification> command = - CreateRCCommand< + rc_rpc_plugin::commands::RCOnRemoteControlSettingsNotification> + command = CreateRCCommand< rc_rpc_plugin::commands::RCOnRemoteControlSettingsNotification>( mobile_message); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc index 567d4b1e20..b28f2c972a 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc @@ -31,59 +31,58 @@ */ #include "application_manager/application.h" -#include "application_manager/mock_application.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/rpc_service_impl.h" -#include "application_manager/mock_request_controller_settings.h" #include "application_manager/include/application_manager/command_holder_impl.h" -#include "application_manager/mock_hmi_capabilities.h" -#include "application_manager/request_controller.h" -#include "application_manager/mock_rpc_plugin_manager.h" -#include "application_manager/mock_rpc_plugin.h" +#include "application_manager/message.h" +#include "application_manager/mock_application.h" #include "application_manager/mock_command_factory.h" #include "application_manager/mock_event_dispatcher.h" -#include "application_manager/message.h" -#include "rc_rpc_plugin/rc_rpc_plugin.h" -#include "rc_rpc_plugin/rc_module_constants.h" -#include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h" -#include "rc_rpc_plugin/mock/mock_interior_data_cache.h" -#include "rc_rpc_plugin/mock/mock_interior_data_manager.h" -#include "rc_rpc_plugin/commands/mobile/button_press_request.h" -#include "rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_consent_response.h" -#include "rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_consent_request.h" +#include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/mock_request_controller_settings.h" +#include "application_manager/mock_rpc_plugin.h" +#include "application_manager/mock_rpc_plugin_manager.h" +#include "application_manager/request_controller.h" +#include "application_manager/rpc_service_impl.h" #include "hmi_message_handler/mock_hmi_message_handler.h" -#include "interfaces/MOBILE_API.h" #include "include/test/protocol_handler/mock_protocol_handler.h" +#include "interfaces/MOBILE_API.h" +#include "rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_consent_request.h" +#include "rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_consent_response.h" +#include "rc_rpc_plugin/commands/mobile/button_press_request.h" +#include "rc_rpc_plugin/mock/mock_interior_data_cache.h" +#include "rc_rpc_plugin/mock/mock_interior_data_manager.h" +#include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h" +#include "rc_rpc_plugin/rc_module_constants.h" +#include "rc_rpc_plugin/rc_rpc_plugin.h" #include "test/application_manager/mock_application_manager_settings.h" using ::testing::_; +using ::testing::Mock; +using ::testing::NiceMock; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::NiceMock; using ::testing::SaveArg; -using ::testing::Mock; -using ::testing::NiceMock; namespace am = ::application_manager; using am::ApplicationSet; -using am::commands::MessageSharedPtr; using am::commands::CommandImpl; +using am::commands::MessageSharedPtr; +using am::plugin_manager::MockRPCPlugin; +using am::plugin_manager::MockRPCPluginManager; using am::plugin_manager::RPCPlugin; -using ::smart_objects::SmartObject; +using rc_rpc_plugin::RCRPCPlugin; using rc_rpc_plugin::commands::ButtonPressRequest; -using rc_rpc_plugin::commands::RCGetInteriorVehicleDataConsentResponse; using rc_rpc_plugin::commands::RCGetInteriorVehicleDataConsentRequest; -using rc_rpc_plugin::RCRPCPlugin; -using test::components::commands_test::CommandsTestMocks; -using test::components::commands_test::CommandRequestTest; -using am::plugin_manager::MockRPCPluginManager; -using am::plugin_manager::MockRPCPlugin; +using rc_rpc_plugin::commands::RCGetInteriorVehicleDataConsentResponse; +using ::smart_objects::SmartObject; using test::components::application_manager_test::MockApplication; +using test::components::application_manager_test::MockCommandFactory; +using test::components::application_manager_test::MockHMICapabilities; using test::components::application_manager_test::MockRequestControlerSettings; -using test::components::protocol_handler_test::MockProtocolHandler; +using test::components::commands_test::CommandRequestTest; +using test::components::commands_test::CommandsTestMocks; using test::components::hmi_message_handler_test::MockHMIMessageHandler; -using test::components::application_manager_test::MockHMICapabilities; -using test::components::application_manager_test::MockCommandFactory; using test::components::policy_test::MockPolicyHandlerInterface; +using test::components::protocol_handler_test::MockProtocolHandler; namespace rc_rpc_plugin_test { using namespace rc_rpc_plugin; diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc index b1cb8271f5..66280eb183 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc @@ -30,34 +30,34 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_request.h" #include "application_manager/application.h" #include "application_manager/commands/command_request_test.h" #include "application_manager/mock_application.h" -#include "rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_request.h" -#include "rc_rpc_plugin/rc_rpc_plugin.h" -#include "rc_rpc_plugin/rc_module_constants.h" -#include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h" -#include "rc_rpc_plugin/mock/mock_interior_data_cache.h" -#include "rc_rpc_plugin/mock/mock_interior_data_manager.h" #include "gtest/gtest.h" #include "interfaces/MOBILE_API.h" +#include "rc_rpc_plugin/mock/mock_interior_data_cache.h" +#include "rc_rpc_plugin/mock/mock_interior_data_manager.h" +#include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h" +#include "rc_rpc_plugin/rc_module_constants.h" +#include "rc_rpc_plugin/rc_rpc_plugin.h" -using ::testing::_; -using ::testing::Return; -using ::testing::NiceMock; using application_manager::ApplicationSet; using application_manager::commands::MessageSharedPtr; using test::components::application_manager_test::MockApplication; using test::components::application_manager_test::MockApplicationManager; using test::components::commands_test::CommandRequestTest; using test::components::commands_test::CommandsTestMocks; +using ::testing::_; +using ::testing::NiceMock; +using ::testing::Return; namespace { const uint32_t kAppId = 0u; const int kModuleId = 153u; const uint32_t kConnectionKey = 1u; const std::string kPolicyAppId = "Test"; -} +} // namespace namespace rc_rpc_plugin_test { using namespace rc_rpc_plugin; @@ -90,7 +90,8 @@ class SetInteriorVehicleDataRequestTest ON_CALL(mock_policy_handler_, CheckHMIType(kPolicyAppId, mobile_apis::AppHMIType::eType::REMOTE_CONTROL, - nullptr)).WillByDefault(Return(true)); + nullptr)) + .WillByDefault(Return(true)); ON_CALL(mock_allocation_manager_, is_rc_enabled()) .WillByDefault(Return(true)); } @@ -154,9 +155,9 @@ TEST_F(SetInteriorVehicleDataRequestTest, mobile_apis::Result::READ_ONLY), application_manager::commands::Command::SOURCE_SDL)); // Act - std::shared_ptr< - rc_rpc_plugin::commands::SetInteriorVehicleDataRequest> command = - CreateRCCommand( + std::shared_ptr + command = CreateRCCommand< + rc_rpc_plugin::commands::SetInteriorVehicleDataRequest>( mobile_message); command->Run(); } @@ -193,9 +194,9 @@ TEST_F( application_manager::commands::Command::SOURCE_SDL)); // Act - std::shared_ptr< - rc_rpc_plugin::commands::SetInteriorVehicleDataRequest> command = - CreateRCCommand( + std::shared_ptr + command = CreateRCCommand< + rc_rpc_plugin::commands::SetInteriorVehicleDataRequest>( mobile_message); command->Run(); } @@ -224,9 +225,9 @@ TEST_F( application_manager::commands::Command::SOURCE_SDL)); // Act - std::shared_ptr< - rc_rpc_plugin::commands::SetInteriorVehicleDataRequest> command = - CreateRCCommand( + std::shared_ptr + command = CreateRCCommand< + rc_rpc_plugin::commands::SetInteriorVehicleDataRequest>( mobile_message); command->Run(); } diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_resource_allocation_manager.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_resource_allocation_manager.h index 72ace1432a..828e2eea11 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_resource_allocation_manager.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_resource_allocation_manager.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_TEST_INCLUDE_RC_RPC_PLUGIN_MOCK_MOCK_RESOURCE_ALLOCATION_MANAGER_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_TEST_INCLUDE_RC_RPC_PLUGIN_MOCK_MOCK_RESOURCE_ALLOCATION_MANAGER_H_ -#include "gmock/gmock.h" #include "application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h" +#include "gmock/gmock.h" namespace rc_rpc_plugin_test { diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/interior_data_cache_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/interior_data_cache_test.cc index e6922a4c83..b7eb4a554a 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/interior_data_cache_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/interior_data_cache_test.cc @@ -157,4 +157,4 @@ TEST_F(InteriorDataCacheTest, Exist2ModuleTypesRemoveOneAnotherOneLeft) { EXPECT_EQ(data2, retrieved_data2); } -} // rc_rpc_plugin_test +} // namespace rc_rpc_plugin_test diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc index 86c58b9d46..a72b89b9de 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc @@ -32,34 +32,34 @@ #include #include "gtest/gtest.h" -#include "rc_rpc_plugin/resource_allocation_manager_impl.h" -#include "rc_rpc_plugin/rc_rpc_plugin.h" -#include "rc_rpc_plugin/rc_module_constants.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" #include "application_manager/mock_rpc_service.h" #include "application_manager/policies/mock_policy_handler_interface.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" +#include "rc_rpc_plugin/rc_module_constants.h" +#include "rc_rpc_plugin/rc_rpc_plugin.h" +#include "rc_rpc_plugin/resource_allocation_manager_impl.h" using test::components::application_manager_test::MockApplication; using test::components::application_manager_test::MockApplicationManager; using test::components::application_manager_test::MockRPCService; +using ::application_manager::ApplicationSharedPtr; +using ::application_manager::Message; +using ::application_manager::MessageType; +using ::protocol_handler::MessagePriority; using ::testing::_; +using ::testing::DoAll; +using ::testing::Eq; using ::testing::Mock; using ::testing::NiceMock; -using ::testing::StrictMock; using ::testing::Return; using ::testing::ReturnRef; using ::testing::SaveArg; -using ::testing::Eq; -using ::testing::DoAll; using ::testing::SetArgPointee; -using ::application_manager::Message; -using ::application_manager::MessageType; -using ::application_manager::ApplicationSharedPtr; -using ::protocol_handler::MessagePriority; +using ::testing::StrictMock; namespace { const bool kDeviceHandle = 1u; @@ -72,7 +72,7 @@ const uint32_t kHMIAppId1 = 1u; const uint32_t kAppId2 = 22u; const std::string policy_app_id_1_ = "policy_id_1"; const uint32_t kSizeOfModules = 6u; -} +} // namespace namespace rc_rpc_plugin_test { @@ -665,4 +665,4 @@ TEST_F(RAManagerTest, OnRCStatus_ModuleAllocation) { kHMIAppId1); } -} // namespace rc_rpc_plugin +} // namespace rc_rpc_plugin_test diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_request.h index 7b0911fef9..6d8f5e4b2b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_request.h @@ -72,6 +72,6 @@ class ActivateAppRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ACTIVATE_APP_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_response.h index f937b4f63b..93be297bf6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/activate_app_response.h @@ -72,6 +72,6 @@ class ActivateAppResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ACTIVATE_APP_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h index 4e9e4d54d7..6e7ef63cf4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.h @@ -74,6 +74,6 @@ class AddStatisticsInfoNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ADD_STATISTICS_INFO_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_request.h index 45acb3a424..54a81f50f3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_request.h @@ -72,6 +72,6 @@ class AllowAllAppsRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ALLOW_ALL_APPS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h index 41d1c9e752..ffd60a61d8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_all_apps_response.h @@ -72,6 +72,6 @@ class AllowAllAppsResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ALLOW_ALL_APPS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_request.h index b3a2d88d7d..c8c0198cc8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_request.h @@ -72,6 +72,6 @@ class AllowAppRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ALLOW_APP_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_response.h index 55637e1756..5f6ee670ec 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/allow_app_response.h @@ -72,6 +72,6 @@ class AllowAppResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ALLOW_APP_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_get_system_time_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_get_system_time_response.h index 3a97ebdfb5..e90e6cd20f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_get_system_time_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_get_system_time_response.h @@ -35,8 +35,8 @@ #include "application_manager/commands/response_from_hmi.h" -#include "utils/macro.h" #include "application_manager/application_manager.h" +#include "utils/macro.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_on_awake_sdl.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_on_awake_sdl.h index 2ac1be2580..82ac7b0efa 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_on_awake_sdl.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_on_awake_sdl.h @@ -72,6 +72,6 @@ class OnAwakeSDLNotification : public app_mngr::commands::NotificationFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_ON_AWAKE_SDL_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_request.h index a7eb820146..71eb9e4105 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_request.h @@ -74,6 +74,6 @@ class BasicCommunicationSystemRequest } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_SYSTEM_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h index 20483a45e3..c76993cc6f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h @@ -74,6 +74,6 @@ class BasicCommunicationSystemResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BASIC_COMMUNICATION_SYSTEM_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_request.h index 5c650fb8e4..9bb3d9a6fb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_request.h @@ -73,6 +73,6 @@ class ButtonGetCapabilitiesRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BUTTON_GET_CAPABILITIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h index bf2f15c18a..4431ea1224 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/button_get_capabilities_response.h @@ -74,6 +74,6 @@ class ButtonGetCapabilitiesResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BUTTON_GET_CAPABILITIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_request.h index 635b0579f4..bfcf478930 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_request.h @@ -72,6 +72,6 @@ class ClosePopupRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_CLOSE_POPUP_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_response.h index 199b40f070..7477bda854 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/close_popup_response.h @@ -72,6 +72,6 @@ class ClosePopupResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_CLOSE_POPUP_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_request.h index a70bff2553..f59b36fe09 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_request.h @@ -67,6 +67,6 @@ class DecryptCertificateRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_DECRYPT_CERTIFICATE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_response.h index 88b216eeea..9844ed9165 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/decrypt_certificate_response.h @@ -73,6 +73,6 @@ class DecryptCertificateResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_DECRYPT_CERTIFICATE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_request.h index fa0efb90e6..bafe9c1e91 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_request.h @@ -75,6 +75,6 @@ class DialNumberRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_DIAL_NUMBER_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_response.h index 33d4788eca..9097757ab2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/dial_number_response.h @@ -76,6 +76,6 @@ class DialNumberResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_DIAL_NUMBER_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_request.h index d771167798..8d3be68539 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_request.h @@ -72,6 +72,6 @@ class GetSystemInfoRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_SYSTEM_INFO_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_response.h index 5bf5f41b73..d4f35a4e2a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_system_info_response.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_SYSTEM_INFO_RESPONSE_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_SYSTEM_INFO_RESPONSE_H_ -#include "application_manager/commands/response_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/response_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -82,6 +82,6 @@ class GetSystemInfoResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_SYSTEM_INFO_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls.h index 93b414c8c4..c3f7453583 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls.h @@ -91,6 +91,6 @@ class GetUrls : public app_mngr::commands::RequestFromHMI { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_URLS_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls_response.h index 1ff38194b8..06af3c6ea5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls_response.h @@ -67,6 +67,6 @@ class GetUrlsResponse : public app_mngr::commands::ResponseToHMI { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_URLS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_request.h index 34c10cedf1..46aa575eb5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_request.h @@ -73,6 +73,6 @@ class MixingAudioSupportedRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_MIXING_AUDIO_SUPPORTED_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h index 5c67666225..32dd23d352 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h @@ -74,6 +74,6 @@ class MixingAudioSupportedResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_MIXING_AUDIO_SUPPORTED_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_request.h index 3f63ef883d..a04488df76 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_request.h @@ -72,6 +72,6 @@ class NaviAlertManeuverRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_ALERT_MANEUVER_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h index 7d7c4de85e..610af3fbfc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h @@ -72,6 +72,6 @@ class NaviAlertManeuverResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_ALERT_MANEUVER_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_request.h index 80e948ad25..fa9eee485e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_request.h @@ -63,8 +63,8 @@ class AudioStartStreamRequest : public app_mngr::commands::RequestToHMI, virtual ~AudioStartStreamRequest(); /** - * @brief onTimeOut from requrst Controller - */ + * @brief onTimeOut from requrst Controller + */ virtual void onTimeOut(); /** @@ -78,9 +78,9 @@ class AudioStartStreamRequest : public app_mngr::commands::RequestToHMI, virtual void on_event(const app_mngr::event_engine::Event& event); /** - * @brief RetryStartSession resend HMI startSession request if needed. - * If limit expired, set audio_stream_retry_number counter to 0 - */ + * @brief RetryStartSession resend HMI startSession request if needed. + * If limit expired, set audio_stream_retry_number counter to 0 + */ void RetryStartSession(); private: @@ -90,6 +90,6 @@ class AudioStartStreamRequest : public app_mngr::commands::RequestToHMI, } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_AUDIO_START_STREAM_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h index 926cfc36ed..0f669084cb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_response.h @@ -71,6 +71,6 @@ class AudioStartStreamResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_AUDIO_START_STREAM_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_request.h index 7c5fbbdd3d..9f3aa8c312 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_request.h @@ -71,6 +71,6 @@ class AudioStopStreamRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_AUDIO_STOP_STREAM_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h index 8eb091dd92..740efc2d19 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_response.h @@ -71,6 +71,6 @@ class AudioStopStreamResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_AUDIO_STOP_STREAM_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_request.h index dab5fc1022..0e2ad8b9a3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_request.h @@ -70,6 +70,6 @@ class NaviGetWayPointsRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_GET_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h index fb93c2c64a..9fef4f041e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h @@ -72,6 +72,6 @@ class NaviGetWayPointsResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_GET_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_request.h index 404ddc9f00..17d4eb483f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_request.h @@ -78,6 +78,6 @@ class NaviIsReadyRequest : public app_mngr::commands::RequestToHMI, } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_IS_READY_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h index 7f94312d04..5dcbdd46df 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_is_ready_response.h @@ -72,6 +72,6 @@ class NaviIsReadyResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_IS_READY_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_request.h index 7bdf0e4787..02068779a9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_request.h @@ -72,6 +72,6 @@ class NaviSendLocationRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SEND_LOCATION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_response.h index 6a65eb00a1..e322177e45 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_send_location_response.h @@ -72,6 +72,6 @@ class NaviSendLocationResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SEND_LOCATION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_request.h index a981b8ff81..437d58861c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_request.h @@ -84,6 +84,6 @@ class NaviSetVideoConfigRequest : public app_mngr::commands::RequestToHMI, } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SET_VIDEO_CONFIG_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h index f5f9e7a5ee..3cf3ca17ae 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_set_video_config_response.h @@ -74,6 +74,6 @@ class NaviSetVideoConfigResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SET_VIDEO_CONFIG_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_request.h index f64bdf6ce0..efe6743d88 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_request.h @@ -73,6 +73,6 @@ class NaviShowConstantTBTRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SHOW_CONSTANT_TBT_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h index fd4da08cf0..a77d2b9dbb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_response.h @@ -73,6 +73,6 @@ class NaviShowConstantTBTResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SHOW_CONSTANT_TBT_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_request.h index d5aae67661..afad744eb3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_request.h @@ -47,10 +47,10 @@ class NaviStartStreamRequest : public app_mngr::commands::RequestToHMI, public app_mngr::event_engine::EventObserver { public: /** - * @brief NaviStartStreamRequest class constructor - * - * @param message Incoming SmartObject message - **/ + * @brief NaviStartStreamRequest class constructor + * + * @param message Incoming SmartObject message + **/ NaviStartStreamRequest(const app_mngr::commands::MessageSharedPtr& message, app_mngr::ApplicationManager& application_manager, app_mngr::rpc_service::RPCService& rpc_service, @@ -78,9 +78,9 @@ class NaviStartStreamRequest : public app_mngr::commands::RequestToHMI, virtual void onTimeOut(); /** - * @brief RetryStartSession resend HMI startSession request if needed. - * If limit expired, set video_stream_retry_number counter to 0 - */ + * @brief RetryStartSession resend HMI startSession request if needed. + * If limit expired, set video_stream_retry_number counter to 0 + */ void RetryStartSession(); private: @@ -90,6 +90,6 @@ class NaviStartStreamRequest : public app_mngr::commands::RequestToHMI, } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_START_STREAM_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h index b4770e82fe..38d9ba905c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_start_stream_response.h @@ -71,6 +71,6 @@ class NaviStartStreamResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_START_STREAM_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_request.h index 400c61ba07..0d14d0595f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_request.h @@ -71,6 +71,6 @@ class NaviStopStreamRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_STOP_STREAM_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h index 39512ac2bb..10b5ef0f80 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_stop_stream_response.h @@ -71,6 +71,6 @@ class NaviStopStreamResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_STOP_STREAM_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_request.h index 052c3c7151..3def06ba9a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_request.h @@ -71,6 +71,6 @@ class NaviSubscribeWayPointsRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h index 73aab4633f..c424ae0857 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_response.h @@ -74,6 +74,6 @@ class NaviSubscribeWayPointsResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h index f20386a246..be1ccbb45b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h @@ -72,6 +72,6 @@ class NaviUnsubscribeWayPointsRequest } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h index ec4f4eb963..d4f98a871c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_response.h @@ -74,5 +74,5 @@ class NaviUnsubscribeWayPointsResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_request.h index db269a65d3..a80d111dae 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_request.h @@ -72,6 +72,6 @@ class NaviUpdateTurnListRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_UPDATE_TURN_LIST_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h index 20295485a3..8f715ac33d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h @@ -73,6 +73,6 @@ class NaviUpdateTurnListResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_NAVI_UPDATE_TURN_LIST_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h index 42bf877f2d..3f9d096625 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h @@ -74,6 +74,6 @@ class OnAllowSDLFunctionalityNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_ALLOW_SDL_FUNCTIONALITY_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h index cc21d699fb..f856ce966e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h @@ -74,6 +74,6 @@ class OnAppActivatedNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_ACTIVATED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h index 9b4a6ba5a0..6a7fd00632 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h @@ -74,6 +74,6 @@ class OnAppDeactivatedNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_DEACTIVATED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h index 6008a8ce51..afed4bfa39 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_changed_notification.h @@ -74,6 +74,6 @@ class OnAppPermissionChangedNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_PERMISSION_CHANGED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h index a751b25d85..1f06e38ccd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_permission_consent_notification.h @@ -74,6 +74,6 @@ class OnAppPermissionConsentNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_PERMISSION_CONSENT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h index 3548786d1d..00c75d2c23 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_registered_notification.h @@ -74,6 +74,6 @@ class OnAppRegisteredNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_REGISTERED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h index 097eb1eb28..791374f6f4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h @@ -64,13 +64,13 @@ class OnAppUnregisteredNotification ~OnAppUnregisteredNotification() FINAL; /** - * @brief Init overrides and skips replacement of app id with hmi id since - * 1) at the moment this notification is being sent there is no application - * registered in application manager - * 2) hmi id is already used whenever this message is being constructed, so - * its already there - * @return True in any case - */ + * @brief Init overrides and skips replacement of app id with hmi id since + * 1) at the moment this notification is being sent there is no application + * registered in application manager + * 2) hmi id is already used whenever this message is being constructed, so + * its already there + * @return True in any case + */ bool Init() FINAL; /** @@ -84,6 +84,6 @@ class OnAppUnregisteredNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_UNREGISTERED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h index cac306f760..8f51a822a2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_notification.h @@ -74,6 +74,6 @@ class OnAudioDataStreamingNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_AUDIO_DATA_STREAMING_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_bc_system_capability_updated_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_bc_system_capability_updated_notification.h index 17f8a5b3c8..0e956e8688 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_bc_system_capability_updated_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_bc_system_capability_updated_notification.h @@ -74,6 +74,6 @@ class OnBCSystemCapabilityUpdatedNotification } // namespace commands -} // namespace app_service_rpc_plugin +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_BC_SYSTEM_CAPABILITY_UPDATED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h index b83fe1bfe0..955249bd4b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_event_notification.h @@ -74,6 +74,6 @@ class OnButtonEventNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_BUTTON_EVENT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h index e996c9952c..9de86d1d9c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_press_notification.h @@ -74,6 +74,6 @@ class OnButtonPressNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_BUTTON_PRESS_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h index 4ed60f9a07..0a0a8c3c5d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h @@ -78,6 +78,6 @@ class OnButtonSubscriptionNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_BUTTON_SUBSCRIPTION_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h index 99c165c12f..7fe0b2a8c3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h @@ -74,6 +74,6 @@ class OnDeviceChosenNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_DEVICE_CHOSEN_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h index 7701e2a601..df1efb4d30 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h @@ -74,6 +74,6 @@ class OnDeviceStateChangedNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_DEVICE_STATE_CHANGED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h index 51fb49c6bc..df8dd3d401 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h @@ -80,6 +80,6 @@ class OnDriverDistractionNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_DRIVER_DISTRACTION_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h index cff0a0e617..4fcde5f7d0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h @@ -74,6 +74,6 @@ class OnEventChangedNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_EVENT_CHANGED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h index 116932d87a..dbbbe925fe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h @@ -79,6 +79,6 @@ class OnExitAllApplicationsNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_EXIT_ALL_APPLICATIONS_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h index 11c397bfe7..403642f64d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h @@ -74,6 +74,6 @@ class OnExitApplicationNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_EXIT_APPLICATION_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h index 38c5dcf535..7658017364 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_file_removed_notification.h @@ -72,6 +72,6 @@ class OnFileRemovedNotification : public app_mngr::commands::NotificationToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_FILE_REMOVED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_find_applications.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_find_applications.h index 672ded9dcf..bf3a9d530e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_find_applications.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_find_applications.h @@ -72,6 +72,6 @@ class OnFindApplications : public app_mngr::commands::NotificationFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_FIND_APPLICATIONS_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h index 85b7ed356e..d215b3d07d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_IGNITION_CYCLE_OVER_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_IGNITION_CYCLE_OVER_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_impl.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnIgnitionCycleOverNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_IGNITION_CYCLE_OVER_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h index 075dc2cb5c..a07af99df1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_tbt_client_state_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_NAVI_TBT_CLIENT_STATE_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_NAVI_TBT_CLIENT_STATE_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnNaviTBTClientStateNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_NAVI_TBT_CLIENT_STATE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h index 3efde9c8c1..74058e246c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_navi_way_point_change_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_NAVI_WAY_POINT_CHANGE_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_NAVI_WAY_POINT_CHANGE_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,5 +75,5 @@ class OnNaviWayPointChangeNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_NAVI_WAY_POINT_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_policy_update.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_policy_update.h index 331e352795..ede78dd362 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_policy_update.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_policy_update.h @@ -66,6 +66,6 @@ class OnPolicyUpdate : public app_mngr::commands::NotificationFromHMI { DISALLOW_COPY_AND_ASSIGN(OnPolicyUpdate); }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_POLICY_UPDATE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_put_file_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_put_file_notification.h index 503013ff58..e64edd51bc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_put_file_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_put_file_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_PUT_FILE_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_PUT_FILE_NOTIFICATION_H_ -#include "application_manager/commands/notification_to_hmi.h" #include "application_manager/application_impl.h" +#include "application_manager/commands/notification_to_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -73,6 +73,6 @@ class OnPutFileNotification : public app_mngr::commands::NotificationToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_PUT_FILE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ready_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ready_notification.h index c4adc20090..f540abbf4a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ready_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ready_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_READY_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_READY_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -73,6 +73,6 @@ class OnReadyNotification : public app_mngr::commands::NotificationFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_READY_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_received_policy_update.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_received_policy_update.h index c1e1b01a18..1ffe038a82 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_received_policy_update.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_received_policy_update.h @@ -43,10 +43,10 @@ namespace commands { class OnReceivedPolicyUpdate : public app_mngr::commands::NotificationFromHMI { public: /** - * @brief OnReceivedPolicyUpdate class constructor - * - * @param message Incoming SmartObject message - **/ + * @brief OnReceivedPolicyUpdate class constructor + * + * @param message Incoming SmartObject message + **/ OnReceivedPolicyUpdate(const app_mngr::commands::MessageSharedPtr& message, app_mngr::ApplicationManager& application_manager, app_mngr::rpc_service::RPCService& rpc_service, @@ -69,6 +69,6 @@ class OnReceivedPolicyUpdate : public app_mngr::commands::NotificationFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_RECEIVED_POLICY_UPDATE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h index c5755a364c..68cc5ca487 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_record_start_notification.h @@ -74,6 +74,6 @@ class OnRecordStartdNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_RECORD_START_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h index ef2b5a34eb..63ea659747 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_RESUME_AUDIO_SOURCE_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_RESUME_AUDIO_SOURCE_NOTIFICATION_H_ -#include "application_manager/commands/notification_to_hmi.h" #include "application_manager/application_impl.h" +#include "application_manager/commands/notification_to_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnResumeAudioSourceNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_RESUME_AUDIO_SOURCE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h index 34fe41de81..a40872b578 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h @@ -72,6 +72,6 @@ class OnSDLCloseNotification : public app_mngr::commands::NotificationToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SDL_CLOSE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h index 9fe736a595..00bc6c9a05 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h @@ -74,6 +74,6 @@ class OnSDLConsentNeededNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SDL_CONSENT_NEEDED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h index 96f63845e1..6ae9aee1f5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h @@ -74,6 +74,6 @@ class OnSDLPersistenceCompleteNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SDL_PERSISTENCE_COMPLETE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h index da049b1dc4..38bb1db03e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h @@ -72,6 +72,6 @@ class OnStartDeviceDiscovery : public app_mngr::commands::NotificationFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_START_DEVICE_DISCOVERY_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h index 7c61fac041..7a6e8b871a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_status_update_notification.h @@ -74,6 +74,6 @@ class OnStatusUpdateNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_STATUS_UPDATE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h index d4c940bac7..a239203053 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_context_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_CONTEXT_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_CONTEXT_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -76,6 +76,6 @@ class OnSystemContextNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_CONTEXT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h index 76325b078f..3993eefd8b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_error_notification.h @@ -73,6 +73,6 @@ class OnSystemErrorNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_ERROR_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h index 1e4046b83b..a5ab636464 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h @@ -74,6 +74,6 @@ class OnSystemInfoChangedNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_INFO_CHANGED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h index 1e1e1818b8..6f9f63b517 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_request_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_REQUEST_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_REQUEST_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_impl.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnSystemRequestNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_REQUEST_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_time_ready_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_time_ready_notification.h index 7cd8410d8e..799af1e134 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_time_ready_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_system_time_ready_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_TIME_READY_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SYSTEM_TIME_READY_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h index 33c7d98b6f..0462925f71 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h @@ -74,6 +74,6 @@ class OnTTSLanguageChangeNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_TTS_LANGUAGE_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h index 70050a667e..c8bd159064 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h @@ -78,6 +78,6 @@ class OnTTSResetTimeoutNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_TTS_RESET_TIMEOUT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h index 93dac3f292..315acf3a5f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h @@ -73,6 +73,6 @@ class OnTTSStartedNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_TTS_STARTED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h index 362e96f4be..0dafd61c58 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h @@ -73,6 +73,6 @@ class OnTTSStoppedNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_TTS_STOPPED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h index 0cc4e9e772..f468ce5b0a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h @@ -72,6 +72,6 @@ class OnUICommandNotification : public app_mngr::commands::NotificationFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_COMMAND_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h index c487894770..31b7eef3a3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_KEYBOARD_INPUT_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_KEYBOARD_INPUT_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -79,6 +79,6 @@ class OnUIKeyBoardInputNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_KEYBOARD_INPUT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h index f30b8573aa..2495aa2b96 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h @@ -74,6 +74,6 @@ class OnUILanguageChangeNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_LANGUAGE_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h index bbdf4d04ef..1c87f82349 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h @@ -78,6 +78,6 @@ class OnUIResetTimeoutNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_RESET_TIMEOUT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h index 5c7dd0128b..26c25f437a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_TOUCH_EVENT_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_TOUCH_EVENT_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -79,6 +79,6 @@ class OnUITouchEventNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UI_TOUCH_EVENT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_update_device_list.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_update_device_list.h index 2942c36053..d638629b3a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_update_device_list.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_update_device_list.h @@ -72,6 +72,6 @@ class OnUpdateDeviceList : public app_mngr::commands::NotificationFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_UPDATE_DEVICE_LIST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h index ed0b1572ff..c848233497 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_acc_pedal_position_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ACC_PEDAL_POSITION_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ACC_PEDAL_POSITION_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnVIAccPedalPositionNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ACC_PEDAL_POSITION_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h index cc81160ccb..0cb3e04f4e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_belt_status_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_BELT_STATUS_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_BELT_STATUS_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnVIBeltStatusNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_BELT_STATUS_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h index 2b46b69f55..6ab920204d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_body_information_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_BODY_INFORMATION_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_BODY_INFORMATION_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnVIBodyInformationNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_BODY_INFORMATION_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h index 05da9a775d..b3afeb82b3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_device_status_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_DEVICE_STATUS_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_DEVICE_STATUS_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnVIDeviceStatusNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_DEVICE_STATUS_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h index 6640d7953a..a1885c5e29 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_driver_braking_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_DRIVER_BRAKING_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_DRIVER_BRAKING_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnVIDriverBrakingNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_DRIVER_BRAKING_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h index f8c0526f8c..feb6cc6060 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_engine_torque_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ENGINE_TORQUE_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ENGINE_TORQUE_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnVIEngineTorqueNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ENGINE_TORQUE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h index 900aecd845..734420aaee 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_external_temperature_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_EXTERNAL_TEMPERATURE_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_EXTERNAL_TEMPERATURE_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnVIExternalTemperatureNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_EXTERNAL_TEMPERATURE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h index 7374de9ad9..a5588901f7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_FUEL_LEVEL_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_FUEL_LEVEL_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -74,6 +74,6 @@ class OnVIFuelLevelNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_FUEL_LEVEL_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h index a705fcbd04..5ed661cdbf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_fuel_level_state_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_FUEL_LEVEL_STATE_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_FUEL_LEVEL_STATE_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnVIFuelLevelStateNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_FUEL_LEVEL_STATE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h index 984e1e4c0b..70ee5f6c00 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_gps_data_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_GPS_DATA_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_GPS_DATA_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -73,6 +73,6 @@ class OnVIGpsDataNotification : public app_mngr::commands::NotificationFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_GPS_DATA_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h index 1dfda8a9e0..5ef1e3ed92 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_head_lamp_status_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_HEAD_LAMP_STATUS_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_HEAD_LAMP_STATUS_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnVIHeadLampStatusNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_HEAD_LAMP_STATUS_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h index fd8743907c..7bb7756fc5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_instant_fuel_consumption_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_INSTANT_FUEL_CONSUMPTION_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_INSTANT_FUEL_CONSUMPTION_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnVIInstantFuelConsumptionNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_INSTANT_FUEL_CONSUMPTION_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h index 25ace2821d..cdebc99768 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_my_key_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_MY_KEY_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_MY_KEY_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -73,6 +73,6 @@ class OnVIMyKeyNotification : public app_mngr::commands::NotificationFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_MY_KEY_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h index ad141e733c..1da26dd316 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_odometer_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ODOMETER_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ODOMETER_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -74,6 +74,6 @@ class OnVIOdometerNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_ODOMETER_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h index 95fb873957..7d03c62633 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_prndl_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_PRNDL_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_PRNDL_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -73,6 +73,6 @@ class OnVIPrndlNotification : public app_mngr::commands::NotificationFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_PRNDL_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h index d4b121a96f..60a0ce0782 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_rpm_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_RPM_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_RPM_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -73,6 +73,6 @@ class OnVIRpmNotification : public app_mngr::commands::NotificationFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_RPM_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h index 4afaafc9ff..4920fbd661 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_SPEED_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_SPEED_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -73,6 +73,6 @@ class OnVISpeedNotification : public app_mngr::commands::NotificationFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_SPEED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h index 0d0aeadad8..cff99ecf8e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_steering_wheel_angle_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_STEERING_WHEEL_ANGLE_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_STEERING_WHEEL_ANGLE_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnVISteeringWheelAngleNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_STEERING_WHEEL_ANGLE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h index c358ed37e9..0399780869 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_tire_pressure_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_TIRE_PRESSURE_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_TIRE_PRESSURE_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnVITirePressureNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_TIRE_PRESSURE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h index 75062a51e1..60b686683f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_vin_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_VIN_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_VIN_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -73,6 +73,6 @@ class OnVIVinNotification : public app_mngr::commands::NotificationFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_VIN_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h index de7a5dfc9e..a6e1ba9921 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vi_wiper_status_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_WIPER_STATUS_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_WIPER_STATUS_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -75,6 +75,6 @@ class OnVIWiperStatusNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_WIPER_STATUS_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h index 7a7cf3cd96..6d6d4a69db 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h @@ -74,6 +74,6 @@ class OnVideoDataStreamingNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VIDEO_DATA_STREAMING_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h index 3ef21fc568..58ea2e07b5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_COMMAND_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_COMMAND_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_impl.h" +#include "application_manager/commands/notification_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -73,6 +73,6 @@ class OnVRCommandNotification : public app_mngr::commands::NotificationFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_COMMAND_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h index e6bd39d46e..f583d1e2fe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h @@ -74,6 +74,6 @@ class OnVRLanguageChangeNotification } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_LANGUAGE_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h index abca9db91d..98ed40101b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_started_notification.h @@ -72,6 +72,6 @@ class OnVRStartedNotification : public app_mngr::commands::NotificationFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_STARTED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h index 9b53214f8f..e16b440da7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h @@ -72,6 +72,6 @@ class OnVRStoppedNotification : public app_mngr::commands::NotificationFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VR_STOPPED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h index 8f94d4876a..57a90955f4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h @@ -72,6 +72,6 @@ class RCGetCapabilitiesRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_GET_CAPABILITIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h index dec31c9ea1..e0c305f796 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h @@ -72,6 +72,6 @@ class RCGetCapabilitiesResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_GET_CAPABILITIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_request.h index 3ba614f823..305a866659 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_request.h @@ -89,6 +89,6 @@ class RCIsReadyRequest : public app_mngr::commands::RequestToHMI, } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_IS_READY_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h index 93f30e795c..5f4af23527 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h @@ -72,6 +72,6 @@ class RCIsReadyResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_IS_READY_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_request.h index e97312b881..2751104486 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_request.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_ACTIVATE_APP_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_ACTIVATE_APP_REQUEST_H_ -#include "application_manager/commands/request_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/request_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -109,6 +109,6 @@ class SDLActivateAppRequest : public app_mngr::commands::RequestFromHMI { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_ACTIVATE_APP_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h index 7a3f5157da..fd8b885e88 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h @@ -71,6 +71,6 @@ class SDLActivateAppResponse : public app_mngr::commands::ResponseToHMI { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_ACTIVATE_APP_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_request.h index 61426e0af3..acf390cfbc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_request.h @@ -73,6 +73,6 @@ class SDLGetListOfPermissionsRequest }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_LIST_OF_PERMISSIONS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h index e2556bac3d..4fc1775c72 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h @@ -74,6 +74,6 @@ class SDLGetListOfPermissionsResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_LIST_OF_PERMISSIONS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_request.h index b6376bacc6..fae0b6480d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_request.h @@ -71,6 +71,6 @@ class SDLGetStatusUpdateRequest : public app_mngr::commands::RequestFromHMI { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_STATUS_UPDATE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h index 4e6da22370..1c10142c99 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h @@ -72,6 +72,6 @@ class SDLGetStatusUpdateResponse : public app_mngr::commands::ResponseToHMI { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_STATUS_UPDATE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h index 75902e2733..18ad1fa535 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_USER_FRIENDLY_MESSAGE_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_USER_FRIENDLY_MESSAGE_REQUEST_H_ -#include "application_manager/commands/request_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/request_from_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -74,6 +74,6 @@ class SDLGetUserFriendlyMessageRequest }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_USER_FRIENDLY_MESSAGE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h index a02d6894e3..101a13b218 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h @@ -74,6 +74,6 @@ class SDLGetUserFriendlyMessageResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_USER_FRIENDLY_MESSAGE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update.h index f164aed775..e330e847b0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update.h @@ -43,10 +43,10 @@ namespace commands { class SDLPolicyUpdate : public app_mngr::commands::RequestToHMI { public: /** - * @brief SDLPolicyUpdate class constructor - * - * @param message Incoming SmartObject message - **/ + * @brief SDLPolicyUpdate class constructor + * + * @param message Incoming SmartObject message + **/ SDLPolicyUpdate(const app_mngr::commands::MessageSharedPtr& message, app_mngr::ApplicationManager& application_manager, app_mngr::rpc_service::RPCService& rpc_service, @@ -66,6 +66,6 @@ class SDLPolicyUpdate : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_POLICY_UPDATE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h index 63f33477b6..ce7125f251 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h @@ -69,6 +69,6 @@ class SDLPolicyUpdateResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_POLICY_UPDATE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h index 229ed92947..0905e90b45 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h @@ -73,6 +73,6 @@ class TTSChangeRegistrationRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_CHANGE_REGISTRATION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h index 8462178283..1988a7ee62 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h @@ -74,6 +74,6 @@ class TTSChangeRegistratioResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_CHANGE_REGISTRATION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h index df6cf3b4a4..d636485915 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h @@ -72,6 +72,6 @@ class TTSGetCapabilitiesRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_CAPABILITIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h index 7919f213a4..5c9b60e2f8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_capabilities_response.h @@ -73,6 +73,6 @@ class TTSGetCapabilitiesResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_CAPABILITIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_request.h index 09345c02d7..73ef8c5234 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_request.h @@ -72,6 +72,6 @@ class TTSGetLanguageRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_LANGUAGE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_response.h index e52dbf1ada..b29b3e7314 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_language_response.h @@ -72,6 +72,6 @@ class TTSGetLanguageResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_LANGUAGE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_request.h index c42d0257d3..a24a6446b3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_request.h @@ -74,6 +74,6 @@ class TTSGetSupportedLanguagesRequest } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_SUPPORTED_LANGUAGES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h index cc24db22b9..25850de5f2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_response.h @@ -74,6 +74,6 @@ class TTSGetSupportedLanguagesResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_request.h index b7dffd5bde..dd360eeb4a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_request.h @@ -88,6 +88,6 @@ class TTSIsReadyRequest : public app_mngr::commands::RequestToHMI, } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_IS_READY_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h index 268edd0eeb..881cd98179 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_is_ready_response.h @@ -72,6 +72,6 @@ class TTSIsReadyResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_IS_READY_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h index f416b3a787..009ee8f0be 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h @@ -73,6 +73,6 @@ class TTSSetGlobalPropertiesRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_SET_GLOBAL_PROPERTIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h index ff5622296c..d7ac422e57 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_set_global_properties_response.h @@ -74,6 +74,6 @@ class TTSSetGlobalPropertiesResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_SET_GLOBAL_PROPERTIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_request.h index 9e8915a440..efb67243fa 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_request.h @@ -72,6 +72,6 @@ class TTSSpeakRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_SPEAK_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_response.h index e4b2c8adbd..d516a9df1e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_speak_response.h @@ -72,6 +72,6 @@ class TTSSpeakResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_SPEAK_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_request.h index 8eb6a66c95..f3ce24d928 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_request.h @@ -72,6 +72,6 @@ class TTSStopSpeakingRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_STOP_SPEAKING_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_response.h index d433fe2280..6399193ae6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/tts_stop_speaking_response.h @@ -72,6 +72,6 @@ class TTSStopSpeakingResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_TTS_STOP_SPEAKING_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_request.h index e5d2483576..2d1e84fbec 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_request.h @@ -72,6 +72,6 @@ class UIAddCommandRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_COMMAND_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_response.h index 90a9666561..cf69368551 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_command_response.h @@ -72,6 +72,6 @@ class UIAddCommandResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_COMMAND_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h index 5de5e41cd6..0cd120b3cd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h @@ -72,6 +72,6 @@ class UIAddSubmenuRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_response.h index 20f830be27..5e951600bd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_response.h @@ -72,6 +72,6 @@ class UIAddSubmenuResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_SUBMENU_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_request.h index 6235a51c7d..3c0423e35e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_request.h @@ -72,6 +72,6 @@ class UIAlertRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ALERT_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_response.h index b43185af78..0392da0c7b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_alert_response.h @@ -72,6 +72,6 @@ class UIAlertResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ALERT_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_request.h index c504c55727..44440bf49d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_request.h @@ -73,6 +73,6 @@ class UIChangeRegistrationRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CHANGE_REGISTRATION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h index d7fca83d3e..e0077744a1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h @@ -73,6 +73,6 @@ class UIChangeRegistratioResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CHANGE_REGISTRATION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_request.h index ecc0b44495..4af8b91793 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_request.h @@ -72,6 +72,6 @@ class UIDeleteCommandRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_COMMAND_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h index f9601b7491..1eda0d362a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h @@ -72,6 +72,6 @@ class UIDeleteCommandResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_COMMAND_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_request.h index 3161c84b7c..9a7cd97ec7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_request.h @@ -72,6 +72,6 @@ class UIDeleteSubmenuRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_SUBMENU_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h index 7c73a53c3e..3edb8489e0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h @@ -72,6 +72,6 @@ class UIDeleteSubmenuResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_SUBMENU_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_request.h index 8d34e1852b..90bf6f7dbc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_request.h @@ -73,6 +73,6 @@ class UIEndAudioPassThruRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_END_AUDIO_PASS_THRU_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h index b1c3bfd87a..69a7959e53 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h @@ -73,6 +73,6 @@ class UIEndAudioPassThruResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_END_AUDIO_PASS_THRU_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_request.h index 47782cc7a9..58d8d0f732 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_request.h @@ -72,6 +72,6 @@ class UIGetCapabilitiesRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_CAPABILITIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h index 421844560d..d83d5f211b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_capabilities_response.h @@ -72,6 +72,6 @@ class UIGetCapabilitiesResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_CAPABILITIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_request.h index 7c82584178..842a97a717 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_request.h @@ -72,6 +72,6 @@ class UIGetLanguageRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_LANGUAGE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_response.h index 7354e87ee4..ec02b6fde9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_language_response.h @@ -72,6 +72,6 @@ class UIGetLanguageResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_LANGUAGE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_request.h index 7fd456b92b..42ea555358 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_request.h @@ -73,6 +73,6 @@ class UIGetSupportedLanguagesRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_SUPPORTED_LANGUAGES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h index 26d8e98892..45137ba518 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_get_supported_languages_response.h @@ -74,6 +74,6 @@ class UIGetSupportedLanguagesResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_request.h index 2e7806cd2b..18536032b7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_request.h @@ -88,6 +88,6 @@ class UIIsReadyRequest : public app_mngr::commands::RequestToHMI, } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_IS_READY_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h index f2b4f201f3..790c0115aa 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_is_ready_response.h @@ -72,6 +72,6 @@ class UIIsReadyResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_IS_READY_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_request.h index 6d4e870228..be7d384583 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_request.h @@ -73,6 +73,6 @@ class UIPerformAudioPassThruRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_PERFORM_AUDIO_PASS_THRU_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h index e36a292573..05f2cc84fd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.h @@ -74,6 +74,6 @@ class UIPerformAudioPassThruResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_PERFORM_AUDIO_PASS_THRU_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_request.h index ff4540de23..15cec6c17e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_request.h @@ -73,6 +73,6 @@ class UIPerformInteractionRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_PERFORM_INTERACTION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h index caf5716e18..2d13e15ad2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_perform_interaction_response.h @@ -74,6 +74,6 @@ class UIPerformInteractionResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_PERFORM_INTERACTION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_request.h index f5acf41c8d..bc25259662 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_request.h @@ -73,6 +73,6 @@ class UIScrollableMessageRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SCROLLABLE_MESSAGE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_response.h index e46265c0e4..f7f92600cd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_scrollable_message_response.h @@ -73,6 +73,6 @@ class UIScrollableMessageResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SCROLLABLE_MESSAGE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h index 4e260a99ff..56ffe40c21 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h @@ -73,6 +73,6 @@ class UISendHapticDataRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SEND_HAPTIC_DATA_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h index 1bf38939be..439c2f2682 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h @@ -73,6 +73,6 @@ class UISendHapticDataResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SEND_HAPTIC_DATA_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_request.h index ea526df135..a7d07628e3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_request.h @@ -72,6 +72,6 @@ class UISetAppIconRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_APP_ICON_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_response.h index af2c4fafea..3e4b338439 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_app_icon_response.h @@ -72,6 +72,6 @@ class UISetAppIconResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_APP_ICON_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h index f60f7325fd..446b77b997 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h @@ -71,6 +71,6 @@ class UiSetDisplayLayoutRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_DISPLAY_LAYOUT_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_response.h index ce404a4049..ade6aa1c13 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_display_layout_response.h @@ -73,6 +73,6 @@ class UiSetDisplayLayoutResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_DISPLAY_LAYOUT_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h index 44e8bba450..8df60a318a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h @@ -73,6 +73,6 @@ class UISetGlobalPropertiesRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_GLOBAL_PROPERTIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h index a9c27a423b..a189093fc7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_global_properties_response.h @@ -74,6 +74,6 @@ class UISetGlobalPropertiesResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_GLOBAL_PROPERTIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_request.h index 24f4d76d89..b1b196a25f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_request.h @@ -73,6 +73,6 @@ class UISetMediaClockTimerRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_MEDIA_CLOCK_TIMER_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h index c664bd04f9..23b6d3aefa 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_response.h @@ -74,6 +74,6 @@ class UISetMediaClockTimerResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SET_MEDIA_CLOCK_TIMER_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_request.h index 7ba950d530..6024243481 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_request.h @@ -72,6 +72,6 @@ class UIShowRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SHOW_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_response.h index f9f7a61056..4d19667153 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_show_response.h @@ -72,6 +72,6 @@ class UIShowResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SHOW_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_request.h index 3de1b4e775..c41e02b44f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_request.h @@ -72,6 +72,6 @@ class UISliderRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SLIDER_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_response.h index 17d1f8a8ed..f4e4465568 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_slider_response.h @@ -72,6 +72,6 @@ class UISliderResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_SLIDER_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_request.h index dc0166e33f..b352a3b273 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_request.h @@ -72,6 +72,6 @@ class UpdateAppListRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_APP_LIST_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_response.h index 2e3bb79233..a31621dbd5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_app_list_response.h @@ -72,6 +72,6 @@ class UpdateAppListResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_APP_LIST_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_request.h index c4c9f11e06..db4f265a9f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_request.h @@ -35,8 +35,8 @@ #include "application_manager/commands/request_to_hmi.h" #include "application_manager/event_engine/event_observer.h" -#include "utils/lock.h" #include "utils/conditional_variable.h" +#include "utils/lock.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -92,6 +92,6 @@ class UpdateDeviceListRequest : public app_mngr::commands::RequestToHMI, } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_DEVICE_LIST_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_response.h index c33518a545..5f7afed2c3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_device_list_response.h @@ -72,6 +72,6 @@ class UpdateDeviceListResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_DEVICE_LIST_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_request.h index e30b045fcb..3e001b2582 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_request.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_SDL_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_SDL_REQUEST_H_ -#include "application_manager/commands/request_to_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/request_to_hmi.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -73,6 +73,6 @@ class UpdateSDLRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_SDL_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_response.h index f71921ea3a..a6fc917872 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/update_sdl_response.h @@ -72,6 +72,6 @@ class UpdateSDLResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UPDATE_SDL_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_request.h index 0abb37adbc..b40245256e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_request.h @@ -72,6 +72,6 @@ class VRAddCommandRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_ADD_COMMAND_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_response.h index 5f9c99a483..dc123bc82f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_add_command_response.h @@ -72,6 +72,6 @@ class VRAddCommandResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_ADD_COMMAND_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_request.h index 4af28cb542..418842395d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_request.h @@ -73,6 +73,6 @@ class VRChangeRegistrationRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_CHANGE_REGISTRATION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h index a80df0968b..08f3dfa501 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_change_registration_response.h @@ -74,6 +74,6 @@ class VRChangeRegistrationResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_CHANGE_REGISTRATION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_request.h index 0ed9521ec5..2e1aa7c0d1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_request.h @@ -72,6 +72,6 @@ class VRDeleteCommandRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_DELETE_COMMAND_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_response.h index 63efcab355..a7d45ed5ea 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_delete_command_response.h @@ -72,6 +72,6 @@ class VRDeleteCommandResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_DELETE_COMMAND_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_request.h index f8ac83af58..254d00452f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_request.h @@ -72,6 +72,6 @@ class VRGetCapabilitiesRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_CAPABILITIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h index 9c9bb55b1b..781e38cda2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_capabilities_response.h @@ -72,6 +72,6 @@ class VRGetCapabilitiesResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_CAPABILITIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_request.h index e764cbef91..441795cfb5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_request.h @@ -72,6 +72,6 @@ class VRGetLanguageRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_LANGUAGE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_response.h index 470fe3ebdc..2bc08e5173 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_language_response.h @@ -72,6 +72,6 @@ class VRGetLanguageResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_LANGUAGE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_request.h index 8d9e9e2a61..ad87415a87 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_request.h @@ -73,6 +73,6 @@ class VRGetSupportedLanguagesRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_SUPPORTED_LANGUAGES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h index 735844cd99..16a67d6468 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h @@ -74,6 +74,6 @@ class VRGetSupportedLanguagesResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_GET_SUPPORTED_LANGUAGES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_request.h index 0b580f6c1d..2dba80065a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_request.h @@ -89,6 +89,6 @@ class VRIsReadyRequest : public app_mngr::commands::RequestToHMI, } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_IS_READY_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h index 42c47f5077..f901147094 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_is_ready_response.h @@ -72,6 +72,6 @@ class VRIsReadyResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_IS_READY_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_request.h index 6f206c010f..8cbd2e346e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_request.h @@ -73,6 +73,6 @@ class VRPerformInteractionRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_PERFORM_INTERACTION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h index 9e8599419f..60cb4cb80c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/vr_perform_interaction_response.h @@ -74,6 +74,6 @@ class VRPerformInteractionResponse } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VR_PERFORM_INTERACTION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_request.h index 745fb3ec18..8cac0d686d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_request.h @@ -164,6 +164,6 @@ class AddCommandRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ADD_COMMAND_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_response.h index fb3f172b0b..811bda2cc7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_command_response.h @@ -73,6 +73,6 @@ class AddCommandResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ADD_COMMAND_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h index 37ba9a5990..2da94ae67e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h @@ -92,6 +92,6 @@ class AddSubMenuRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ADD_SUB_MENU_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_response.h index 253556f899..ba15f04cd0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_response.h @@ -73,6 +73,6 @@ class AddSubMenuResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ADD_SUB_MENU_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_request.h index 93f716cb65..8b7e86fb3f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_request.h @@ -105,6 +105,6 @@ class AlertManeuverRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ALERT_MANEUVER_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_response.h index 8b21aa64eb..2f21fadb54 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_maneuver_response.h @@ -73,6 +73,6 @@ class AlertManeuverResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ALERT_MANEUVER_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_request.h index e34653daf4..dfc7b73487 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_request.h @@ -149,6 +149,6 @@ class AlertRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ALERT_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_response.h index 4ae95fb979..51de24fd41 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/alert_response.h @@ -73,6 +73,6 @@ class AlertResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ALERT_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h index bd5c34ebd1..01f20a68e3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h @@ -38,8 +38,8 @@ #include "application_manager/commands/command_request_impl.h" #include "application_manager/commands/pending.h" -#include "utils/macro.h" #include "utils/custom_string.h" +#include "utils/macro.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -146,11 +146,11 @@ class ChangeRegistrationRequest std::string& ResponseInfo); /** - * @brief Predicate for using with CheckCoincidence method to compare with VR - * synonym SO - * - * @return TRUE if there is coincidence of VR, otherwise FALSE - */ + * @brief Predicate for using with CheckCoincidence method to compare with VR + * synonym SO + * + * @return TRUE if there is coincidence of VR, otherwise FALSE + */ struct CoincidencePredicateVR { CoincidencePredicateVR(const custom_str::CustomString& newItem) : newItem_(newItem) {} @@ -186,6 +186,6 @@ class ChangeRegistrationRequest }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CHANGE_REGISTRATION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_response.h index 4cb8c394c7..8c3b7f0be3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_response.h @@ -75,6 +75,6 @@ class ChangeRegistrationResponse }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CHANGE_REGISTRATION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h index 1ad1c07b2a..a1bc866347 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h @@ -162,11 +162,11 @@ class CreateInteractionChoiceSetRequest app_mngr::ApplicationConstSharedPtr app); /* - * @brief Predicate for using with CheckChoiceSet method to compare choice ID - *param - * - * return TRUE if there is coincidence of choice ID, otherwise FALSE - */ + * @brief Predicate for using with CheckChoiceSet method to compare choice ID + *param + * + * return TRUE if there is coincidence of choice ID, otherwise FALSE + */ struct CoincidencePredicateChoiceID { CoincidencePredicateChoiceID(const uint32_t newItem) : newItem_(newItem) {} @@ -178,11 +178,11 @@ class CreateInteractionChoiceSetRequest }; /* - * @brief Predicate for using with CheckChoiceSet method to compare menu name - *param - * - * return TRUE if there is coincidence of menu name, otherwise FALSE - */ + * @brief Predicate for using with CheckChoiceSet method to compare menu name + *param + * + * return TRUE if there is coincidence of menu name, otherwise FALSE + */ struct CoincidencePredicateMenuName { CoincidencePredicateMenuName(const std::string& newItem) : newItem_(newItem) {} @@ -195,11 +195,11 @@ class CreateInteractionChoiceSetRequest }; /* - * @brief Predicate for using with CheckChoiceSet method to compare VR commands - *param - * - * return TRUE if there is coincidence of VR commands, otherwise FALSE - */ + * @brief Predicate for using with CheckChoiceSet method to compare VR + *commands param + * + * return TRUE if there is coincidence of VR commands, otherwise FALSE + */ struct CoincidencePredicateVRCommands { CoincidencePredicateVRCommands(const smart_objects::SmartObject& newItem) : newItem_(newItem) {} @@ -219,7 +219,7 @@ class CreateInteractionChoiceSetRequest * * return Return TRUE if there are similar VR synonyms in choice set, * otherwise FALSE - */ + */ bool compareSynonyms( const ns_smart_device_link::ns_smart_objects::SmartObject& choice1, const ns_smart_device_link::ns_smart_objects::SmartObject& choice2); @@ -232,7 +232,7 @@ class CreateInteractionChoiceSetRequest * * return Return TRUE if there are similar VR synonyms in choice set, * otherwise FALSE - */ + */ static bool compareStr( const ns_smart_device_link::ns_smart_objects::SmartObject& str1, const ns_smart_device_link::ns_smart_objects::SmartObject& str2); @@ -273,6 +273,6 @@ class CreateInteractionChoiceSetRequest }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CREATE_INTERACTION_CHOICE_SET_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_response.h index 76718bc2c3..0bfc0e5cdf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_response.h @@ -75,6 +75,6 @@ class CreateInteractionChoiceSetResponse }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CREATE_INTERACTION_CHOICE_SET_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_request.h index a21b1928d0..45864ca3aa 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_request.h @@ -114,6 +114,6 @@ class DeleteCommandRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_COMMAND_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_response.h index f81f119792..a91012a934 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_command_response.h @@ -73,6 +73,6 @@ class DeleteCommandResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_COMMAND_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_request.h index 02cd0086b6..8e4d63df4a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_request.h @@ -78,6 +78,6 @@ class DeleteFileRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_FILE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_response.h index fbdc70c9bc..8fbc79ba9f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_file_response.h @@ -73,6 +73,6 @@ class DeleteFileResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_FILE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_request.h index 4dec11a67b..c1d8759962 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_request.h @@ -34,8 +34,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_INTERACTION_CHOICE_SET_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_INTERACTION_CHOICE_SET_REQUEST_H_ -#include "application_manager/commands/command_request_impl.h" #include "application_manager/application.h" +#include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" namespace sdl_rpc_plugin { @@ -90,6 +90,6 @@ class DeleteInteractionChoiceSetRequest }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_INTERACTION_CHOICE_SET_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_response.h index 0fce16ea9f..bd67f9c556 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_response.h @@ -75,6 +75,6 @@ class DeleteInteractionChoiceSetResponse }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_INTERACTION_CHOICE_SET_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_request.h index c947fda78a..2f85065ee7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_request.h @@ -34,8 +34,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_SUB_MENU_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_SUB_MENU_REQUEST_H_ -#include "application_manager/commands/command_request_impl.h" #include "application_manager/application.h" +#include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" namespace sdl_rpc_plugin { @@ -104,6 +104,6 @@ class DeleteSubMenuRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_SUB_MENU_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_response.h index e5b0c58a34..c569d61258 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_sub_menu_response.h @@ -73,6 +73,6 @@ class DeleteSubMenuResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_SUB_MENU_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_request.h index 3e313602c7..750288f5e8 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_request.h @@ -61,13 +61,13 @@ class DialNumberRequest : public app_mngr::commands::CommandRequestImpl { ~DialNumberRequest() OVERRIDE; /** - * @brief Initialize request params + * @brief Initialize request params **/ bool Init() OVERRIDE; /** - * @brief Execute command - **/ + * @brief Execute command + **/ void Run() OVERRIDE; /** @@ -90,6 +90,6 @@ class DialNumberRequest : public app_mngr::commands::CommandRequestImpl { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DIAL_NUMBER_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_response.h index 6181231458..9c47537c6f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/dial_number_response.h @@ -73,6 +73,6 @@ class DialNumberResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DIAL_NUMBER_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h index 319a20958e..1c18de3237 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h @@ -80,6 +80,6 @@ class EndAudioPassThruRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_END_AUDIO_PASS_THRU_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_response.h index e2a667f272..1003d9d2d7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_response.h @@ -74,6 +74,6 @@ class EndAudioPassThruResponse }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_END_AUDIO_PASS_THRU_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/generic_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/generic_response.h index b780daaf03..6516d3cef1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/generic_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/generic_response.h @@ -72,6 +72,6 @@ class GenericResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GENERIC_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_request.h index b8da061870..a5d1611f02 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_request.h @@ -61,7 +61,7 @@ class GetSystemCapabilityRequest DISALLOW_COPY_AND_ASSIGN(GetSystemCapabilityRequest); }; // GetSystemCapabilityRequest -} // commands -} // application_manager +} // namespace commands +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_response.h index 9fa954c89f..61079b3ac2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_system_capability_response.h @@ -60,7 +60,7 @@ class GetSystemCapabilityResponse DISALLOW_COPY_AND_ASSIGN(GetSystemCapabilityResponse); }; // GetSystemCapabilityResponse -} // commands -} // application_manager +} // namespace commands +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_SYSTEM_CAPABILITY_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_request.h index 7197874475..ec656820e5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_request.h @@ -76,6 +76,6 @@ class GetWayPointsRequest : public app_mngr::commands::CommandRequestImpl { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_response.h index bb480a7ac0..1b8f055e9c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/get_way_points_response.h @@ -71,6 +71,6 @@ class GetWayPointsResponse : public app_mngr::commands::CommandResponseImpl { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_request.h index 53d75819f8..d98fa433b4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_request.h @@ -73,6 +73,6 @@ class ListFilesRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_LIST_FILES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_response.h index 1b3cdf1b02..d259b27ecf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/list_files_response.h @@ -73,6 +73,6 @@ class ListFilesResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_LIST_FILES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_app_interface_unregistered_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_app_interface_unregistered_notification.h index ba01d4bb28..28508d386c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_app_interface_unregistered_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_app_interface_unregistered_notification.h @@ -75,6 +75,6 @@ class OnAppInterfaceUnregisteredNotification }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_APP_INTERFACE_UNREGISTERED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_audio_pass_thru_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_audio_pass_thru_notification.h index e3410bd873..a6de6b929c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_audio_pass_thru_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_audio_pass_thru_notification.h @@ -77,6 +77,6 @@ class OnAudioPassThruNotification }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_AUDIO_PASS_THRU_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_event_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_event_notification.h index 6afdc0e1cf..afde9bac92 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_event_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_event_notification.h @@ -34,8 +34,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_BUTTON_EVENT_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_BUTTON_EVENT_NOTIFICATION_H_ -#include "application_manager/commands/command_notification_impl.h" #include "application_manager/application.h" +#include "application_manager/commands/command_notification_impl.h" #include "utils/macro.h" namespace sdl_rpc_plugin { @@ -87,6 +87,6 @@ class OnButtonEventNotification } // namespace mobile } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_BUTTON_EVENT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_press_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_press_notification.h index fe9bc449be..57fda49be7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_press_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_button_press_notification.h @@ -34,8 +34,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_BUTTON_PRESS_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_BUTTON_PRESS_NOTIFICATION_H_ -#include "application_manager/commands/command_notification_impl.h" #include "application_manager/application.h" +#include "application_manager/commands/command_notification_impl.h" #include "utils/macro.h" namespace sdl_rpc_plugin { @@ -86,6 +86,6 @@ class OnButtonPressNotification } // namespace mobile } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_BUTTON_PRESS_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_command_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_command_notification.h index 367b280e73..76ee0b4052 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_command_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_command_notification.h @@ -77,6 +77,6 @@ class OnCommandNotification }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_COMMAND_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_driver_distraction_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_driver_distraction_notification.h index 82e6097d84..9c7fb5e91b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_driver_distraction_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_driver_distraction_notification.h @@ -79,6 +79,6 @@ class OnDriverDistractionNotification } // namespace mobile } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_DRIVER_DISTRACTION_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hash_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hash_change_notification.h index 76c9cf34c5..b62f74e199 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hash_change_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hash_change_notification.h @@ -76,6 +76,6 @@ class OnHashChangeNotification } // namespace mobile } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_HASH_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification.h index 0e1919676b..ef040de3de 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification.h @@ -74,6 +74,6 @@ class OnHMIStatusNotification }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_HMI_STATUS_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification_from_mobile.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification_from_mobile.h index 12e3b54be9..6f3ef40076 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification_from_mobile.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_hmi_status_notification_from_mobile.h @@ -34,8 +34,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_HMI_STATUS_NOTIFICATION_FROM_MOBILE_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_HMI_STATUS_NOTIFICATION_FROM_MOBILE_H_ -#include "application_manager/commands/command_notification_from_mobile_impl.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/command_notification_from_mobile_impl.h" #include "interfaces/MOBILE_API.h" #include "utils/macro.h" @@ -77,6 +77,6 @@ class OnHMIStatusNotificationFromMobile }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_HMI_STATUS_NOTIFICATION_FROM_MOBILE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_keyboard_input_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_keyboard_input_notification.h index d34815ff2f..52f6e5d487 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_keyboard_input_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_keyboard_input_notification.h @@ -78,6 +78,6 @@ class OnKeyBoardInputNotification } // namespace mobile } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_KEYBOARD_INPUT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_language_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_language_change_notification.h index b234b93796..1bc1e94b1f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_language_change_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_language_change_notification.h @@ -75,6 +75,6 @@ class OnLanguageChangeNotification }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_LANGUAGE_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_permissions_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_permissions_change_notification.h index f586a0d36c..eca3cebf31 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_permissions_change_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_permissions_change_notification.h @@ -75,6 +75,6 @@ class OnPermissionsChangeNotification }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_PERMISSIONS_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_system_capability_updated_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_system_capability_updated_notification.h index 1f7e8468db..f29c7dcf2b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_system_capability_updated_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_system_capability_updated_notification.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_SYSTEM_CAPABILITY_UPDATED_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_SYSTEM_CAPABILITY_UPDATED_NOTIFICATION_H_ +#include #include "application_manager/commands/command_notification_impl.h" #include "policy/policy_table/enums.h" -#include namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -79,6 +79,6 @@ class OnSystemCapabilityUpdatedNotification } // namespace mobile } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_SYSTEM_CAPABILITY_UPDATED_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_system_request_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_system_request_notification.h index b369ad38f2..a0148a4abd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_system_request_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_system_request_notification.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_SYSTEM_REQUEST_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_SYSTEM_REQUEST_NOTIFICATION_H_ +#include #include "application_manager/commands/command_notification_impl.h" #include "policy/policy_table/enums.h" -#include namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -88,6 +88,6 @@ class OnSystemRequestNotification } // namespace mobile } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_SYSTEM_REQUEST_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_tbt_client_state_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_tbt_client_state_notification.h index 39b12fea15..cbb7525092 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_tbt_client_state_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_tbt_client_state_notification.h @@ -75,6 +75,6 @@ class OnTBTClientStateNotification }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_TBT_CLIENT_STATE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_touch_event_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_touch_event_notification.h index 858759b793..48872d9b27 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_touch_event_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_touch_event_notification.h @@ -77,6 +77,6 @@ class OnTouchEventNotification } // namespace mobile } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_TOUCH_EVENT_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_way_point_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_way_point_change_notification.h index c379fceb02..ed7cbccf4a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_way_point_change_notification.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/on_way_point_change_notification.h @@ -71,5 +71,5 @@ class OnWayPointChangeNotification }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_WAY_POINT_CHANGE_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h index 1a4c248a02..434b6de028 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h @@ -35,8 +35,8 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_AUDIO_PASS_THRU_REQUEST_H_ #include "application_manager/commands/command_request_impl.h" -#include "utils/macro.h" #include "interfaces/MOBILE_API.h" +#include "utils/macro.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -184,6 +184,6 @@ class PerformAudioPassThruRequest }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_AUDIO_PASS_THRU_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_response.h index 6654762067..300ea6531f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_response.h @@ -75,6 +75,6 @@ class PerformAudioPassThruResponse }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_AUDIO_PASS_THRU_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_request.h index 2d4cbc9afc..0572679c85 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_request.h @@ -36,8 +36,8 @@ #include -#include "application_manager/commands/command_request_impl.h" #include "application_manager/application.h" +#include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" namespace sdl_rpc_plugin { @@ -246,6 +246,6 @@ class PerformInteractionRequest }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_INTERACTION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_response.h index 6bb9135dcc..113757a1ad 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_response.h @@ -75,6 +75,6 @@ class PerformInteractionResponse }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PERFORM_INTERACTION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_request.h index 2783280f87..f24ce422f2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_request.h @@ -34,9 +34,9 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PUT_FILE_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PUT_FILE_REQUEST_H_ +#include "application_manager/application_manager.h" #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -#include "application_manager/application_manager.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -81,6 +81,6 @@ class PutFileRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PUT_FILE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_response.h index 22dbf1b5d5..348a217eba 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/put_file_response.h @@ -73,6 +73,6 @@ class PutFileResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_PUT_FILE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h index 91ee8ea813..8a80db9cdf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h @@ -36,8 +36,8 @@ #include "application_manager/commands/command_request_impl.h" #include "application_manager/policies/policy_handler_interface.h" -#include "utils/macro.h" #include "utils/custom_string.h" +#include "utils/macro.h" namespace policy { struct DeviceInfo; @@ -154,11 +154,11 @@ class RegisterAppInterfaceRequest std::vector& out_duplicate_apps); /* - * @brief Predicate for using with CheckCoincidence method to compare with VR - * synonym SO - * - * return TRUE if there is coincidence of VR, otherwise FALSE - */ + * @brief Predicate for using with CheckCoincidence method to compare with VR + * synonym SO + * + * return TRUE if there is coincidence of VR, otherwise FALSE + */ struct CoincidencePredicateVR { CoincidencePredicateVR(const custom_str::CustomString& newItem) : newItem_(newItem) {} @@ -225,6 +225,6 @@ class RegisterAppInterfaceRequest } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_REGISTER_APP_INTERFACE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_response.h index d591d67794..2a6e847067 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_response.h @@ -79,6 +79,6 @@ class RegisterAppInterfaceResponse }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_REGISTER_APP_INTERFACE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_request.h index 6f7e330bf5..880fced6ba 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_request.h @@ -34,8 +34,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_RESET_GLOBAL_PROPERTIES_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_RESET_GLOBAL_PROPERTIES_REQUEST_H_ -#include "application_manager/commands/command_request_impl.h" #include "application_manager/application.h" +#include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" namespace sdl_rpc_plugin { @@ -144,6 +144,6 @@ class ResetGlobalPropertiesRequest }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_RESET_GLOBAL_PROPERTIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_response.h index b33ef41426..6d9b604b41 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/reset_global_properties_response.h @@ -75,6 +75,6 @@ class ResetGlobalPropertiesResponse }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_RESET_GLOBAL_PROPERTIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_request.h index a641fa0cd4..58b7b4491a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_request.h @@ -85,6 +85,6 @@ class ScrollableMessageRequest : public app_mngr::commands::CommandRequestImpl { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SCROLLABLE_MESSAGE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_response.h index 8bc8a36363..e5c668b424 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/scrollable_message_response.h @@ -68,6 +68,6 @@ class ScrollableMessageResponse }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SCROLLABLE_MESSAGE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_request.h index e3ed6ef28b..2f00b58d9e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_request.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_HAPTIC_DATA_REQUEST_H_ #include -#include "application_manager/commands/command_request_impl.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/command_request_impl.h" #include "application_manager/event_engine/event.h" #include "smart_objects/smart_object.h" @@ -83,6 +83,6 @@ class SendHapticDataRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_HAPTIC_DATA_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_response.h index 53e8766241..515fe3f74d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_haptic_data_response.h @@ -72,6 +72,6 @@ class SendHapticDataResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_HAPTIC_DATA_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_request.h index 6626da4c9d..5a0dc67f35 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_request.h @@ -75,10 +75,10 @@ class SendLocationRequest : public app_mngr::commands::CommandRequestImpl { private: /** - * @brief CheckFieldsCompatibility checks if fields are compatible with each - * other. - * @return true if compatible, otherwise return false - */ + * @brief CheckFieldsCompatibility checks if fields are compatible with each + * other. + * @return true if compatible, otherwise return false + */ bool CheckFieldsCompatibility(); /** @@ -95,6 +95,6 @@ class SendLocationRequest : public app_mngr::commands::CommandRequestImpl { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_LOCATION_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_response.h index cb461f9a60..a2e9d1eb0a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/send_location_response.h @@ -66,6 +66,6 @@ class SendLocationResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SEND_LOCATION_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h index 1075999af9..86ca2fb126 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h @@ -111,6 +111,6 @@ class SetAppIconRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_APP_ICON_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_response.h index e4ce0725dc..a9b203bec7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_response.h @@ -73,6 +73,6 @@ class SetAppIconResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_APP_ICON_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_request.h index 4bd800988c..2f9c0946d3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_request.h @@ -80,6 +80,6 @@ class SetDisplayLayoutRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_DISPLAY_LAYOUT_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_response.h index 73f57fc187..7b43613ac4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_display_layout_response.h @@ -74,6 +74,6 @@ class SetDisplayLayoutResponse }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_DISPLAY_LAYOUT_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_request.h index 674de4731a..e84bf6e5e6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_request.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_GLOBAL_PROPERTIES_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_GLOBAL_PROPERTIES_REQUEST_H_ #include +#include "application_manager/application.h" #include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" -#include "application_manager/application.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -153,6 +153,6 @@ class SetGlobalPropertiesRequest }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_GLOBAL_PROPERTIES_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_response.h index 778dc9b7d7..f8d8117250 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_response.h @@ -75,6 +75,6 @@ class SetGlobalPropertiesResponse }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_GLOBAL_PROPERTIES_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_request.h index ef674f1c38..adced13d73 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_request.h @@ -81,6 +81,6 @@ class SetMediaClockRequest : public app_mngr::commands::CommandRequestImpl { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_MEDIA_CLOCK_TIMER_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_response.h index 2fb3f25839..240d1be8d1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_media_clock_timer_response.h @@ -69,6 +69,6 @@ class SetMediaClockTimerResponse }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SET_MEDIA_CLOCK_TIMER_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h index cadc87cef6..7694070a72 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h @@ -89,6 +89,6 @@ class ShowConstantTBTRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SHOW_CONSTANT_TBT_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_response.h index 4129a7640e..4b2136ad11 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_constant_tbt_response.h @@ -73,6 +73,6 @@ class ShowConstantTBTResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SHOW_CONSTANT_TBT_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_request.h index 2277a38f11..586004b783 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_request.h @@ -98,6 +98,6 @@ class ShowRequest : public app_mngr::commands::CommandRequestImpl { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SHOW_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_response.h index c78820a26e..97843c2148 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_response.h @@ -67,6 +67,6 @@ class ShowResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SHOW_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_request.h index f1e06e8d8d..5dbcbb7d41 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_request.h @@ -91,6 +91,6 @@ class SliderRequest : public app_mngr::commands::CommandRequestImpl { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SLIDER_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_response.h index 2a93103632..842e52f595 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/slider_response.h @@ -67,6 +67,6 @@ class SliderResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SLIDER_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_request.h index d6d47bb869..68e35fcd1d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_request.h @@ -93,6 +93,6 @@ class SpeakRequest : public app_mngr::commands::CommandRequestImpl { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SPEAK_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_response.h index 30eda07810..02b7baae54 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/speak_response.h @@ -67,6 +67,6 @@ class SpeakResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SPEAK_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_request.h index 011c0aa359..2b9887daad 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_request.h @@ -34,8 +34,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_BUTTON_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_BUTTON_REQUEST_H_ -#include "application_manager/commands/command_request_impl.h" #include "application_manager/application_impl.h" +#include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" namespace sdl_rpc_plugin { @@ -98,6 +98,6 @@ class SubscribeButtonRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_BUTTON_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_response.h index 28e942ec17..b42ccb91e1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_button_response.h @@ -73,6 +73,6 @@ class SubscribeButtonResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_BUTTON_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h index 6105f08750..8b88a1c884 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h @@ -80,8 +80,8 @@ class SubscribeWayPointsRequest DISALLOW_COPY_AND_ASSIGN(SubscribeWayPointsRequest); }; -} // commands +} // namespace commands -} // application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h index cd27e96d25..4039f21f8e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h @@ -71,8 +71,8 @@ class SubscribeWayPointsResponse DISALLOW_COPY_AND_ASSIGN(SubscribeWayPointsResponse); }; -} // commands +} // namespace commands -} // application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_request.h index c34db34506..eb2398f279 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_request.h @@ -35,8 +35,8 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SYSTEM_REQUEST_H_ #include -#include "application_manager/commands/command_request_impl.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/command_request_impl.h" #include "application_manager/event_engine/event.h" #include "smart_objects/smart_object.h" @@ -93,6 +93,6 @@ class SystemRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SYSTEM_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_response.h index afbd557d12..5c3f69d757 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/system_response.h @@ -72,6 +72,6 @@ class SystemResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SYSTEM_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h index 172f934a15..0bc01f2aaa 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h @@ -80,6 +80,6 @@ class UnregisterAppInterfaceRequest } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNREGISTER_APP_INTERFACE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_response.h index 13d8b549e8..d1ac004ca0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unregister_app_interface_response.h @@ -76,6 +76,6 @@ class UnregisterAppInterfaceResponse }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNREGISTER_APP_INTERFACE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h index 8cbaafbfe1..51c10642cf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_request.h @@ -84,6 +84,6 @@ class UnsubscribeButtonRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_BUTTON_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_response.h index 1db067acce..efd5478363 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_button_response.h @@ -74,6 +74,6 @@ class UnsubscribeButtonResponse }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_BUTTON_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h index fe14f5c7eb..e83e9b7509 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h @@ -79,8 +79,8 @@ class UnsubscribeWayPointsRequest DISALLOW_COPY_AND_ASSIGN(UnsubscribeWayPointsRequest); }; -} // commands +} // namespace commands -} // application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_response.h index c578bf9f99..9ab167284a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_response.h @@ -71,8 +71,8 @@ class UnsubscribeWayPointsResponse DISALLOW_COPY_AND_ASSIGN(UnsubscribeWayPointsResponse); }; -} // commands +} // namespace commands -} // application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_WAY_POINTS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_request.h index 8766339f96..e1e5df2289 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_request.h @@ -97,6 +97,6 @@ class UpdateTurnListRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UPDATE_TURN_LIST_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_response.h index 59d3bf0b2c..80e143644f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_response.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/update_turn_list_response.h @@ -73,6 +73,6 @@ class UpdateTurnListResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UPDATE_TURN_LIST_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/extensions/system_capability_app_extension.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/extensions/system_capability_app_extension.h index fb82cf37c2..935716aa30 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/extensions/system_capability_app_extension.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/extensions/system_capability_app_extension.h @@ -78,6 +78,6 @@ class SystemCapabilityAppExtension : public app_mngr_::AppExtension { SDLRPCPlugin& plugin_; app_mngr_::Application& app_; }; -} +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_EXTENSIONS_SYSTEM_CAPABILITY_APP_EXTENSION_H diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/hmi_command_factory.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/hmi_command_factory.h index eee454fb00..95bb253120 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/hmi_command_factory.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/hmi_command_factory.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_HMI_COMMAND_FACTORY_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_HMI_COMMAND_FACTORY_H_ -#include "application_manager/command_factory.h" #include "application_manager/application_manager.h" +#include "application_manager/command_factory.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -70,6 +70,6 @@ class HMICommandFactory : public app_mngr::CommandFactory { DISALLOW_COPY_AND_ASSIGN(HMICommandFactory); }; -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_HMI_COMMAND_FACTORY_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/mobile_command_factory.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/mobile_command_factory.h index f0840dde41..d8f790c70e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/mobile_command_factory.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/mobile_command_factory.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_MOBILE_COMMAND_FACTORY_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_MOBILE_COMMAND_FACTORY_H_ -#include "application_manager/command_factory.h" #include "application_manager/application_manager.h" +#include "application_manager/command_factory.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -70,6 +70,6 @@ class MobileCommandFactory : public app_mngr::CommandFactory { DISALLOW_COPY_AND_ASSIGN(MobileCommandFactory); }; -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_MOBILE_COMMAND_FACTORY_H_ diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_command_factory.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_command_factory.h index 5b5f0ae49f..edbfe1bdc0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_command_factory.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_command_factory.h @@ -36,11 +36,11 @@ #include #include "application_manager/application_manager.h" #include "application_manager/command_factory.h" -#include "sdl_rpc_plugin/hmi_command_factory.h" -#include "sdl_rpc_plugin/mobile_command_factory.h" -#include "application_manager/rpc_service.h" #include "application_manager/hmi_capabilities.h" #include "application_manager/policies/policy_handler_interface.h" +#include "application_manager/rpc_service.h" +#include "sdl_rpc_plugin/hmi_command_factory.h" +#include "sdl_rpc_plugin/mobile_command_factory.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -69,5 +69,5 @@ class SDLCommandFactory : public app_mngr::CommandFactory { std::unique_ptr hmi_command_factory_; std::unique_ptr mobile_command_factory_; }; -} +} // namespace sdl_rpc_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_SDL_COMMAND_FACTORY_H diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h index b57fcbec12..7d482709cb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h @@ -32,8 +32,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_SDL_RPC_PLUGIN_H #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_SDL_RPC_PLUGIN_H -#include "application_manager/plugin_manager/rpc_plugin.h" #include "application_manager/command_factory.h" +#include "application_manager/plugin_manager/rpc_plugin.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -64,7 +64,7 @@ class SDLRPCPlugin : public plugins::RPCPlugin { std::unique_ptr command_factory_; }; -} +} // namespace sdl_rpc_plugin extern "C" application_manager::plugin_manager::RPCPlugin* Create(); 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 19d01b594f..c6d181bf57 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 @@ -75,4 +75,4 @@ void ActivateAppRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 d7e38c5d5b..b829ef711e 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 @@ -63,4 +63,4 @@ void ActivateAppResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 3e46bd353a..93999f704d 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 @@ -64,4 +64,4 @@ void AddStatisticsInfoNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 b227dd79dc..68c7896a7f 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 @@ -59,4 +59,4 @@ void AllowAllAppsRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 2fdf29a7dd..c2182f4853 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 @@ -59,4 +59,4 @@ void AllowAllAppsResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 0c6e5145c7..6b5af76fb1 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 @@ -59,4 +59,4 @@ void AllowAppRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 4853c3764a..c62645c6c0 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 @@ -70,4 +70,4 @@ void AllowAppResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_get_system_time_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_get_system_time_response.cc index c067debf36..e26753b3f2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_get_system_time_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_get_system_time_response.cc @@ -62,4 +62,4 @@ void BasicCommunicationGetSystemTimeResponse::Run() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 0c39389116..361dc5fea6 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 @@ -79,4 +79,4 @@ void OnAwakeSDLNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 04e44a6979..052a40a888 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 @@ -58,4 +58,4 @@ void BasicCommunicationSystemRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 5f8221fdbe..0b052de88d 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 @@ -63,4 +63,4 @@ void BasicCommunicationSystemResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_get_file_path_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_get_file_path_response.cc index b86ab6a2b8..58cda68a2b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_get_file_path_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_get_file_path_response.cc @@ -32,9 +32,9 @@ #include "sdl_rpc_plugin/commands/hmi/bc_get_file_path_response.h" #include "application_manager/application_impl.h" +#include "application_manager/event_engine/event.h" #include "application_manager/rpc_service.h" #include "interfaces/MOBILE_API.h" -#include "application_manager/event_engine/event.h" namespace sdl_rpc_plugin { using namespace application_manager; 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 cf2fbd9761..6696689174 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 @@ -60,4 +60,4 @@ void ButtonGetCapabilitiesRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 628eaa2e58..b6ab822c47 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 @@ -78,4 +78,4 @@ void ButtonGetCapabilitiesResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 84a47b9deb..988794f668 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 @@ -58,4 +58,4 @@ void ClosePopupRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 25396af337..072e1960e9 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 @@ -58,4 +58,4 @@ void ClosePopupResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 0e09c14650..71782ef575 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 @@ -59,4 +59,4 @@ void DecryptCertificateRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 694298ed91..cf2a4d092c 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 @@ -64,5 +64,5 @@ void DecryptCertificateResponse::Run() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin #endif // 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 63f5c2e815..97b5109642 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 @@ -61,4 +61,4 @@ void DialNumberRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 6d37ece2bf..4ff6785052 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 @@ -63,4 +63,4 @@ void DialNumberResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 c06c90973d..8546252119 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 @@ -61,4 +61,4 @@ void GetSystemInfoRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 aef428b39f..3dbdf528a5 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 @@ -90,4 +90,4 @@ const SystemInfo GetSystemInfoResponse::GetSystemInfo( } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ae375e4087..54a9633a37 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 @@ -31,10 +31,10 @@ */ #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" +#include "application_manager/message.h" #include "application_manager/policies/policy_handler.h" +#include "application_manager/rpc_service.h" #include "utils/helpers.h" namespace sdl_rpc_plugin { @@ -227,4 +227,4 @@ void GetUrls::ProcessPolicyServiceURLs(const policy::EndpointUrls& endpoints) { #endif // PROPRIETARY_MODE } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 57c925e08f..77d90ec8bb 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 @@ -60,4 +60,4 @@ void GetUrlsResponse::Run() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 39f7e61c06..b8c61ca902 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 @@ -59,4 +59,4 @@ void MixingAudioSupportedRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 26fa967844..089e56e598 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 @@ -60,4 +60,4 @@ void MixingAudioSupportedResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ae3695b68e..8390fea5bc 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 @@ -59,4 +59,4 @@ void NaviAlertManeuverRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 6a6307038a..a1603f069d 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 @@ -63,4 +63,4 @@ void NaviAlertManeuverResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 a9698d36ab..371f47a759 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 @@ -79,8 +79,8 @@ void AudioStartStreamRequest::Run() { application_manager_.application_by_hmi_app(application_id()); if (!app) { LOG4CXX_ERROR(logger_, - "Applcation with hmi_app_id " << application_id() - << " does not exist"); + "Application with hmi_app_id " << application_id() + << " does not exist"); return; } SetAllowedToTerminate(false); @@ -189,4 +189,4 @@ void AudioStartStreamRequest::RetryStartSession() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 362a46cc19..61d49577f6 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 @@ -60,4 +60,4 @@ void AudioStartStreamResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ba2b8c8157..a5d436f015 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 @@ -62,4 +62,4 @@ void AudioStopStreamRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 87ddc81696..98023ab571 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 @@ -56,4 +56,4 @@ void AudioStopStreamResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 77ef3e3369..edc4afe1e4 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 @@ -59,4 +59,4 @@ void NaviGetWayPointsRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 0aad5e5724..0f0b652d01 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 @@ -63,4 +63,4 @@ void NaviGetWayPointsResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 781b8d3045..15e5b46b36 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 @@ -84,4 +84,4 @@ void NaviIsReadyRequest::on_event(const event_engine::Event& event) { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 b4e64e2a3e..073513eda9 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 @@ -58,4 +58,4 @@ void NaviIsReadyResponse::Run() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 a10f61310d..360870e21c 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 @@ -59,4 +59,4 @@ void NaviSendLocationRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 f93e2e17c3..dc60f2fbf0 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 @@ -61,4 +61,4 @@ void NaviSendLocationResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 5e4426bd20..764315f37f 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 @@ -65,9 +65,9 @@ void NaviSetVideoConfigRequest::Run() { ApplicationSharedPtr app = application_manager_.application_by_hmi_app(application_id()); if (!app) { - LOG4CXX_ERROR(logger_, - "Application with hmi_app_id " << application_id() - << "does not exist"); + LOG4CXX_ERROR( + logger_, + "Application with hmi_app_id " << application_id() << "does not exist"); return; } @@ -100,9 +100,9 @@ void NaviSetVideoConfigRequest::on_event(const event_engine::Event& event) { LOG4CXX_DEBUG(logger_, "Received SetVideoConfig success response"); result = true; } else { - LOG4CXX_DEBUG(logger_, - "Received SetVideoConfig failure response (" << event.id() - << ")"); + LOG4CXX_DEBUG( + logger_, + "Received SetVideoConfig failure response (" << event.id() << ")"); result = false; if (message[strings::msg_params].keyExists(strings::rejected_params)) { const smart_objects::SmartArray* list = @@ -153,4 +153,4 @@ void NaviSetVideoConfigRequest::onTimeOut() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 c5f1c5307f..e4a30c9da5 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 @@ -61,4 +61,4 @@ void NaviSetVideoConfigResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 22d604ab0d..95dd4561fc 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 @@ -59,4 +59,4 @@ void NaviShowConstantTBTRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 d2ff26b645..f73099d29a 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 @@ -63,4 +63,4 @@ void NaviShowConstantTBTResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 f3d971acba..7f643d6130 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 @@ -79,9 +79,9 @@ void NaviStartStreamRequest::Run() { ApplicationSharedPtr app = application_manager_.application_by_hmi_app(application_id()); if (!app) { - LOG4CXX_ERROR(logger_, - "Applcation with hmi_app_id " << application_id() - << "does not exist"); + LOG4CXX_ERROR( + logger_, + "Application with hmi_app_id " << application_id() << "does not exist"); return; } SetAllowedToTerminate(false); @@ -190,4 +190,4 @@ void NaviStartStreamRequest::RetryStartSession() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 f09a334f51..eafd81148a 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 @@ -60,4 +60,4 @@ void NaviStartStreamResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 3e27692d62..ad09b0aee1 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 @@ -62,4 +62,4 @@ void NaviStopStreamRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 61b8d5a1e2..ff8c0bddff 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 @@ -56,4 +56,4 @@ void NaviStopStreamResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 a4445ebce8..ba29f552b7 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 @@ -59,4 +59,4 @@ void NaviSubscribeWayPointsRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ae5f236f6f..ddf8f75e58 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 @@ -64,4 +64,4 @@ void NaviSubscribeWayPointsResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ec22c93d8f..d3c998cfdf 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 @@ -59,4 +59,4 @@ void NaviUnsubscribeWayPointsRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 c084bd52d3..beed29e1e2 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 @@ -32,8 +32,8 @@ #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" +#include "interfaces/MOBILE_API.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -65,4 +65,4 @@ void NaviUnsubscribeWayPointsResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 9c507c3637..a8a258b1c0 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 @@ -59,4 +59,4 @@ void NaviUpdateTurnListRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 eb232e6d01..a2f737df38 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 @@ -63,4 +63,4 @@ void NaviUpdateTurnListResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 398c2dac30..204cc7d347 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 @@ -66,4 +66,4 @@ void OnAllowSDLFunctionalityNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 189596c58a..e882020f8b 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 @@ -64,4 +64,4 @@ void OnAppActivatedNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ee45f9bf1e..18b796eaa8 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 @@ -66,4 +66,4 @@ void OnAppDeactivatedNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 e13299ece7..a1eb412c66 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 @@ -58,4 +58,4 @@ void OnAppPermissionChangedNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 cf83c48a5a..0033b392d2 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 @@ -32,12 +32,12 @@ */ #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" #include #include #include +#include "application_manager/application_manager.h" +#include "application_manager/message_helper.h" +#include "application_manager/policies/policy_handler.h" #include "policy/policy_types.h" #include "smart_objects/smart_object.h" @@ -178,5 +178,5 @@ void OnAppPermissionConsentNotification::Run() { policy_handler_.OnAppPermissionConsent(connection_key, permission_consent); #endif } -} // commands -} // namespace application_manager +} // namespace commands +} // namespace sdl_rpc_plugin 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 24c5a94272..51c3125921 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 @@ -64,4 +64,4 @@ void OnAppRegisteredNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 001b9fa5e0..07aadada81 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 @@ -73,4 +73,4 @@ void OnAppUnregisteredNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 e2cd6d2cbf..d9c1120409 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 @@ -58,4 +58,4 @@ void OnAudioDataStreamingNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification.cc index 0677c97db8..37dca47793 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification.cc @@ -69,7 +69,8 @@ void OnBCSystemCapabilityUpdatedNotification::Run() { hmi_apis::Common_SystemCapabilityType::eType system_capability_type = static_cast( msg_params[strings::system_capability] - [strings::system_capability_type].asInt()); + [strings::system_capability_type] + .asInt()); switch (system_capability_type) { case hmi_apis::Common_SystemCapabilityType::NAVIGATION: { smart_objects::SmartObject nav_capability(smart_objects::SmartType_Map); @@ -134,21 +135,24 @@ void OnBCSystemCapabilityUpdatedNotification::Run() { for (size_t i = 0; i < updated_capabilities.length(); i++) { std::string service_id = updated_capabilities[i][strings::updated_app_service_record] - [strings::service_id].asString(); - auto matching_service_predicate = [&service_id]( - const smart_objects::SmartObject& app_service_capability) { - return service_id == - app_service_capability[strings::updated_app_service_record] - [strings::service_id].asString(); - }; + [strings::service_id] + .asString(); + auto matching_service_predicate = + [&service_id]( + const smart_objects::SmartObject& app_service_capability) { + return service_id == + app_service_capability[strings::updated_app_service_record] + [strings::service_id] + .asString(); + }; auto it = std::find_if(app_services->begin(), app_services->end(), matching_service_predicate); if (it != app_services->end()) { - LOG4CXX_DEBUG(logger_, - "Replacing updated record with service_id " - << service_id); + LOG4CXX_DEBUG( + logger_, + "Replacing updated record with service_id " << service_id); app_services->erase(it); } app_services->push_back(updated_capabilities[i]); @@ -164,4 +168,4 @@ void OnBCSystemCapabilityUpdatedNotification::Run() { } } // namespace commands -} // namespace app_service_rpc_plugin +} // namespace sdl_rpc_plugin 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 1f052b865b..f25e6202cd 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 @@ -67,4 +67,4 @@ void OnButtonEventNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 6c5d8f5a43..fee6b1b485 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 @@ -33,8 +33,8 @@ #include "sdl_rpc_plugin/commands/hmi/on_button_press_notification.h" #include "application_manager/application_impl.h" -#include "utils/logger.h" #include "application_manager/event_engine/event.h" +#include "utils/logger.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -69,4 +69,4 @@ void OnButtonPressNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 70ff1c3fad..4ac752d6c5 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 @@ -63,4 +63,4 @@ void OnButtonSubscriptionNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 2c4f9a1ccc..f27c1fe5e5 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 @@ -63,4 +63,4 @@ void OnDeviceChosenNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 307dccd09b..9ddd822b1c 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 @@ -30,12 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include "sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h" +#include #include "application_manager/application_manager.h" #include "application_manager/message_helper.h" -#include "interfaces/HMI_API.h" #include "encryption/hashing.h" +#include "interfaces/HMI_API.h" namespace { // TODO(AOleynik) : replace this !!! @@ -72,7 +72,7 @@ std::string convert_to_bt_mac(std::string& deviceInternalId) { return bt_mac; } -} +} // namespace namespace sdl_rpc_plugin { using namespace application_manager; @@ -121,4 +121,4 @@ void OnDeviceStateChangedNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 a5fb9b206e..2f3ee60a16 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 @@ -30,13 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include "sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h" +#include #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" -#include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -90,7 +90,7 @@ struct OnDriverDistractionProcessor { ApplicationManager& application_manager_; std::string stringified_function_id_; }; -} +} // namespace OnDriverDistractionNotification::OnDriverDistractionNotification( const application_manager::commands::MessageSharedPtr& message, @@ -139,4 +139,4 @@ void OnDriverDistractionNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 cd3f2c23e6..f6ea22ae34 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 @@ -61,4 +61,4 @@ void OnEventChangedNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 9d250d288e..4c168f9eff 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 @@ -32,13 +32,13 @@ #include "sdl_rpc_plugin/commands/hmi/on_exit_all_applications_notification.h" +#include #include #include -#include #include "application_manager/application_manager.h" -#include "application_manager/rpc_service.h" #include "application_manager/resumption/resume_ctrl.h" +#include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" namespace sdl_rpc_plugin { @@ -122,4 +122,4 @@ void OnExitAllApplicationsNotification::SendOnSDLPersistenceComplete() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 b6d44a4511..a2e6836857 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 @@ -33,11 +33,11 @@ #include "sdl_rpc_plugin/commands/hmi/on_exit_application_notification.h" #include "application_manager/application_impl.h" -#include "application_manager/state_controller.h" #include "application_manager/message_helper.h" #include "application_manager/rpc_service.h" -#include "interfaces/MOBILE_API.h" +#include "application_manager/state_controller.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -126,4 +126,4 @@ void OnExitApplicationNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ec680c667d..e1f0e2b104 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 @@ -59,4 +59,4 @@ void OnFileRemovedNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 c74dd70c84..2e8f15387f 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 @@ -59,4 +59,4 @@ void OnFindApplications::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 9ff1851e3f..9c2c68989f 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 @@ -59,4 +59,4 @@ void OnIgnitionCycleOverNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 20f20ece08..f611b81764 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 @@ -64,4 +64,4 @@ void OnNaviTBTClientStateNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 fa8819ca5b..2a1a9c29fb 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 @@ -60,4 +60,4 @@ void OnNaviWayPointChangeNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 e069bea740..67352fbc4a 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 @@ -57,4 +57,4 @@ void OnPolicyUpdate::Run() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 1524aa9ea2..441e36a385 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 @@ -59,4 +59,4 @@ void OnPutFileNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 76c9115662..da3612b043 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 @@ -62,4 +62,4 @@ void OnReadyNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 1eaef0b5e1..4a8c8df0ee 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 @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include "sdl_rpc_plugin/commands/hmi/on_received_policy_update.h" +#include #include "application_manager/application_manager.h" #include "utils/file_system.h" @@ -74,4 +74,4 @@ void OnReceivedPolicyUpdate::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 60699e5b9c..dbef717539 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 @@ -59,4 +59,4 @@ void OnRecordStartdNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 9f8a713ffe..11d549655e 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 @@ -59,4 +59,4 @@ void OnResumeAudioSourceNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 65879edce6..d0c584c66c 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 @@ -59,4 +59,4 @@ void OnSDLCloseNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 cf8feb4ca1..314a9e8f71 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 @@ -59,4 +59,4 @@ void OnSDLConsentNeededNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 0ac4afd4d2..5db38d070b 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 @@ -58,4 +58,4 @@ void OnSDLPersistenceCompleteNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 2cee7926bd..035def10e0 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 @@ -59,4 +59,4 @@ void OnStartDeviceDiscovery::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 4cb01e7e90..5ee2ede198 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 @@ -58,4 +58,4 @@ void OnStatusUpdateNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 242fb1d8cd..38b87f23d3 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 @@ -33,8 +33,8 @@ #include "sdl_rpc_plugin/commands/hmi/on_system_context_notification.h" #include "application_manager/application_impl.h" -#include "application_manager/state_controller.h" #include "application_manager/message_helper.h" +#include "application_manager/state_controller.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -85,4 +85,4 @@ void OnSystemContextNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 5591d59355..6a5ee4fce4 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 @@ -64,4 +64,4 @@ void OnSystemErrorNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 11b2471294..b7ba6951fb 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 @@ -66,4 +66,4 @@ void OnSystemInfoChangedNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 d795896764..a9670681b2 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,9 +32,9 @@ #include "application_manager/application_impl.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 "sdl_rpc_plugin/commands/hmi/on_system_request_notification.h" #include "utils/macro.h" using policy::PolicyHandlerInterface; @@ -121,4 +121,4 @@ void OnSystemRequestNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_time_ready_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_time_ready_notification.cc index b5fd1a007e..b068835545 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_time_ready_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_time_ready_notification.cc @@ -59,4 +59,4 @@ void OnSystemTimeReadyNotification::Run() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 5b5cfeefb1..f89baad737 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 @@ -100,4 +100,4 @@ void OnTTSLanguageChangeNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 701dbe0538..8b60762b31 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 @@ -66,4 +66,4 @@ void OnTTSResetTimeoutNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 34ba82df1d..2d215b2ec9 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 @@ -60,4 +60,4 @@ void OnTTSStartedNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 0935a36848..6910b188f2 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 @@ -63,4 +63,4 @@ void OnTTSStoppedNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 21cf0d9628..6cc9f85d6f 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 @@ -65,4 +65,4 @@ void OnUICommandNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 fbdd4fce2b..f069e4ed65 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 @@ -67,4 +67,4 @@ void OnUIKeyBoardInputNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 3bf5a5aed4..697b2036c4 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 @@ -99,4 +99,4 @@ void OnUILanguageChangeNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 953932cdb6..bd1e1b8ea7 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 @@ -67,4 +67,4 @@ void OnUIResetTimeoutNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 e5b321e1ff..193c3666d2 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 @@ -67,4 +67,4 @@ void OnUITouchEventNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 2a5e6ba797..e6275adab2 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 @@ -56,4 +56,4 @@ void OnUpdateDeviceList::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 c8ecba458a..99c6520fee 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 @@ -64,4 +64,4 @@ void OnVIAccPedalPositionNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ee909d19dc..dbfd9487e3 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 @@ -64,4 +64,4 @@ void OnVIBeltStatusNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 f0386646ce..b8e66b9c0f 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 @@ -64,4 +64,4 @@ void OnVIBodyInformationNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 549c73065a..418c751d1c 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 @@ -64,4 +64,4 @@ void OnVIDeviceStatusNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 23f0d37068..29545fcd87 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 @@ -64,4 +64,4 @@ void OnVIDriverBrakingNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 735a225225..4c2fb94400 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 @@ -64,4 +64,4 @@ void OnVIEngineTorqueNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 0b4bfa893f..6ac26a74fc 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 @@ -64,4 +64,4 @@ void OnVIExternalTemperatureNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 a5e84f1108..1f1cad5b8b 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 @@ -64,4 +64,4 @@ void OnVIFuelLevelNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 950b5a36f1..31c80860fd 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 @@ -64,4 +64,4 @@ void OnVIFuelLevelStateNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 0d94194f76..43ae3524ad 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 @@ -64,4 +64,4 @@ void OnVIGpsDataNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 80edb88e38..282a173b69 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 @@ -64,4 +64,4 @@ void OnVIHeadLampStatusNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 a2b0b1a8fd..f9bb3eca3f 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 @@ -65,4 +65,4 @@ void OnVIInstantFuelConsumptionNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 5e3555bbc4..8f5e845c02 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 @@ -64,4 +64,4 @@ void OnVIMyKeyNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 1dbef77fa3..ea5d8be9ca 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 @@ -64,4 +64,4 @@ void OnVIOdometerNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 d4ae93b324..73231ff4de 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 @@ -64,4 +64,4 @@ void OnVIPrndlNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 77f694c92e..4587939b8f 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 @@ -64,4 +64,4 @@ void OnVIRpmNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 e5860c9eec..df0bfd5cd7 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 @@ -64,4 +64,4 @@ void OnVISpeedNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 db591d9da3..b7eaad7edf 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 @@ -64,4 +64,4 @@ void OnVISteeringWheelAngleNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 b5c7e18803..5f438ef8d1 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 @@ -64,4 +64,4 @@ void OnVITirePressureNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 323fe5b885..1b40da4c40 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 @@ -64,4 +64,4 @@ void OnVIVinNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 6a3b863e7c..7221e88ef1 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 @@ -64,4 +64,4 @@ void OnVIWiperStatusNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 701dee5385..7d5c0165aa 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 @@ -59,4 +59,4 @@ void OnVideoDataStreamingNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 386ef1d1c7..7680b74426 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 @@ -32,13 +32,13 @@ #include "sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h" -#include "application_manager/policies/policy_handler.h" #include "application_manager/message_helper.h" +#include "application_manager/policies/policy_handler.h" #include "application_manager/state_controller.h" -#include "interfaces/MOBILE_API.h" -#include "interfaces/HMI_API.h" #include "application_manager/event_engine/event.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -110,4 +110,4 @@ void OnVRCommandNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 6a58ab9ffa..55c6eb8881 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 @@ -33,9 +33,9 @@ #include "sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h" #include "application_manager/application_impl.h" -#include "application_manager/state_controller.h" #include "application_manager/message_helper.h" #include "application_manager/rpc_service.h" +#include "application_manager/state_controller.h" #include "interfaces/MOBILE_API.h" namespace sdl_rpc_plugin { @@ -98,4 +98,4 @@ void OnVRLanguageChangeNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 04eb9a9ed0..bfc033a865 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 @@ -61,4 +61,4 @@ void OnVRStartedNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 8fea5ddd1c..ede1efab85 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 @@ -61,4 +61,4 @@ void OnVRStoppedNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 5947454517..d8ad6087a6 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 @@ -59,4 +59,4 @@ void RCGetCapabilitiesRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 b14c28426c..f4651ee0cb 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 @@ -66,4 +66,4 @@ void RCGetCapabilitiesResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 d538878dc8..5e4af1503a 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 @@ -105,4 +105,4 @@ void RCIsReadyRequest::SendMessageToHMI() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 7534567204..71e16a831c 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 @@ -58,4 +58,4 @@ void RCIsReadyResponse::Run() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 92a7020208..30184be7a1 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 @@ -31,8 +31,8 @@ */ #include "sdl_rpc_plugin/commands/hmi/sdl_activate_app_request.h" -#include "application_manager/state_controller.h" #include "application_manager/message_helper.h" +#include "application_manager/state_controller.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -45,8 +45,7 @@ struct ProtoV4AppsOnDevice : std::unary_function { ProtoV4AppsOnDevice(const connection_handler::DeviceHandle handle) : handle_(handle) {} bool operator()(const ApplicationSharedPtr app) const { - return app - ? handle_ == app->device() && + return app ? handle_ == app->device() && Message::is_sufficient_version( protocol_handler::MajorProtocolVersion:: PROTOCOL_VERSION_4, @@ -80,7 +79,7 @@ struct SendLaunchApp return; } }; -} +} // namespace SDLActivateAppRequest::SDLActivateAppRequest( const application_manager::commands::MessageSharedPtr& message, @@ -317,4 +316,4 @@ ApplicationSharedPtr SDLActivateAppRequest::get_foreground_app( } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 3262b12759..560b75213c 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 @@ -61,4 +61,4 @@ void SDLActivateAppResponse::Run() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 6b983d566a..095ffbd9c7 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 @@ -64,4 +64,4 @@ void SDLGetListOfPermissionsRequest::Run() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 784b4922d4..280d2cb071 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 @@ -61,4 +61,4 @@ void SDLGetListOfPermissionsResponse::Run() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 9a6c0fd520..7200f6918c 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 @@ -59,4 +59,4 @@ void SDLGetStatusUpdateRequest::Run() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 8fc85da481..4b0f3d0ca8 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 @@ -61,4 +61,4 @@ void SDLGetStatusUpdateResponse::Run() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ab8ec4e3d9..28167df047 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 @@ -93,4 +93,4 @@ void SDLGetUserFriendlyMessageRequest::Run() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 c5b3450723..b95591c4fa 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 @@ -61,4 +61,4 @@ void SDLGetUserFriendlyMessageResponse::Run() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 aef2e286d7..5f69903548 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 @@ -64,4 +64,4 @@ void SDLPolicyUpdate::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 d16fc578ab..12cdfb4ad9 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 @@ -56,4 +56,4 @@ void SDLPolicyUpdateResponse::Run() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 163d749426..988be68a80 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 @@ -59,4 +59,4 @@ void TTSChangeRegistrationRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 2c28d615d3..e5e38ef34a 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 @@ -63,4 +63,4 @@ void TTSChangeRegistratioResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 49623e01d7..9baaabf401 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 @@ -59,4 +59,4 @@ void TTSGetCapabilitiesRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 1cef3daf15..c0581a6380 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 @@ -69,4 +69,4 @@ void TTSGetCapabilitiesResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 5533537b33..7d2c15a9bf 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 @@ -59,4 +59,4 @@ void TTSGetLanguageRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ac423a2bf3..627056dce1 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 @@ -77,4 +77,4 @@ void TTSGetLanguageResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 8b87b9c6ea..2cb47380d5 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 @@ -59,4 +59,4 @@ void TTSGetSupportedLanguagesRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 a4e97d9d70..a70d1c89a3 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 @@ -69,4 +69,4 @@ void TTSGetSupportedLanguagesResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 c7e2c0c4cb..89b5961895 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 @@ -31,8 +31,8 @@ */ #include "sdl_rpc_plugin/commands/hmi/tts_is_ready_request.h" -#include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" +#include "application_manager/rpc_service.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -112,4 +112,4 @@ void TTSIsReadyRequest::SendMessageToHMI() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 c7d634bee2..67e0fb6396 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 @@ -59,4 +59,4 @@ void TTSIsReadyResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 8c7443d465..0b3d9a77bf 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 @@ -59,4 +59,4 @@ void TTSSetGlobalPropertiesRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 dae06d75f9..0901378c4a 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 @@ -63,4 +63,4 @@ void TTSSetGlobalPropertiesResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 96b93b724f..6dce94f931 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 @@ -59,4 +59,4 @@ void TTSSpeakRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 cb2346083b..69be5ab160 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 @@ -32,8 +32,8 @@ #include "sdl_rpc_plugin/commands/hmi/tts_speak_response.h" #include "application_manager/event_engine/event.h" -#include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -64,4 +64,4 @@ void TTSSpeakResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 25a05f085b..43c595040c 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 @@ -59,4 +59,4 @@ void TTSStopSpeakingRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 a2620c1340..892b3e6295 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 @@ -62,4 +62,4 @@ void TTSStopSpeakingResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 749b3ad56b..7c95e8a919 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 @@ -59,4 +59,4 @@ void UIAddCommandRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 266dffd225..72d841a878 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 @@ -62,4 +62,4 @@ void UIAddCommandResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 de338d4670..15342c6ecb 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 @@ -59,4 +59,4 @@ void UIAddSubmenuRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 85e600c87d..ae699dc2bd 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 @@ -63,4 +63,4 @@ void UIAddSubmenuResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ae5f861ba6..bf449db808 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 @@ -59,4 +59,4 @@ void UIAlertRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 3076eabc4c..f53f14e050 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 @@ -63,4 +63,4 @@ void UIAlertResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 d109987009..bb001b37c7 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 @@ -59,4 +59,4 @@ void UIChangeRegistrationRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 6557269e49..8acd654488 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 @@ -63,4 +63,4 @@ void UIChangeRegistratioResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 9e52f5fc18..1d741bba74 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 @@ -59,4 +59,4 @@ void UIDeleteCommandRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 a8f5b59d39..40a5ec8a73 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 @@ -63,4 +63,4 @@ void UIDeleteCommandResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 1b84df8bed..fdca37cee6 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 @@ -59,4 +59,4 @@ void UIDeleteSubmenuRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ec4025bea1..9d522431dc 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 @@ -63,4 +63,4 @@ void UIDeleteSubmenuResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 fe11185c62..92f51bc9cf 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 @@ -59,4 +59,4 @@ void UIEndAudioPassThruRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 3a6d4efbe4..b6639dcbb9 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 @@ -63,4 +63,4 @@ void UIEndAudioPassThruResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 3bd56a0682..5f8704b3e5 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 @@ -59,4 +59,4 @@ void UIGetCapabilitiesRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 cd5f3c9a42..909e3bae47 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 @@ -118,4 +118,4 @@ void UIGetCapabilitiesResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 8acba42493..d3b44d1168 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 @@ -59,4 +59,4 @@ void UIGetLanguageRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 27e46e52b4..2a5c0ab016 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 @@ -78,4 +78,4 @@ void UIGetLanguageResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 2f8ef12a25..0665612525 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 @@ -59,4 +59,4 @@ void UIGetSupportedLanguagesRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 d20dd8545f..19ee62e51d 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 @@ -69,4 +69,4 @@ void UIGetSupportedLanguagesResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 2eab211690..2546b704b2 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 @@ -112,4 +112,4 @@ void UIIsReadyRequest::SendMessageToHMI() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 e25e8ee8ab..96a2d1212c 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 @@ -60,4 +60,4 @@ void UIIsReadyResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 cca89e3073..18d5376b25 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 @@ -59,4 +59,4 @@ void UIPerformAudioPassThruRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 057448ab33..afbd1bbed7 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 @@ -62,4 +62,4 @@ void UIPerformAudioPassThruResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 d5696a39e7..aa5878590b 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 @@ -59,4 +59,4 @@ void UIPerformInteractionRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 7629faa131..4cbc58d278 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 @@ -61,4 +61,4 @@ void UIPerformInteractionResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 dbe0ceb529..de639420fb 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 @@ -59,4 +59,4 @@ void UIScrollableMessageRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 a96b9fa3ee..4e844095b4 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 @@ -62,4 +62,4 @@ void UIScrollableMessageResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 f5f8f7bafd..4a538ac992 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 @@ -58,4 +58,4 @@ void UISendHapticDataRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 4555d81a0a..92afdaaa4a 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 @@ -62,4 +62,4 @@ void UISendHapticDataResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 d25bbd1cd9..821f78a046 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 @@ -59,4 +59,4 @@ void UISetAppIconRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 711b5767f2..68e96725d4 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 @@ -62,4 +62,4 @@ void UISetAppIconResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 73b813d0eb..63166157c8 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 @@ -58,4 +58,4 @@ void UiSetDisplayLayoutRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 d5d2e02e33..f35427895e 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 @@ -63,4 +63,4 @@ void UiSetDisplayLayoutResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 0664404361..0aaaae7cc7 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 @@ -59,4 +59,4 @@ void UISetGlobalPropertiesRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 2e5fecf2af..48d73d146c 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 @@ -62,4 +62,4 @@ void UISetGlobalPropertiesResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 4e87b9ccc3..4c8fcefcdf 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 @@ -59,4 +59,4 @@ void UISetMediaClockTimerRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 39e7e1c232..fb5b25fc2b 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 @@ -62,4 +62,4 @@ void UISetMediaClockTimerResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 5b7568abfe..d7160dc70b 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 @@ -59,4 +59,4 @@ void UIShowRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 3e3c0b79d8..768069bf3a 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 @@ -61,4 +61,4 @@ void UIShowResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 4df3adbe14..56fca3d062 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 @@ -59,4 +59,4 @@ void UISliderRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 2431c65ddf..9cf7224ddb 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 @@ -62,4 +62,4 @@ void UISliderResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 05b08cb723..c5966fcb36 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 @@ -59,4 +59,4 @@ void UpdateAppListRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 3dd03993ef..7fc830b4e6 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 @@ -59,4 +59,4 @@ void UpdateAppListResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 7736f2b1e6..3a014480c1 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 @@ -100,4 +100,4 @@ bool UpdateDeviceListRequest::CleanUp() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 25dc9be5bd..d69e683f2b 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 @@ -58,4 +58,4 @@ void UpdateDeviceListResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 cafacea28f..96d454d4ee 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 @@ -61,4 +61,4 @@ void UpdateSDLRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 a35571ec26..c02cde4111 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 @@ -61,4 +61,4 @@ void UpdateSDLResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 72ce387f77..788eda5a87 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 @@ -59,4 +59,4 @@ void VRAddCommandRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 19d43616ff..37b3e4696d 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 @@ -63,4 +63,4 @@ void VRAddCommandResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 9ba5fa3571..d1be04ad44 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 @@ -59,4 +59,4 @@ void VRChangeRegistrationRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 42c5b6d65b..27bde2bafa 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 @@ -62,4 +62,4 @@ void VRChangeRegistrationResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 efc09dc157..ebcfe78fa9 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 @@ -59,4 +59,4 @@ void VRDeleteCommandRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 f8f7535e68..d1d725b356 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 @@ -62,4 +62,4 @@ void VRDeleteCommandResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 7e9c846857..b06bfa0e77 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 @@ -59,4 +59,4 @@ void VRGetCapabilitiesRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 47ffb3a675..80c308ea40 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 @@ -61,4 +61,4 @@ void VRGetCapabilitiesResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 d57faa08fd..84179f6357 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 @@ -59,4 +59,4 @@ void VRGetLanguageRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 469452d108..6b7fec736d 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 @@ -78,4 +78,4 @@ void VRGetLanguageResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 bb27168a77..351940bf68 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 @@ -59,4 +59,4 @@ void VRGetSupportedLanguagesRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 722040388d..4c725267fa 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 @@ -31,8 +31,8 @@ */ #include "sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_response.h" -#include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -69,4 +69,4 @@ void VRGetSupportedLanguagesResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 22afb03945..12414eab10 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 @@ -112,4 +112,4 @@ void VRIsReadyRequest::SendMessageToHMI() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 48d9c3e075..373f97bf80 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 @@ -59,4 +59,4 @@ void VRIsReadyResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 26e308a0bc..ae94019b25 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 @@ -59,4 +59,4 @@ void VRPerformInteractionRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 dec371e889..16378ab55a 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 @@ -60,4 +60,4 @@ void VRPerformInteractionResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 155f819761..a57d222765 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 @@ -31,14 +31,14 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include #include "sdl_rpc_plugin/commands/mobile/add_command_request.h" +#include #include "application_manager/application.h" #include "application_manager/message_helper.h" +#include "utils/custom_string.h" #include "utils/file_system.h" #include "utils/helpers.h" -#include "utils/custom_string.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -126,9 +126,9 @@ void AddCommandRequest::Run() { } if (((*message_)[strings::msg_params][strings::menu_params].keyExists( hmi_request::parent_id)) && - (0 != - (*message_)[strings::msg_params][strings::menu_params] - [hmi_request::parent_id].asUInt())) { + (0 != (*message_)[strings::msg_params][strings::menu_params] + [hmi_request::parent_id] + .asUInt())) { if (!CheckCommandParentId(app)) { SendResponse( false, mobile_apis::Result::INVALID_ID, "Parent ID doesn't exist"); @@ -224,7 +224,8 @@ bool AddCommandRequest::CheckCommandName(ApplicationConstSharedPtr app) { if ((*message_)[strings::msg_params][strings::menu_params].keyExists( hmi_request::parent_id)) { parent_id = (*message_)[strings::msg_params][strings::menu_params] - [hmi_request::parent_id].asUInt(); + [hmi_request::parent_id] + .asUInt(); } for (; commands.end() != i; ++i) { @@ -239,7 +240,8 @@ bool AddCommandRequest::CheckCommandName(ApplicationConstSharedPtr app) { } if (((*i->second)[strings::menu_params][strings::menu_name].asString() == (*message_)[strings::msg_params][strings::menu_params] - [strings::menu_name].asString()) && + [strings::menu_name] + .asString()) && (saved_parent_id == parent_id)) { LOG4CXX_INFO(logger_, "AddCommandRequest::CheckCommandName received" @@ -293,7 +295,8 @@ bool AddCommandRequest::CheckCommandParentId(ApplicationConstSharedPtr app) { const int32_t parent_id = (*message_)[strings::msg_params][strings::menu_params] - [hmi_request::parent_id].asInt(); + [hmi_request::parent_id] + .asInt(); smart_objects::SmartObject* parent = app->FindSubMenu(parent_id); if (!parent) { @@ -524,7 +527,8 @@ bool AddCommandRequest::IsWhiteSpaceExist() { if ((*message_)[strings::msg_params].keyExists(strings::menu_params)) { str = (*message_)[strings::msg_params][strings::menu_params] - [strings::menu_name].asCharArray(); + [strings::menu_name] + .asCharArray(); if (!CheckSyntax(str)) { LOG4CXX_ERROR(logger_, "Invalid menu name syntax check failed."); return true; @@ -624,4 +628,4 @@ void AddCommandRequest::RemoveCommand() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ccb84cecbb..24ff3b5a28 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 @@ -61,4 +61,4 @@ void AddCommandResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 183b445326..3541f7f7cb 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 @@ -33,8 +33,8 @@ #include "sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h" -#include "application_manager/message_helper.h" #include "application_manager/application.h" +#include "application_manager/message_helper.h" #include "utils/helpers.h" namespace sdl_rpc_plugin { @@ -183,4 +183,4 @@ bool AddSubMenuRequest::CheckSubMenuName() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 d0ec635dd0..d91f13f1df 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 @@ -32,8 +32,8 @@ */ #include "sdl_rpc_plugin/commands/mobile/add_sub_menu_response.h" -#include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" +#include "application_manager/rpc_service.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -62,4 +62,4 @@ void AddSubMenuResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 5dda34b743..9f36f260ae 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 @@ -25,12 +25,12 @@ POSSIBILITY OF SUCH DAMAGE. */ +#include "sdl_rpc_plugin/commands/mobile/alert_maneuver_request.h" #include #include -#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" +#include "application_manager/policies/policy_handler.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -107,9 +107,9 @@ void AlertManeuverRequest::Run() { MessageHelper::VerifyTtsFiles(tts_chunks, app, application_manager_); if (mobile_apis::Result::FILE_NOT_FOUND == verification_result) { - LOG4CXX_ERROR(logger_, - "MessageHelper::VerifyTtsFiles return " - << verification_result); + LOG4CXX_ERROR( + logger_, + "MessageHelper::VerifyTtsFiles return " << verification_result); SendResponse(false, mobile_apis::Result::FILE_NOT_FOUND, "One or more files needed for tts_chunks are not present"); @@ -288,4 +288,4 @@ bool AlertManeuverRequest::IsWhiteSpaceExist() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 d3e527f6ae..97c93d7455 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 @@ -62,4 +62,4 @@ void AlertManeuverResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 2806ac1d93..7173aaf2d0 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 @@ -35,12 +35,12 @@ #include -#include "application_manager/message_helper.h" #include "application_manager/application_impl.h" +#include "application_manager/message_helper.h" #include "application_manager/policies/policy_handler.h" -#include "utils/helpers.h" #include "smart_objects/smart_object.h" +#include "utils/helpers.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -298,9 +298,9 @@ bool AlertRequest::Validate(uint32_t app_id) { MessageHelper::VerifyTtsFiles(tts_chunks, app, application_manager_); if (mobile_apis::Result::FILE_NOT_FOUND == verification_result) { - LOG4CXX_ERROR(logger_, - "MessageHelper::VerifyTtsFiles return " - << verification_result); + LOG4CXX_ERROR( + logger_, + "MessageHelper::VerifyTtsFiles return " << verification_result); SendResponse(false, mobile_apis::Result::FILE_NOT_FOUND, "One or more files needed for tts_chunks are not present"); @@ -450,4 +450,4 @@ bool AlertRequest::HasHmiResponsesToWait() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 bab5e5a5d8..b709d13958 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 @@ -32,10 +32,10 @@ */ #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" +#include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -64,4 +64,4 @@ void AlertResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 6af930ea53..ef81babdd6 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 @@ -31,14 +31,14 @@ POSSIBILITY OF SUCH DAMAGE. */ +#include "sdl_rpc_plugin/commands/mobile/change_registration_request.h" #include #include -#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" -#include "interfaces/HMI_API.h" +#include "application_manager/application_manager.h" #include "application_manager/message_helper.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" namespace { namespace custom_str = utils::custom_string; @@ -51,7 +51,7 @@ struct IsSameNickname { private: const custom_str::CustomString& app_id_; }; -} +} // namespace namespace sdl_rpc_plugin { using namespace application_manager; @@ -194,9 +194,9 @@ void ChangeRegistrationRequest::Run() { MessageHelper::VerifyTtsFiles(tts_name, app, application_manager_); if (mobile_apis::Result::FILE_NOT_FOUND == verification_result) { - LOG4CXX_ERROR(logger_, - "MessageHelper::VerifyTtsFiles return " - << verification_result); + LOG4CXX_ERROR( + logger_, + "MessageHelper::VerifyTtsFiles return " << verification_result); SendResponse(false, mobile_apis::Result::FILE_NOT_FOUND, "One or more files needed for tts_name are not present"); @@ -216,9 +216,9 @@ void ChangeRegistrationRequest::Run() { hmi_interfaces.GetInterfaceState( HmiInterfaces::InterfaceID::HMI_INTERFACE_TTS); + using helpers::ALL; using helpers::Compare; using helpers::EQ; - using helpers::ALL; if (Compare( HmiInterfaces::InterfaceState::STATE_NOT_AVAILABLE, @@ -638,9 +638,9 @@ bool ChangeRegistrationRequest::IsNicknameAllowed( ApplicationSharedPtr app = application_manager_.application(connection_key()); if (!app) { - LOG4CXX_ERROR(logger_, - "Can't find appication with connection key " - << connection_key()); + LOG4CXX_ERROR( + logger_, + "Can't find appication with connection key " << connection_key()); return false; } @@ -681,4 +681,4 @@ bool ChangeRegistrationRequest::IsNicknameAllowed( } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 2dae92cd9b..78c60bc746 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 @@ -61,4 +61,4 @@ void ChangeRegistrationResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 416f4f2085..258aefd63f 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 @@ -31,11 +31,11 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include "sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h" #include +#include +#include #include -#include "sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" @@ -218,9 +218,9 @@ bool CreateInteractionChoiceSetRequest::compareSynonyms( CreateInteractionChoiceSetRequest::compareStr); if (it != vr_cmds_1->end()) { - LOG4CXX_INFO(logger_, - "Incoming choice set has duplicated VR synonyms " - << it->asString()); + LOG4CXX_INFO( + logger_, + "Incoming choice set has duplicated VR synonyms " << it->asString()); return true; } @@ -332,9 +332,9 @@ void CreateInteractionChoiceSetRequest::SendVRAddCommandRequests( VRCommandInfo vr_command(vr_cmd_id); sent_commands_map_[vr_corr_id] = vr_command; - LOG4CXX_DEBUG(logger_, - "VR_command sent corr_id " << vr_corr_id << " cmd_id " - << vr_corr_id); + LOG4CXX_DEBUG( + logger_, + "VR_command sent corr_id " << vr_corr_id << " cmd_id " << vr_corr_id); } expected_chs_count_ = chs_num; LOG4CXX_DEBUG(logger_, "expected_chs_count_ = " << expected_chs_count_); @@ -480,4 +480,4 @@ void CreateInteractionChoiceSetRequest::OnAllHMIResponsesReceived() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 807770ed12..43dba2f238 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 @@ -72,4 +72,4 @@ void CreateInteractionChoiceSetResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 38069c341e..363b14f92f 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 @@ -35,8 +35,8 @@ #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" -#include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" #include "utils/helpers.h" namespace sdl_rpc_plugin { @@ -204,8 +204,9 @@ void DeleteCommandRequest::on_event(const event_engine::Event& event) { if (!command) { LOG4CXX_ERROR(logger_, - "Command id " << cmd_id << " not found for " - "application with connection key " + "Command id " << cmd_id + << " not found for " + "application with connection key " << connection_key()); return; } @@ -232,4 +233,4 @@ bool DeleteCommandRequest::IsPendingResponseExist() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 8f85d50e28..919385ee50 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 @@ -61,4 +61,4 @@ void DeleteCommandResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 cf8a6d259f..b2c9a3377f 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 @@ -129,4 +129,4 @@ void DeleteFileRequest::SendFileRemovedNotification( } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 66c61c9e4a..732a1e56b5 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 @@ -72,4 +72,4 @@ void DeleteFileResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 a9db3975db..7950595b1c 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 @@ -34,9 +34,9 @@ #include "sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_request.h" #include "application_manager/application_impl.h" -#include "interfaces/MOBILE_API.h" -#include "interfaces/HMI_API.h" #include "application_manager/message_helper.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -63,9 +63,9 @@ void DeleteInteractionChoiceSetRequest::Run() { ApplicationSharedPtr app = application_manager_.application(connection_key()); if (!app) { - LOG4CXX_ERROR(logger_, - "No application associated with connection key " - << connection_key()); + LOG4CXX_ERROR( + logger_, + "No application associated with connection key " << connection_key()); SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED); return; } @@ -165,4 +165,4 @@ void DeleteInteractionChoiceSetRequest::SendVrDeleteCommand( } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 18ca60f255..cf5ad3a2c2 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 @@ -34,8 +34,8 @@ #include "sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_response.h" #include "application_manager/application_impl.h" -#include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -81,4 +81,4 @@ void DeleteInteractionChoiceSetResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 9a01163702..6aaa2406e8 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 @@ -33,8 +33,8 @@ #include "sdl_rpc_plugin/commands/mobile/delete_sub_menu_request.h" -#include "application_manager/message_helper.h" #include "application_manager/application_impl.h" +#include "application_manager/message_helper.h" #include "interfaces/HMI_API.h" #include "utils/helpers.h" @@ -200,4 +200,4 @@ bool DeleteSubMenuRequest::Init() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 6831a66e1e..3cefef5c38 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 @@ -61,4 +61,4 @@ void DeleteSubMenuResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ee0297ded6..1de7a3ea03 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 @@ -30,9 +30,9 @@ POSSIBILITY OF SUCH DAMAGE. */ +#include "sdl_rpc_plugin/commands/mobile/dial_number_request.h" #include #include -#include "sdl_rpc_plugin/commands/mobile/dial_number_request.h" #include "application_manager/application_impl.h" @@ -153,4 +153,4 @@ void DialNumberRequest::StripNumberParam(std::string& number) { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 a264f96e0d..4385b3fe90 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 @@ -60,4 +60,4 @@ void DialNumberResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 3650a8226c..66ff7b48d5 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 @@ -97,4 +97,4 @@ void EndAudioPassThruRequest::on_event(const event_engine::Event& event) { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 f9f9f89d11..6c9bd05e09 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 @@ -61,4 +61,4 @@ void EndAudioPassThruResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 b0715225e4..fda6cc64e5 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 @@ -63,4 +63,4 @@ void GenericResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_cloud_app_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_cloud_app_properties_response.cc index 813a9e7006..f50897303a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_cloud_app_properties_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_cloud_app_properties_response.cc @@ -1,6 +1,6 @@ +#include "sdl_rpc_plugin/commands/mobile/get_cloud_app_properties_response.h" #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" -#include "sdl_rpc_plugin/commands/mobile/get_cloud_app_properties_response.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -28,4 +28,4 @@ void GetCloudAppPropertiesResponse::Run() { } } // namespace commands -} // namespace sdl_rpc_plugins +} // namespace sdl_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_file_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_file_request.cc index a582670426..75263494c2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_file_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_file_request.cc @@ -32,20 +32,20 @@ #include "sdl_rpc_plugin/commands/mobile/get_file_request.h" +#include #include "application_manager/app_service_manager.h" #include "application_manager/application_impl.h" +#include "application_manager/message_helper.h" #include "application_manager/rpc_service.h" #include "interfaces/MOBILE_API.h" -#include "application_manager/message_helper.h" #include "utils/file_system.h" -#include namespace { /** -* Calculates CRC32 checksum -* @param binary_data - input data for which CRC32 should be calculated -* @return calculated CRC32 checksum -*/ + * Calculates CRC32 checksum + * @param binary_data - input data for which CRC32 should be calculated + * @return calculated CRC32 checksum + */ uint32_t GetCrc32CheckSum(const std::vector& binary_data) { const std::size_t file_size = binary_data.size(); boost::crc_32_type result; @@ -195,9 +195,9 @@ void GetFileRequest::Run() { } if (offset_ > file_size) { - LOG4CXX_ERROR(logger_, - "Offset " << offset_ << " greater than file size " - << file_size); + LOG4CXX_ERROR( + logger_, + "Offset " << offset_ << " greater than file size " << file_size); SendResponse(false, mobile_apis::Result::INVALID_DATA, "Offset greater than file size", @@ -309,9 +309,9 @@ void GetFileRequest::on_event(const app_mngr::event_engine::Event& event) { } if (offset_ > file_size) { - LOG4CXX_ERROR(logger_, - "Offset " << offset_ << " greater than file size " - << file_size); + LOG4CXX_ERROR( + logger_, + "Offset " << offset_ << " greater than file size " << file_size); SendResponse(false, mobile_apis::Result::INVALID_DATA, "Offset greater than file size", 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 2a25928b97..4b34db9934 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 @@ -32,10 +32,10 @@ #include "sdl_rpc_plugin/commands/mobile/get_system_capability_request.h" -#include "sdl_rpc_plugin/extensions/system_capability_app_extension.h" +#include #include "application_manager/app_service_manager.h" #include "application_manager/message_helper.h" -#include +#include "sdl_rpc_plugin/extensions/system_capability_app_extension.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -146,9 +146,10 @@ void GetSystemCapabilityRequest::Run() { case mobile_apis::SystemCapabilityType::APP_SERVICES: { auto all_services = application_manager_.GetAppServiceManager().GetAllServiceRecords(); - response_params - [strings::system_capability][strings::app_services_capabilities] = - MessageHelper::CreateAppServiceCapabilities(all_services); + response_params[strings::system_capability] + [strings::app_services_capabilities] = + MessageHelper::CreateAppServiceCapabilities( + all_services); break; } default: // Return unsupported resource @@ -179,4 +180,4 @@ void GetSystemCapabilityRequest::on_event(const event_engine::Event& event) { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 dd5461081c..5df0c72607 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 @@ -30,9 +30,9 @@ POSSIBILITY OF SUCH DAMAGE. */ +#include "sdl_rpc_plugin/commands/mobile/get_system_capability_response.h" #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" -#include "sdl_rpc_plugin/commands/mobile/get_system_capability_response.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -61,4 +61,4 @@ void GetSystemCapabilityResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 7dc9eb9ad9..cd7d7a37b7 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 @@ -30,8 +30,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/application_manager.h" #include "sdl_rpc_plugin/commands/mobile/get_way_points_request.h" +#include "application_manager/application_manager.h" #include "application_manager/message_helper.h" namespace sdl_rpc_plugin { @@ -113,4 +113,4 @@ void GetWayPointsRequest::on_event(const event_engine::Event& event) { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 7581990273..e481c926b8 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 @@ -30,8 +30,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/application_manager.h" #include "sdl_rpc_plugin/commands/mobile/get_way_points_response.h" +#include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" namespace sdl_rpc_plugin { @@ -61,4 +61,4 @@ void GetWayPointsResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 e671dab463..46a39513d5 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 @@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include #include "sdl_rpc_plugin/commands/mobile/list_files_request.h" +#include #include "application_manager/application_impl.h" @@ -112,4 +112,4 @@ void ListFilesRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 d025f05358..ffa8a443d5 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 @@ -32,8 +32,8 @@ */ #include "sdl_rpc_plugin/commands/mobile/list_files_response.h" -#include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" +#include "application_manager/rpc_service.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -62,4 +62,4 @@ void ListFilesResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 128ce1e3bf..5714043a51 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 @@ -60,4 +60,4 @@ void OnAppInterfaceUnregisteredNotification::Run() { SendNotification(); } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ff88ae96bd..3088c7df33 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 @@ -57,4 +57,4 @@ void OnAudioPassThruNotification::Run() { SendNotification(); } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 79fb1f4272..f0368a742d 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 @@ -79,9 +79,8 @@ void OnButtonEventNotification::Run() { (*message_)[strings::msg_params][strings::app_id].asUInt()); // custom_button_id is mandatory for CUSTOM_BUTTON notification - if (false == - (*message_)[strings::msg_params].keyExists( - hmi_response::custom_button_id)) { + if (false == (*message_)[strings::msg_params].keyExists( + hmi_response::custom_button_id)) { LOG4CXX_ERROR(logger_, "CUSTOM_BUTTON OnButtonEvent without custom_button_id."); return; @@ -188,4 +187,4 @@ void OnButtonEventNotification::SendButtonEvent(ApplicationConstSharedPtr app) { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 c73f2b4b98..7c77e29298 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 @@ -80,9 +80,8 @@ void OnButtonPressNotification::Run() { (*message_)[strings::msg_params][strings::app_id].asUInt()); // custom_button_id is mandatory for CUSTOM_BUTTON notification - if (false == - (*message_)[strings::msg_params].keyExists( - hmi_response::custom_button_id)) { + if (false == (*message_)[strings::msg_params].keyExists( + hmi_response::custom_button_id)) { LOG4CXX_ERROR(logger_, "CUSTOM_BUTTON OnButtonPress without custom_button_id."); return; @@ -196,4 +195,4 @@ void OnButtonPressNotification::SendButtonPress(ApplicationConstSharedPtr app) { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 dff3aa6808..9c7edf74e6 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 @@ -84,4 +84,4 @@ void OnCommandNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ca5d4bfed4..42a1928f2e 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 @@ -67,4 +67,4 @@ void OnDriverDistractionNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 e252b031e6..c2ce2550b9 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 @@ -34,9 +34,9 @@ #include "sdl_rpc_plugin/commands/mobile/on_hash_change_notification.h" +#include #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" -#include namespace sdl_rpc_plugin { using namespace application_manager; @@ -81,4 +81,4 @@ void OnHashChangeNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 6b5838e40a..df3bce0154 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 @@ -33,8 +33,8 @@ #include "sdl_rpc_plugin/commands/mobile/on_hmi_status_notification.h" -#include "application_manager/message_helper.h" #include "application_manager/message.h" +#include "application_manager/message_helper.h" #include "interfaces/MOBILE_API.h" namespace sdl_rpc_plugin { @@ -92,4 +92,4 @@ void OnHMIStatusNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 c4ee22afed..28325a40f5 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 @@ -32,8 +32,8 @@ */ #include "sdl_rpc_plugin/commands/mobile/on_hmi_status_notification_from_mobile.h" -#include "application_manager/message_helper.h" #include "application_manager/message.h" +#include "application_manager/message_helper.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -132,4 +132,4 @@ void OnHMIStatusNotificationFromMobile::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 04b52f29e1..8ec8a86554 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 @@ -93,4 +93,4 @@ void OnKeyBoardInputNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 fdbdd910a0..9605fd6074 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 @@ -60,4 +60,4 @@ void OnLanguageChangeNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 32d940aca2..f64ca34bf2 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 @@ -62,4 +62,4 @@ void OnPermissionsChangeNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc index a8544ae643..515279c5f9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc @@ -31,10 +31,11 @@ void OnSystemCapabilityUpdatedNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); smart_objects::SmartObject& msg_params = (*message_)[strings::msg_params]; - mobile_apis::SystemCapabilityType::eType system_capability_type = static_cast< - mobile_apis::SystemCapabilityType::eType>( - msg_params[strings::system_capability][strings::system_capability_type] - .asInt()); + mobile_apis::SystemCapabilityType::eType system_capability_type = + static_cast( + msg_params[strings::system_capability] + [strings::system_capability_type] + .asInt()); switch (system_capability_type) { case mobile_apis::SystemCapabilityType::NAVIGATION: { @@ -100,21 +101,24 @@ void OnSystemCapabilityUpdatedNotification::Run() { for (size_t i = 0; i < updated_capabilities.length(); i++) { std::string service_id = updated_capabilities[i][strings::updated_app_service_record] - [strings::service_id].asString(); - auto matching_service_predicate = [&service_id]( - const smart_objects::SmartObject& app_service_capability) { - return service_id == - app_service_capability[strings::updated_app_service_record] - [strings::service_id].asString(); - }; + [strings::service_id] + .asString(); + auto matching_service_predicate = + [&service_id]( + const smart_objects::SmartObject& app_service_capability) { + return service_id == + app_service_capability[strings::updated_app_service_record] + [strings::service_id] + .asString(); + }; auto it = std::find_if(app_services->begin(), app_services->end(), matching_service_predicate); if (it != app_services->end()) { - LOG4CXX_DEBUG(logger_, - "Replacing updated record with service_id " - << service_id); + LOG4CXX_DEBUG( + logger_, + "Replacing updated record with service_id " << service_id); app_services->erase(it); } app_services->push_back(updated_capabilities[i]); @@ -174,4 +178,4 @@ void OnSystemCapabilityUpdatedNotification::Run() { } // namespace mobile } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 10b0b41a58..a85dec10bb 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 @@ -30,16 +30,16 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "sdl_rpc_plugin/commands/mobile/on_system_request_notification.h" #include +#include #include -#include "sdl_rpc_plugin/commands/mobile/on_system_request_notification.h" +#include "application_manager/application_manager.h" +#include "application_manager/policies/policy_handler_interface.h" #include "interfaces/MOBILE_API.h" +#include "policy/policy_table/enums.h" #include "utils/file_system.h" #include "utils/helpers.h" -#include "policy/policy_table/enums.h" -#include "application_manager/application_manager.h" -#include "application_manager/policies/policy_handler_interface.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -129,11 +129,11 @@ void OnSystemRequestNotification::Run() { } if (mobile_apis::RequestType::PROPRIETARY == request_type) { -/* According to requirements: - "If the requestType = PROPRIETARY, add to mobile API fileType = JSON - If the requestType = HTTP, add to mobile API fileType = BINARY" - Also in Genivi SDL we don't save the PT to file - we put it directly in - binary_data */ + /* According to requirements: + "If the requestType = PROPRIETARY, add to mobile API fileType = JSON + If the requestType = HTTP, add to mobile API fileType = BINARY" + Also in Genivi SDL we don't save the PT to file - we put it directly in + binary_data */ #if defined(PROPRIETARY_MODE) AddHeader(binary_data); @@ -246,4 +246,4 @@ size_t OnSystemRequestNotification::ParsePTString( } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 503f1b04d5..ccbdab15c9 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 @@ -76,4 +76,4 @@ void OnTBTClientStateNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 502f0ae57d..6ceb381d2e 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 @@ -93,4 +93,4 @@ void OnTouchEventNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 2f666ffc03..e89ede53b9 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 @@ -67,4 +67,4 @@ void OnWayPointChangeNotification::Run() { } } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 c90038a8b7..8f8e4dbf6f 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 @@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include #include "sdl_rpc_plugin/commands/mobile/perform_audio_pass_thru_request.h" +#include #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" @@ -113,9 +113,9 @@ void PerformAudioPassThruRequest::Run() { initial_prompt, app, application_manager_); if (mobile_apis::Result::FILE_NOT_FOUND == verification_result) { - LOG4CXX_ERROR(logger_, - "MessageHelper::VerifyTtsFiles return " - << verification_result); + LOG4CXX_ERROR( + logger_, + "MessageHelper::VerifyTtsFiles return " << verification_result); SendResponse( false, mobile_apis::Result::FILE_NOT_FOUND, @@ -450,4 +450,4 @@ bool PerformAudioPassThruRequest::IsWaitingHMIResponse() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 a5eb98f2ba..5dae6327eb 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 @@ -61,4 +61,4 @@ void PerformAudioPassThruResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 42489fd8bd..6b2f3cbcc5 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 @@ -31,20 +31,20 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "sdl_rpc_plugin/commands/mobile/perform_interaction_request.h" #include +#include #include -#include "sdl_rpc_plugin/commands/mobile/perform_interaction_request.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" -#include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" -#include "utils/file_system.h" -#include "utils/helpers.h" +#include "interfaces/MOBILE_API.h" #include "utils/custom_string.h" +#include "utils/file_system.h" #include "utils/gen_hash.h" +#include "utils/helpers.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -560,9 +560,9 @@ void PerformInteractionRequest::SendVRPerformInteractionRequest( MessageHelper::VerifyTtsFiles(help_prompt, app, application_manager_); if (mobile_apis::Result::FILE_NOT_FOUND == verification_result) { - LOG4CXX_WARN(logger_, - "MessageHelper::VerifyTtsFiles return " - << verification_result); + LOG4CXX_WARN( + logger_, + "MessageHelper::VerifyTtsFiles return " << verification_result); invalid_params.push_back("help_prompt"); } else { msg_params[strings::help_prompt] = help_prompt; @@ -608,9 +608,9 @@ void PerformInteractionRequest::SendVRPerformInteractionRequest( timeout_prompt, app, application_manager_); if (mobile_apis::Result::FILE_NOT_FOUND == verification_result) { - LOG4CXX_WARN(logger_, - "MessageHelper::VerifyTtsFiles return " - << verification_result); + LOG4CXX_WARN( + logger_, + "MessageHelper::VerifyTtsFiles return " << verification_result); invalid_params.push_back("timeout_prompt"); } else { msg_params[strings::timeout_prompt] = timeout_prompt; @@ -629,9 +629,9 @@ void PerformInteractionRequest::SendVRPerformInteractionRequest( initial_prompt, app, application_manager_); if (mobile_apis::Result::FILE_NOT_FOUND == verification_result) { - LOG4CXX_WARN(logger_, - "MessageHelper::VerifyTtsFiles return " - << verification_result); + LOG4CXX_WARN( + logger_, + "MessageHelper::VerifyTtsFiles return " << verification_result); invalid_params.push_back("initial_prompt"); } else { msg_params[strings::initial_prompt] = initial_prompt; @@ -1065,4 +1065,4 @@ void PerformInteractionRequest::SendBothModeResponse( } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 85bef9b2ad..fa02641c2b 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 @@ -61,4 +61,4 @@ void PerformInteractionResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 b418f52fa3..41558c08f0 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 @@ -31,22 +31,22 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include #include "sdl_rpc_plugin/commands/mobile/put_file_request.h" +#include -#include "application_manager/policies/policy_handler.h" #include "application_manager/application_impl.h" +#include "application_manager/policies/policy_handler.h" #include "application_manager/rpc_service.h" -#include "utils/file_system.h" #include +#include "utils/file_system.h" namespace { /** -* Calculates CRC32 checksum -* @param binary_data - input data for which CRC32 should be calculated -* @return calculated CRC32 checksum -*/ + * Calculates CRC32 checksum + * @param binary_data - input data for which CRC32 should be calculated + * @return calculated CRC32 checksum + */ uint32_t GetCrc32CheckSum(const std::vector& binary_data) { const std::size_t file_size = binary_data.size(); boost::crc_32_type result; @@ -321,4 +321,4 @@ void PutFileRequest::SendOnPutFileNotification() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 8c54970a5c..f9ddbf7717 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 @@ -32,8 +32,8 @@ */ #include "sdl_rpc_plugin/commands/mobile/put_file_response.h" -#include "utils/file_system.h" #include "application_manager/application_impl.h" +#include "utils/file_system.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -70,4 +70,4 @@ void PutFileResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 924705f82b..597df26d0a 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 @@ -33,19 +33,19 @@ #include "sdl_rpc_plugin/commands/mobile/register_app_interface_request.h" +#include #include #include #include -#include -#include "application_manager/application_manager.h" -#include "application_manager/policies/policy_handler_interface.h" -#include "application_manager/application_impl.h" #include "application_manager/app_launch/app_launch_ctrl.h" +#include "application_manager/application_impl.h" +#include "application_manager/application_manager.h" +#include "application_manager/helpers/application_helper.h" #include "application_manager/message_helper.h" -#include "application_manager/resumption/resume_ctrl.h" #include "application_manager/policies/policy_handler.h" -#include "application_manager/helpers/application_helper.h" +#include "application_manager/policies/policy_handler_interface.h" +#include "application_manager/resumption/resume_ctrl.h" #include "application_manager/rpc_service.h" #include "config_profile/profile.h" #include "interfaces/MOBILE_API.h" @@ -166,7 +166,7 @@ struct IsSameNickname { private: const custom_str::CustomString& app_id_; }; -} +} // namespace namespace sdl_rpc_plugin { using namespace application_manager; @@ -400,9 +400,9 @@ void RegisterAppInterfaceRequest::Run() { tts_name, application, application_manager_); if (mobile_apis::Result::FILE_NOT_FOUND == verification_result) { - LOG4CXX_WARN(logger_, - "MessageHelper::VerifyTtsFiles return " - << verification_result); + LOG4CXX_WARN( + logger_, + "MessageHelper::VerifyTtsFiles return " << verification_result); response_info_ = "One or more files needed for tts_name are not present"; result_code_ = mobile_apis::Result::WARNINGS; } @@ -454,17 +454,16 @@ void RegisterAppInterfaceRequest::Run() { // Add device to policy table and set device info, if any policy::DeviceParams dev_params; - if (-1 == - application_manager_.connection_handler() - .get_session_observer() - .GetDataOnDeviceID(application->device(), - &dev_params.device_name, - NULL, - &dev_params.device_mac_address, - &dev_params.device_connection_type)) { - LOG4CXX_ERROR(logger_, - "Failed to extract information for device " - << application->device()); + if (-1 == application_manager_.connection_handler() + .get_session_observer() + .GetDataOnDeviceID(application->device(), + &dev_params.device_name, + NULL, + &dev_params.device_mac_address, + &dev_params.device_connection_type)) { + LOG4CXX_ERROR( + logger_, + "Failed to extract information for device " << application->device()); } policy::DeviceInfo device_info; device_info.AdoptDeviceType(dev_params.device_connection_type); @@ -1212,7 +1211,8 @@ bool RegisterAppInterfaceRequest::IsWhiteSpaceExist() { if ((*message_)[strings::msg_params][strings::device_info].keyExists( strings::hardware)) { str = (*message_)[strings::msg_params][strings::device_info] - [strings::hardware].asCharArray(); + [strings::hardware] + .asCharArray(); if (strlen(str) && !CheckSyntax(str)) { LOG4CXX_ERROR(logger_, "Invalid device_info hardware syntax check failed"); @@ -1223,7 +1223,8 @@ bool RegisterAppInterfaceRequest::IsWhiteSpaceExist() { if ((*message_)[strings::msg_params][strings::device_info].keyExists( strings::firmware_rev)) { str = (*message_)[strings::msg_params][strings::device_info] - [strings::firmware_rev].asCharArray(); + [strings::firmware_rev] + .asCharArray(); if (strlen(str) && !CheckSyntax(str)) { LOG4CXX_ERROR(logger_, "Invalid device_info firmware_rev syntax check failed"); @@ -1244,7 +1245,8 @@ bool RegisterAppInterfaceRequest::IsWhiteSpaceExist() { if ((*message_)[strings::msg_params][strings::device_info].keyExists( strings::os_version)) { str = (*message_)[strings::msg_params][strings::device_info] - [strings::os_version].asCharArray(); + [strings::os_version] + .asCharArray(); if (strlen(str) && !CheckSyntax(str)) { LOG4CXX_ERROR(logger_, "Invalid device_info os_version syntax check failed"); @@ -1255,7 +1257,8 @@ bool RegisterAppInterfaceRequest::IsWhiteSpaceExist() { if ((*message_)[strings::msg_params][strings::device_info].keyExists( strings::carrier)) { str = (*message_)[strings::msg_params][strings::device_info] - [strings::carrier].asCharArray(); + [strings::carrier] + .asCharArray(); if (strlen(str) && !CheckSyntax(str)) { LOG4CXX_ERROR(logger_, "Invalid device_info carrier syntax check failed"); @@ -1323,18 +1326,18 @@ bool RegisterAppInterfaceRequest::IsApplicationSwitched() { auto app = application_manager_.application_by_policy_id(policy_app_id); if (!app) { - LOG4CXX_DEBUG(logger_, - "Application with policy id " << policy_app_id - << " is not found."); + LOG4CXX_DEBUG( + logger_, + "Application with policy id " << policy_app_id << " is not found."); return false; } LOG4CXX_DEBUG(logger_, "Application with policy id " << policy_app_id << " is found."); if (!application_manager_.IsAppInReconnectMode(policy_app_id)) { - LOG4CXX_DEBUG(logger_, - "Policy id " << policy_app_id - << " is not found in reconnection list."); + LOG4CXX_DEBUG( + logger_, + "Policy id " << policy_app_id << " is not found in reconnection list."); SendResponse(false, mobile_apis::Result::APPLICATION_REGISTERED_ALREADY); return false; } @@ -1369,4 +1372,4 @@ RegisterAppInterfaceRequest::GetPolicyHandler() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 584d7db075..b5683c62cb 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 @@ -32,11 +32,10 @@ */ #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" #include "connection_handler/connection_handler.h" -#include "application_manager/policies/policy_handler_interface.h" +#include "interfaces/MOBILE_API.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -128,4 +127,4 @@ void RegisterAppInterfaceResponse::SetHeartBeatTimeout( } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ab6e1cc143..39363bbad1 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 @@ -36,8 +36,8 @@ #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" -#include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -333,4 +333,4 @@ bool ResetGlobalPropertiesRequest::IsPendingResponseExist() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 f5542ab26b..07aa23d9c9 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 @@ -61,4 +61,4 @@ void ResetGlobalPropertiesResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 0b28e09210..c1d02c96d3 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 @@ -31,14 +31,14 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include #include "sdl_rpc_plugin/commands/mobile/scrollable_message_request.h" +#include #include "application_manager/application_impl.h" -#include "application_manager/policies/policy_handler.h" #include "application_manager/message_helper.h" -#include "interfaces/MOBILE_API.h" +#include "application_manager/policies/policy_handler.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" #include "utils/helpers.h" namespace sdl_rpc_plugin { @@ -160,4 +160,4 @@ void ScrollableMessageRequest::on_event(const event_engine::Event& event) { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 4eee819497..6236506c00 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 @@ -69,4 +69,4 @@ void ScrollableMessageResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 a09434ebb6..6e745fe0db 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 @@ -105,4 +105,4 @@ void SendHapticDataRequest::on_event(const event_engine::Event& event) { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 f4515472a4..79a0516928 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 @@ -60,4 +60,4 @@ void SendHapticDataResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 2719d0674d..1df4d788d2 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 @@ -30,8 +30,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "sdl_rpc_plugin/commands/mobile/send_location_request.h" +#include #include "application_manager/message_helper.h" #include "utils/custom_string.h" @@ -281,4 +281,4 @@ bool SendLocationRequest::CheckHMICapabilities( } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 59dab4a9a7..934008b816 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 @@ -32,8 +32,8 @@ */ #include "sdl_rpc_plugin/commands/mobile/send_location_response.h" -#include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" +#include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" namespace sdl_rpc_plugin { @@ -63,4 +63,4 @@ void SendLocationResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 e79fb315ce..b2363e870f 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 @@ -34,10 +34,10 @@ #include "sdl_rpc_plugin/commands/mobile/set_app_icon_request.h" #include -#include "application_manager/message_helper.h" #include "application_manager/application_impl.h" -#include "interfaces/MOBILE_API.h" +#include "application_manager/message_helper.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" #include "utils/file_system.h" #include "utils/helpers.h" @@ -148,10 +148,12 @@ void SetAppIconRequest::CopyToIconStorage( if (storage_max_size < file_size) { LOG4CXX_ERROR(logger_, - "Icon size (" << file_size << ") is bigger, than " - " icons storage maximum size (" - << storage_max_size << ")." - "Copying skipped."); + "Icon size (" << file_size + << ") is bigger, than " + " icons storage maximum size (" + << storage_max_size + << ")." + "Copying skipped."); return; } @@ -203,12 +205,12 @@ void SetAppIconRequest::CopyToIconStorage( void SetAppIconRequest::RemoveOldestIcons(const std::string& storage, const uint32_t icons_amount) const { const std::vector icons_list = file_system::ListFiles(storage); - auto compareTime = [](const time_t t1, const time_t t2) - -> bool { return difftime(t1, t2) > 0; }; - std::map > - icon_modification_time(compareTime); + auto compareTime = [](const time_t t1, const time_t t2) -> bool { + return difftime(t1, t2) > 0; + }; + std:: + map > + icon_modification_time(compareTime); std::vector::const_iterator it = icons_list.begin(); for (; it != icons_list.end(); ++it) { const std::string file_name = *it; @@ -271,7 +273,8 @@ void SetAppIconRequest::on_event(const event_engine::Event& event) { const std::string& path = (*message_)[strings::msg_params][strings::sync_file_name] - [strings::value].asString(); + [strings::value] + .asString(); if (is_icons_saving_enabled_) { CopyToIconStorage(path); @@ -298,4 +301,4 @@ void SetAppIconRequest::on_event(const event_engine::Event& event) { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 aa8731f062..55255920d0 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 @@ -61,4 +61,4 @@ void SetAppIconResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_cloud_app_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_cloud_app_properties_response.cc index 6d27ce8b3e..39d2ea7f90 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_cloud_app_properties_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_cloud_app_properties_response.cc @@ -1,6 +1,6 @@ +#include "sdl_rpc_plugin/commands/mobile/set_cloud_app_properties_response.h" #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" -#include "sdl_rpc_plugin/commands/mobile/set_cloud_app_properties_response.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -28,4 +28,4 @@ void SetCloudAppPropertiesResponse::Run() { } } // namespace commands -} // namespace sdl_rpc_plugins +} // namespace sdl_rpc_plugin 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 32164b8f0e..2a09a72af2 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 @@ -33,8 +33,8 @@ #include "sdl_rpc_plugin/commands/mobile/set_display_layout_request.h" -#include "application_manager/message_helper.h" #include "application_manager/application_impl.h" +#include "application_manager/message_helper.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -145,9 +145,9 @@ void SetDisplayLayoutRequest::on_event(const event_engine::Event& event) { // in case templates_available is empty copy from hmi capabilities if (msg_params.keyExists(hmi_response::display_capabilities)) { - if (0 == - msg_params[hmi_response::display_capabilities] - [hmi_response::templates_available].length()) { + if (0 == msg_params[hmi_response::display_capabilities] + [hmi_response::templates_available] + .length()) { msg_params[hmi_response::display_capabilities] [hmi_response::templates_available] = hmi_capabilities.display_capabilities()->getElement( @@ -170,4 +170,4 @@ void SetDisplayLayoutRequest::on_event(const event_engine::Event& event) { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 4bab4a3e5b..0999b596b5 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 @@ -62,4 +62,4 @@ void SetDisplayLayoutResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 0c217b6b4f..bbfc61d463 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 @@ -30,14 +30,14 @@ POSSIBILITY OF SUCH DAMAGE. */ +#include "sdl_rpc_plugin/commands/mobile/set_global_properties_request.h" #include -#include #include -#include "sdl_rpc_plugin/commands/mobile/set_global_properties_request.h" +#include #include "application_manager/message_helper.h" -#include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" #include "utils/helpers.h" namespace sdl_rpc_plugin { @@ -74,9 +74,9 @@ void SetGlobalPropertiesRequest::Run() { ApplicationSharedPtr app = application_manager_.application(connection_key()); if (!app) { - LOG4CXX_ERROR(logger_, - "No application associated with connection key " - << connection_key()); + LOG4CXX_ERROR( + logger_, + "No application associated with connection key " << connection_key()); SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED); return; } @@ -197,9 +197,9 @@ void SetGlobalPropertiesRequest::Run() { MessageHelper::VerifyTtsFiles(help_prompt, app, application_manager_); if (mobile_apis::Result::FILE_NOT_FOUND == verification_result) { - LOG4CXX_ERROR(logger_, - "MessageHelper::VerifyTtsFiles return " - << verification_result); + LOG4CXX_ERROR( + logger_, + "MessageHelper::VerifyTtsFiles return " << verification_result); invalid_params.push_back("help_prompt"); } else { app->set_help_prompt(help_prompt); @@ -215,9 +215,9 @@ void SetGlobalPropertiesRequest::Run() { timeout_prompt, app, application_manager_); if (mobile_apis::Result::FILE_NOT_FOUND == verification_result) { - LOG4CXX_ERROR(logger_, - "MessageHelper::VerifyTtsFiles return " - << verification_result); + LOG4CXX_ERROR( + logger_, + "MessageHelper::VerifyTtsFiles return " << verification_result); invalid_params.push_back("timeout_prompt"); } else { app->set_timeout_prompt(timeout_prompt); @@ -531,7 +531,8 @@ bool SetGlobalPropertiesRequest::IsWhiteSpaceExist() { strings::limited_character_list)) { const smart_objects::SmartArray* lcl_array = msg_params[strings::keyboard_properties] - [strings::limited_character_list].asArray(); + [strings::limited_character_list] + .asArray(); smart_objects::SmartArray::const_iterator it_lcl = lcl_array->begin(); smart_objects::SmartArray::const_iterator it_lcl_end = lcl_array->end(); @@ -565,4 +566,4 @@ bool SetGlobalPropertiesRequest::IsWhiteSpaceExist() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 567a1a088b..1de2b97d3a 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 @@ -61,4 +61,4 @@ void SetGlobalPropertiesResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 55bd164368..d610090aa4 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 @@ -33,10 +33,10 @@ #include "sdl_rpc_plugin/commands/mobile/set_media_clock_timer_request.h" -#include "application_manager/message_helper.h" #include "application_manager/application_impl.h" -#include "interfaces/MOBILE_API.h" +#include "application_manager/message_helper.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -163,4 +163,4 @@ bool SetMediaClockRequest::isDataValid() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 e777533ce4..948ff84156 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 @@ -61,4 +61,4 @@ void SetMediaClockTimerResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 3b2936e6cd..b439c1cb16 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 @@ -31,15 +31,15 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include #include "sdl_rpc_plugin/commands/mobile/show_constant_tbt_request.h" +#include -#include "application_manager/policies/policy_handler.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" +#include "application_manager/policies/policy_handler.h" #include "application_manager/policies/policy_handler_interface.h" -#include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -228,7 +228,8 @@ bool ShowConstantTBTRequest::IsWhiteSpaceExist() { if ((*message_)[strings::msg_params].keyExists(strings::next_turn_icon)) { str = (*message_)[strings::msg_params][strings::next_turn_icon] - [strings::value].asCharArray(); + [strings::value] + .asCharArray(); if (!CheckSyntax(str)) { LOG4CXX_ERROR(logger_, "Invalid next_turn_icon value syntax check failed"); @@ -289,4 +290,4 @@ bool ShowConstantTBTRequest::IsWhiteSpaceExist() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 239040a3b3..d027daf77d 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 @@ -63,4 +63,4 @@ void ShowConstantTBTResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 e0c3e1da9a..2bf1a81261 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 @@ -30,12 +30,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "sdl_rpc_plugin/commands/mobile/show_request.h" +#include -#include "application_manager/policies/policy_handler.h" #include "application_manager/application.h" #include "application_manager/message_helper.h" +#include "application_manager/policies/policy_handler.h" #include "utils/file_system.h" #include "utils/helpers.h" @@ -138,7 +138,8 @@ void ShowRequest::Run() { mobile_apis::Result::eType verification_result = mobile_apis::Result::SUCCESS; if (((*message_)[strings::msg_params].keyExists(strings::graphic)) && ((*message_)[strings::msg_params][strings::graphic][strings::value] - .asString()).length()) { + .asString()) + .length()) { verification_result = MessageHelper::VerifyImage( (*message_)[strings::msg_params][strings::graphic], app, @@ -398,7 +399,8 @@ bool ShowRequest::CheckStringsOfShowRequest() { if ((*message_)[strings::msg_params].keyExists(strings::secondary_graphic)) { str = (*message_)[strings::msg_params][strings::secondary_graphic] - [strings::value].asCharArray(); + [strings::value] + .asCharArray(); if (!CheckSyntax(str)) { LOG4CXX_ERROR(logger_, "Invalid secondary_graphic value syntax check failed"); @@ -410,4 +412,4 @@ bool ShowRequest::CheckStringsOfShowRequest() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 4e167e7531..f5667189b7 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 @@ -32,8 +32,8 @@ */ #include "sdl_rpc_plugin/commands/mobile/show_response.h" -#include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" +#include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" namespace sdl_rpc_plugin { @@ -63,4 +63,4 @@ void ShowResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 08b4775d3f..d80e73ccbf 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 @@ -35,8 +35,8 @@ #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" -#include "utils/helpers.h" #include "config_profile/profile.h" +#include "utils/helpers.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -204,4 +204,4 @@ bool SliderRequest::IsWhiteSpaceExist() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 4d6e714e88..4ac96a272e 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 @@ -61,4 +61,4 @@ void SliderResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 e14321c488..0730a8730f 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 @@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include #include "sdl_rpc_plugin/commands/mobile/speak_request.h" +#include #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" @@ -84,9 +84,9 @@ void SpeakRequest::Run() { MessageHelper::VerifyTtsFiles(tts_chunks, app, application_manager_); if (mobile_apis::Result::FILE_NOT_FOUND == verification_result) { - LOG4CXX_ERROR(logger_, - "MessageHelper::VerifyTtsFiles return " - << verification_result); + LOG4CXX_ERROR( + logger_, + "MessageHelper::VerifyTtsFiles return " << verification_result); SendResponse(false, mobile_apis::Result::FILE_NOT_FOUND, "One or more files needed for tts_chunks are not present"); @@ -181,4 +181,4 @@ bool SpeakRequest::IsWhiteSpaceExist() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 f57bd91cd5..69b04977ef 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 @@ -32,8 +32,8 @@ */ #include "sdl_rpc_plugin/commands/mobile/speak_response.h" -#include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" +#include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" namespace sdl_rpc_plugin { @@ -63,4 +63,4 @@ void SpeakResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 f76b6ab210..0d3158d841 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 @@ -144,4 +144,4 @@ void SubscribeButtonRequest::SendSubscribeButtonNotification() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 1350cfb66e..e584f84f4c 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 @@ -70,4 +70,4 @@ void SubscribeButtonResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 eb4ca42568..2ee7771833 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 @@ -30,8 +30,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/application_manager.h" #include "sdl_rpc_plugin/commands/mobile/subscribe_way_points_request.h" +#include "application_manager/application_manager.h" #include "application_manager/message_helper.h" namespace sdl_rpc_plugin { @@ -120,4 +120,4 @@ bool SubscribeWayPointsRequest::Init() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 7d051df7e9..45486792d7 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 @@ -30,9 +30,9 @@ POSSIBILITY OF SUCH DAMAGE. */ +#include "sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h" #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" -#include "sdl_rpc_plugin/commands/mobile/subscribe_way_points_response.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -61,4 +61,4 @@ void SubscribeWayPointsResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 ca9182469a..e70433f29b 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 @@ -33,19 +33,19 @@ Copyright (c) 2018, Ford Motor Company #include "sdl_rpc_plugin/commands/mobile/system_request.h" -#include -#include #include #include #include +#include +#include #include "application_manager/policies/policy_handler_interface.h" -#include "interfaces/MOBILE_API.h" -#include "utils/file_system.h" -#include "policy/policy_table/enums.h" #include "formatters/CFormatterJsonBase.h" +#include "interfaces/MOBILE_API.h" #include "json/json.h" -#include "utils/helpers.h" +#include "policy/policy_table/enums.h" #include "utils/custom_string.h" +#include "utils/file_system.h" +#include "utils/helpers.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -170,17 +170,18 @@ class QueryAppsDataValidator { << "Package name length [" << app_data[json::android][json::packageName] .asString() - .length() << "] exceeds max length [" - << kPackageNameLengthMax << "]in json file."); + .length() + << "] exceeds max length [" << kPackageNameLengthMax + << "]in json file."); return false; } } // Languages verification if (!app_data[os_type].keyExists(json::languages)) { - LOG4CXX_WARN(logger_, - kQueryAppsValidationFailedPrefix - << "'languages' doesn't exist"); + LOG4CXX_WARN( + logger_, + kQueryAppsValidationFailedPrefix << "'languages' doesn't exist"); return false; } if (!ValidateLanguages(app_data[os_type][json::languages], @@ -217,9 +218,9 @@ class QueryAppsDataValidator { ApplicationSharedPtr registered_app = manager_.application_by_policy_id(app_id); if (registered_app) { - LOG4CXX_INFO(logger_, - "Application with the id: " << app_id - << " is already registered."); + LOG4CXX_INFO( + logger_, + "Application with the id: " << app_id << " is already registered."); } // And app name length const std::string appName(app_data[json::name].asString()); @@ -250,9 +251,9 @@ class QueryAppsDataValidator { for (size_t idx = 0; idx < languages_array_size; ++idx) { const smart_objects::SmartObject& language = languages.getElement(idx); if (smart_objects::SmartType_Map != language.getType()) { - LOG4CXX_WARN(logger_, - kQueryAppsValidationFailedPrefix - << "language is not a map."); + LOG4CXX_WARN( + logger_, + kQueryAppsValidationFailedPrefix << "language is not a map."); return false; } if (language.length() != 1) { @@ -263,9 +264,9 @@ class QueryAppsDataValidator { } const std::string language_name = (*language.map_begin()).first; if (!language_name.length()) { - LOG4CXX_WARN(logger_, - kQueryAppsValidationFailedPrefix - << "language name is empty"); + LOG4CXX_WARN( + logger_, + kQueryAppsValidationFailedPrefix << "language name is empty"); return false; } // Verify default language defined @@ -329,9 +330,9 @@ class QueryAppsDataValidator { const smart_objects::SmartArray* synonyms_array = language[language_name][json::vrSynonyms].asArray(); if (!synonyms_array) { - LOG4CXX_WARN(logger_, - kQueryAppsValidationFailedPrefix - << "vrSynonyms is not array."); + LOG4CXX_WARN( + logger_, + kQueryAppsValidationFailedPrefix << "vrSynonyms is not array."); return false; } const size_t synonyms_array_size = synonyms_array->size(); @@ -421,7 +422,7 @@ class QueryAppsDataValidator { DISALLOW_COPY_AND_ASSIGN(QueryAppsDataValidator); }; -} +} // namespace namespace commands { @@ -699,9 +700,9 @@ void SystemRequest::on_event(const event_engine::Event& event) { bool SystemRequest::ValidateQueryAppData( smart_objects::SmartObject& data) const { if (!data.isValid()) { - LOG4CXX_ERROR(logger_, - kQueryAppsValidationFailedPrefix - << "QueryApps response is not valid."); + LOG4CXX_ERROR( + logger_, + kQueryAppsValidationFailedPrefix << "QueryApps response is not valid."); return false; } if (!data.keyExists(json::response)) { @@ -718,4 +719,4 @@ bool SystemRequest::ValidateQueryAppData( } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 dc2e3ea3f5..428901a1c5 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 @@ -61,4 +61,4 @@ void SystemResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 9119fb48da..3ba0513aeb 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 @@ -32,8 +32,8 @@ */ #include "sdl_rpc_plugin/commands/mobile/unregister_app_interface_request.h" -#include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" +#include "application_manager/rpc_service.h" namespace sdl_rpc_plugin { using namespace application_manager; @@ -62,4 +62,4 @@ void UnregisterAppInterfaceRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 4e7c879b58..7c90639968 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 @@ -45,4 +45,4 @@ void UnregisterAppInterfaceResponse::Run() { } } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 0c30f567b4..ebd463d4fa 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 @@ -123,4 +123,4 @@ void UnsubscribeButtonRequest::SendUnsubscribeButtonNotification() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 592b91851e..c69d49bca1 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 @@ -71,4 +71,4 @@ void UnsubscribeButtonResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 4b40b7a9ce..17326a99a0 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 @@ -30,8 +30,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/application_manager.h" #include "sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_request.h" +#include "application_manager/application_manager.h" #include "application_manager/message_helper.h" namespace sdl_rpc_plugin { @@ -125,4 +125,4 @@ bool UnsubscribeWayPointsRequest::Init() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 67e3466a44..a7a180fb46 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 @@ -30,8 +30,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/application_manager.h" #include "sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_response.h" +#include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" namespace sdl_rpc_plugin { @@ -61,4 +61,4 @@ void UnsubscribeWayPointsResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 c04ad34f5f..8c2cce9765 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 @@ -31,14 +31,14 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include #include "sdl_rpc_plugin/commands/mobile/update_turn_list_request.h" +#include -#include "application_manager/policies/policy_handler.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" -#include "interfaces/MOBILE_API.h" +#include "application_manager/policies/policy_handler.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" #include "utils/custom_string.h" namespace sdl_rpc_plugin { @@ -240,4 +240,4 @@ bool UpdateTurnListRequest::IsWhiteSpaceExist() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 5ddf355f88..eca9e3703c 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 @@ -62,4 +62,4 @@ void UpdateTurnListResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace sdl_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/extensions/system_capability_app_extension.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/extensions/system_capability_app_extension.cc index 130585a927..5ffbbd83bb 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/extensions/system_capability_app_extension.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/extensions/system_capability_app_extension.cc @@ -25,9 +25,9 @@ bool SystemCapabilityAppExtension::SubscribeTo( bool SystemCapabilityAppExtension::UnsubscribeFrom( const SystemCapabilityType system_capability_type) { - LOG4CXX_INFO(logger_, - "Unsubscribing from System Capability " - << system_capability_type); + LOG4CXX_INFO( + logger_, + "Unsubscribing from System Capability " << system_capability_type); auto it = subscribed_data_.find(system_capability_type); if (it != subscribed_data_.end()) { subscribed_data_.erase(it); @@ -95,4 +95,4 @@ SystemCapabilityAppExtension& SystemCapabilityAppExtension::ExtractExtension( DCHECK(app_extension); return *app_extension; } -} \ No newline at end of file +} // namespace sdl_rpc_plugin \ No newline at end of file diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc index fb809e8834..0734e1935d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc @@ -35,213 +35,212 @@ #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/activate_app_request.h" +#include "sdl_rpc_plugin/commands/hmi/activate_app_response.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/button_get_capabilities_request.h" +#include "sdl_rpc_plugin/commands/hmi/button_get_capabilities_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/get_system_info_request.h" +#include "sdl_rpc_plugin/commands/hmi/get_system_info_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_activated_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_event_changed_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_find_applications.h" +#include "sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_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_sdl_consent_needed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h" +#include "sdl_rpc_plugin/commands/hmi/on_status_update_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/on_update_device_list.h" +#include "sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.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/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_status_update_request.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_get_status_update_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/tts_change_registration_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_change_registration_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/tts_get_language_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_get_language_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_is_ready_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_is_ready_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_speak_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_speak_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/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_alert_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_alert_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_delete_command_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_delete_command_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_end_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_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_get_language_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_get_language_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_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_perform_audio_pass_thru_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_response.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/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/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_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_show_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_show_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/update_app_list_request.h" +#include "sdl_rpc_plugin/commands/hmi/update_app_list_response.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/update_sdl_request.h" +#include "sdl_rpc_plugin/commands/hmi/update_sdl_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_delete_command_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_delete_command_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_get_language_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_get_language_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_is_ready_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_is_ready_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/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 +#include "sdl_rpc_plugin/commands/hmi/add_statistics_info_notification.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/basic_communication_system_request.h" +#include "sdl_rpc_plugin/commands/hmi/basic_communication_system_response.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/get_urls.h" +#include "sdl_rpc_plugin/commands/hmi/get_urls_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_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/navi_get_way_points_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_get_way_points_response.h" #include "sdl_rpc_plugin/commands/hmi/navi_is_ready_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_is_ready_response.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/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_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_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_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/navi_update_turn_list_request.h" +#include "sdl_rpc_plugin/commands/hmi/navi_update_turn_list_response.h" +#include "sdl_rpc_plugin/commands/hmi/on_app_deactivated_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_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_device_chosen_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_file_removed_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_policy_update.h" +#include "sdl_rpc_plugin/commands/hmi/on_ready_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_received_policy_update.h" +#include "sdl_rpc_plugin/commands/hmi/on_record_start_notification.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_context_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/on_system_request_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_system_time_ready_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_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_ui_command_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vr_language_change_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/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/ui_set_display_layout_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_display_layout_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" #include "sdl_rpc_plugin/commands/hmi/bc_get_file_path_request.h" #include "sdl_rpc_plugin/commands/hmi/bc_get_file_path_response.h" +#include "sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h" +#include "sdl_rpc_plugin/commands/hmi/rc_get_capabilities_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/on_bc_system_capability_updated_notification.h" @@ -293,7 +292,8 @@ bool HMICommandFactory::IsAbleToProcess( return get_creator_factory( static_cast(function_id), hmi_apis::messageType::INVALID_ENUM, - message_source).CanBeCreated(); + message_source) + .CanBeCreated(); } CommandCreator& HMICommandFactory::get_creator_factory( @@ -859,4 +859,4 @@ CommandCreator& HMICommandFactory::get_creator_factory( } } -} // namespace application_manager +} // namespace sdl_rpc_plugin diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc index 554d004360..8c37e5729d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc @@ -31,29 +31,36 @@ */ #include "sdl_rpc_plugin/mobile_command_factory.h" +#include "interfaces/MOBILE_API.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/alert_request.h" +#include "sdl_rpc_plugin/commands/mobile/alert_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_command_request.h" +#include "sdl_rpc_plugin/commands/mobile/delete_command_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/dial_number_request.h" +#include "sdl_rpc_plugin/commands/mobile/dial_number_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_cloud_app_properties_request.h" +#include "sdl_rpc_plugin/commands/mobile/get_cloud_app_properties_response.h" +#include "sdl_rpc_plugin/commands/mobile/get_file_request.h" +#include "sdl_rpc_plugin/commands/mobile/get_file_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_way_points_request.h" @@ -64,16 +71,19 @@ #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_command_notification.h" #include "sdl_rpc_plugin/commands/mobile/on_driver_distraction_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_hash_change_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_keyboard_input_notification.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_system_capability_updated_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_system_request_notification.h" #include "sdl_rpc_plugin/commands/mobile/on_tbt_client_state_notification.h" -#include "sdl_rpc_plugin/commands/mobile/on_hash_change_notification.h" +#include "sdl_rpc_plugin/commands/mobile/on_touch_event_notification.h" #include "sdl_rpc_plugin/commands/mobile/on_way_point_change_notification.h" -#include "sdl_rpc_plugin/commands/mobile/on_system_capability_updated_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" @@ -86,12 +96,18 @@ #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/send_haptic_data_request.h" +#include "sdl_rpc_plugin/commands/mobile/send_haptic_data_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/set_app_icon_request.h" +#include "sdl_rpc_plugin/commands/mobile/set_app_icon_response.h" +#include "sdl_rpc_plugin/commands/mobile/set_cloud_app_properties_request.h" +#include "sdl_rpc_plugin/commands/mobile/set_cloud_app_properties_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" @@ -106,32 +122,16 @@ #include "sdl_rpc_plugin/commands/mobile/subscribe_button_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/system_request.h" +#include "sdl_rpc_plugin/commands/mobile/system_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_way_points_request.h" +#include "sdl_rpc_plugin/commands/mobile/unsubscribe_way_points_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/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 "sdl_rpc_plugin/commands/mobile/set_cloud_app_properties_request.h" -#include "sdl_rpc_plugin/commands/mobile/set_cloud_app_properties_response.h" -#include "sdl_rpc_plugin/commands/mobile/get_cloud_app_properties_request.h" -#include "sdl_rpc_plugin/commands/mobile/get_cloud_app_properties_response.h" -#include "sdl_rpc_plugin/commands/mobile/get_file_request.h" -#include "sdl_rpc_plugin/commands/mobile/get_file_response.h" -#include "interfaces/MOBILE_API.h" CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationManager") namespace sdl_rpc_plugin { @@ -446,7 +446,8 @@ bool MobileCommandFactory::IsAbleToProcess( return get_creator_factory( static_cast(function_id), mobile_apis::messageType::INVALID_ENUM, - message_source).CanBeCreated(); + message_source) + .CanBeCreated(); } CommandSharedPtr MobileCommandFactory::CreateCommand( @@ -467,4 +468,4 @@ CommandSharedPtr MobileCommandFactory::CreateCommand( return get_creator_factory(function_id, message_type, source).create(message); } -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 index d745cd8f44..21f15a33fe 100644 --- 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 @@ -77,4 +77,4 @@ bool SDLCommandFactory::IsAbleToProcess( : is_mobile_command_factory_able_to_process; } -} // namespace application_manager +} // namespace sdl_rpc_plugin 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 c448b41ff1..b261b20c24 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 @@ -30,10 +30,10 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/plugin_manager/plugin_keys.h" #include "sdl_rpc_plugin/sdl_rpc_plugin.h" -#include "sdl_rpc_plugin/sdl_command_factory.h" +#include "application_manager/plugin_manager/plugin_keys.h" #include "sdl_rpc_plugin/extensions/system_capability_app_extension.h" +#include "sdl_rpc_plugin/sdl_command_factory.h" namespace sdl_rpc_plugin { namespace app_mngr = application_manager; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/activate_app_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/activate_app_request_test.cc index 50b7aae42a..7dadad59fe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/activate_app_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/activate_app_request_test.cc @@ -30,12 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "hmi/activate_app_request.h" -#include "smart_objects/smart_object.h" #include "application_manager/commands/command_impl.h" #include "application_manager/commands/commands_test.h" #include "application_manager/mock_application.h" +#include "gtest/gtest.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -47,9 +47,9 @@ using ::testing::_; namespace am = ::application_manager; namespace strings = ::application_manager::strings; +using am::commands::CommandImpl; using am::commands::MessageSharedPtr; using sdl_rpc_plugin::commands::ActivateAppRequest; -using am::commands::CommandImpl; using ::test::components::application_manager_test::MockApplication; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/add_statistics_info_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/add_statistics_info_notification_test.cc index a5707488dd..01487284a4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/add_statistics_info_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/add_statistics_info_notification_test.cc @@ -30,15 +30,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "hmi/add_statistics_info_notification.h" +#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" #include "application_manager/commands/commands_test.h" #include "application_manager/mock_application.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/policies/policy_handler.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/policies/policy_handler.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -49,11 +49,11 @@ namespace add_statistics_info_notification { namespace am = ::application_manager; namespace strings = ::application_manager::strings; namespace hmi_notification = ::application_manager::hmi_notification; -using am::commands::MessageSharedPtr; -using sdl_rpc_plugin::commands::AddStatisticsInfoNotification; using am::commands::CommandImpl; +using am::commands::MessageSharedPtr; using policy::PolicyHandler; using policy_test::MockPolicyHandlerInterface; +using sdl_rpc_plugin::commands::AddStatisticsInfoNotification; using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/allow_all_apps_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/allow_all_apps_response_test.cc index a2fcf8f605..251fe230fc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/allow_all_apps_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/allow_all_apps_response_test.cc @@ -30,13 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "hmi/allow_all_apps_response.h" +#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" #include "application_manager/commands/command_impl.h" #include "application_manager/commands/commands_test.h" #include "application_manager/mock_application.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { namespace commands_test { @@ -53,7 +53,7 @@ typedef std::shared_ptr ResponsePtr; namespace { const bool kResponseIsAllowed = true; -} // +} // namespace class AllowAllAppsResponseTest : public CommandsTest {}; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/allow_app_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/allow_app_response_test.cc index 2ce400542a..a0e23d7b9d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/allow_app_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/allow_app_response_test.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "hmi/allow_app_response.h" +#include "gtest/gtest.h" #include "application_manager/commands/commands_test.h" #include "application_manager/mock_application.h" @@ -53,7 +53,7 @@ namespace hmi_response = ::application_manager::hmi_response; namespace { const uint32_t kConnectionKey = 1u; const bool kIsResponseAllowed = true; -} +} // namespace typedef std::shared_ptr ResponsePtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/basic_communication_get_system_time_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/basic_communication_get_system_time_request_test.cc index a3f0ab6933..0251c4873d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/basic_communication_get_system_time_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/basic_communication_get_system_time_request_test.cc @@ -28,7 +28,7 @@ * 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 "hmi/basic_communication_get_system_time_request.h" diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/basic_communication_get_system_time_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/basic_communication_get_system_time_response_test.cc index 8f56c6462c..0c8e986fc6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/basic_communication_get_system_time_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/basic_communication_get_system_time_response_test.cc @@ -30,12 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" -#include "application_manager/commands/commands_test.h" #include "hmi/basic_communication_get_system_time_response.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/mock_application_manager.h" #include "application_manager/mock_event_dispatcher.h" #include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" #include "interfaces/HMI_API.h" namespace test { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/button_get_capabilities_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/button_get_capabilities_response_test.cc index 6ed15bebeb..7d9ed899a6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/button_get_capabilities_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/button_get_capabilities_response_test.cc @@ -30,13 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "hmi/button_get_capabilities_response.h" +#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" #include "application_manager/commands/commands_test.h" #include "application_manager/mock_application.h" #include "application_manager/mock_hmi_capabilities.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { namespace commands_test { @@ -45,8 +45,8 @@ namespace button_get_capabilities_response { using application_manager::commands::MessageSharedPtr; using sdl_rpc_plugin::commands::ButtonGetCapabilitiesResponse; -using ::testing::ReturnRef; using ::testing::NiceMock; +using ::testing::ReturnRef; namespace strings = ::application_manager::strings; namespace hmi_response = ::application_manager::hmi_response; @@ -100,7 +100,8 @@ TEST_F(ButtonGetCapabilitiesResponseTest, Run_CodeAborted_SUCCESS) { EXPECT_CALL(mock_hmi_capabilities_, set_button_capabilities(capabilities_)) .Times(0); EXPECT_CALL(mock_hmi_capabilities_, - set_preset_bank_capabilities(preset_bank_capabilities_)).Times(0); + set_preset_bank_capabilities(preset_bank_capabilities_)) + .Times(0); command->Run(); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/close_popup_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/close_popup_response_test.cc index 6914a4ca7e..087109c871 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/close_popup_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/close_popup_response_test.cc @@ -35,13 +35,13 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/commands/command.h" -#include "application_manager/commands/response_from_hmi.h" -#include "hmi/close_popup_response.h" #include "application_manager/commands/commands_test.h" +#include "application_manager/commands/response_from_hmi.h" #include "application_manager/mock_application.h" +#include "application_manager/smart_object_keys.h" +#include "hmi/close_popup_response.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -50,9 +50,9 @@ namespace hmi_commands_test { namespace close_popup_response { namespace am = ::application_manager; +using am::commands::CommandImpl; using application_manager::commands::ResponseFromHMI; using sdl_rpc_plugin::commands::ClosePopupResponse; -using am::commands::CommandImpl; typedef std::shared_ptr ResponseFromHMIPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc index 874d27b4b0..f5593bf241 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc @@ -37,194 +37,193 @@ #include #include "gtest/gtest.h" +#include "hmi/activate_app_request.h" +#include "hmi/activate_app_response.h" +#include "hmi/add_statistics_info_notification.h" #include "hmi/allow_all_apps_request.h" #include "hmi/allow_all_apps_response.h" #include "hmi/allow_app_request.h" #include "hmi/allow_app_response.h" +#include "hmi/basic_communication_system_request.h" +#include "hmi/basic_communication_system_response.h" +#include "hmi/bc_get_file_path_request.h" +#include "hmi/bc_get_file_path_response.h" +#include "hmi/button_get_capabilities_request.h" +#include "hmi/button_get_capabilities_response.h" +#include "hmi/close_popup_request.h" +#include "hmi/close_popup_response.h" +#include "hmi/dial_number_request.h" +#include "hmi/dial_number_response.h" +#include "hmi/get_system_info_request.h" +#include "hmi/get_system_info_response.h" +#include "hmi/get_urls.h" +#include "hmi/get_urls_response.h" +#include "hmi/mixing_audio_supported_request.h" +#include "hmi/mixing_audio_supported_response.h" +#include "hmi/navi_alert_maneuver_request.h" +#include "hmi/navi_alert_maneuver_response.h" #include "hmi/navi_audio_start_stream_request.h" #include "hmi/navi_audio_start_stream_response.h" #include "hmi/navi_audio_stop_stream_request.h" #include "hmi/navi_audio_stop_stream_response.h" -#include "hmi/update_device_list_request.h" -#include "hmi/update_device_list_response.h" -#include "hmi/on_update_device_list.h" -#include "hmi/on_start_device_discovery.h" -#include "hmi/update_app_list_request.h" -#include "hmi/update_app_list_response.h" -#include "hmi/on_find_applications.h" -#include "hmi/sdl_get_list_of_permissions_request.h" -#include "hmi/sdl_get_list_of_permissions_response.h" -#include "hmi/sdl_get_user_friendly_message_request.h" -#include "hmi/sdl_get_user_friendly_message_response.h" -#include "hmi/sdl_get_status_update_request.h" -#include "hmi/sdl_get_status_update_response.h" -#include "hmi/on_status_update_notification.h" -#include "hmi/update_sdl_request.h" -#include "hmi/update_sdl_response.h" -#include "hmi/activate_app_request.h" -#include "hmi/activate_app_response.h" -#include "hmi/mixing_audio_supported_request.h" -#include "hmi/mixing_audio_supported_response.h" +#include "hmi/navi_get_way_points_request.h" +#include "hmi/navi_get_way_points_response.h" +#include "hmi/navi_is_ready_request.h" +#include "hmi/navi_is_ready_response.h" +#include "hmi/navi_send_location_request.h" +#include "hmi/navi_send_location_response.h" +#include "hmi/navi_show_constant_tbt_request.h" +#include "hmi/navi_show_constant_tbt_response.h" +#include "hmi/navi_start_stream_request.h" +#include "hmi/navi_start_stream_response.h" +#include "hmi/navi_stop_stream_request.h" +#include "hmi/navi_stop_stream_response.h" +#include "hmi/navi_subscribe_way_points_request.h" +#include "hmi/navi_subscribe_way_points_response.h" +#include "hmi/navi_unsubscribe_way_points_request.h" +#include "hmi/navi_unsubscribe_way_points_response.h" +#include "hmi/navi_update_turn_list_request.h" +#include "hmi/navi_update_turn_list_response.h" #include "hmi/on_allow_sdl_functionality_notification.h" +#include "hmi/on_app_activated_notification.h" +#include "hmi/on_app_deactivated_notification.h" #include "hmi/on_app_permission_changed_notification.h" #include "hmi/on_app_permission_consent_notification.h" -#include "hmi/on_app_activated_notification.h" +#include "hmi/on_app_registered_notification.h" +#include "hmi/on_app_unregistered_notification.h" #include "hmi/on_audio_data_streaming_notification.h" -#include "hmi/on_video_data_streaming_notification.h" -#include "hmi/on_sdl_consent_needed_notification.h" +#include "hmi/on_button_event_notification.h" +#include "hmi/on_button_press_notification.h" +#include "hmi/on_button_subscription_notification.h" +#include "hmi/on_device_chosen_notification.h" +#include "hmi/on_device_state_changed_notification.h" +#include "hmi/on_driver_distraction_notification.h" +#include "hmi/on_event_changed_notification.h" #include "hmi/on_exit_all_applications_notification.h" #include "hmi/on_exit_application_notification.h" +#include "hmi/on_file_removed_notification.h" +#include "hmi/on_find_applications.h" +#include "hmi/on_ignition_cycle_over_notification.h" +#include "hmi/on_navi_tbt_client_state_notification.h" +#include "hmi/on_navi_way_point_change_notification.h" +#include "hmi/on_policy_update.h" #include "hmi/on_put_file_notification.h" +#include "hmi/on_ready_notification.h" +#include "hmi/on_received_policy_update.h" +#include "hmi/on_record_start_notification.h" #include "hmi/on_resume_audio_source_notification.h" -#include "hmi/on_ignition_cycle_over_notification.h" +#include "hmi/on_sdl_close_notification.h" +#include "hmi/on_sdl_consent_needed_notification.h" +#include "hmi/on_sdl_persistence_complete_notification.h" +#include "hmi/on_start_device_discovery.h" +#include "hmi/on_status_update_notification.h" +#include "hmi/on_system_context_notification.h" +#include "hmi/on_system_error_notification.h" #include "hmi/on_system_info_changed_notification.h" -#include "hmi/get_system_info_request.h" -#include "hmi/get_system_info_response.h" -#include "hmi/close_popup_request.h" -#include "hmi/close_popup_response.h" -#include "hmi/button_get_capabilities_request.h" -#include "hmi/button_get_capabilities_response.h" +#include "hmi/on_system_request_notification.h" +#include "hmi/on_tts_language_change_notification.h" +#include "hmi/on_tts_reset_timeout_notification.h" +#include "hmi/on_tts_started_notification.h" +#include "hmi/on_tts_stopped_notification.h" +#include "hmi/on_ui_command_notification.h" +#include "hmi/on_ui_keyboard_input_notification.h" +#include "hmi/on_ui_language_change_notification.h" +#include "hmi/on_ui_reset_timeout_notification.h" +#include "hmi/on_ui_touch_event_notification.h" +#include "hmi/on_update_device_list.h" +#include "hmi/on_video_data_streaming_notification.h" +#include "hmi/on_vr_command_notification.h" +#include "hmi/on_vr_language_change_notification.h" +#include "hmi/on_vr_started_notification.h" +#include "hmi/on_vr_stopped_notification.h" +#include "hmi/sdl_activate_app_request.h" +#include "hmi/sdl_activate_app_response.h" +#include "hmi/sdl_get_list_of_permissions_request.h" +#include "hmi/sdl_get_list_of_permissions_response.h" +#include "hmi/sdl_get_status_update_request.h" +#include "hmi/sdl_get_status_update_response.h" +#include "hmi/sdl_get_user_friendly_message_request.h" +#include "hmi/sdl_get_user_friendly_message_response.h" +#include "hmi/sdl_policy_update.h" +#include "hmi/sdl_policy_update_response.h" +#include "hmi/tts_change_registration_request.h" +#include "hmi/tts_change_registration_response.h" +#include "hmi/tts_get_capabilities_request.h" +#include "hmi/tts_get_capabilities_response.h" +#include "hmi/tts_get_language_request.h" +#include "hmi/tts_get_language_response.h" +#include "hmi/tts_get_supported_languages_request.h" +#include "hmi/tts_get_supported_languages_response.h" +#include "hmi/tts_is_ready_request.h" +#include "hmi/tts_is_ready_response.h" +#include "hmi/tts_set_global_properties_request.h" +#include "hmi/tts_set_global_properties_response.h" +#include "hmi/tts_speak_request.h" +#include "hmi/tts_speak_response.h" +#include "hmi/tts_stop_speaking_request.h" +#include "hmi/tts_stop_speaking_response.h" #include "hmi/ui_add_command_request.h" #include "hmi/ui_add_command_response.h" -#include "hmi/ui_delete_command_request.h" -#include "hmi/ui_delete_command_response.h" #include "hmi/ui_add_submenu_request.h" #include "hmi/ui_add_submenu_response.h" +#include "hmi/ui_alert_request.h" +#include "hmi/ui_alert_response.h" +#include "hmi/ui_change_registration_request.h" +#include "hmi/ui_change_registration_response.h" +#include "hmi/ui_delete_command_request.h" +#include "hmi/ui_delete_command_response.h" #include "hmi/ui_delete_submenu_request.h" #include "hmi/ui_delete_submenu_response.h" -#include "hmi/ui_get_supported_languages_request.h" -#include "hmi/ui_get_supported_languages_response.h" -#include "hmi/ui_get_language_request.h" -#include "hmi/ui_get_language_response.h" +#include "hmi/ui_end_audio_pass_thru_request.h" +#include "hmi/ui_end_audio_pass_thru_response.h" #include "hmi/ui_get_capabilities_request.h" #include "hmi/ui_get_capabilities_response.h" -#include "hmi/ui_change_registration_request.h" -#include "hmi/ui_change_registration_response.h" -#include "hmi/ui_show_request.h" -#include "hmi/ui_show_response.h" -#include "hmi/ui_alert_request.h" -#include "hmi/ui_alert_response.h" +#include "hmi/ui_get_language_request.h" +#include "hmi/ui_get_language_response.h" +#include "hmi/ui_get_supported_languages_request.h" +#include "hmi/ui_get_supported_languages_response.h" #include "hmi/ui_is_ready_request.h" #include "hmi/ui_is_ready_response.h" -#include "hmi/ui_slider_request.h" -#include "hmi/ui_slider_response.h" -#include "hmi/ui_set_media_clock_timer_request.h" -#include "hmi/ui_set_media_clock_timer_response.h" -#include "hmi/ui_set_global_properties_request.h" -#include "hmi/ui_set_global_properties_response.h" +#include "hmi/ui_perform_audio_pass_thru_request.h" +#include "hmi/ui_perform_audio_pass_thru_response.h" +#include "hmi/ui_perform_interaction_request.h" +#include "hmi/ui_perform_interaction_response.h" #include "hmi/ui_scrollable_message_request.h" #include "hmi/ui_scrollable_message_response.h" #include "hmi/ui_set_app_icon_request.h" #include "hmi/ui_set_app_icon_response.h" -#include "hmi/ui_perform_audio_pass_thru_response.h" -#include "hmi/ui_perform_audio_pass_thru_request.h" -#include "hmi/ui_end_audio_pass_thru_request.h" -#include "hmi/ui_end_audio_pass_thru_response.h" -#include "hmi/ui_perform_interaction_request.h" -#include "hmi/ui_perform_interaction_response.h" -#include "hmi/vr_is_ready_request.h" -#include "hmi/vr_is_ready_response.h" +#include "hmi/ui_set_display_layout_request.h" +#include "hmi/ui_set_display_layout_response.h" +#include "hmi/ui_set_global_properties_request.h" +#include "hmi/ui_set_global_properties_response.h" +#include "hmi/ui_set_media_clock_timer_request.h" +#include "hmi/ui_set_media_clock_timer_response.h" +#include "hmi/ui_show_request.h" +#include "hmi/ui_show_response.h" +#include "hmi/ui_slider_request.h" +#include "hmi/ui_slider_response.h" +#include "hmi/update_app_list_request.h" +#include "hmi/update_app_list_response.h" +#include "hmi/update_device_list_request.h" +#include "hmi/update_device_list_response.h" +#include "hmi/update_sdl_request.h" +#include "hmi/update_sdl_response.h" #include "hmi/vr_add_command_request.h" #include "hmi/vr_add_command_response.h" -#include "hmi/vr_delete_command_request.h" -#include "hmi/vr_delete_command_response.h" #include "hmi/vr_change_registration_request.h" #include "hmi/vr_change_registration_response.h" -#include "hmi/vr_get_supported_languages_request.h" -#include "hmi/vr_get_supported_languages_response.h" -#include "hmi/vr_get_language_request.h" -#include "hmi/vr_get_language_response.h" +#include "hmi/vr_delete_command_request.h" +#include "hmi/vr_delete_command_response.h" #include "hmi/vr_get_capabilities_request.h" #include "hmi/vr_get_capabilities_response.h" -#include "hmi/tts_is_ready_request.h" -#include "hmi/tts_is_ready_response.h" -#include "hmi/tts_change_registration_request.h" -#include "hmi/tts_change_registration_response.h" -#include "hmi/tts_get_supported_languages_request.h" -#include "hmi/tts_get_supported_languages_response.h" -#include "hmi/tts_get_language_request.h" -#include "hmi/tts_get_language_response.h" -#include "hmi/tts_stop_speaking_request.h" -#include "hmi/tts_stop_speaking_response.h" -#include "hmi/tts_speak_request.h" -#include "hmi/tts_speak_response.h" -#include "hmi/tts_set_global_properties_request.h" -#include "hmi/tts_set_global_properties_response.h" -#include "hmi/tts_get_capabilities_request.h" -#include "hmi/tts_get_capabilities_response.h" +#include "hmi/vr_get_language_request.h" +#include "hmi/vr_get_language_response.h" +#include "hmi/vr_get_supported_languages_request.h" +#include "hmi/vr_get_supported_languages_response.h" +#include "hmi/vr_is_ready_request.h" +#include "hmi/vr_is_ready_response.h" #include "hmi/vr_perform_interaction_request.h" #include "hmi/vr_perform_interaction_response.h" -#include "hmi/sdl_activate_app_request.h" -#include "hmi/sdl_activate_app_response.h" -#include "hmi/on_app_permission_changed_notification.h" -#include "hmi/on_event_changed_notification.h" -#include "hmi/navi_is_ready_request.h" -#include "hmi/navi_show_constant_tbt_request.h" -#include "hmi/navi_show_constant_tbt_response.h" -#include "hmi/navi_is_ready_response.h" -#include "hmi/navi_alert_maneuver_request.h" -#include "hmi/navi_alert_maneuver_response.h" -#include "hmi/navi_update_turn_list_request.h" -#include "hmi/navi_update_turn_list_response.h" -#include "hmi/navi_subscribe_way_points_request.h" -#include "hmi/navi_subscribe_way_points_response.h" -#include "hmi/navi_unsubscribe_way_points_request.h" -#include "hmi/navi_unsubscribe_way_points_response.h" -#include "hmi/navi_get_way_points_request.h" -#include "hmi/navi_get_way_points_response.h" -#include "hmi/on_ready_notification.h" -#include "hmi/on_device_chosen_notification.h" -#include "hmi/on_file_removed_notification.h" -#include "hmi/on_system_context_notification.h" -#include "hmi/on_app_registered_notification.h" -#include "hmi/on_app_unregistered_notification.h" -#include "hmi/on_driver_distraction_notification.h" -#include "hmi/on_tts_started_notification.h" -#include "hmi/on_tts_stopped_notification.h" -#include "hmi/on_vr_started_notification.h" -#include "hmi/on_vr_stopped_notification.h" -#include "hmi/on_vr_command_notification.h" -#include "hmi/on_ui_command_notification.h" -#include "hmi/on_app_deactivated_notification.h" -#include "hmi/on_ui_language_change_notification.h" -#include "hmi/on_vr_language_change_notification.h" -#include "hmi/on_tts_language_change_notification.h" -#include "hmi/on_navi_tbt_client_state_notification.h" -#include "hmi/on_navi_way_point_change_notification.h" -#include "hmi/on_button_event_notification.h" -#include "hmi/on_button_press_notification.h" -#include "hmi/on_button_subscription_notification.h" -#include "hmi/on_ui_keyboard_input_notification.h" -#include "hmi/on_ui_touch_event_notification.h" -#include "hmi/on_ui_reset_timeout_notification.h" -#include "hmi/navi_start_stream_request.h" -#include "hmi/navi_start_stream_response.h" -#include "hmi/navi_stop_stream_request.h" -#include "hmi/navi_stop_stream_response.h" -#include "hmi/on_system_request_notification.h" -#include "hmi/ui_set_display_layout_request.h" -#include "hmi/ui_set_display_layout_response.h" -#include "hmi/on_sdl_close_notification.h" -#include "hmi/on_sdl_persistence_complete_notification.h" -#include "hmi/on_record_start_notification.h" -#include "hmi/add_statistics_info_notification.h" -#include "hmi/on_system_error_notification.h" -#include "hmi/basic_communication_system_request.h" -#include "hmi/basic_communication_system_response.h" -#include "hmi/sdl_policy_update.h" -#include "hmi/sdl_policy_update_response.h" -#include "hmi/on_received_policy_update.h" -#include "hmi/on_policy_update.h" -#include "hmi/get_urls.h" -#include "hmi/get_urls_response.h" -#include "hmi/on_device_state_changed_notification.h" -#include "hmi/navi_send_location_request.h" -#include "hmi/navi_send_location_response.h" -#include "hmi/on_tts_reset_timeout_notification.h" -#include "hmi/dial_number_request.h" -#include "hmi/dial_number_response.h" -#include "hmi/bc_get_file_path_request.h" -#include "hmi/bc_get_file_path_response.h" #include "application_manager/commands/commands_test.h" #include "application_manager/mock_application.h" @@ -242,16 +241,16 @@ namespace dummy_hmi_commands_test { namespace commands = sdl_rpc_plugin::commands; -using ::testing::_; -using ::testing::NotNull; -using ::testing::Types; +using ::application_manager::ApplicationSharedPtr; using application_manager::commands::MessageSharedPtr; -using ::test::components::event_engine_test::MockEventDispatcher; +using ::test::components::application_manager_test::MockApplication; using ::test::components::application_manager_test::MockApplicationManager; using ::test::components::application_manager_test:: MockApplicationManagerSettings; -using ::application_manager::ApplicationSharedPtr; -using ::test::components::application_manager_test::MockApplication; +using ::test::components::event_engine_test::MockEventDispatcher; +using ::testing::_; +using ::testing::NotNull; +using ::testing::Types; template class HMICommandsTest : public components::commands_test::CommandRequestTest< @@ -359,7 +358,8 @@ typedef Types HMICommandsListFirst; + commands::UIChangeRegistratioResponse> + HMICommandsListFirst; typedef Types HMICommandsListSecond; + commands::UIIsReadyRequest> + HMICommandsListSecond; typedef Types HMICommandsListThird; + commands::OnAppDeactivatedNotification> + HMICommandsListThird; typedef Types HMICommandsListFourth; + commands::OnTTSLanguageChangeNotification> + HMICommandsListFourth; typedef Types HMICommandsListFifth; + commands::BCGetFilePathResponse> + HMICommandsListFifth; TYPED_TEST_CASE(HMICommandsTestFirst, HMICommandsListFirst); TYPED_TEST_CASE(HMICommandsTestSecond, HMICommandsListSecond); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_system_info_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_system_info_request_test.cc index 4cbe7305ea..5b860499dd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_system_info_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_system_info_request_test.cc @@ -35,13 +35,13 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/application.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/commands/request_to_hmi.h" +#include "application_manager/mock_application_manager.h" +#include "application_manager/smart_object_keys.h" #include "hmi/get_system_info_request.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -51,9 +51,9 @@ namespace get_system_info_request { namespace am = ::application_manager; namespace strings = ::application_manager::strings; +using am::commands::CommandImpl; using am::commands::RequestToHMI; using sdl_rpc_plugin::commands::GetSystemInfoRequest; -using am::commands::CommandImpl; typedef std::shared_ptr RequestToHMIPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_system_info_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_system_info_response_test.cc index 6908e21053..11589683be 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_system_info_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_system_info_response_test.cc @@ -33,32 +33,32 @@ #include #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/application.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/commands/response_from_hmi.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_capabilities.h" #include "application_manager/mock_message_helper.h" -#include "application_manager/mock_application_manager.h" -#include "application_manager/commands/response_from_hmi.h" -#include "hmi/get_system_info_response.h" #include "application_manager/policies/mock_policy_handler_interface.h" -#include "application_manager/commands/commands_test.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" +#include "hmi/get_system_info_response.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { namespace commands_test { namespace hmi_commands_test { namespace get_system_info_response { -using ::testing::Return; using ::testing::NiceMock; +using ::testing::Return; namespace am = ::application_manager; namespace strings = ::application_manager::strings; namespace hmi_response = am::hmi_response; +using am::commands::CommandImpl; using application_manager::commands::ResponseFromHMI; using sdl_rpc_plugin::commands::GetSystemInfoResponse; using sdl_rpc_plugin::commands::SystemInfo; -using am::commands::CommandImpl; typedef std::shared_ptr ResponseFromHMIPtr; typedef NiceMock< diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_response_test.cc index 339a749909..f030701710 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_response_test.cc @@ -33,15 +33,15 @@ #include #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" +#include "application_manager/application.h" #include "application_manager/commands/command.h" #include "application_manager/commands/commands_test.h" -#include "application_manager/application.h" -#include "application_manager/mock_application_manager.h" #include "application_manager/commands/response_to_hmi.h" +#include "application_manager/mock_application_manager.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" #include "hmi/get_urls_response.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -53,9 +53,9 @@ using ::testing::_; using ::testing::Return; namespace am = ::application_manager; namespace strings = ::application_manager::strings; -using sdl_rpc_plugin::commands::GetUrlsResponse; -using am::commands::ResponseToHMI; using am::commands::CommandImpl; +using am::commands::ResponseToHMI; +using sdl_rpc_plugin::commands::GetUrlsResponse; typedef std::shared_ptr ResponseToHMIPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_test.cc index 20a05d8601..b19207cc14 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_test.cc @@ -33,21 +33,21 @@ #include #include -#include "gtest/gtest.h" -#include "application_manager/message.h" +#include "application_manager/commands/command.h" +#include "application_manager/commands/command_request_test.h" #include "application_manager/commands/commands_test.h" +#include "application_manager/commands/request_from_hmi.h" +#include "application_manager/event_engine/event_dispatcher.h" +#include "application_manager/message.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "smart_objects/smart_object.h" +#include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/policies/policy_handler.h" #include "application_manager/smart_object_keys.h" -#include "application_manager/commands/command.h" +#include "gtest/gtest.h" #include "hmi/get_urls.h" -#include "application_manager/policies/policy_handler.h" -#include "application_manager/policies/mock_policy_handler_interface.h" -#include "application_manager/commands/command_request_test.h" -#include "application_manager/commands/request_from_hmi.h" #include "policy/mock_policy_manager.h" -#include "application_manager/event_engine/event_dispatcher.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -57,17 +57,17 @@ namespace get_urls { using namespace hmi_apis; using namespace policy; -using ::testing::NiceMock; +using ::test::components::application_manager_test::MockApplication; using ::testing::_; +using ::testing::NiceMock; using ::testing::SetArgReferee; -using ::test::components::application_manager_test::MockApplication; namespace am = ::application_manager; namespace strings = ::application_manager::strings; -using am::commands::RequestFromHMI; -using sdl_rpc_plugin::commands::GetUrls; using am::commands::CommandImpl; +using am::commands::RequestFromHMI; using policy::PolicyHandler; using policy_test::MockPolicyHandlerInterface; +using sdl_rpc_plugin::commands::GetUrls; typedef std::shared_ptr RequestFromHMIPtr; @@ -175,10 +175,12 @@ TEST_F(GetUrlsTest, ProcessPolicyServiceURLs_SUCCESS) { EXPECT_EQ(kAppIdForSending, (*command_msg_)[am::strings::msg_params][am::hmi_response::urls][0] - [strings::app_id].asInt()); + [strings::app_id] + .asInt()); EXPECT_EQ(kDefaultUrl, (*command_msg_)[am::strings::msg_params][am::hmi_response::urls][0] - [strings::url].asString()); + [strings::url] + .asString()); } TEST_F(GetUrlsTest, ProcessPolicyServiceURLs_IncorrectIdForSending_UNSUCCESS) { @@ -297,10 +299,12 @@ TEST_F(GetUrlsTest, DISABLED_ProcessServiceURLs_SUCCESS) { am::hmi_request::service)); EXPECT_EQ(kDefaultUrl, (*command_msg_)[am::strings::msg_params][am::hmi_response::urls][0] - [am::strings::url].asString()); + [am::strings::url] + .asString()); EXPECT_EQ(endpoints_[0].app_id, (*command_msg_)[am::strings::msg_params][am::hmi_response::urls][0] - [am::hmi_response::policy_app_id].asString()); + [am::hmi_response::policy_app_id] + .asString()); } TEST_F(GetUrlsTest, ProcessServiceURLs_PolicyDefaultId_SUCCESS) { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc index ca322ea425..8f2feed877 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc @@ -33,81 +33,81 @@ #include #include #include -#include "gtest/gtest.h" #include "application_manager/commands/commands_test.h" -#include "sdl_rpc_plugin/commands/hmi/on_button_event_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_ui_command_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 "gtest/gtest.h" +#include "sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_app_deactivated_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_registered_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h" #include "sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_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_device_chosen_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_event_changed_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_file_removed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_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_policy_update.h" #include "sdl_rpc_plugin/commands/hmi/on_put_file_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ready_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_received_policy_update.h" +#include "sdl_rpc_plugin/commands/hmi/on_record_start_notification.h" #include "sdl_rpc_plugin/commands/hmi/on_resume_audio_source_notification.h" #include "sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h" #include "sdl_rpc_plugin/commands/hmi/on_sdl_consent_needed_notification.h" #include "sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h" #include "sdl_rpc_plugin/commands/hmi/on_status_update_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_record_start_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_app_activated_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_app_deactivated_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_button_press_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_event_changed_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_ready_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_system_context_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_system_error_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_system_request_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h" #include "sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_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_ui_command_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h" #include "sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_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_app_permission_consent_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_policy_update.h" -#include "sdl_rpc_plugin/commands/hmi/on_received_policy_update.h" -#include "sdl_rpc_plugin/commands/hmi/on_system_error_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_allow_sdl_functionality_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_device_state_changed_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_ui_touch_event_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_video_data_streaming_notification.h" #include "sdl_rpc_plugin/commands/hmi/on_vr_command_notification.h" #include "sdl_rpc_plugin/commands/hmi/on_vr_language_change_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_start_device_discovery.h" -#include "sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_system_context_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_system_request_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h" -#include "sdl_rpc_plugin/commands/hmi/on_driver_distraction_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 "utils/lock.h" #include "utils/data_accessor.h" +#include "utils/lock.h" #include "utils/signals.h" -#include "utils/file_system.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/mock_application_manager.h" -#include "application_manager/mock_rpc_plugin_manager.h" -#include "application_manager/mock_state_controller.h" +#include "application_manager/hmi_capabilities_impl.h" #include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_event_dispatcher.h" -#include "application_manager/hmi_capabilities_impl.h" #include "application_manager/mock_hmi_capabilities.h" -#include "transport_manager/mock_transport_manager.h" +#include "application_manager/mock_message_helper.h" +#include "application_manager/mock_resume_ctrl.h" +#include "application_manager/mock_rpc_plugin_manager.h" +#include "application_manager/mock_state_controller.h" +#include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" #include "connection_handler/mock_connection_handler.h" #include "connection_handler/mock_connection_handler_settings.h" -#include "test/application_manager/mock_application_manager_settings.h" -#include "application_manager/policies/mock_policy_handler_interface.h" -#include "application_manager/mock_message_helper.h" #include "protocol_handler/mock_session_observer.h" -#include "application_manager/mock_resume_ctrl.h" +#include "smart_objects/smart_object.h" +#include "test/application_manager/mock_application_manager_settings.h" +#include "transport_manager/mock_transport_manager.h" +#include "utils/file_system.h" namespace am = application_manager; @@ -117,22 +117,22 @@ namespace commands_test { namespace hmi_commands_test { namespace hmi_notifications_test { -using ::testing::_; -using ::testing::Test; -using ::testing::Types; -using ::testing::Return; -using ::testing::ReturnRef; -using ::testing::NiceMock; -using ::testing::InSequence; -using ::smart_objects::SmartObject; +using ::application_manager::ApplicationSharedPtr; +using ::application_manager::MockMessageHelper; using ::application_manager::commands::MessageSharedPtr; +using ::smart_objects::SmartObject; +using ::test::components::application_manager_test::MockApplication; using ::test::components::application_manager_test::MockApplicationManager; using ::test::components::application_manager_test:: MockApplicationManagerSettings; -using ::application_manager::ApplicationSharedPtr; -using ::test::components::application_manager_test::MockApplication; using ::test::components::event_engine_test::MockEventDispatcher; -using ::application_manager::MockMessageHelper; +using ::testing::_; +using ::testing::InSequence; +using ::testing::NiceMock; +using ::testing::Return; +using ::testing::ReturnRef; +using ::testing::Test; +using ::testing::Types; using namespace sdl_rpc_plugin::commands; using namespace am::commands; @@ -319,7 +319,8 @@ typedef Types HMIOnNotificationsListToHMITypes; + OnRecordStartdNotification> + HMIOnNotificationsListToHMITypes; typedef Types< CommandPair command = CreateCommand(message); - EXPECT_CALL(app_mngr_, - ConnectToDevice( - (*message)[am::strings::msg_params][am::strings::device_info] - [am::strings::id].asString())); + EXPECT_CALL( + app_mngr_, + ConnectToDevice((*message)[am::strings::msg_params] + [am::strings::device_info][am::strings::id] + .asString())); command->Run(); } diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/mixing_audio_supported_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/mixing_audio_supported_request_test.cc index 8164f957cb..64bf167f83 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/mixing_audio_supported_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/mixing_audio_supported_request_test.cc @@ -33,13 +33,13 @@ #include #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/commands/request_to_hmi.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" #include "hmi/mixing_audio_supported_request.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -51,9 +51,9 @@ using ::testing::_; using ::testing::Return; namespace am = ::application_manager; namespace strings = ::application_manager::strings; +using am::commands::CommandImpl; using am::commands::RequestToHMI; using sdl_rpc_plugin::commands::MixingAudioSupportedRequest; -using am::commands::CommandImpl; typedef std::shared_ptr RequestToHMIPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/mixing_audio_supported_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/mixing_audio_supported_response_test.cc index aa651c2dca..8c2f07a1d6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/mixing_audio_supported_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/mixing_audio_supported_response_test.cc @@ -33,18 +33,18 @@ #include #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/commands/command.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/commands/response_from_hmi.h" -#include "interfaces/HMI_API.h" -#include "interfaces/MOBILE_API.h" #include "application_manager/mock_application.h" #include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" #include "sdl_rpc_plugin/commands/hmi/mixing_audio_supported_response.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -52,15 +52,15 @@ namespace commands_test { namespace hmi_commands_test { namespace mixing_audio_supported_response { +using ::testing::NiceMock; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = ::application_manager::strings; -using sdl_rpc_plugin::commands::MixingAudioSupportedResponse; -using application_manager::commands::ResponseFromHMI; -using am::commands::CommandImpl; using am::HMICapabilities; +using am::commands::CommandImpl; +using application_manager::commands::ResponseFromHMI; +using sdl_rpc_plugin::commands::MixingAudioSupportedResponse; namespace hmi_response = ::application_manager::hmi_response; typedef std::shared_ptr ResponseFromHMIPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_audio_start_stream_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_audio_start_stream_request_test.cc index d8454bb98e..926e51446f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_audio_start_stream_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_audio_start_stream_request_test.cc @@ -36,13 +36,13 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/hmi_interfaces.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_interface.h" -#include "application_manager/commands/commands_test.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -54,9 +54,9 @@ using ::testing::_; using ::testing::ReturnRef; namespace am = ::application_manager; namespace commands = am::commands; +using am::event_engine::Event; using commands::MessageSharedPtr; using sdl_rpc_plugin::commands::AudioStartStreamRequest; -using am::event_engine::Event; namespace { const uint32_t kHmiAppId = 13u; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_is_ready_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_is_ready_request_test.cc index 1a03ecf523..5e13755a32 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_is_ready_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_is_ready_request_test.cc @@ -34,15 +34,15 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application_manager.h" -#include "application_manager/hmi_interfaces.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/event_engine/event.h" -#include "application_manager/mock_hmi_interface.h" +#include "application_manager/hmi_interfaces.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_capabilities.h" -#include "application_manager/commands/commands_test.h" +#include "application_manager/mock_hmi_interface.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -54,8 +54,8 @@ using ::testing::_; using ::testing::ReturnRef; namespace am = ::application_manager; using am::commands::MessageSharedPtr; -using sdl_rpc_plugin::commands::NaviIsReadyRequest; using am::event_engine::Event; +using sdl_rpc_plugin::commands::NaviIsReadyRequest; namespace { const hmi_apis::FunctionID::eType kEventID = diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_is_ready_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_is_ready_response_test.cc index 23f01fac3f..e166928348 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_is_ready_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_is_ready_response_test.cc @@ -33,12 +33,12 @@ #include #include -#include "gtest/gtest.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/mock_application_manager.h" #include "application_manager/mock_event_dispatcher.h" +#include "application_manager/mock_hmi_capabilities.h" +#include "gtest/gtest.h" #include "hmi/navi_is_ready_response.h" namespace test { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_set_video_config_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_set_video_config_request_test.cc index 3110a11fd8..d6ef540bc0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_set_video_config_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_set_video_config_request_test.cc @@ -36,14 +36,14 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application_manager.h" -#include "application_manager/hmi_interfaces.h" -#include "application_manager/mock_hmi_interface.h" #include "application_manager/event_engine/event.h" +#include "application_manager/hmi_interfaces.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_event_dispatcher.h" +#include "application_manager/mock_hmi_interface.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -55,8 +55,8 @@ using ::testing::_; using ::testing::ReturnRef; namespace am = ::application_manager; using am::commands::MessageSharedPtr; -using sdl_rpc_plugin::commands::NaviSetVideoConfigRequest; using am::event_engine::Event; +using sdl_rpc_plugin::commands::NaviSetVideoConfigRequest; namespace { const uint32_t kAppId = 1u; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_set_video_config_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_set_video_config_response_test.cc index 06fa61db29..c4e7976bde 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_set_video_config_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_set_video_config_response_test.cc @@ -30,13 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" -#include "application_manager/commands/commands_test.h" #include "hmi/navi_set_video_config_response.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/mock_application_manager.h" #include "application_manager/mock_event_dispatcher.h" #include "application_manager/mock_hmi_capabilities.h" #include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -47,8 +47,8 @@ namespace navi_set_video_config_response { using sdl_rpc_plugin::commands::NaviSetVideoConfigResponse; using test::components::event_engine_test::MockEventDispatcher; using testing::_; -using testing::ReturnRef; using ::testing::NiceMock; +using testing::ReturnRef; typedef NiceMock< ::test::components::application_manager_test::MockHMICapabilities> diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_start_stream_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_start_stream_request_test.cc index a7f50504fb..232d5ab628 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_start_stream_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_start_stream_request_test.cc @@ -36,12 +36,12 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application_manager.h" #include "application_manager/hmi_interfaces.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -53,9 +53,9 @@ using ::testing::_; using ::testing::ReturnRef; namespace am = ::application_manager; namespace commands = am::commands; +using am::event_engine::Event; using commands::MessageSharedPtr; using sdl_rpc_plugin::commands::NaviStartStreamRequest; -using am::event_engine::Event; namespace { const uint32_t kHmiAppId = 13u; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_stop_stream_requests_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_stop_stream_requests_test.cc index e4a79997fd..b32189ce1a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_stop_stream_requests_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/navi_stop_stream_requests_test.cc @@ -30,17 +30,17 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "hmi/navi_stop_stream_request.h" #include "hmi/navi_audio_stop_stream_request.h" +#include "hmi/navi_stop_stream_request.h" #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application_manager.h" #include "application_manager/hmi_interfaces.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -76,7 +76,8 @@ class NaviStopStreamRequestsTest }; typedef testing::Types RequestCommandsList; + commands::NaviStopStreamRequest> + RequestCommandsList; TYPED_TEST_CASE(NaviStopStreamRequestsTest, RequestCommandsList); TYPED_TEST(NaviStopStreamRequestsTest, Run_HmiInterfaceNotAvailable_NoRequest) { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_driver_distraction_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_driver_distraction_notification_test.cc index fc3899e861..802ad01d0b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_driver_distraction_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_driver_distraction_notification_test.cc @@ -33,17 +33,17 @@ #include #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "utils/lock.h" -#include "utils/data_accessor.h" #include "application_manager/commands/commands_test.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" #include "hmi/on_driver_distraction_notification.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/data_accessor.h" +#include "utils/lock.h" namespace test { namespace components { @@ -52,8 +52,8 @@ namespace hmi_commands_test { namespace on_driver_distraction_notification { using ::testing::_; -using ::testing::Return; using ::testing::Eq; +using ::testing::Return; namespace am = ::application_manager; using am::commands::MessageSharedPtr; using sdl_rpc_plugin::commands::hmi::OnDriverDistractionNotification; @@ -152,7 +152,7 @@ TEST_F(HMIOnDriverDistractionNotificationTest, command->Run(); } -} // on_driver_distraction_notification +} // namespace on_driver_distraction_notification } // namespace hmi_commands_test } // namespace commands_test } // namespace components diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_system_time_ready_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_system_time_ready_notification_test.cc index 2d50ec2b72..f9dbbf259f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_system_time_ready_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_system_time_ready_notification_test.cc @@ -30,12 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" -#include "application_manager/commands/commands_test.h" #include "hmi/on_system_time_ready_notification.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/mock_application_manager.h" #include "application_manager/mock_event_dispatcher.h" #include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" #include "interfaces/HMI_API.h" namespace test { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_get_capabilities_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_get_capabilities_response_test.cc index 8e62c1a409..d6df3e61ee 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_get_capabilities_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_get_capabilities_response_test.cc @@ -34,13 +34,13 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "interfaces/MOBILE_API.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/mock_hmi_capabilities.h" #include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_impl.h" #include "hmi/rc_get_capabilities_response.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -52,8 +52,8 @@ using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = am::strings; namespace hmi_response = am::hmi_response; -using sdl_rpc_plugin::commands::RCGetCapabilitiesResponse; using am::commands::CommandImpl; +using sdl_rpc_plugin::commands::RCGetCapabilitiesResponse; typedef std::shared_ptr RCGetCapabilitiesResponsePtr; typedef NiceMock< diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_is_ready_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_is_ready_request_test.cc index c7fbdb663b..539c0efeb3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_is_ready_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_is_ready_request_test.cc @@ -34,15 +34,15 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/event_engine/event.h" #include "application_manager/hmi_interfaces.h" -#include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/mock_hmi_interface.h" #include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -54,8 +54,8 @@ using ::testing::_; using ::testing::ReturnRef; namespace am = ::application_manager; using am::commands::MessageSharedPtr; -using sdl_rpc_plugin::commands::RCIsReadyRequest; using am::event_engine::Event; +using sdl_rpc_plugin::commands::RCIsReadyRequest; typedef std::shared_ptr RCIsReadyRequestPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_is_ready_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_is_ready_response_test.cc index a1a8c1c87e..4224e82b5f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_is_ready_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_is_ready_response_test.cc @@ -35,11 +35,11 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" #include "application_manager/commands/commands_test.h" +#include "application_manager/mock_event_dispatcher.h" #include "application_manager/mock_hmi_capabilities.h" #include "hmi/rc_is_ready_response.h" -#include "application_manager/mock_event_dispatcher.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/response_from_hmi_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/response_from_hmi_test.cc index 25abefb010..3e7e6e6f59 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/response_from_hmi_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/response_from_hmi_test.cc @@ -32,24 +32,24 @@ #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" +#include "application_manager/commands/command.h" +#include "application_manager/commands/response_from_hmi.h" #include "application_manager/smart_object_keys.h" #include "application_manager/test/include/application_manager/commands/commands_test.h" -#include "application_manager/commands/command.h" #include "application_manager/test/include/application_manager/mock_event_dispatcher.h" -#include "application_manager/commands/response_from_hmi.h" +#include "gtest/gtest.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { namespace commands_test { namespace hmi_commands_test { namespace response_from_hmi { +using ::test::components::event_engine_test::MockEventDispatcher; using ::testing::_; +using ::testing::DoAll; using ::testing::Return; using ::testing::SaveArg; -using ::testing::DoAll; -using ::test::components::event_engine_test::MockEventDispatcher; namespace am = ::application_manager; using application_manager::commands::ResponseFromHMI; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_activate_app_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_activate_app_request_test.cc index 917de81fb3..93344f1a0d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_activate_app_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_activate_app_request_test.cc @@ -32,19 +32,19 @@ #include -#include "gtest/gtest.h" -#include "utils/lock.h" -#include "utils/helpers.h" -#include "hmi/sdl_activate_app_request.h" -#include "application_manager/mock_application.h" #include "application_manager/application_manager.h" -#include "application_manager/policies/mock_policy_handler_interface.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_message_helper.h" #include "application_manager/event_engine/event.h" +#include "application_manager/mock_application.h" #include "application_manager/mock_event_dispatcher.h" +#include "application_manager/mock_message_helper.h" #include "application_manager/mock_state_controller.h" +#include "application_manager/policies/mock_policy_handler_interface.h" #include "connection_handler/mock_connection_handler.h" +#include "gtest/gtest.h" +#include "hmi/sdl_activate_app_request.h" +#include "utils/helpers.h" +#include "utils/lock.h" namespace test { namespace components { @@ -55,18 +55,17 @@ namespace sdl_activate_app_request { namespace am = ::application_manager; namespace strings = am::strings; namespace hmi_response = am::hmi_response; +using am::ApplicationSet; using am::commands::MessageSharedPtr; +using am::event_engine::Event; +using connection_handler_test::MockConnectionHandler; +using policy_test::MockPolicyHandlerInterface; using sdl_rpc_plugin::commands::SDLActivateAppRequest; -using am::ApplicationSet; +using testing::Gt; using testing::Mock; +using ::testing::NiceMock; using testing::Return; using testing::ReturnRef; -using testing::Mock; -using testing::Gt; -using ::testing::NiceMock; -using policy_test::MockPolicyHandlerInterface; -using connection_handler_test::MockConnectionHandler; -using am::event_engine::Event; namespace { const uint32_t kCorrelationID = 1u; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_activate_app_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_activate_app_response_test.cc index bca316bcfa..b35ccde314 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_activate_app_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_activate_app_response_test.cc @@ -33,12 +33,12 @@ #include #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/application.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" #include "hmi/sdl_activate_app_response.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -48,8 +48,8 @@ namespace sdl_activate_app_response { namespace am = ::application_manager; namespace strings = ::application_manager::strings; -using sdl_rpc_plugin::commands::SDLActivateAppResponse; using am::commands::CommandImpl; +using sdl_rpc_plugin::commands::SDLActivateAppResponse; typedef std::shared_ptr SDLActivateAppResponsePtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_list_of_permisssions_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_list_of_permisssions_request_test.cc index 262ac5fc7d..c8cc4bb18c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_list_of_permisssions_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_list_of_permisssions_request_test.cc @@ -32,11 +32,11 @@ #include -#include "gtest/gtest.h" -#include "hmi/sdl_get_list_of_permissions_request.h" +#include "application_manager/commands/command_request_test.h" #include "application_manager/mock_application.h" #include "application_manager/policies/mock_policy_handler_interface.h" -#include "application_manager/commands/command_request_test.h" +#include "gtest/gtest.h" +#include "hmi/sdl_get_list_of_permissions_request.h" namespace test { namespace components { @@ -46,8 +46,8 @@ namespace sdl_get_list_of_permissions_request { using application_manager::commands::MessageSharedPtr; using sdl_rpc_plugin::commands::SDLGetListOfPermissionsRequest; -using test::components::policy_test::MockPolicyHandlerInterface; using smart_objects::SmartObject; +using test::components::policy_test::MockPolicyHandlerInterface; using testing::Return; using testing::ReturnRef; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_status_update_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_status_update_request_test.cc index fca8ed840f..021dfc8b1d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_status_update_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_status_update_request_test.cc @@ -32,11 +32,11 @@ #include -#include "gtest/gtest.h" -#include "hmi/sdl_get_status_update_request.h" +#include "application_manager/commands/command_request_test.h" #include "application_manager/mock_application.h" #include "application_manager/policies/mock_policy_handler_interface.h" -#include "application_manager/commands/command_request_test.h" +#include "gtest/gtest.h" +#include "hmi/sdl_get_status_update_request.h" namespace test { namespace components { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_user_friendly_message_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_user_friendly_message_request_test.cc index b040f8ea40..5cac1c823f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_user_friendly_message_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_user_friendly_message_request_test.cc @@ -34,15 +34,15 @@ #include #include -#include "gtest/gtest.h" -#include "hmi/sdl_get_user_friendly_message_request.h" +#include "application_manager/commands/command_request_test.h" #include "application_manager/mock_application.h" +#include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/mock_message_helper.h" #include "application_manager/mock_state_controller.h" #include "application_manager/policies/mock_policy_handler_interface.h" -#include "application_manager/mock_message_helper.h" -#include "application_manager/mock_hmi_capabilities.h" +#include "gtest/gtest.h" +#include "hmi/sdl_get_user_friendly_message_request.h" #include "smart_objects/smart_object.h" -#include "application_manager/commands/command_request_test.h" namespace test { namespace components { @@ -50,11 +50,11 @@ namespace commands_test { namespace hmi_commands_test { namespace sdl_get_user_friendly_message_request { +using application_manager::MockMessageHelper; using application_manager::commands::MessageSharedPtr; using sdl_rpc_plugin::commands::SDLGetUserFriendlyMessageRequest; -using application_manager::MockMessageHelper; -using test::components::policy_test::MockPolicyHandlerInterface; using test::components::application_manager_test::MockHMICapabilities; +using test::components::policy_test::MockPolicyHandlerInterface; using testing::_; using testing::Return; using testing::ReturnRef; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_notifications_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_notifications_test.cc index 581913d3a5..57bb018273 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_notifications_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_notifications_test.cc @@ -34,8 +34,8 @@ #include "application_manager/commands/commands_test.h" -#include "application_manager/commands/notification_to_hmi.h" #include "application_manager/commands/command_notification_impl.h" +#include "application_manager/commands/notification_to_hmi.h" namespace test { namespace components { @@ -45,8 +45,8 @@ namespace simple_notifications_test { using namespace application_manager; -using ::testing::Types; using commands::NotificationToHMI; +using ::testing::Types; template class SimpleNotificationsTest : public CommandsTest { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_request_from_hmi_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_request_from_hmi_test.cc index a69f6c71fc..fc2cd1cca4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_request_from_hmi_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_request_from_hmi_test.cc @@ -30,14 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/commands/request_from_hmi.h" #include "application_manager/event_engine/event.h" #include "application_manager/mock_event_dispatcher.h" -#include "application_manager/commands/request_from_hmi.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -46,12 +46,12 @@ namespace hmi_commands_test { namespace simple_requests_from_hmi_test { using ::testing::_; -using ::testing::Types; -using ::testing::NotNull; using ::testing::NiceMock; +using ::testing::NotNull; +using ::testing::Types; namespace commands = ::application_manager::commands; -using commands::MessageSharedPtr; using ::application_manager::event_engine::EventObserver; +using commands::MessageSharedPtr; using ::test::components::event_engine_test::MockEventDispatcher; class RequestFromHMITest : public CommandsTest { @@ -89,7 +89,7 @@ TEST_F(RequestFromHMITest, SendResponse_SUCCESS) { hmi_apis::Common_Result::SUCCESS); } -} // namespace simple_requests_to_hmi_test +} // namespace simple_requests_from_hmi_test } // namespace hmi_commands_test } // namespace commands_test } // namespace components diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc index 599c7e50f2..162e832e9f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc @@ -30,16 +30,18 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_request_test.h" #include "application_manager/commands/command.h" -#include "sdl_rpc_plugin/commands/hmi/allow_app_request.h" +#include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/commands/request_to_hmi.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" #include "sdl_rpc_plugin/commands/hmi/allow_all_apps_request.h" +#include "sdl_rpc_plugin/commands/hmi/allow_app_request.h" #include "sdl_rpc_plugin/commands/hmi/basic_communication_system_request.h" #include "sdl_rpc_plugin/commands/hmi/button_get_capabilities_request.h" +#include "sdl_rpc_plugin/commands/hmi/close_popup_request.h" +#include "sdl_rpc_plugin/commands/hmi/dial_number_request.h" #include "sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_request.h" #include "sdl_rpc_plugin/commands/hmi/navi_audio_stop_stream_request.h" #include "sdl_rpc_plugin/commands/hmi/navi_get_way_points_request.h" @@ -53,21 +55,15 @@ #include "sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h" #include "sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h" #include "sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h" -#include "sdl_rpc_plugin/commands/hmi/ui_scrollable_message_request.h" -#include "sdl_rpc_plugin/commands/hmi/ui_set_app_icon_request.h" -#include "sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h" -#include "sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h" -#include "application_manager/commands/request_to_hmi.h" -#include "sdl_rpc_plugin/commands/hmi/dial_number_request.h" +#include "sdl_rpc_plugin/commands/hmi/sdl_policy_update.h" +#include "sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_get_language_request.h" +#include "sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_request.h" #include "sdl_rpc_plugin/commands/hmi/tts_is_ready_request.h" #include "sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h" #include "sdl_rpc_plugin/commands/hmi/tts_speak_request.h" #include "sdl_rpc_plugin/commands/hmi/tts_stop_speaking_request.h" -#include "sdl_rpc_plugin/commands/hmi/tts_get_supported_languages_request.h" -#include "sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h" -#include "sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h" -#include "sdl_rpc_plugin/commands/hmi/tts_get_language_request.h" -#include "sdl_rpc_plugin/commands/hmi/close_popup_request.h" #include "sdl_rpc_plugin/commands/hmi/ui_add_command_request.h" #include "sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h" #include "sdl_rpc_plugin/commands/hmi/ui_alert_request.h" @@ -81,6 +77,11 @@ #include "sdl_rpc_plugin/commands/hmi/ui_is_ready_request.h" #include "sdl_rpc_plugin/commands/hmi/ui_perform_audio_pass_thru_request.h" #include "sdl_rpc_plugin/commands/hmi/ui_perform_interaction_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_scrollable_message_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_app_icon_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h" +#include "sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h" #include "sdl_rpc_plugin/commands/hmi/ui_set_media_clock_timer_request.h" #include "sdl_rpc_plugin/commands/hmi/ui_show_request.h" #include "sdl_rpc_plugin/commands/hmi/ui_slider_request.h" @@ -88,23 +89,11 @@ #include "sdl_rpc_plugin/commands/hmi/vr_change_registration_request.h" #include "sdl_rpc_plugin/commands/hmi/vr_delete_command_request.h" #include "sdl_rpc_plugin/commands/hmi/vr_get_capabilities_request.h" -#include "sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_request.h" #include "sdl_rpc_plugin/commands/hmi/vr_get_language_request.h" +#include "sdl_rpc_plugin/commands/hmi/vr_get_supported_languages_request.h" #include "sdl_rpc_plugin/commands/hmi/vr_is_ready_request.h" #include "sdl_rpc_plugin/commands/hmi/vr_perform_interaction_request.h" -#include "sdl_rpc_plugin/commands/hmi/allow_all_apps_request.h" -#include "sdl_rpc_plugin/commands/hmi/basic_communication_system_request.h" -#include "sdl_rpc_plugin/commands/hmi/button_get_capabilities_request.h" -#include "sdl_rpc_plugin/commands/hmi/allow_app_request.h" -#include "sdl_rpc_plugin/commands/hmi/navi_send_location_request.h" -#include "sdl_rpc_plugin/commands/hmi/navi_unsubscribe_way_points_request.h" -#include "sdl_rpc_plugin/commands/hmi/navi_update_turn_list_request.h" -#include "sdl_rpc_plugin/commands/hmi/navi_show_constant_tbt_request.h" -#include "sdl_rpc_plugin/commands/hmi/navi_stop_stream_request.h" -#include "sdl_rpc_plugin/commands/hmi/navi_subscribe_way_points_request.h" -#include "sdl_rpc_plugin/commands/hmi/sdl_policy_update.h" -#include "sdl_rpc_plugin/commands/hmi/dial_number_request.h" -#include "sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h" +#include "smart_objects/smart_object.h" #include "application_manager/mock_event_dispatcher.h" @@ -115,8 +104,8 @@ namespace hmi_commands_test { namespace simple_requests_to_hmi_test { using ::testing::_; -using ::testing::Types; using ::testing::NotNull; +using ::testing::Types; namespace am_commands = application_manager::commands; using am_commands::MessageSharedPtr; using event_engine_test::MockEventDispatcher; @@ -221,7 +210,8 @@ typedef Types RequestCommandsList3; + sdl_rpc_plugin::commands::VRIsReadyRequest> + RequestCommandsList3; TYPED_TEST_CASE(RequestToHMICommandsTest, RequestCommandsList); TYPED_TEST_CASE(RequestToHMICommandsTest2, RequestCommandsList2); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_from_hmi_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_from_hmi_test.cc index 4f415975ba..f232240c28 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_from_hmi_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_from_hmi_test.cc @@ -32,13 +32,18 @@ #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/commands/notification_from_hmi.h" +#include "application_manager/mock_event_dispatcher.h" +#include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" #include "hmi/activate_app_response.h" #include "hmi/basic_communication_system_response.h" +#include "hmi/close_popup_response.h" +#include "hmi/dial_number_response.h" #include "hmi/navi_alert_maneuver_response.h" #include "hmi/navi_audio_start_stream_response.h" #include "hmi/navi_audio_stop_stream_response.h" @@ -50,20 +55,13 @@ #include "hmi/navi_subscribe_way_points_response.h" #include "hmi/navi_unsubscribe_way_points_response.h" #include "hmi/navi_update_turn_list_response.h" +#include "hmi/on_find_applications.h" +#include "hmi/on_update_device_list.h" +#include "hmi/sdl_policy_update_response.h" #include "hmi/tts_change_registration_response.h" -#include "hmi/ui_set_app_icon_response.h" -#include "hmi/ui_set_display_layout_response.h" -#include "hmi/ui_set_global_properties_response.h" -#include "hmi/ui_scrollable_message_response.h" -#include "application_manager/mock_event_dispatcher.h" -#include "application_manager/mock_hmi_capabilities.h" -#include "application_manager/policies/mock_policy_handler_interface.h" -#include "hmi/dial_number_response.h" -#include "hmi/close_popup_response.h" #include "hmi/tts_set_global_properties_response.h" #include "hmi/tts_speak_response.h" #include "hmi/tts_stop_speaking_response.h" -#include "hmi/tts_change_registration_response.h" #include "hmi/ui_add_command_response.h" #include "hmi/ui_add_submenu_response.h" #include "hmi/ui_alert_response.h" @@ -73,28 +71,21 @@ #include "hmi/ui_end_audio_pass_thru_response.h" #include "hmi/ui_perform_audio_pass_thru_response.h" #include "hmi/ui_perform_interaction_response.h" +#include "hmi/ui_scrollable_message_response.h" +#include "hmi/ui_send_haptic_data_response.h" +#include "hmi/ui_set_app_icon_response.h" +#include "hmi/ui_set_display_layout_response.h" +#include "hmi/ui_set_global_properties_response.h" #include "hmi/ui_set_media_clock_timer_response.h" #include "hmi/ui_show_response.h" #include "hmi/ui_slider_response.h" +#include "hmi/update_app_list_response.h" +#include "hmi/update_device_list_response.h" #include "hmi/vr_add_command_response.h" #include "hmi/vr_change_registration_response.h" #include "hmi/vr_delete_command_response.h" #include "hmi/vr_perform_interaction_response.h" -#include "hmi/activate_app_response.h" -#include "hmi/basic_communication_system_response.h" -#include "hmi/navi_unsubscribe_way_points_response.h" -#include "hmi/navi_update_turn_list_response.h" -#include "hmi/navi_send_location_response.h" -#include "hmi/navi_show_constant_tbt_response.h" -#include "hmi/navi_start_stream_response.h" -#include "hmi/navi_subscribe_way_points_response.h" -#include "hmi/on_find_applications.h" -#include "hmi/on_update_device_list.h" -#include "hmi/sdl_policy_update_response.h" -#include "hmi/update_app_list_response.h" -#include "hmi/update_device_list_response.h" -#include "application_manager/commands/notification_from_hmi.h" -#include "hmi/ui_send_haptic_data_response.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -102,12 +93,12 @@ namespace commands_test { namespace hmi_commands_test { namespace simple_response_from_hmi_test { +using ::test::components::event_engine_test::MockEventDispatcher; using ::testing::_; +using ::testing::Eq; using ::testing::Return; using ::testing::ReturnRef; using ::testing::Types; -using ::testing::Eq; -using ::test::components::event_engine_test::MockEventDispatcher; namespace am = ::application_manager; namespace commands = sdl_rpc_plugin::commands; @@ -218,7 +209,8 @@ typedef Types< CommandData, CommandData > ResponseCommandsList; + hmi_apis::FunctionID::UI_SendHapticData> > + ResponseCommandsList; typedef Types ResponseCommandsList; + commands::SDLGetUserFriendlyMessageResponse> + ResponseCommandsList; TYPED_TEST_CASE(ResponseToHMICommandsTest, ResponseCommandsList); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_get_capabilities_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_get_capabilities_response_test.cc index bc9d262e6d..c7b96f1acf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_get_capabilities_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_get_capabilities_response_test.cc @@ -32,11 +32,11 @@ #include +#include "application_manager/commands/commands_test.h" +#include "application_manager/mock_hmi_capabilities.h" #include "gtest/gtest.h" #include "hmi/tts_get_capabilities_response.h" -#include "application_manager/mock_hmi_capabilities.h" #include "smart_objects/smart_object.h" -#include "application_manager/commands/commands_test.h" namespace test { namespace components { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_get_language_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_get_language_response_test.cc index 0d22500f48..c0d23cb34b 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_get_language_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_get_language_response_test.cc @@ -30,13 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "hmi/tts_get_language_response.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" -#include "application_manager/mock_hmi_capabilities.h" #include "application_manager/mock_event_dispatcher.h" -#include "application_manager/commands/commands_test.h" +#include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" namespace test { namespace components { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_get_supported_languages_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_get_supported_languages_response_test.cc index 417b8e1898..c0f187a85f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_get_supported_languages_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_get_supported_languages_response_test.cc @@ -33,17 +33,17 @@ #include #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/application.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/commands/response_from_hmi.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_capabilities.h" #include "application_manager/mock_message_helper.h" -#include "application_manager/mock_application_manager.h" -#include "application_manager/commands/response_from_hmi.h" -#include "hmi/tts_get_supported_languages_response.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" +#include "hmi/tts_get_supported_languages_response.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -52,14 +52,14 @@ namespace hmi_commands_test { namespace tts_get_supported_languages_response { using ::testing::_; -using ::testing::Return; using ::testing::NiceMock; +using ::testing::Return; namespace am = ::application_manager; namespace strings = ::application_manager::strings; namespace hmi_response = am::hmi_response; +using am::commands::CommandImpl; using application_manager::commands::ResponseFromHMI; using sdl_rpc_plugin::commands::TTSGetSupportedLanguagesResponse; -using am::commands::CommandImpl; typedef std::shared_ptr ResponseFromHMIPtr; typedef NiceMock< @@ -113,7 +113,8 @@ TEST_F(TTSGetSupportedLanguageResponseTest, RUN_UNSUCCESS) { CreateCommand(command_msg)); EXPECT_CALL(mock_hmi_capabilities_, - set_tts_supported_languages(supported_languages)).Times(0); + set_tts_supported_languages(supported_languages)) + .Times(0); command->Run(); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_is_ready_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_is_ready_response_test.cc index 2fae8a6819..a2f4440c86 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_is_ready_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/tts_is_ready_response_test.cc @@ -33,18 +33,18 @@ #include #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/application.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/commands/response_from_hmi.h" +#include "application_manager/mock_application_manager.h" +#include "application_manager/mock_event_dispatcher.h" #include "application_manager/mock_hmi_capabilities.h" #include "application_manager/mock_message_helper.h" -#include "application_manager/mock_application_manager.h" -#include "application_manager/commands/response_from_hmi.h" -#include "hmi/tts_is_ready_response.h" #include "application_manager/policies/mock_policy_handler_interface.h" -#include "application_manager/mock_event_dispatcher.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" +#include "hmi/tts_is_ready_response.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -53,14 +53,14 @@ namespace hmi_commands_test { namespace tts_is_ready_response { using ::testing::_; -using ::testing::Return; using ::testing::NiceMock; +using ::testing::Return; namespace am = ::application_manager; namespace strings = ::application_manager::strings; namespace hmi_response = am::hmi_response; +using am::commands::CommandImpl; using application_manager::commands::ResponseFromHMI; using sdl_rpc_plugin::commands::TTSIsReadyResponse; -using am::commands::CommandImpl; using test::components::event_engine_test::MockEventDispatcher; typedef std::shared_ptr ResponseFromHMIPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_capabilities_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_capabilities_response_test.cc index 31e4860d4a..3fd3a39dca 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_capabilities_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_capabilities_response_test.cc @@ -32,14 +32,14 @@ #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "interfaces/MOBILE_API.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/mock_hmi_capabilities.h" #include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_impl.h" +#include "gtest/gtest.h" #include "hmi/ui_get_capabilities_response.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -51,9 +51,9 @@ using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = am::strings; namespace hmi_response = am::hmi_response; +using am::commands::CommandImpl; using application_manager::commands::ResponseFromHMI; using sdl_rpc_plugin::commands::UIGetCapabilitiesResponse; -using am::commands::CommandImpl; typedef std::shared_ptr ResponseFromHMIPtr; typedef NiceMock< @@ -113,8 +113,9 @@ TEST_F(UIGetCapabilitiesResponseTest, SetSoftButton_SUCCESS) { ResponseFromHMIPtr command( CreateCommand(command_msg)); - smart_objects::SmartObject soft_button_capabilities_so = (*command_msg) - [strings::msg_params][hmi_response::soft_button_capabilities]; + smart_objects::SmartObject soft_button_capabilities_so = + (*command_msg)[strings::msg_params] + [hmi_response::soft_button_capabilities]; EXPECT_CALL(mock_hmi_capabilities_, set_soft_button_capabilities(soft_button_capabilities_so)); @@ -149,8 +150,9 @@ TEST_F(UIGetCapabilitiesResponseTest, SetAudioPassThru_SUCCESS) { ResponseFromHMIPtr command( CreateCommand(command_msg)); - smart_objects::SmartObject audio_pass_thru_capabilities_so = (*command_msg) - [strings::msg_params][strings::audio_pass_thru_capabilities]; + smart_objects::SmartObject audio_pass_thru_capabilities_so = + (*command_msg)[strings::msg_params] + [strings::audio_pass_thru_capabilities]; EXPECT_CALL( mock_hmi_capabilities_, set_audio_pass_thru_capabilities(audio_pass_thru_capabilities_so)); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_language_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_language_response_test.cc index de69c5de5c..7e8040543d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_language_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_language_response_test.cc @@ -30,13 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "hmi/ui_get_language_response.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" -#include "application_manager/mock_hmi_capabilities.h" -#include "application_manager/mock_event_dispatcher.h" #include "application_manager/mock_application_manager.h" +#include "application_manager/mock_event_dispatcher.h" +#include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -47,8 +47,8 @@ namespace ui_get_language_response { using sdl_rpc_plugin::commands::UIGetLanguageResponse; using test::components::event_engine_test::MockEventDispatcher; using testing::_; -using testing::ReturnRef; using ::testing::NiceMock; +using testing::ReturnRef; namespace strings = application_manager::strings; namespace hmi_response = application_manager::hmi_response; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_supported_languages_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_supported_languages_response_test.cc index 5626e2b0ee..10cf244bcf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_supported_languages_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_supported_languages_response_test.cc @@ -33,15 +33,15 @@ #include #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/application.h" #include "application_manager/commands/commands_test.h" -#include "application_manager/mock_hmi_capabilities.h" #include "application_manager/mock_application_manager.h" -#include "hmi/ui_get_supported_languages_response.h" +#include "application_manager/mock_hmi_capabilities.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" +#include "hmi/ui_get_supported_languages_response.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -49,8 +49,8 @@ namespace commands_test { namespace hmi_commands_test { namespace ui_get_supported_languages_response { -using ::testing::Return; using ::testing::NiceMock; +using ::testing::Return; namespace am = ::application_manager; namespace strings = ::application_manager::strings; namespace hmi_response = am::hmi_response; @@ -107,7 +107,8 @@ TEST_F(UIGetSupportedLanguagesResponseTest, RUN_UNSUCCESS) { CreateCommand(command_msg)); EXPECT_CALL(mock_hmi_capabilities_, - set_ui_supported_languages(supported_languages)).Times(0); + set_ui_supported_languages(supported_languages)) + .Times(0); command->Run(); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_is_ready_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_is_ready_request_test.cc index 70fc80bbd1..837b8438dc 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_is_ready_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_is_ready_request_test.cc @@ -34,16 +34,16 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/event_engine/event.h" #include "application_manager/hmi_interfaces.h" -#include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_capabilities.h" -#include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/mock_hmi_interface.h" #include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" +#include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -53,12 +53,12 @@ namespace ui_is_ready_request { namespace am = ::application_manager; +using am::commands::MessageSharedPtr; +using am::event_engine::Event; +using sdl_rpc_plugin::commands::UIIsReadyRequest; using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; -using am::commands::MessageSharedPtr; -using sdl_rpc_plugin::commands::UIIsReadyRequest; -using am::event_engine::Event; typedef std::shared_ptr UIIsReadyRequestPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_is_ready_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_is_ready_response_test.cc index cccdbdc44d..44b9504055 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_is_ready_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_is_ready_response_test.cc @@ -33,12 +33,12 @@ #include #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" #include "application_manager/commands/commands_test.h" +#include "application_manager/mock_event_dispatcher.h" #include "application_manager/mock_hmi_capabilities.h" +#include "gtest/gtest.h" #include "hmi/ui_is_ready_response.h" -#include "application_manager/mock_event_dispatcher.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -46,8 +46,8 @@ namespace commands_test { namespace hmi_commands_test { namespace ui_is_ready_response { -using ::testing::Return; using ::testing::NiceMock; +using ::testing::Return; namespace am = ::application_manager; namespace strings = ::application_manager::strings; namespace hmi_response = am::hmi_response; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_device_list_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_device_list_request_test.cc index c566702998..31c03a7ed5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_device_list_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_device_list_request_test.cc @@ -32,20 +32,20 @@ #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "interfaces/HMI_API.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_impl.h" #include "application_manager/application_manager.h" #include "application_manager/application_manager_impl.h" -#include "application_manager/mock_event_dispatcher.h" -#include "application_manager/mock_application.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/event_engine/event.h" -#include "application_manager/request_controller_settings.h" +#include "application_manager/mock_application.h" #include "application_manager/mock_application_manager_settings.h" +#include "application_manager/mock_event_dispatcher.h" +#include "application_manager/request_controller_settings.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" #include "hmi/update_device_list_request.h" +#include "interfaces/HMI_API.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -53,18 +53,18 @@ namespace commands_test { namespace hmi_commands_test { namespace update_device_list_request { -using testing::_; -using testing::ReturnRef; -using testing::Return; -using test::components::event_engine_test::MockEventDispatcher; using ::test::components::application_manager_test:: MockApplicationManagerSettings; +using test::components::event_engine_test::MockEventDispatcher; +using testing::_; +using testing::Return; +using testing::ReturnRef; namespace am = ::application_manager; namespace strings = am::strings; namespace hmi_response = am::hmi_response; +using am::commands::CommandImpl; using am::event_engine::Event; using sdl_rpc_plugin::commands::UpdateDeviceListRequest; -using am::commands::CommandImpl; typedef std::shared_ptr UpdateDeviceListRequestPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_sdl_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_sdl_request_test.cc index af3b9bebf6..96f3b38fbf 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_sdl_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_sdl_request_test.cc @@ -33,13 +33,13 @@ #include #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/application.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" #include "hmi/update_sdl_request.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -47,8 +47,8 @@ namespace commands_test { namespace hmi_commands_test { namespace update_sdl_request { -using ::testing::ReturnRef; using ::testing::NiceMock; +using ::testing::ReturnRef; namespace am = ::application_manager; namespace strings = ::application_manager::strings; using sdl_rpc_plugin::commands::UpdateSDLRequest; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_sdl_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_sdl_response_test.cc index 93c49724ce..62ffc6be4d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_sdl_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/update_sdl_response_test.cc @@ -33,12 +33,12 @@ #include #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/application.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" #include "hmi/update_sdl_response.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -48,8 +48,8 @@ namespace update_sdl_response { namespace am = ::application_manager; namespace strings = ::application_manager::strings; -using sdl_rpc_plugin::commands::UpdateSDLResponse; using am::commands::CommandImpl; +using sdl_rpc_plugin::commands::UpdateSDLResponse; typedef std::shared_ptr UpdateSDLResponsePtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_capabilities_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_capabilities_response_test.cc index 15d38d4ef3..21acf2bb70 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_capabilities_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_capabilities_response_test.cc @@ -32,14 +32,14 @@ #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "interfaces/MOBILE_API.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/mock_hmi_capabilities.h" #include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_impl.h" +#include "gtest/gtest.h" #include "hmi/vr_get_capabilities_response.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -51,8 +51,8 @@ using ::testing::NiceMock; namespace am = ::application_manager; namespace strings = am::strings; namespace hmi_response = am::hmi_response; -using sdl_rpc_plugin::commands::VRGetCapabilitiesResponse; using am::commands::CommandImpl; +using sdl_rpc_plugin::commands::VRGetCapabilitiesResponse; typedef std::shared_ptr VRGetCapabilitiesResponsePtr; typedef NiceMock< diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_language_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_language_response_test.cc index 05ed186963..8b00b4dded 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_language_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_language_response_test.cc @@ -30,13 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "hmi/vr_get_language_response.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/commands/commands_test.h" -#include "application_manager/mock_hmi_capabilities.h" -#include "application_manager/mock_event_dispatcher.h" #include "application_manager/mock_application_manager.h" +#include "application_manager/mock_event_dispatcher.h" +#include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -47,8 +47,8 @@ namespace vr_get_language_response { using sdl_rpc_plugin::commands::VRGetLanguageResponse; using test::components::event_engine_test::MockEventDispatcher; using testing::_; -using testing::ReturnRef; using ::testing::NiceMock; +using testing::ReturnRef; namespace strings = application_manager::strings; namespace hmi_response = application_manager::hmi_response; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_supported_languages_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_supported_languages_response_test.cc index 56b11ad440..b81823624c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_supported_languages_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_get_supported_languages_response_test.cc @@ -33,15 +33,15 @@ #include #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/application.h" #include "application_manager/commands/commands_test.h" -#include "application_manager/mock_hmi_capabilities.h" #include "application_manager/mock_application_manager.h" -#include "hmi/vr_get_supported_languages_response.h" +#include "application_manager/mock_hmi_capabilities.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" +#include "hmi/vr_get_supported_languages_response.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -49,8 +49,8 @@ namespace commands_test { namespace hmi_commands_test { namespace vr_get_supported_languages_response { -using ::testing::Return; using ::testing::NiceMock; +using ::testing::Return; namespace am = ::application_manager; namespace strings = ::application_manager::strings; namespace hmi_response = am::hmi_response; @@ -107,7 +107,8 @@ TEST_F(VRGetSupportedLanguagesResponseTest, RUN_UNSUCCESS) { CreateCommand(command_msg)); EXPECT_CALL(mock_hmi_capabilities_, - set_vr_supported_languages(supported_languages)).Times(0); + set_vr_supported_languages(supported_languages)) + .Times(0); command->Run(); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_is_ready_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_is_ready_request_test.cc index 259fd0b92b..9bb8e4c2d5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_is_ready_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_is_ready_request_test.cc @@ -34,15 +34,15 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/event_engine/event.h" #include "application_manager/hmi_interfaces.h" -#include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/mock_hmi_interface.h" #include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -54,8 +54,8 @@ using ::testing::_; using ::testing::ReturnRef; namespace am = ::application_manager; using am::commands::MessageSharedPtr; -using sdl_rpc_plugin::commands::VRIsReadyRequest; using am::event_engine::Event; +using sdl_rpc_plugin::commands::VRIsReadyRequest; typedef std::shared_ptr VRIsReadyRequestPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_is_ready_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_is_ready_response_test.cc index 0e56f5b483..8b7b0a94f4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_is_ready_response_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/vr_is_ready_response_test.cc @@ -33,12 +33,12 @@ #include #include -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" #include "application_manager/commands/commands_test.h" +#include "application_manager/mock_event_dispatcher.h" #include "application_manager/mock_hmi_capabilities.h" +#include "gtest/gtest.h" #include "hmi/vr_is_ready_response.h" -#include "application_manager/mock_event_dispatcher.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -46,8 +46,8 @@ namespace commands_test { namespace hmi_commands_test { namespace vr_is_ready_response { -using ::testing::Return; using ::testing::NiceMock; +using ::testing::Return; namespace am = ::application_manager; namespace strings = ::application_manager::strings; namespace hmi_response = am::hmi_response; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc index 0023368b5a..b11312eb33 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc @@ -32,8 +32,8 @@ #include #include -#include #include +#include #include "mobile/add_command_request.h" @@ -41,16 +41,16 @@ #include "utils/helpers.h" -#include "smart_objects/smart_object.h" -#include "utils/custom_string.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/smart_object_keys.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" -#include "application_manager/mock_hmi_interface.h" #include "application_manager/mock_help_prompt_manager.h" +#include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" +#include "utils/custom_string.h" namespace test { namespace components { @@ -60,17 +60,17 @@ namespace add_command_request { namespace am = application_manager; namespace am_test = application_manager_test; -using am::commands::CommandImpl; using am::ApplicationManager; -using am::commands::MessageSharedPtr; using am::ApplicationSharedPtr; -using ::testing::_; -using ::testing::Return; -using ::testing::InSequence; -using sdl_rpc_plugin::commands::AddCommandRequest; +using am::commands::CommandImpl; +using am::commands::MessageSharedPtr; +using am::event_engine::EventObserver; using ns_smart_device_link::ns_smart_objects::SmartObjectSPtr; +using sdl_rpc_plugin::commands::AddCommandRequest; using ::test::components::application_manager_test::MockApplication; -using am::event_engine::EventObserver; +using ::testing::_; +using ::testing::InSequence; +using ::testing::Return; using namespace smart_objects; namespace custom_str = utils::custom_string; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_sub_menu_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_sub_menu_request_test.cc index ecaa436529..a88a1ade69 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_sub_menu_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_sub_menu_request_test.cc @@ -35,14 +35,14 @@ #include "mobile/add_sub_menu_request.h" -#include "gtest/gtest.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application_manager.h" -#include "application_manager/mock_application.h" -#include "application_manager/mock_message_helper.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/event_engine/event.h" +#include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -51,9 +51,9 @@ namespace mobile_commands_test { namespace add_sub_menu_request { namespace am = ::application_manager; -using sdl_rpc_plugin::commands::AddSubMenuRequest; using am::commands::MessageSharedPtr; using am::event_engine::Event; +using sdl_rpc_plugin::commands::AddSubMenuRequest; using ::testing::_; using ::testing::Return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_maneuver_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_maneuver_request_test.cc index 7d2dd0b2c2..e726616345 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_maneuver_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_maneuver_request_test.cc @@ -35,20 +35,20 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_request_test.h" #include "application_manager/application.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" +#include "application_manager/mock_hmi_interface.h" #include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" -#include "mobile/alert_maneuver_request.h" -#include "interfaces/MOBILE_API.h" -#include "application_manager/policies/policy_handler_interface.h" #include "application_manager/policies/mock_policy_handler_interface.h" -#include "application_manager/mock_hmi_interface.h" +#include "application_manager/policies/policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" +#include "interfaces/MOBILE_API.h" +#include "mobile/alert_maneuver_request.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -60,9 +60,9 @@ using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; namespace am = ::application_manager; -using sdl_rpc_plugin::commands::AlertManeuverRequest; using am::commands::MessageSharedPtr; using am::event_engine::Event; +using sdl_rpc_plugin::commands::AlertManeuverRequest; typedef std::shared_ptr CommandPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_request_test.cc index a66d0d557f..113c6d32a0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_request_test.cc @@ -31,19 +31,19 @@ */ #include -#include #include +#include #include "mobile/alert_request.h" -#include "gtest/gtest.h" #include "application_manager/commands/command_request_test.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -52,12 +52,12 @@ namespace mobile_commands_test { namespace alert_request { namespace am = application_manager; -using sdl_rpc_plugin::commands::AlertRequest; +using am::MockMessageHelper; using am::commands::CommandImpl; using am::commands::MessageSharedPtr; -using am::MockMessageHelper; using am::event_engine::Event; using policy_test::MockPolicyHandlerInterface; +using sdl_rpc_plugin::commands::AlertRequest; using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; @@ -477,9 +477,10 @@ TEST_F(AlertRequestTest, DISABLED_OnEvent_TTSWarnings_SUCCESS) { (*msg_)[am::strings::msg_params][am::strings::tts_chunks], _, _)) .WillOnce(Return(mobile_apis::Result::SUCCESS)); - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::TTS_Speak), - _)).WillOnce(Return(true)); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::TTS_Speak), _)) + .WillOnce(Return(true)); CommandPtr command(CreateCommand(msg_)); command->Run(); @@ -508,9 +509,10 @@ TEST_F(AlertRequestTest, DISABLED_OnEvent_TTSUnsupportedResource_SUCCESS) { VerifyTtsFiles( (*msg_)[am::strings::msg_params][am::strings::tts_chunks], _, _)) .WillOnce(Return(mobile_apis::Result::SUCCESS)); - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::TTS_Speak), - _)).WillOnce(Return(true)); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::TTS_Speak), _)) + .WillOnce(Return(true)); CommandPtr command(CreateCommand(msg_)); command->Run(); @@ -641,9 +643,10 @@ TEST_F(AlertRequestTest, OnEvent_TTSSuccesUiAlertInvalidEnum_SUCCESS) { VerifyTtsFiles( (*msg_)[am::strings::msg_params][am::strings::tts_chunks], _, _)) .WillOnce(Return(mobile_apis::Result::SUCCESS)); - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::TTS_Speak), - _)).WillOnce(Return(true)); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::TTS_Speak), _)) + .WillOnce(Return(true)); CommandPtr command(CreateCommand(msg_)); command->Run(); @@ -690,9 +693,10 @@ TEST_F(AlertRequestTest, DISABLED_OnEvent_TTSAbortedUiAlertNotSent_SUCCESS) { VerifyTtsFiles( (*msg_)[am::strings::msg_params][am::strings::tts_chunks], _, _)) .WillOnce(Return(mobile_apis::Result::SUCCESS)); - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::TTS_Speak), - _)).WillOnce(Return(true)); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::TTS_Speak), _)) + .WillOnce(Return(true)); CommandPtr command(CreateCommand(msg_)); command->Run(); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/change_registration_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/change_registration_test.cc index 58755c8b36..4394c6fe5e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/change_registration_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/change_registration_test.cc @@ -31,25 +31,25 @@ */ #include -#include #include +#include #include "mobile/change_registration_request.h" -#include "gtest/gtest.h" -#include "utils/helpers.h" -#include "utils/custom_string.h" -#include "smart_objects/smart_object.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/smart_object_keys.h" -#include "policy/policy_regular/policy/usage_statistics/mock_statistics_manager.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/mock_message_helper.h" #include "application_manager/mock_hmi_capabilities.h" -#include "application_manager/event_engine/event.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" +#include "policy/policy_regular/policy/usage_statistics/mock_statistics_manager.h" +#include "smart_objects/smart_object.h" +#include "utils/custom_string.h" +#include "utils/helpers.h" namespace test { namespace components { @@ -58,18 +58,18 @@ namespace mobile_commands_test { namespace change_registration_request { namespace am = application_manager; -using am::commands::CommandImpl; using am::ApplicationManager; -using am::commands::MessageSharedPtr; using am::ApplicationSharedPtr; using am::MockMessageHelper; +using am::commands::CommandImpl; +using am::commands::MessageSharedPtr; +using policy_test::MockPolicyHandlerInterface; +using sdl_rpc_plugin::commands::ChangeRegistrationRequest; +using ::test::components::application_manager_test::MockApplication; using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; using ::testing::SetArgPointee; -using sdl_rpc_plugin::commands::ChangeRegistrationRequest; -using policy_test::MockPolicyHandlerInterface; -using ::test::components::application_manager_test::MockApplication; namespace custom_str = utils::custom_string; namespace strings = ::application_manager::strings; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_interaction_choice_set_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_interaction_choice_set_test.cc index 3abda89234..73a0008624 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_interaction_choice_set_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_interaction_choice_set_test.cc @@ -31,24 +31,24 @@ */ #include -#include #include +#include #include "mobile/create_interaction_choice_set_request.h" #include "mobile/create_interaction_choice_set_response.h" -#include "gtest/gtest.h" -#include "utils/helpers.h" -#include "smart_objects/smart_object.h" -#include "utils/custom_string.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/smart_object_keys.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" -#include "application_manager/mock_hmi_interface.h" #include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" +#include "smart_objects/smart_object.h" +#include "utils/custom_string.h" +#include "utils/helpers.h" namespace test { namespace components { @@ -57,18 +57,18 @@ namespace mobile_commands_test { namespace create_interaction_choice_set_request { namespace am = application_manager; -using am::commands::CommandImpl; using am::ApplicationManager; -using am::commands::MessageSharedPtr; using am::ApplicationSharedPtr; using am::MockMessageHelper; -using ::testing::_; -using ::testing::Return; -using ::testing::ReturnRef; -using ::testing::AtLeast; +using am::commands::CommandImpl; +using am::commands::MessageSharedPtr; using sdl_rpc_plugin::commands::CreateInteractionChoiceSetRequest; using sdl_rpc_plugin::commands::CreateInteractionChoiceSetResponse; using ::test::components::application_manager_test::MockApplication; +using ::testing::_; +using ::testing::AtLeast; +using ::testing::Return; +using ::testing::ReturnRef; namespace custom_str = utils::custom_string; namespace strings = ::application_manager::strings; @@ -920,4 +920,4 @@ TEST_F(CreateInteractionChoiceSetRequestTest, Run_ErrorFromHmiFalse_UNSUCCESS) { } // namespace mobile_commands_test } // namespace commands_test } // namespace components -} // namespace tests +} // namespace test diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_command_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_command_request_test.cc index a87d172923..081058f05a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_command_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_command_request_test.cc @@ -37,15 +37,15 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" -#include "application_manager/mock_message_helper.h" -#include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_help_prompt_manager.h" -#include "application_manager/event_engine/event.h" +#include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -58,11 +58,11 @@ using ::testing::Return; using ::testing::ReturnRef; namespace am = ::application_manager; namespace am_test = application_manager_test; -using sdl_rpc_plugin::commands::DeleteCommandRequest; +using am::MockHmiInterfaces; +using am::MockMessageHelper; using am::commands::MessageSharedPtr; using am::event_engine::Event; -using am::MockMessageHelper; -using am::MockHmiInterfaces; +using sdl_rpc_plugin::commands::DeleteCommandRequest; typedef std::shared_ptr DeleteCommandPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_file_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_file_test.cc index 0ed7a92fa4..4081583099 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_file_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_file_test.cc @@ -31,32 +31,32 @@ */ #include -#include -#include #include +#include +#include #include "mobile/delete_file_request.h" #include "mobile/delete_file_response.h" #include "gtest/gtest.h" -#include "utils/file_system.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_request_test.h" #include "application_manager/application.h" -#include "application_manager/mock_application_manager.h" -#include "application_manager/mock_application.h" -#include "application_manager/mock_message_helper.h" +#include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/event_engine/event.h" +#include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" +#include "application_manager/mock_application_manager_settings.h" #include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/mock_message_helper.h" #include "application_manager/policies/mock_policy_handler_interface.h" -#include "application_manager/mock_application_manager_settings.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" +#include "utils/file_system.h" -#include "interfaces/MOBILE_API.h" -#include "application_manager/policies/policy_handler_interface.h" #include "application_manager/policies/policy_handler.h" +#include "application_manager/policies/policy_handler_interface.h" +#include "interfaces/MOBILE_API.h" namespace test { namespace components { @@ -65,17 +65,17 @@ namespace mobile_commands_test { namespace delete_file { using ::testing::_; -using ::testing::Test; +using ::testing::AtLeast; using ::testing::Return; using ::testing::ReturnRef; using ::testing::SetArgReferee; -using ::testing::AtLeast; +using ::testing::Test; namespace am = ::application_manager; -using sdl_rpc_plugin::commands::DeleteFileRequest; -using sdl_rpc_plugin::commands::DeleteFileResponse; +using am::MockMessageHelper; using am::commands::MessageSharedPtr; using am::event_engine::Event; -using am::MockMessageHelper; +using sdl_rpc_plugin::commands::DeleteFileRequest; +using sdl_rpc_plugin::commands::DeleteFileResponse; typedef std::shared_ptr DeleteFileRequestPtr; typedef std::shared_ptr DeleteFileResponsePtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_interaction_choice_set_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_interaction_choice_set_test.cc index c209c4fea2..fa96b21ca7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_interaction_choice_set_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_interaction_choice_set_test.cc @@ -38,13 +38,13 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application_manager.h" -#include "application_manager/mock_application.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/event_engine/event.h" +#include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -53,15 +53,15 @@ namespace mobile_commands_test { namespace delete_interaction_choice_set { using ::testing::_; -using ::testing::Return; using ::testing::InSequence; +using ::testing::Return; namespace am = ::application_manager; -using sdl_rpc_plugin::commands::DeleteInteractionChoiceSetRequest; -using sdl_rpc_plugin::commands::DeleteInteractionChoiceSetResponse; using am::commands::MessageSharedPtr; using am::event_engine::Event; +using sdl_rpc_plugin::commands::DeleteInteractionChoiceSetRequest; +using sdl_rpc_plugin::commands::DeleteInteractionChoiceSetResponse; typedef std::shared_ptr DeleteInteractionChoiceSetRequestPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_sub_menu_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_sub_menu_test.cc index ff9e29c872..04f12568b4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_sub_menu_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_sub_menu_test.cc @@ -36,14 +36,14 @@ #include "mobile/delete_sub_menu_request.h" #include "mobile/delete_sub_menu_response.h" -#include "gtest/gtest.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application_manager.h" -#include "application_manager/mock_application.h" -#include "application_manager/mock_message_helper.h" #include "application_manager/event_engine/event.h" -#include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_help_prompt_manager.h" +#include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -52,15 +52,15 @@ namespace mobile_commands_test { namespace delete_sub_menu_request { using ::testing::_; +using ::testing::InSequence; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::InSequence; namespace am = ::application_manager; namespace am_test = application_manager_test; -using am::commands::MessageSharedPtr; -using am::event_engine::Event; using am::MockHmiInterfaces; using am::MockMessageHelper; +using am::commands::MessageSharedPtr; +using am::event_engine::Event; using sdl_rpc_plugin::commands::DeleteSubMenuRequest; using sdl_rpc_plugin::commands::DeleteSubMenuResponse; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dial_number_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dial_number_request_test.cc index ffa1b833be..cf2634b37c 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dial_number_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dial_number_request_test.cc @@ -36,16 +36,16 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_request_test.h" #include "application_manager/application.h" -#include "application_manager/mock_application_manager.h" -#include "application_manager/mock_application.h" +#include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/event_engine/event.h" -#include "mobile/dial_number_request.h" +#include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/MOBILE_API.h" +#include "mobile/dial_number_request.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -57,8 +57,8 @@ using ::testing::_; using ::testing::Return; namespace am = ::application_manager; using am::commands::MessageSharedPtr; -using sdl_rpc_plugin::commands::DialNumberRequest; using am::event_engine::Event; +using sdl_rpc_plugin::commands::DialNumberRequest; namespace mobile_result = mobile_apis::Result; typedef std::shared_ptr DialNumberRequestPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dummy_mobile_commands_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dummy_mobile_commands_test.cc index 9c20143c39..8f83a2dd10 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dummy_mobile_commands_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/dummy_mobile_commands_test.cc @@ -131,8 +131,8 @@ #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "test/application_manager/mock_application_manager_settings.h" #include "application_manager/mock_event_dispatcher.h" +#include "test/application_manager/mock_application_manager_settings.h" namespace am = application_manager; @@ -143,16 +143,16 @@ namespace mobile_commands_test { namespace dummy_mobile_commands_test { namespace commands = sdl_rpc_plugin::commands; -using ::testing::_; -using ::testing::NotNull; -using ::testing::Types; using am::commands::MessageSharedPtr; -using ::test::components::event_engine_test::MockEventDispatcher; +using ::application_manager::ApplicationSharedPtr; +using ::test::components::application_manager_test::MockApplication; using ::test::components::application_manager_test::MockApplicationManager; using ::test::components::application_manager_test:: MockApplicationManagerSettings; -using ::application_manager::ApplicationSharedPtr; -using ::test::components::application_manager_test::MockApplication; +using ::test::components::event_engine_test::MockEventDispatcher; +using ::testing::_; +using ::testing::NotNull; +using ::testing::Types; namespace { const std::string kEmptyString_ = ""; @@ -283,7 +283,8 @@ typedef Types MobileCommandsListSecond; + commands::UnregisterAppInterfaceRequest> + MobileCommandsListSecond; typedef Types MobileCommandsListThird; + commands::UpdateTurnListResponse> + MobileCommandsListThird; TYPED_TEST_CASE(MobileCommandsTestFirst, MobileCommandsListFirst); TYPED_TEST_CASE(MobileCommandsTestSecond, MobileCommandsListSecond); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/end_audio_pass_thru_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/end_audio_pass_thru_request_test.cc index 304cf13ffd..ba09e0dabe 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/end_audio_pass_thru_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/end_audio_pass_thru_request_test.cc @@ -36,14 +36,14 @@ #include "mobile/end_audio_pass_thru_request.h" -#include "gtest/gtest.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/event_engine/event.h" -#include "application_manager/mock_message_helper.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -52,13 +52,13 @@ namespace mobile_commands_test { namespace end_audio_pass_thru_request { namespace am = ::application_manager; +using am::MockMessageHelper; +using am::commands::MessageSharedPtr; +using am::event_engine::Event; +using sdl_rpc_plugin::commands::EndAudioPassThruRequest; using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; -using am::commands::MessageSharedPtr; -using sdl_rpc_plugin::commands::EndAudioPassThruRequest; -using am::event_engine::Event; -using am::MockMessageHelper; typedef std::shared_ptr EndAudioPassThruRequestPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_way_points_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_way_points_request_test.cc index f450d4b671..7f7a8b55bd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_way_points_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_way_points_request_test.cc @@ -32,18 +32,17 @@ #include "gtest/gtest.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_request_test.h" #include "application_manager/application.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/mock_application.h" -#include "mobile/get_way_points_request.h" -#include "application_manager/smart_object_keys.h" +#include "application_manager/mock_application_manager.h" +#include "application_manager/mock_hmi_interface.h" #include "application_manager/mock_message_helper.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" -#include "application_manager/mock_hmi_interface.h" -#include "application_manager/mock_message_helper.h" +#include "mobile/get_way_points_request.h" namespace test { namespace components { @@ -52,11 +51,11 @@ namespace mobile_commands_test { namespace get_way_points_request { using namespace mobile_apis::Result; -using ::testing::Return; -using ::testing::_; -using sdl_rpc_plugin::commands::GetWayPointsRequest; -using application_manager::MockMessageHelper; using application_manager::MockHmiInterfaces; +using application_manager::MockMessageHelper; +using sdl_rpc_plugin::commands::GetWayPointsRequest; +using ::testing::_; +using ::testing::Return; typedef std::shared_ptr CommandPtr; typedef mobile_apis::Result::eType MobileResult; @@ -67,7 +66,7 @@ const uint32_t kCorrelationId = 2u; const uint32_t kAppId = 3u; const uint32_t kConnectionKey = kAppId; const std::string kMethodName = "Navigation.GetWayPoints"; -} +} // namespace class GetWayPointsRequestTest : public CommandRequestTest { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/list_files_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/list_files_request_test.cc index 3fcc4225f3..8b6f6696b7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/list_files_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/list_files_request_test.cc @@ -35,15 +35,15 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_request_test.h" #include "application_manager/application.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/mock_application.h" -#include "mobile/list_files_request.h" -#include "interfaces/MOBILE_API.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/smart_object_keys.h" +#include "interfaces/MOBILE_API.h" +#include "mobile/list_files_request.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -52,13 +52,13 @@ namespace mobile_commands_test { namespace list_files_request { using ::testing::_; +using ::testing::DoAll; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::DoAll; using ::testing::SaveArg; namespace am = ::application_manager; -using sdl_rpc_plugin::commands::ListFilesRequest; using am::commands::MessageSharedPtr; +using sdl_rpc_plugin::commands::ListFilesRequest; class ListFilesRequestTest : public CommandRequestTest { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_button_notification_commands_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_button_notification_commands_test.cc index a0e41cf728..1f514e09c5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_button_notification_commands_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_button_notification_commands_test.cc @@ -33,16 +33,16 @@ #include #include +#include "application_manager/smart_object_keys.h" #include "gtest/gtest.h" #include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/mock_application_manager.h" #include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/commands/command_impl.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" #include "mobile/on_button_event_notification.h" #include "mobile/on_button_press_notification.h" @@ -54,12 +54,12 @@ namespace on_button_notification { namespace am = ::application_manager; namespace commands = am::commands; +using am::commands::MessageSharedPtr; using sdl_rpc_plugin::commands::mobile::OnButtonEventNotification; using sdl_rpc_plugin::commands::mobile::OnButtonPressNotification; using ::testing::_; -using ::testing::Types; using ::testing::Return; -using am::commands::MessageSharedPtr; +using ::testing::Types; namespace { const uint32_t kAppId = 5u; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_command_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_command_notification_test.cc index 2fd6f6137d..1356b1c5fa 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_command_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_command_notification_test.cc @@ -35,11 +35,11 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_impl.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/smart_object_keys.h" #include "mobile/on_command_notification.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_hash_change_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_hash_change_notification_test.cc index 1d6711e36f..15faa5c13f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_hash_change_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_hash_change_notification_test.cc @@ -32,12 +32,12 @@ #include -#include "gtest/gtest.h" -#include "mobile/on_hash_change_notification.h" +#include "application_manager/commands/command_impl.h" #include "application_manager/mock_message_helper.h" #include "application_manager/smart_object_keys.h" -#include "application_manager/commands/command_impl.h" #include "application_manager/test/include/application_manager/commands/commands_test.h" +#include "gtest/gtest.h" +#include "mobile/on_hash_change_notification.h" namespace test { namespace components { @@ -47,13 +47,13 @@ namespace on_hash_change_notification { namespace strings = application_manager::strings; -using sdl_rpc_plugin::commands::mobile::OnHashChangeNotification; using application_manager::MockMessageHelper; using application_manager::commands::CommandImpl; +using sdl_rpc_plugin::commands::mobile::OnHashChangeNotification; +using testing::_; using testing::Mock; using testing::Return; using testing::ReturnRef; -using testing::_; class OnHashChangeNotificationTest : public CommandsTest {}; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_hmi_status_notification_from_mobile_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_hmi_status_notification_from_mobile_test.cc index 333c204d57..528f1d8618 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_hmi_status_notification_from_mobile_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_hmi_status_notification_from_mobile_test.cc @@ -30,13 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "mobile/on_hmi_status_notification_from_mobile.h" -#include "application_manager/commands/commands_test.h" #include -#include "application_manager/message.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/message.h" #include "application_manager/mock_message_helper.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -51,12 +51,12 @@ const connection_handler::DeviceHandle kHandle = 2u; namespace strings = application_manager::strings; -using sdl_rpc_plugin::commands::OnHMIStatusNotificationFromMobile; -using protocol_handler::MajorProtocolVersion; using application_manager::ApplicationSet; +using protocol_handler::MajorProtocolVersion; +using sdl_rpc_plugin::commands::OnHMIStatusNotificationFromMobile; +using testing::_; using testing::Mock; using testing::Return; -using testing::_; class OnHMIStatusNotificationFromMobileTest : public CommandsTest { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_hmi_status_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_hmi_status_notification_test.cc index ba3b1e8f1d..5bf68414e5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_hmi_status_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_hmi_status_notification_test.cc @@ -30,11 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "mobile/on_hmi_status_notification.h" -#include "application_manager/test/include/application_manager/commands/commands_test.h" -#include "application_manager/mock_message_helper.h" #include "application_manager/commands/command_impl.h" +#include "application_manager/mock_message_helper.h" +#include "application_manager/test/include/application_manager/commands/commands_test.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -47,13 +47,13 @@ const uint32_t kConnectionKey = 1u; } // namespace namespace strings = application_manager::strings; -using sdl_rpc_plugin::commands::OnHMIStatusNotification; -using protocol_handler::MajorProtocolVersion; using application_manager::MockMessageHelper; using application_manager::commands::CommandImpl; +using protocol_handler::MajorProtocolVersion; +using sdl_rpc_plugin::commands::OnHMIStatusNotification; +using testing::_; using testing::Mock; using testing::Return; -using testing::_; class OnHMIStatusNotificationTest : public CommandsTest { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_keyboard_input_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_keyboard_input_notification_test.cc index 04f88e2b13..501b4d8631 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_keyboard_input_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_keyboard_input_notification_test.cc @@ -30,13 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "mobile/on_keyboard_input_notification.h" -#include "application_manager/commands/commands_test.h" #include +#include "application_manager/commands/command_impl.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/message.h" #include "application_manager/mock_message_helper.h" -#include "application_manager/commands/command_impl.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -50,13 +50,13 @@ namespace { const uint32_t kConnectionKey = 1u; } // namespace -using sdl_rpc_plugin::commands::mobile::OnKeyBoardInputNotification; +using application_manager::ApplicationSet; using application_manager::MockMessageHelper; using application_manager::commands::CommandImpl; -using application_manager::ApplicationSet; +using sdl_rpc_plugin::commands::mobile::OnKeyBoardInputNotification; +using testing::_; using testing::Mock; using testing::Return; -using testing::_; class OnKeyBoardInputNotificationTest : public CommandsTest { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_request_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_request_notification_test.cc index 4981301e07..69ed8fb311 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_request_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_request_notification_test.cc @@ -32,14 +32,13 @@ #include -#include "gtest/gtest.h" -#include "mobile/on_system_request_notification.h" +#include "application_manager/commands/command_impl.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/mock_message_helper.h" #include "application_manager/policies/mock_policy_handler_interface.h" -#include "application_manager/mock_message_helper.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_impl.h" +#include "gtest/gtest.h" #include "interfaces/MOBILE_API.h" +#include "mobile/on_system_request_notification.h" namespace test { namespace components { @@ -49,16 +48,16 @@ namespace on_system_request_notification { namespace strings = application_manager::strings; -using sdl_rpc_plugin::commands::mobile::OnSystemRequestNotification; -using application_manager::commands::CommandImpl; using application_manager::MockMessageHelper; +using application_manager::commands::CommandImpl; +using sdl_rpc_plugin::commands::mobile::OnSystemRequestNotification; using test::components::policy_test::MockPolicyHandlerInterface; using namespace mobile_apis; -using testing::SaveArg; +using testing::_; using testing::Mock; using testing::Return; using testing::ReturnRef; -using testing::_; +using testing::SaveArg; namespace { const uint32_t kConnectionKey = 1u; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_tbt_client_state_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_tbt_client_state_notification_test.cc index 3d989db478..f1e1a291d3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_tbt_client_state_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_tbt_client_state_notification_test.cc @@ -36,10 +36,10 @@ #include "gtest/gtest.h" #include "mobile/on_tbt_client_state_notification.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_impl.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" #include "utils/helpers.h" namespace test { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_touch_event_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_touch_event_notification_test.cc index f69dd5da2e..95020328b4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_touch_event_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_touch_event_notification_test.cc @@ -36,10 +36,10 @@ #include "gtest/gtest.h" #include "mobile/on_touch_event_notification.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_impl.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" #include "utils/helpers.h" namespace test { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_way_point_change_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_way_point_change_notification_test.cc index ed0a9b07d2..83958954cd 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_way_point_change_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_way_point_change_notification_test.cc @@ -36,10 +36,10 @@ #include "gtest/gtest.h" #include "mobile/on_way_point_change_notification.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_impl.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" #include "utils/helpers.h" namespace test { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/perform_audio_pass_thru_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/perform_audio_pass_thru_test.cc index acda9b9fc7..b0df0e57d3 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/perform_audio_pass_thru_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/perform_audio_pass_thru_test.cc @@ -31,18 +31,18 @@ */ #include -#include #include +#include #include "mobile/perform_audio_pass_thru_request.h" -#include "gtest/gtest.h" #include "application_manager/commands/command_request_test.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -51,14 +51,14 @@ namespace mobile_commands_test { namespace perform_audio_pass_thru_request { namespace am = application_manager; -using sdl_rpc_plugin::commands::PerformAudioPassThruRequest; +using am::MockMessageHelper; using am::commands::CommandImpl; using am::commands::MessageSharedPtr; -using am::MockMessageHelper; +using sdl_rpc_plugin::commands::PerformAudioPassThruRequest; using ::testing::_; +using ::testing::InSequence; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::InSequence; namespace { const int32_t kCommandId = 1; @@ -250,7 +250,8 @@ TEST_F(PerformAudioPassThruRequestTest, VerifyTtsFiles((*mobile_request)[am::strings::msg_params] [am::strings::initial_prompt], _, - _)).WillOnce(Return(mobile_apis::Result::SUCCESS)); + _)) + .WillOnce(Return(mobile_apis::Result::SUCCESS)); command->Run(); command->on_event(event_tts); @@ -463,10 +464,12 @@ TEST_F(PerformAudioPassThruRequestTest, .asString(); const std::string result_display_text_1 = perform_msg_params[am::hmi_request::audio_pass_display_texts][0] - [am::hmi_request::field_text].asString(); + [am::hmi_request::field_text] + .asString(); const std::string result_display_text_2 = perform_msg_params[am::hmi_request::audio_pass_display_texts][1] - [am::hmi_request::field_text].asString(); + [am::hmi_request::field_text] + .asString(); EXPECT_EQ(kCorrectPrompt, result_initial_prompt); EXPECT_EQ(kCorrectType, result_prompt_type); @@ -579,7 +582,8 @@ TEST_F( const hmi_apis::FunctionID::eType start_record_result_function_id = static_cast( (*start_record_result_msg)[am::strings::params] - [am::strings::function_id].asInt()); + [am::strings::function_id] + .asInt()); EXPECT_EQ(hmi_apis::FunctionID::UI_OnRecordStart, start_record_result_function_id); } @@ -831,4 +835,4 @@ TEST_F(PerformAudioPassThruRequestTest, } // namespace mobile_commands_test } // namespace commands_test } // namespace components -} // namespace tests +} // namespace test diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/perform_interaction_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/perform_interaction_test.cc index 3b68d3ea72..f1f7c4c907 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/perform_interaction_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/perform_interaction_test.cc @@ -31,22 +31,22 @@ */ #include -#include #include +#include #include "mobile/perform_interaction_request.h" -#include "gtest/gtest.h" -#include "utils/helpers.h" -#include "smart_objects/smart_object.h" -#include "utils/custom_string.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/smart_object_keys.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" +#include "smart_objects/smart_object.h" +#include "utils/custom_string.h" +#include "utils/helpers.h" namespace test { namespace components { @@ -55,16 +55,16 @@ namespace mobile_commands_test { namespace perform_interaction_request { namespace am = application_manager; -using am::commands::CommandImpl; using am::ApplicationManager; -using am::commands::MessageSharedPtr; using am::ApplicationSharedPtr; using am::MockMessageHelper; +using am::commands::CommandImpl; +using am::commands::MessageSharedPtr; +using sdl_rpc_plugin::commands::PerformInteractionRequest; +using ::test::components::application_manager_test::MockApplication; using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; -using sdl_rpc_plugin::commands::PerformInteractionRequest; -using ::test::components::application_manager_test::MockApplication; namespace strings = ::application_manager::strings; namespace hmi_response = ::application_manager::hmi_response; @@ -258,4 +258,4 @@ TEST_F(PerformInteractionRequestTest, } // namespace mobile_commands_test } // namespace commands_test } // namespace components -} // namespace tests +} // namespace test diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/put_file_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/put_file_test.cc index 415b559f82..e8e03484ed 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/put_file_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/put_file_test.cc @@ -36,18 +36,18 @@ #include "gtest/gtest.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" -#include "mobile/put_file_response.h" #include "mobile/put_file_request.h" +#include "mobile/put_file_response.h" -#include "utils/file_system.h" -#include "smart_objects/smart_object.h" -#include "interfaces/MOBILE_API.h" #include "application_manager/application.h" #include "application_manager/mock_application.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/file_system.h" namespace test { namespace components { @@ -56,16 +56,16 @@ namespace mobile_commands_test { namespace put_file { using ::testing::_; +using ::testing::AtLeast; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::AtLeast; namespace am = ::application_manager; -using sdl_rpc_plugin::commands::PutFileRequest; -using sdl_rpc_plugin::commands::PutFileResponse; using am::commands::MessageSharedPtr; using policy_test::MockPolicyHandlerInterface; +using sdl_rpc_plugin::commands::PutFileRequest; +using sdl_rpc_plugin::commands::PutFileResponse; typedef std::shared_ptr PutFileRequestPtr; typedef std::shared_ptr PutFileResponsePtr; @@ -78,7 +78,7 @@ const int64_t kZeroOffset = 0u; const std::string kStorageFolder = "./storage"; const std::string kFolder = "folder"; const std::string kAppFolder = "app_folder"; -} +} // namespace class PutFileRequestTest : public CommandRequestTest { @@ -319,7 +319,8 @@ TEST_F(PutFileRequestTest, Run_SendOnPutFileNotification_SUCCESS) { mock_rpc_service_, ManageHMICommand( HMIResultCodeIs(hmi_apis::FunctionID::BasicCommunication_OnPutFile), - _)).WillOnce(Return(true)); + _)) + .WillOnce(Return(true)); ExpectManageMobileCommandWithResultCode(mobile_apis::Result::SUCCESS); PutFileRequestPtr command(CreateCommand(msg_)); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc index 868d353a85..0e8374b75a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc @@ -34,25 +34,25 @@ #include #include -#include "gtest/gtest.h" -#include "mobile/register_app_interface_request.h" -#include "smart_objects/smart_object.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_request_test.h" #include "application_manager/application.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_helper.h" -#include "interfaces/MOBILE_API.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/policies/mock_policy_handler_interface.h" -#include "protocol_handler/mock_session_observer.h" -#include "connection_handler/mock_connection_handler.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_capabilities.h" -#include "application_manager/mock_resume_ctrl.h" #include "application_manager/mock_hmi_interface.h" -#include "utils/data_accessor.h" +#include "application_manager/mock_resume_ctrl.h" +#include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" +#include "connection_handler/mock_connection_handler.h" +#include "gtest/gtest.h" +#include "interfaces/MOBILE_API.h" +#include "mobile/register_app_interface_request.h" +#include "protocol_handler/mock_session_observer.h" +#include "smart_objects/smart_object.h" #include "utils/custom_string.h" +#include "utils/data_accessor.h" #include "utils/lock.h" #include "utils/macro.h" #include "utils/semantic_version.h" @@ -64,9 +64,9 @@ namespace mobile_commands_test { namespace register_app_interface_request { using ::testing::_; +using ::testing::DoAll; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::DoAll; namespace am = ::application_manager; @@ -212,13 +212,15 @@ class RegisterAppInterfaceRequestTest ManageHMICommand( HMIResultCodeIs( hmi_apis::FunctionID::BasicCommunication_OnAppRegistered), - _)).Times(0); + _)) + .Times(0); EXPECT_CALL( mock_rpc_service_, ManageHMICommand( HMIResultCodeIs(hmi_apis::FunctionID::Buttons_OnButtonSubscription), - _)).Times(0); + _)) + .Times(0); EXPECT_CALL( mock_rpc_service_, @@ -309,12 +311,14 @@ TEST_F(RegisterAppInterfaceRequestTest, Run_MinimalData_SUCCESS) { ManageHMICommand( HMIResultCodeIs( hmi_apis::FunctionID::BasicCommunication_OnAppRegistered), - _)).WillOnce(Return(true)); + _)) + .WillOnce(Return(true)); EXPECT_CALL( mock_rpc_service_, ManageHMICommand( HMIResultCodeIs(hmi_apis::FunctionID::Buttons_OnButtonSubscription), - _)).WillOnce(Return(true)); + _)) + .WillOnce(Return(true)); EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, am::commands::Command::SOURCE_SDL)) .Times(2); @@ -413,24 +417,29 @@ TEST_F(RegisterAppInterfaceRequestTest, ManageHMICommand( HMIResultCodeIs( hmi_apis::FunctionID::BasicCommunication_OnAppRegistered), - _)).WillOnce(Return(true)); + _)) + .WillOnce(Return(true)); EXPECT_CALL( mock_rpc_service_, ManageHMICommand( HMIResultCodeIs(hmi_apis::FunctionID::Buttons_OnButtonSubscription), - _)).WillOnce(Return(true)); - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand( - HMIResultCodeIs(hmi_apis::FunctionID::VR_ChangeRegistration), - _)).WillOnce(Return(true)); - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand( - HMIResultCodeIs(hmi_apis::FunctionID::TTS_ChangeRegistration), - _)).WillOnce(Return(true)); - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand( - HMIResultCodeIs(hmi_apis::FunctionID::UI_ChangeRegistration), - _)).WillOnce(Return(true)); + _)) + .WillOnce(Return(true)); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand( + HMIResultCodeIs(hmi_apis::FunctionID::VR_ChangeRegistration), _)) + .WillOnce(Return(true)); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand( + HMIResultCodeIs(hmi_apis::FunctionID::TTS_ChangeRegistration), _)) + .WillOnce(Return(true)); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand( + HMIResultCodeIs(hmi_apis::FunctionID::UI_ChangeRegistration), _)) + .WillOnce(Return(true)); EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, am::commands::Command::SOURCE_SDL)) .Times(2); @@ -460,7 +469,8 @@ TEST_F(RegisterAppInterfaceRequestTest, mock_resume_crt_, CheckApplicationHash( std::static_pointer_cast(mock_app), - request_hash_id)).WillOnce(Return(true)); + request_hash_id)) + .WillOnce(Return(true)); EXPECT_CALL(mock_resume_crt_, RemoveApplicationFromSaved(_)).Times(0); @@ -494,7 +504,8 @@ TEST_F(RegisterAppInterfaceRequestTest, mock_resume_crt_, CheckApplicationHash( std::static_pointer_cast(mock_app), - request_hash_id)).WillOnce(Return(false)); + request_hash_id)) + .WillOnce(Return(false)); EXPECT_CALL( mock_application_helper_, diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/reset_global_properties_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/reset_global_properties_test.cc index 38585319e4..98c0ad098a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/reset_global_properties_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/reset_global_properties_test.cc @@ -37,17 +37,17 @@ #include "mobile/reset_global_properties_request.h" #include "mobile/reset_global_properties_response.h" -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "interfaces/HMI_API.h" -#include "interfaces/MOBILE_API.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" +#include "application_manager/smart_object_keys.h" +#include "gtest/gtest.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -61,11 +61,11 @@ using ::testing::ReturnRef; namespace am = ::application_manager; -using sdl_rpc_plugin::commands::ResetGlobalPropertiesRequest; -using sdl_rpc_plugin::commands::ResetGlobalPropertiesResponse; +using am::MockMessageHelper; using am::commands::MessageSharedPtr; using am::event_engine::Event; -using am::MockMessageHelper; +using sdl_rpc_plugin::commands::ResetGlobalPropertiesRequest; +using sdl_rpc_plugin::commands::ResetGlobalPropertiesResponse; typedef std::shared_ptr ResetGlobalPropertiesRequestPtr; @@ -237,10 +237,11 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_SUCCESS) { EXPECT_CALL(*mock_app_, timeout_prompt()) .WillOnce(Return(so_help_prompt.get())); - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand( - HMIResultCodeIs(hmi_apis::FunctionID::UI_SetGlobalProperties), - _)).WillOnce(Return(true)); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand( + HMIResultCodeIs(hmi_apis::FunctionID::UI_SetGlobalProperties), _)) + .WillOnce(Return(true)); EXPECT_CALL( mock_rpc_service_, ManageHMICommand( @@ -275,10 +276,11 @@ TEST_F(ResetGlobalPropertiesRequestTest, smart_objects::SmartType_Map); EXPECT_CALL(mock_message_helper_, CreateAppVrHelp(_)) .WillOnce(Return(vr_help)); - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand( - HMIResultCodeIs(hmi_apis::FunctionID::UI_SetGlobalProperties), - _)).WillOnce(Return(true)); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand( + HMIResultCodeIs(hmi_apis::FunctionID::UI_SetGlobalProperties), _)) + .WillOnce(Return(true)); command_->Run(); @@ -321,10 +323,11 @@ TEST_F(ResetGlobalPropertiesRequestTest, (*ui_msg)[am::strings::params][am::strings::correlation_id] = kCorrelationId; (*ui_msg)[am::strings::params][am::hmi_response::code] = hmi_apis::Common_Result::eType::SUCCESS; - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand( - HMIResultCodeIs(hmi_apis::FunctionID::UI_SetGlobalProperties), - _)).WillOnce(Return(true)); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand( + HMIResultCodeIs(hmi_apis::FunctionID::UI_SetGlobalProperties), _)) + .WillOnce(Return(true)); EXPECT_CALL( mock_rpc_service_, ManageHMICommand( @@ -364,10 +367,11 @@ TEST_F(ResetGlobalPropertiesRequestTest, OnEvent_InvalidApp_NoHashUpdate) { EXPECT_CALL(*mock_app_, reset_vr_help()); EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand( - HMIResultCodeIs(hmi_apis::FunctionID::UI_SetGlobalProperties), - _)).WillOnce(Return(true)); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand( + HMIResultCodeIs(hmi_apis::FunctionID::UI_SetGlobalProperties), _)) + .WillOnce(Return(true)); smart_objects::SmartObjectSPtr vr_help = std::make_shared( smart_objects::SmartType_Map); @@ -414,10 +418,11 @@ TEST_F(ResetGlobalPropertiesRequestTest, EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand( - HMIResultCodeIs(hmi_apis::FunctionID::UI_SetGlobalProperties), - _)).WillOnce(Return(true)); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand( + HMIResultCodeIs(hmi_apis::FunctionID::UI_SetGlobalProperties), _)) + .WillOnce(Return(true)); EXPECT_CALL( mock_rpc_service_, ManageHMICommand( @@ -480,10 +485,11 @@ TEST_F(ResetGlobalPropertiesRequestTest, EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand( - HMIResultCodeIs(hmi_apis::FunctionID::UI_SetGlobalProperties), - _)).WillOnce(Return(true)); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand( + HMIResultCodeIs(hmi_apis::FunctionID::UI_SetGlobalProperties), _)) + .WillOnce(Return(true)); EXPECT_CALL( mock_rpc_service_, ManageHMICommand( @@ -545,10 +551,11 @@ TEST_F(ResetGlobalPropertiesRequestTest, EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand( - HMIResultCodeIs(hmi_apis::FunctionID::UI_SetGlobalProperties), - _)).WillOnce(Return(true)); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand( + HMIResultCodeIs(hmi_apis::FunctionID::UI_SetGlobalProperties), _)) + .WillOnce(Return(true)); EXPECT_CALL( mock_rpc_service_, ManageHMICommand( diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/scrollable_message_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/scrollable_message_test.cc index cf25a82972..3820112ea5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/scrollable_message_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/scrollable_message_test.cc @@ -31,20 +31,20 @@ */ #include -#include #include +#include #include "mobile/scrollable_message_request.h" -#include "gtest/gtest.h" #include "application_manager/commands/command_request_test.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" -#include "application_manager/mock_hmi_interface.h" #include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -57,10 +57,10 @@ namespace hmi_response = am::hmi_response; namespace mobile_result = mobile_apis::Result; namespace am = ::application_manager; -using sdl_rpc_plugin::commands::ScrollableMessageRequest; +using am::MockMessageHelper; using am::commands::CommandImpl; using am::commands::MessageSharedPtr; -using am::MockMessageHelper; +using sdl_rpc_plugin::commands::ScrollableMessageRequest; using ::testing::_; using ::testing::Eq; using ::testing::Ref; @@ -282,4 +282,4 @@ TEST_F(ScrollableMessageRequestTest, } // namespace mobile_commands_test } // namespace commands_test } // namespace components -} // namespace tests +} // namespace test diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/send_haptic_data_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/send_haptic_data_test.cc index 19f799448a..3cb9642021 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/send_haptic_data_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/send_haptic_data_test.cc @@ -32,15 +32,15 @@ #include "gtest/gtest.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" #include "mobile/send_haptic_data_request.h" #include "mobile/send_haptic_data_response.h" -#include "interfaces/MOBILE_API.h" #include "application_manager/application.h" #include "application_manager/mock_application.h" +#include "interfaces/MOBILE_API.h" namespace test { namespace components { @@ -53,9 +53,9 @@ using ::testing::Return; namespace am = ::application_manager; +using am::commands::MessageSharedPtr; using sdl_rpc_plugin::commands::SendHapticDataRequest; using sdl_rpc_plugin::commands::SendHapticDataResponse; -using am::commands::MessageSharedPtr; typedef std::shared_ptr SendHapticDataRequestPtr; typedef std::shared_ptr SendHapticDataResponsePtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/send_location_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/send_location_request_test.cc index 4cab3db2a3..5d90453278 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/send_location_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/send_location_request_test.cc @@ -32,10 +32,10 @@ #include #include -#include "gtest/gtest.h" -#include "mobile/send_location_request.h" #include "application_manager/mock_hmi_capabilities.h" #include "application_manager/mock_message_helper.h" +#include "gtest/gtest.h" +#include "mobile/send_location_request.h" #include "application_manager/commands/command_request_test.h" @@ -45,11 +45,11 @@ namespace commands_test { namespace mobile_commands_test { namespace send_location_request { +using application_manager::MockMessageHelper; using application_manager::commands::MessageSharedPtr; using sdl_rpc_plugin::commands::SendLocationRequest; -using application_manager::MockMessageHelper; -using test::components::application_manager_test::MockHMICapabilities; using smart_objects::SmartObject; +using test::components::application_manager_test::MockHMICapabilities; using testing::_; using testing::Return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_app_icon_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_app_icon_test.cc index d8d1faca47..116a796312 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_app_icon_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_app_icon_test.cc @@ -31,20 +31,20 @@ */ #include -#include #include +#include #include "mobile/set_app_icon_request.h" -#include "gtest/gtest.h" #include "application_manager/commands/command_request_test.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" +#include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" +#include "gtest/gtest.h" #include "protocol_handler/mock_protocol_handler.h" #include "protocol_handler/mock_protocol_handler_settings.h" -#include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" -#include "application_manager/mock_hmi_interface.h" namespace test { namespace components { @@ -53,11 +53,11 @@ namespace mobile_commands_test { namespace set_app_icon_request { namespace am = application_manager; -using sdl_rpc_plugin::commands::SetAppIconRequest; +using am::MockHmiInterfaces; +using am::MockMessageHelper; using am::commands::CommandImpl; using am::commands::MessageSharedPtr; -using am::MockMessageHelper; -using am::MockHmiInterfaces; +using sdl_rpc_plugin::commands::SetAppIconRequest; using test::components::protocol_handler_test::MockProtocolHandler; using test::components::protocol_handler_test::MockProtocolHandlerSettings; using ::testing::_; @@ -170,4 +170,4 @@ TEST_F(SetAppIconRequestTest, OnEvent_UI_UNSUPPORTED_RESOURCE) { } // namespace mobile_commands_test } // namespace commands_test } // namespace components -} // namespace tests +} // namespace test diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_display_layout_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_display_layout_test.cc index 10ca925739..cc2f042eac 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_display_layout_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_display_layout_test.cc @@ -31,19 +31,19 @@ */ #include -#include #include +#include #include "mobile/set_display_layout_request.h" -#include "gtest/gtest.h" #include "application_manager/commands/command_request_test.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" -#include "application_manager/mock_hmi_interface.h" #include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -53,10 +53,10 @@ namespace set_display_layout_request { namespace am = application_manager; namespace mobile_result = mobile_apis::Result; -using sdl_rpc_plugin::commands::SetDisplayLayoutRequest; +using am::MockMessageHelper; using am::commands::CommandImpl; using am::commands::MessageSharedPtr; -using am::MockMessageHelper; +using sdl_rpc_plugin::commands::SetDisplayLayoutRequest; using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; @@ -246,4 +246,4 @@ TEST_F(SetDisplayLayoutRequestTest, OnEvent_SUCCESS) { } // namespace mobile_commands_test } // namespace commands_test } // namespace components -} // namespace tests +} // namespace test diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc index 94dbbc8b44..3e791aef01 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc @@ -32,19 +32,19 @@ #include #include -#include #include +#include #include "mobile/set_global_properties_request.h" -#include "gtest/gtest.h" #include "application_manager/commands/command_request_test.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" -#include "application_manager/mock_help_prompt_manager.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" +#include "application_manager/mock_help_prompt_manager.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -53,15 +53,15 @@ namespace mobile_commands_test { namespace set_global_properties_request { namespace am = application_manager; -using sdl_rpc_plugin::commands::SetGlobalPropertiesRequest; +using am::CommandsMap; +using am::MockMessageHelper; using am::commands::CommandImpl; using am::commands::MessageSharedPtr; -using am::MockMessageHelper; -using am::CommandsMap; -using utils::custom_string::CustomString; +using sdl_rpc_plugin::commands::SetGlobalPropertiesRequest; using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; +using utils::custom_string::CustomString; namespace { const int32_t kCommandId = 1; @@ -314,17 +314,19 @@ TEST_F(SetGlobalPropertiesRequestTest, EXPECT_CALL(*mock_app_, help_prompt_manager()) .WillRepeatedly(ReturnRef(*mock_help_prompt_manager_.get())); EXPECT_CALL(*mock_help_prompt_manager_, - OnSetGlobalPropertiesReceived(_, false)).Times(2); + OnSetGlobalPropertiesReceived(_, false)) + .Times(2); EXPECT_CALL( mock_message_helper_, VerifyTtsFiles( (*msg_vr)[am::strings::msg_params][am::strings::help_prompt], _, _)) .WillOnce(Return(mobile_apis::Result::SUCCESS)); - EXPECT_CALL(mock_rpc_service_, - ManageHMICommand( - HMIResultCodeIs(hmi_apis::FunctionID::UI_SetGlobalProperties), - _)).WillOnce(Return(true)); + EXPECT_CALL( + mock_rpc_service_, + ManageHMICommand( + HMIResultCodeIs(hmi_apis::FunctionID::UI_SetGlobalProperties), _)) + .WillOnce(Return(true)); EXPECT_CALL( mock_rpc_service_, ManageHMICommand( @@ -414,7 +416,8 @@ TEST_F(SetGlobalPropertiesRequestTest, command->Run(); EXPECT_CALL(*mock_help_prompt_manager_, - OnSetGlobalPropertiesReceived(_, true)).Times(2); + OnSetGlobalPropertiesReceived(_, true)) + .Times(2); command->on_event(event_ui); command->on_event(event_tts); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_media_clock_timer_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_media_clock_timer_test.cc index 04a7da60cf..86d15e76f2 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_media_clock_timer_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_media_clock_timer_test.cc @@ -35,13 +35,13 @@ #include "mobile/set_media_clock_timer_request.h" -#include "gtest/gtest.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application_manager.h" -#include "application_manager/mock_application.h" -#include "application_manager/mock_message_helper.h" #include "application_manager/event_engine/event.h" +#include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -50,10 +50,10 @@ namespace mobile_commands_test { namespace set_media_clock_timer_request { namespace am = ::application_manager; -using sdl_rpc_plugin::commands::SetMediaClockRequest; +using am::MockMessageHelper; using am::commands::MessageSharedPtr; using am::event_engine::Event; -using am::MockMessageHelper; +using sdl_rpc_plugin::commands::SetMediaClockRequest; using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc index 4540980b9e..ed0f52a521 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc @@ -32,19 +32,19 @@ #include #include -#include #include +#include #include "mobile/show_request.h" -#include "gtest/gtest.h" #include "application_manager/commands/command_request_test.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -53,10 +53,10 @@ namespace mobile_commands_test { namespace show_request { namespace am = application_manager; -using sdl_rpc_plugin::commands::ShowRequest; +using am::MockMessageHelper; using am::commands::CommandImpl; using am::commands::MessageSharedPtr; -using am::MockMessageHelper; +using sdl_rpc_plugin::commands::ShowRequest; using test::components::policy_test::MockPolicyHandlerInterface; using ::testing::_; using ::testing::Return; @@ -971,4 +971,4 @@ TEST_F(ShowRequestTest, OnEvent_WrongFunctionID_Canceled) { } // namespace mobile_commands_test } // namespace commands_test } // namespace components -} // namespace tests +} // namespace test diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/simple_notification_commands_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/simple_notification_commands_test.cc index d96a9d7643..6e85aff281 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/simple_notification_commands_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/simple_notification_commands_test.cc @@ -35,16 +35,16 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/mock_message_helper.h" #include "application_manager/commands/command_impl.h" #include "application_manager/commands/commands_test.h" +#include "application_manager/mock_message_helper.h" +#include "application_manager/smart_object_keys.h" #include "mobile/on_app_interface_unregistered_notification.h" #include "mobile/on_audio_pass_thru_notification.h" #include "mobile/on_driver_distraction_notification.h" #include "mobile/on_language_change_notification.h" #include "mobile/on_permissions_change_notification.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -56,8 +56,8 @@ namespace am = ::application_manager; namespace commands = sdl_rpc_plugin::commands; using ::testing::_; -using ::testing::Types; using ::testing::Return; +using ::testing::Types; template class MobileNotificationCommandsTest diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/simple_response_commands_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/simple_response_commands_test.cc index bbd39874e0..0034dcf916 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/simple_response_commands_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/simple_response_commands_test.cc @@ -38,37 +38,36 @@ #include "application_manager/commands/commands_test.h" #include "application_manager/mock_application_manager.h" -#include "mobile/delete_command_response.h" +#include "mobile/add_command_response.h" +#include "mobile/add_sub_menu_response.h" #include "mobile/alert_maneuver_response.h" #include "mobile/alert_response.h" -#include "mobile/list_files_response.h" -#include "mobile/subscribe_button_response.h" -#include "mobile/add_sub_menu_response.h" +#include "mobile/change_registration_response.h" +#include "mobile/delete_command_response.h" #include "mobile/dial_number_response.h" #include "mobile/end_audio_pass_thru_response.h" -#include "mobile/unregister_app_interface_response.h" -#include "mobile/unsubscribe_button_response.h" -#include "mobile/unsubscribe_way_points_response.h" -#include "mobile/update_turn_list_response.h" -#include "mobile/slider_response.h" -#include "mobile/speak_response.h" -#include "mobile/subscribe_way_points_response.h" -#include "mobile/system_response.h" +#include "mobile/generic_response.h" #include "mobile/get_way_points_response.h" -#include "mobile/perform_interaction_response.h" +#include "mobile/list_files_response.h" #include "mobile/perform_audio_pass_thru_response.h" +#include "mobile/perform_interaction_response.h" +#include "mobile/scrollable_message_response.h" +#include "mobile/send_location_response.h" +#include "mobile/set_app_icon_response.h" +#include "mobile/set_display_layout_response.h" #include "mobile/set_global_properties_response.h" #include "mobile/set_media_clock_timer_response.h" #include "mobile/show_constant_tbt_response.h" #include "mobile/show_response.h" -#include "mobile/add_command_response.h" -#include "mobile/send_location_response.h" -#include "mobile/set_app_icon_response.h" -#include "mobile/set_display_layout_response.h" -#include "mobile/generic_response.h" -#include "mobile/set_app_icon_response.h" -#include "mobile/scrollable_message_response.h" -#include "mobile/change_registration_response.h" +#include "mobile/slider_response.h" +#include "mobile/speak_response.h" +#include "mobile/subscribe_button_response.h" +#include "mobile/subscribe_way_points_response.h" +#include "mobile/system_response.h" +#include "mobile/unregister_app_interface_response.h" +#include "mobile/unsubscribe_button_response.h" +#include "mobile/unsubscribe_way_points_response.h" +#include "mobile/update_turn_list_response.h" namespace test { namespace components { @@ -120,7 +119,8 @@ typedef Types ResponseCommandsList; + commands::ChangeRegistrationResponse> + ResponseCommandsList; TYPED_TEST_CASE(MobileResponseCommandsTest, ResponseCommandsList); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/slider_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/slider_test.cc index 14e670a387..0450f06ee1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/slider_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/slider_test.cc @@ -31,19 +31,19 @@ */ #include -#include #include +#include #include "mobile/slider_request.h" -#include "gtest/gtest.h" #include "application_manager/commands/command_request_test.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -52,11 +52,11 @@ namespace mobile_commands_test { namespace slider_request { namespace am = application_manager; -using sdl_rpc_plugin::commands::SliderRequest; +using am::MockMessageHelper; using am::commands::CommandImpl; using am::commands::MessageSharedPtr; -using am::MockMessageHelper; using policy_test::MockPolicyHandlerInterface; +using sdl_rpc_plugin::commands::SliderRequest; using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; @@ -337,4 +337,4 @@ TEST_F(SliderRequestTest, OnEvent_UISliderAborted_SUCCESS) { } // namespace mobile_commands_test } // namespace commands_test } // namespace components -} // namespace tests +} // namespace test diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/speak_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/speak_request_test.cc index 5dcbd7e6b9..87320d3a7a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/speak_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/speak_request_test.cc @@ -31,26 +31,26 @@ POSSIBILITY OF SUCH DAMAGE. */ +#include "mobile/speak_request.h" #include #include "gtest/gtest.h" -#include "mobile/speak_request.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" #include "utils/helpers.h" -#include "smart_objects/smart_object.h" -#include "utils/custom_string.h" #include "application_manager/application.h" -#include "application_manager/smart_object_keys.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" +#include "utils/custom_string.h" namespace test { namespace components { @@ -62,24 +62,24 @@ namespace am = application_manager; namespace mobile_result = mobile_apis::Result; namespace hmi_response = ::application_manager::hmi_response; namespace strings = ::application_manager::strings; -using am::commands::CommandImpl; using am::ApplicationManager; -using am::commands::MessageSharedPtr; using am::ApplicationSharedPtr; using am::MockMessageHelper; +using am::commands::CommandImpl; +using am::commands::MessageSharedPtr; using ::testing::_; -using ::testing::Return; -using ::testing::ReturnRef; using sdl_rpc_plugin::commands::SpeakRequest; using ::test::components::application_manager_test::MockApplication; +using ::testing::Return; +using ::testing::ReturnRef; typedef std::shared_ptr CommandPtr; namespace { const uint32_t kAppId = 10u; const uint32_t kConnectionKey = 5u; -} +} // namespace class SpeakRequestTest : public CommandRequestTest { public: @@ -402,5 +402,5 @@ TEST_F(SpeakRequestTest, OnEvent_ApplicationIsNotRegistered_UNSUCCESS) { } // namespace speak_request } // namespace mobile_commands_test } // namespace commands_test -} // namespace component +} // namespace components } // namespace test diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/subscribe_button_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/subscribe_button_request_test.cc index df3e778ee6..01f8f313b6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/subscribe_button_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/subscribe_button_request_test.cc @@ -35,16 +35,16 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_request_test.h" #include "application_manager/application.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_capabilities.h" -#include "mobile/subscribe_button_request.h" -#include "interfaces/MOBILE_API.h" #include "application_manager/smart_object_keys.h" +#include "interfaces/MOBILE_API.h" +#include "mobile/subscribe_button_request.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -53,13 +53,13 @@ namespace mobile_commands_test { namespace subscribe_button_request { using ::testing::_; +using ::testing::DoAll; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::DoAll; using ::testing::SaveArg; namespace am = ::application_manager; -using sdl_rpc_plugin::commands::SubscribeButtonRequest; using am::commands::MessageSharedPtr; +using sdl_rpc_plugin::commands::SubscribeButtonRequest; typedef std::shared_ptr CommandPtr; @@ -199,7 +199,8 @@ TEST_F(SubscribeButtonRequestTest, Run_SUCCESS) { EXPECT_EQ(mobile_apis::Result::SUCCESS, static_cast( (*mobile_result_msg)[am::strings::msg_params] - [am::strings::result_code].asInt())); + [am::strings::result_code] + .asInt())); } TEST_F(SubscribeButtonRequestTest, Run_SUCCESS_App_Base_RPC_Version) { @@ -252,7 +253,8 @@ TEST_F(SubscribeButtonRequestTest, Run_SUCCESS_App_Base_RPC_Version) { EXPECT_EQ(mobile_apis::Result::SUCCESS, static_cast( (*mobile_result_msg)[am::strings::msg_params] - [am::strings::result_code].asInt())); + [am::strings::result_code] + .asInt())); } } // namespace subscribe_button_request diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/subscribe_way_points_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/subscribe_way_points_request_test.cc index d08c13b3f3..56e4e05d48 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/subscribe_way_points_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/subscribe_way_points_request_test.cc @@ -32,17 +32,17 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_request_test.h" #include "application_manager/application.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_capabilities.h" #include "application_manager/mock_message_helper.h" -#include "mobile/subscribe_way_points_request.h" -#include "interfaces/MOBILE_API.h" #include "application_manager/smart_object_keys.h" +#include "interfaces/MOBILE_API.h" +#include "mobile/subscribe_way_points_request.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -52,14 +52,14 @@ namespace subscribe_way_points_request { using ::testing::_; using ::testing::A; +using ::testing::DoAll; +using ::testing::InSequence; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::DoAll; using ::testing::SaveArg; -using ::testing::InSequence; namespace am = ::application_manager; -using sdl_rpc_plugin::commands::SubscribeWayPointsRequest; using am::commands::MessageSharedPtr; +using sdl_rpc_plugin::commands::SubscribeWayPointsRequest; typedef std::shared_ptr CommandPtr; @@ -90,7 +90,8 @@ TEST_F(SubscribeWayPointsRequestTest, Run_SUCCESS) { EXPECT_EQ(mobile_apis::Result::SUCCESS, static_cast( (*mobile_result_msg)[am::strings::msg_params] - [am::strings::result_code].asInt())); + [am::strings::result_code] + .asInt())); } TEST_F(SubscribeWayPointsRequestTest, OnEvent_SUCCESS) { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/system_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/system_request_test.cc index 298661dc74..14441d450e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/system_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/system_request_test.cc @@ -31,18 +31,18 @@ */ #include -#include #include +#include #include "gtest/gtest.h" -#include "mobile/system_request.h" #include "application_manager/commands/command_request_test.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/event_engine/event.h" #include "application_manager/mock_hmi_interface.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "mobile/system_request.h" namespace test { namespace components { @@ -51,13 +51,13 @@ namespace mobile_commands_test { namespace system_request { namespace am = application_manager; -using sdl_rpc_plugin::commands::SystemRequest; +using am::MessageType; +using am::MockHmiInterfaces; using am::commands::CommandImpl; using am::commands::MessageSharedPtr; -using am::MockHmiInterfaces; using am::event_engine::Event; -using am::MessageType; using policy_test::MockPolicyHandlerInterface; +using sdl_rpc_plugin::commands::SystemRequest; using ::testing::_; using ::testing::DoAll; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unregister_app_interface_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unregister_app_interface_request_test.cc index 771374348b..f244acb8d6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unregister_app_interface_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unregister_app_interface_request_test.cc @@ -51,8 +51,8 @@ namespace mobile_result = mobile_apis::Result; using ::testing::_; -using sdl_rpc_plugin::commands::UnregisterAppInterfaceRequest; using am::commands::MessageSharedPtr; +using sdl_rpc_plugin::commands::UnregisterAppInterfaceRequest; typedef std::shared_ptr CommandPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_button_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_button_request_test.cc index 22893b771c..98d20dbbc4 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_button_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_button_request_test.cc @@ -5,8 +5,8 @@ #include "application_manager/commands/command_request_test.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/mock_message_helper.h" #include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/mock_message_helper.h" #include "mobile/unsubscribe_button_request.h" namespace test { @@ -20,8 +20,8 @@ namespace mobile_result = mobile_apis::Result; using ::testing::_; -using sdl_rpc_plugin::commands::UnsubscribeButtonRequest; using am::commands::MessageSharedPtr; +using sdl_rpc_plugin::commands::UnsubscribeButtonRequest; typedef std::shared_ptr CommandPtr; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_way_points_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_way_points_request_test.cc index 05e15a78af..3165d57d44 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_way_points_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_way_points_request_test.cc @@ -34,18 +34,18 @@ #include #include "gtest/gtest.h" -#include "mobile/unsubscribe_way_points_request.h" #include "interfaces/MOBILE_API.h" +#include "mobile/unsubscribe_way_points_request.h" -#include "smart_objects/smart_object.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_request_test.h" #include "application_manager/application.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_message_helper.h" #include "application_manager/smart_object_keys.h" -#include "application_manager/event_engine/event.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -59,8 +59,8 @@ namespace mobile_result = mobile_apis::Result; using ::testing::_; using ::testing::Return; -using sdl_rpc_plugin::commands::UnsubscribeWayPointsRequest; using am::commands::MessageSharedPtr; +using sdl_rpc_plugin::commands::UnsubscribeWayPointsRequest; namespace { const uint32_t kConnectionKey = 3u; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/update_turn_list_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/update_turn_list_request_test.cc index 78fca8681a..44628a8e89 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/update_turn_list_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/update_turn_list_request_test.cc @@ -34,20 +34,20 @@ #include #include "gtest/gtest.h" -#include "mobile/update_turn_list_request.h" #include "interfaces/MOBILE_API.h" +#include "mobile/update_turn_list_request.h" -#include "smart_objects/smart_object.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_request_test.h" #include "application_manager/application.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" -#include "application_manager/mock_message_helper.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/mock_message_helper.h" #include "application_manager/policies/mock_policy_handler_interface.h" #include "application_manager/smart_object_keys.h" -#include "application_manager/event_engine/event.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -59,14 +59,14 @@ namespace am = ::application_manager; namespace mobile_result = mobile_apis::Result; using ::testing::_; +using ::testing::Eq; +using ::testing::Ref; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::Ref; -using ::testing::Eq; -using sdl_rpc_plugin::commands::UpdateTurnListRequest; using am::commands::MessageSharedPtr; using application_manager_test::MockHMICapabilities; +using sdl_rpc_plugin::commands::UpdateTurnListRequest; namespace { const uint32_t kConnectionKey = 3u; @@ -208,7 +208,8 @@ TEST_F(UpdateTurnListRequestTest, Run_ValidTurnList_SUCCESS) { (*command_msg_)[am::strings::msg_params][am::strings::turn_list][0] [am::strings::turn_icon], Eq(mock_app), - Ref(app_mngr_))).WillOnce(Return(mobile_result::SUCCESS)); + Ref(app_mngr_))) + .WillOnce(Return(mobile_result::SUCCESS)); EXPECT_CALL(mock_message_helper_, SubscribeApplicationToSoftButton(_, _, kFunctionId)); @@ -223,8 +224,8 @@ TEST_F(UpdateTurnListRequestTest, Run_ValidTurnList_SUCCESS) { .keyExists(am::hmi_request::navi_text)); EXPECT_TRUE((*result_msg)[am::strings::msg_params][am::strings::turn_list][0] - [am::hmi_request::navi_text].keyExists( - am::hmi_request::field_name)); + [am::hmi_request::navi_text] + .keyExists(am::hmi_request::field_name)); EXPECT_EQ( hmi_apis::Common_TextFieldName::turnText, (*result_msg)[am::strings::msg_params][am::strings::turn_list][0] @@ -232,8 +233,8 @@ TEST_F(UpdateTurnListRequestTest, Run_ValidTurnList_SUCCESS) { .asInt()); EXPECT_TRUE((*result_msg)[am::strings::msg_params][am::strings::turn_list][0] - [am::hmi_request::navi_text].keyExists( - am::hmi_request::field_text)); + [am::hmi_request::navi_text] + .keyExists(am::hmi_request::field_text)); EXPECT_EQ( kNavigationText, (*result_msg)[am::strings::msg_params][am::strings::turn_list][0] @@ -268,7 +269,8 @@ TEST_F(UpdateTurnListRequestTest, Run_ValidTurnList_WARNINGS) { (*command_msg_)[am::strings::msg_params][am::strings::turn_list][0] [am::strings::turn_icon], Eq(mock_app), - Ref(app_mngr_))).WillOnce(Return(mobile_result::WARNINGS)); + Ref(app_mngr_))) + .WillOnce(Return(mobile_result::WARNINGS)); EXPECT_CALL(mock_message_helper_, SubscribeApplicationToSoftButton(_, _, kFunctionId)); @@ -283,8 +285,8 @@ TEST_F(UpdateTurnListRequestTest, Run_ValidTurnList_WARNINGS) { .keyExists(am::hmi_request::navi_text)); EXPECT_TRUE((*result_msg)[am::strings::msg_params][am::strings::turn_list][0] - [am::hmi_request::navi_text].keyExists( - am::hmi_request::field_name)); + [am::hmi_request::navi_text] + .keyExists(am::hmi_request::field_name)); EXPECT_EQ( hmi_apis::Common_TextFieldName::turnText, (*result_msg)[am::strings::msg_params][am::strings::turn_list][0] @@ -292,8 +294,8 @@ TEST_F(UpdateTurnListRequestTest, Run_ValidTurnList_WARNINGS) { .asInt()); EXPECT_TRUE((*result_msg)[am::strings::msg_params][am::strings::turn_list][0] - [am::hmi_request::navi_text].keyExists( - am::hmi_request::field_text)); + [am::hmi_request::navi_text] + .keyExists(am::hmi_request::field_text)); EXPECT_EQ( kNavigationText, (*result_msg)[am::strings::msg_params][am::strings::turn_list][0] diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/on_vi_vehicle_data_notification.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/on_vi_vehicle_data_notification.h index 1fb9c0a008..103bfb56dc 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/on_vi_vehicle_data_notification.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/on_vi_vehicle_data_notification.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_VEHICLE_DATA_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_VEHICLE_DATA_NOTIFICATION_H_ -#include "application_manager/commands/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/notification_from_hmi.h" namespace vehicle_info_plugin { namespace app_mngr = application_manager; @@ -76,6 +76,6 @@ class OnVIVehicleDataNotification } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_VI_VEHICLE_DATA_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_diagnostic_message_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_diagnostic_message_request.h index 0b0a9ef99e..162a6b338a 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_diagnostic_message_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_diagnostic_message_request.h @@ -73,6 +73,6 @@ class VIDiagnosticMessageRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_DIAGNOSTIC_MESSAGE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_diagnostic_message_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_diagnostic_message_response.h index 31fc73897e..a427bbe362 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_diagnostic_message_response.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_diagnostic_message_response.h @@ -73,6 +73,6 @@ class VIDiagnosticMessageResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_DIAGNOSTIC_MESSAGE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_dtcs_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_dtcs_request.h index 67308a3898..df9e84eab4 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_dtcs_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_dtcs_request.h @@ -72,6 +72,6 @@ class VIGetDTCsRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_DTCS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_dtcs_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_dtcs_response.h index 0ddf225c93..d8351c1a61 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_dtcs_response.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_dtcs_response.h @@ -72,6 +72,6 @@ class VIGetDTCsResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_DTCS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_request.h index 1b4669cf24..437e7c8933 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_request.h @@ -72,6 +72,6 @@ class VIGetVehicleDataRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_response.h index df5e630aea..651a0af79c 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_response.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_response.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_H_ -#include "application_manager/commands/response_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/response_from_hmi.h" namespace vehicle_info_plugin { namespace app_mngr = application_manager; @@ -73,6 +73,6 @@ class VIGetVehicleDataResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_request.h index 79a5270f8d..1166d3f774 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_request.h @@ -72,6 +72,6 @@ class VIGetVehicleTypeRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_TYPE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_response.h index baa4a936ae..00c1944c0f 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_response.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_response.h @@ -73,6 +73,6 @@ class VIGetVehicleTypeResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_TYPE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_is_ready_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_is_ready_request.h index 3f12a30c8d..7a8ca3a4b6 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_is_ready_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_is_ready_request.h @@ -88,6 +88,6 @@ class VIIsReadyRequest : public app_mngr::commands::RequestToHMI, } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_IS_READY_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_is_ready_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_is_ready_response.h index 3531aa03c4..e0ff20b8bb 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_is_ready_response.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_is_ready_response.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_IS_READY_RESPONSE_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_IS_READY_RESPONSE_H_ -#include "application_manager/commands/response_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/commands/response_from_hmi.h" namespace vehicle_info_plugin { namespace app_mngr = application_manager; @@ -73,6 +73,6 @@ class VIIsReadyResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_IS_READY_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_read_did_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_read_did_request.h index 2d10bbf11d..1e91a4c3af 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_read_did_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_read_did_request.h @@ -72,6 +72,6 @@ class VIReadDIDRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_READ_DID_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_read_did_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_read_did_response.h index 5ac655b499..f659f7ae87 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_read_did_response.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_read_did_response.h @@ -72,6 +72,6 @@ class VIReadDIDResponse : public app_mngr::commands::ResponseFromHMI { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_READ_DID_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h index bd22a313e7..dab5989e9e 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h @@ -73,6 +73,6 @@ class VISubscribeVehicleDataRequest : public app_mngr::commands::RequestToHMI { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h index 1148a8b41a..8eea8d0cfa 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h @@ -74,6 +74,6 @@ class VISubscribeVehicleDataResponse } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h index 3b39835fbf..a8ebf34ea2 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h @@ -74,6 +74,6 @@ class VIUnsubscribeVehicleDataRequest } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h index ada6896520..780d1e9eae 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h @@ -74,6 +74,6 @@ class VIUnsubscribeVehicleDataResponse } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_request.h index e2bc7c4dfd..bd9ce31325 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_request.h @@ -80,6 +80,6 @@ class DiagnosticMessageRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DIAGNOSTIC_MESSAGE_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_response.h index d69a6a0155..7b6364fe41 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_response.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_response.h @@ -74,6 +74,6 @@ class DiagnosticMessageResponse }; } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DIAGNOSTIC_MESSAGE_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_dtcs_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_dtcs_request.h index 01f007697d..9175900610 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_dtcs_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_dtcs_request.h @@ -80,6 +80,6 @@ class GetDTCsRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_DTCS_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_dtcs_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_dtcs_response.h index 87024b1860..473174fd0d 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_dtcs_response.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_dtcs_response.h @@ -73,6 +73,6 @@ class GetDTCsResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_DTCS_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_request.h index 04a131da8f..ff04ca1e2c 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_request.h @@ -77,6 +77,6 @@ class GetVehicleDataRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_VEHICLE_DATA_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_response.h index 22ec1a5a78..25fd27b67c 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_response.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_response.h @@ -73,6 +73,6 @@ class GetVehicleDataResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_GET_VEHICLE_DATA_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/on_vehicle_data_notification.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/on_vehicle_data_notification.h index 57c30164e4..ce1b732775 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/on_vehicle_data_notification.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/on_vehicle_data_notification.h @@ -34,8 +34,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_VEHICLE_DATA_NOTIFICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_VEHICLE_DATA_NOTIFICATION_H_ -#include "application_manager/commands/command_notification_impl.h" #include "application_manager/application.h" +#include "application_manager/commands/command_notification_impl.h" #include "utils/macro.h" namespace vehicle_info_plugin { @@ -83,6 +83,6 @@ class OnVehicleDataNotification }; } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_ON_VEHICLE_DATA_NOTIFICATION_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/read_did_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/read_did_request.h index 9a8fbbd62e..d006cf02ef 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/read_did_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/read_did_request.h @@ -80,6 +80,6 @@ class ReadDIDRequest : public app_mngr::commands::CommandRequestImpl { }; } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_READ_DID_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/read_did_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/read_did_response.h index 2b7ab04768..d3c0e14c93 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/read_did_response.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/read_did_response.h @@ -73,6 +73,6 @@ class ReadDIDResponse : public app_mngr::commands::CommandResponseImpl { }; } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_READ_DID_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h index 7c6e1754da..2671173ba3 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h @@ -37,8 +37,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_ -#include "application_manager/commands/command_request_impl.h" #include "application_manager/application.h" +#include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" #include "vehicle_info_plugin/vehicle_info_app_extension.h" @@ -153,6 +153,6 @@ class SubscribeVehicleDataRequest }; } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_response.h index 60670afee1..2212af0846 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_response.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_response.h @@ -75,6 +75,6 @@ class SubscribeVehicleDataResponse }; } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_SUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h index e04d1fb97a..b246dbc9ef 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h @@ -34,8 +34,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_ -#include "application_manager/commands/command_request_impl.h" #include "application_manager/application.h" +#include "application_manager/commands/command_request_impl.h" #include "utils/macro.h" #include "vehicle_info_plugin/vehicle_info_app_extension.h" @@ -115,6 +115,6 @@ class UnsubscribeVehicleDataRequest }; } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_response.h index 397ae3cbce..67f09a68a8 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_response.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_response.h @@ -75,6 +75,6 @@ class UnsubscribeVehicleDataResponse }; } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_H_ diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_app_extension.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_app_extension.h index ead6af841f..b3ba768b1b 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_app_extension.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_app_extension.h @@ -61,11 +61,11 @@ class VehicleInfoAppExtension : public app_mngr::AppExtension { virtual ~VehicleInfoAppExtension(); /** - * @brief subscribeToVehicleInfo add vehicle_data to list of subscriptions of - * application extension - * @param vehicle_data data to subscribe - * @return true in case if subscription is successful - */ + * @brief subscribeToVehicleInfo add vehicle_data to list of subscriptions of + * application extension + * @param vehicle_data data to subscribe + * @return true in case if subscription is successful + */ bool subscribeToVehicleInfo(const VehicleDataType vehicle_data); /** @@ -130,6 +130,6 @@ class VehicleInfoAppExtension : public app_mngr::AppExtension { VehicleInfoPlugin& plugin_; app_mngr::Application& app_; }; -} +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_INCLUDE_VEHICLE_INFO_PLUGIN_VEHICLE_INFO_APP_EXTENSION_H diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h index e36611dfa6..58100ba1ae 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h @@ -65,6 +65,6 @@ class VehicleInfoCommandFactory : public app_mngr::CommandFactory { std::unique_ptr hmi_command_factory_; std::unique_ptr mob_command_factory_; }; -} +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_INCLUDE_VEHICLE_INFO_PLUGIN_VEHICLE_INFO_COMMAND_FACTORY_H diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_hmi_command_factory.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_hmi_command_factory.h index 412949eedb..c927f3f2bb 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_hmi_command_factory.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_hmi_command_factory.h @@ -68,6 +68,6 @@ class VehicleInfoHmiCommandFactory : public app_mngr::CommandFactory { DISALLOW_COPY_AND_ASSIGN(VehicleInfoHmiCommandFactory); }; -} +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_INCLUDE_VEHICLE_INFO_PLUGIN_VEHICLE_INFO_HMI_COMMAND_FACTORY_H diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_mobile_command_factory.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_mobile_command_factory.h index 6cfc77a41c..9743aee769 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_mobile_command_factory.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_mobile_command_factory.h @@ -68,6 +68,6 @@ class VehicleInfoMobileCommandFactory : public app_mngr::CommandFactory { DISALLOW_COPY_AND_ASSIGN(VehicleInfoMobileCommandFactory); }; -} +} // namespace vehicle_info_plugin #endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_INCLUDE_VEHICLE_INFO_PLUGIN_VEHICLE_INFO_MOBILE_COMMAND_FACTORY_H diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h index b15b7006e6..d0e4926a65 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h @@ -75,7 +75,7 @@ class VehicleInfoPlugin : public plugins::RPCPlugin { std::unique_ptr command_factory_; app_mngr::ApplicationManager* application_manager_; }; -} +} // namespace vehicle_info_plugin extern "C" application_manager::plugin_manager::RPCPlugin* Create(); diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc index 6125c4ee45..23dd3da879 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc @@ -72,4 +72,4 @@ void OnVIVehicleDataNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_diagnostic_message_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_diagnostic_message_request.cc index 8d3b9f13fb..97d035a20b 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_diagnostic_message_request.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_diagnostic_message_request.cc @@ -59,4 +59,4 @@ void VIDiagnosticMessageRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_diagnostic_message_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_diagnostic_message_response.cc index e22ba7ddb2..f4079fc6fd 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_diagnostic_message_response.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_diagnostic_message_response.cc @@ -63,4 +63,4 @@ void VIDiagnosticMessageResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_dtcs_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_dtcs_request.cc index 71ce6331ab..d67d0909a9 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_dtcs_request.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_dtcs_request.cc @@ -59,4 +59,4 @@ void VIGetDTCsRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_dtcs_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_dtcs_response.cc index 9d39c60796..494e779c4d 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_dtcs_response.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_dtcs_response.cc @@ -62,4 +62,4 @@ void VIGetDTCsResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc index 9fc48c8820..e2c1ed4e3a 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc @@ -59,4 +59,4 @@ void VIGetVehicleDataRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc index 73ba1a94fe..a4b778a487 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc @@ -86,4 +86,4 @@ void VIGetVehicleDataResponse::Run() { } } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc index a1a221220a..96d27a120b 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc @@ -59,4 +59,4 @@ void VIGetVehicleTypeRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc index 9f14b4e7ea..add55f9a40 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc @@ -61,4 +61,4 @@ void VIGetVehicleTypeResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_is_ready_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_is_ready_request.cc index 04bcc435ba..6479676094 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_is_ready_request.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_is_ready_request.cc @@ -31,8 +31,8 @@ */ #include "vehicle_info_plugin/commands/hmi/vi_is_ready_request.h" -#include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" +#include "application_manager/rpc_service.h" namespace vehicle_info_plugin { using namespace application_manager; @@ -109,4 +109,4 @@ void VIIsReadyRequest::SendMessageToHMI() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_is_ready_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_is_ready_response.cc index 35907e11d2..0db30afb87 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_is_ready_response.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_is_ready_response.cc @@ -59,4 +59,4 @@ void VIIsReadyResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_read_did_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_read_did_request.cc index b55c9e32a0..fbcc59849d 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_read_did_request.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_read_did_request.cc @@ -59,4 +59,4 @@ void VIReadDIDRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_read_did_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_read_did_response.cc index 9d56b2aa78..0b8d0f3055 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_read_did_response.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_read_did_response.cc @@ -61,4 +61,4 @@ void VIReadDIDResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc index 60e9dc88c3..84e41a26dc 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc @@ -59,4 +59,4 @@ void VISubscribeVehicleDataRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc index f004d6f3cd..25d876a125 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc @@ -60,4 +60,4 @@ void VISubscribeVehicleDataResponse::Run() { } } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc index 9056538514..50565e95d2 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc @@ -59,4 +59,4 @@ void VIUnsubscribeVehicleDataRequest::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc index 348bc1b269..722073edc7 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc @@ -60,4 +60,4 @@ void VIUnsubscribeVehicleDataResponse::Run() { } } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_request.cc index 4eba894025..a1dfe1e936 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_request.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_request.cc @@ -31,13 +31,13 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include #include "vehicle_info_plugin/commands/mobile/diagnostic_message_request.h" +#include #include "application_manager/application_impl.h" -#include "interfaces/HMI_API.h" #include "application_manager/message_helper.h" +#include "interfaces/HMI_API.h" namespace vehicle_info_plugin { using namespace application_manager; @@ -127,4 +127,4 @@ void DiagnosticMessageRequest::on_event(const event_engine::Event& event) { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_response.cc index 54d8382f5d..f5ad1c89a2 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_response.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_response.cc @@ -61,4 +61,4 @@ void DiagnosticMessageResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_request.cc index 6c04e874e8..af941e3ea7 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_request.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_request.cc @@ -34,8 +34,8 @@ #include "vehicle_info_plugin/commands/mobile/get_dtcs_request.h" #include "application_manager/application_impl.h" -#include "interfaces/HMI_API.h" #include "application_manager/message_helper.h" +#include "interfaces/HMI_API.h" namespace vehicle_info_plugin { using namespace application_manager; @@ -116,4 +116,4 @@ void GetDTCsRequest::on_event(const event_engine::Event& event) { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_response.cc index 3686094b73..894c564a0b 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_response.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_response.cc @@ -61,4 +61,4 @@ void GetDTCsResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_request.cc index 87a9ace377..8d762e30e5 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_request.cc @@ -31,13 +31,13 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include #include "vehicle_info_plugin/commands/mobile/get_vehicle_data_request.h" +#include #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" -#include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" namespace vehicle_info_plugin { using namespace application_manager; @@ -144,4 +144,4 @@ void GetVehicleDataRequest::on_event(const event_engine::Event& event) { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_response.cc index 3a7d663756..f634915354 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_response.cc @@ -62,4 +62,4 @@ void GetVehicleDataResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc index f8553c84f8..6ef76ad125 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc @@ -34,11 +34,11 @@ #include "vehicle_info_plugin/commands/mobile/on_vehicle_data_notification.h" #include "application_manager/application_impl.h" +#include "application_manager/helpers/application_helper.h" #include "application_manager/message_helper.h" #include "interfaces/MOBILE_API.h" -#include "vehicle_info_plugin/vehicle_info_app_extension.h" -#include "application_manager/helpers/application_helper.h" #include "utils/macro.h" +#include "vehicle_info_plugin/vehicle_info_app_extension.h" namespace vehicle_info_plugin { using namespace application_manager; @@ -133,4 +133,4 @@ void OnVehicleDataNotification::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_request.cc index 010cce4c63..ed83f53516 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_request.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_request.cc @@ -30,13 +30,13 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include #include "vehicle_info_plugin/commands/mobile/read_did_request.h" +#include #include "application_manager/application_impl.h" -#include "interfaces/MOBILE_API.h" -#include "interfaces/HMI_API.h" #include "application_manager/message_helper.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" namespace vehicle_info_plugin { using namespace application_manager; @@ -131,4 +131,4 @@ void ReadDIDRequest::on_event(const event_engine::Event& event) { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_response.cc index 82d49574f0..f0b9e3097a 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_response.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_response.cc @@ -61,4 +61,4 @@ void ReadDIDResponse::Run() { } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc index 65f4fde0b2..815ffeb3d2 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc @@ -325,9 +325,8 @@ void SubscribeVehicleDataRequest::CheckVISubscriptions( } const bool is_everything_already_subscribed = - items_to_subscribe == - vi_already_subscribed_by_another_apps_.size() + - vi_already_subscribed_by_this_app_.size(); + items_to_subscribe == vi_already_subscribed_by_another_apps_.size() + + vi_already_subscribed_by_this_app_.size(); if (0 == items_to_subscribe) { if (HasDisallowedParams()) { @@ -357,4 +356,4 @@ void SubscribeVehicleDataRequest::CheckVISubscriptions( } } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc index 2bea839320..b0d09e1a5b 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc @@ -32,8 +32,8 @@ */ #include "vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_response.h" -#include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" +#include "application_manager/rpc_service.h" #include "interfaces/MOBILE_API.h" namespace vehicle_info_plugin { @@ -60,4 +60,4 @@ void SubscribeVehicleDataResponse::Run() { } } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc index d0152ea0c3..40bd9182e7 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc @@ -36,9 +36,9 @@ #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" -#include "interfaces/MOBILE_API.h" -#include "interfaces/HMI_API.h" #include "application_manager/smart_object_keys.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" #include "utils/helpers.h" #include "vehicle_info_plugin/vehicle_info_app_extension.h" @@ -284,4 +284,4 @@ void UnsubscribeVehicleDataRequest::AddAlreadyUnsubscribedVI( } } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc index 5f79785784..a4a486a5e7 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc @@ -67,4 +67,4 @@ void UnsubscribeVehicleDataResponse::Run() { } } // namespace commands -} // namespace application_manager +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc index 3b1d411841..730812e9c8 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc @@ -122,4 +122,4 @@ VehicleInfoAppExtension& VehicleInfoAppExtension::ExtractVIExtension( DCHECK(vi_app_extension); return *vi_app_extension; } -} +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc index 0c6e0a07b1..617925589f 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc @@ -69,4 +69,4 @@ bool VehicleInfoCommandFactory::IsAbleToProcess( ? hmi_command_factory_->IsAbleToProcess(function_id, source) : mob_command_factory_->IsAbleToProcess(function_id, source); } -} +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_hmi_command_factory.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_hmi_command_factory.cc index 9311cea6d7..dd3b43920a 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_hmi_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_hmi_command_factory.cc @@ -41,6 +41,8 @@ #include "vehicle_info_plugin/commands/hmi/vi_get_dtcs_response.h" #include "vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_request.h" #include "vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_response.h" +#include "vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_request.h" +#include "vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_response.h" #include "vehicle_info_plugin/commands/hmi/vi_is_ready_request.h" #include "vehicle_info_plugin/commands/hmi/vi_is_ready_response.h" #include "vehicle_info_plugin/commands/hmi/vi_read_did_request.h" @@ -49,8 +51,6 @@ #include "vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h" #include "vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h" #include "vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h" -#include "vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_request.h" -#include "vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_response.h" CREATE_LOGGERPTR_GLOBAL(logger_, "VehicleInfoPlugin") @@ -153,4 +153,4 @@ app_mngr::CommandCreator& VehicleInfoHmiCommandFactory::buildCommandCreator( return factory.GetCreator(); } } -} +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_mobile_command_factory.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_mobile_command_factory.cc index 7600afa091..7d1d25560a 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_mobile_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_mobile_command_factory.cc @@ -141,4 +141,4 @@ app_mngr::CommandCreator& VehicleInfoMobileCommandFactory::buildCommandCreator( return factory.GetCreator(); } } -} +} // namespace vehicle_info_plugin diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc index c9e9839929..70210f704e 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc @@ -31,12 +31,11 @@ */ #include "vehicle_info_plugin/vehicle_info_plugin.h" -#include "vehicle_info_plugin/vehicle_info_command_factory.h" -#include "vehicle_info_plugin/vehicle_info_app_extension.h" +#include "application_manager/message_helper.h" #include "application_manager/plugin_manager/plugin_keys.h" #include "application_manager/smart_object_keys.h" -#include "application_manager/message_helper.h" -#include "application_manager/message_helper.h" +#include "vehicle_info_plugin/vehicle_info_app_extension.h" +#include "vehicle_info_plugin/vehicle_info_command_factory.h" namespace vehicle_info_plugin { CREATE_LOGGERPTR_GLOBAL(logger_, "VehicleInfoPlugin") @@ -162,7 +161,7 @@ void VehicleInfoPlugin::DeleteSubscriptions( } } } -} +} // namespace vehicle_info_plugin extern "C" application_manager::plugin_manager::RPCPlugin* Create() { return new vehicle_info_plugin::VehicleInfoPlugin(); diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_get_vehicle_data_response_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_get_vehicle_data_response_test.cc index 0508f0cdd6..575df4ce50 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_get_vehicle_data_response_test.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_get_vehicle_data_response_test.cc @@ -36,17 +36,17 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/application.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/event_engine/event.h" #include "application_manager/message_helper.h" -#include "application_manager/mock_message_helper.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/event_engine/event.h" #include "application_manager/mock_event_dispatcher.h" +#include "application_manager/mock_message_helper.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" #include "hmi/vi_get_vehicle_data_response.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -61,9 +61,9 @@ namespace am = ::application_manager; namespace strings = ::application_manager::strings; namespace hmi_response = am::hmi_response; using am::commands::MessageSharedPtr; -using vehicle_info_plugin::commands::VIGetVehicleDataResponse; using am::event_engine::Event; using test::components::event_engine_test::MockEventDispatcher; +using vehicle_info_plugin::commands::VIGetVehicleDataResponse; typedef std::shared_ptr VIGetVehicleDataResponsePtr; diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_is_ready_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_is_ready_request_test.cc index 679d9d0e58..8c77b492ee 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_is_ready_request_test.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_is_ready_request_test.cc @@ -34,16 +34,16 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/commands/command_request_test.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/event_engine/event.h" #include "application_manager/hmi_interfaces.h" -#include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_hmi_capabilities.h" -#include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/mock_hmi_interface.h" #include "application_manager/mock_message_helper.h" -#include "application_manager/event_engine/event.h" +#include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -52,12 +52,12 @@ namespace hmi_commands_test { namespace vi_is_ready_request { using ::testing::_; -using ::testing::ReturnRef; using ::testing::Return; +using ::testing::ReturnRef; namespace am = ::application_manager; using am::commands::MessageSharedPtr; -using vehicle_info_plugin::commands::VIIsReadyRequest; using am::event_engine::Event; +using vehicle_info_plugin::commands::VIIsReadyRequest; typedef std::shared_ptr VIIsReadyRequestPtr; diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/diagnostic_message_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/diagnostic_message_request_test.cc index b27a306a5c..3763e033fc 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/diagnostic_message_request_test.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/diagnostic_message_request_test.cc @@ -36,16 +36,16 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_request_test.h" #include "application_manager/application.h" -#include "application_manager/mock_application_manager.h" -#include "application_manager/mock_application.h" +#include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/event_engine/event.h" +#include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_message_helper.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" #include "vehicle_info_plugin/commands/mobile/diagnostic_message_request.h" namespace test { @@ -59,8 +59,8 @@ using ::testing::Return; using ::testing::ReturnRef; namespace am = ::application_manager; using am::commands::MessageSharedPtr; -using vehicle_info_plugin::commands::DiagnosticMessageRequest; using am::event_engine::Event; +using vehicle_info_plugin::commands::DiagnosticMessageRequest; namespace mobile_result = mobile_apis::Result; typedef std::shared_ptr DiagnosticMessageRequestPtr; diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_dtcs_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_dtcs_request_test.cc index 981d649a94..1575fe2bd8 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_dtcs_request_test.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_dtcs_request_test.cc @@ -36,17 +36,17 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_request_test.h" #include "application_manager/application.h" -#include "application_manager/mock_application_manager.h" -#include "application_manager/mock_application.h" +#include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/event_engine/event.h" -#include "mobile/get_dtcs_request.h" +#include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_message_helper.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/MOBILE_API.h" +#include "mobile/get_dtcs_request.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -57,11 +57,11 @@ namespace get_dtcs_request { using ::testing::_; using ::testing::Return; namespace am = ::application_manager; +using am::MockMessageHelper; using am::commands::MessageSharedPtr; -using vehicle_info_plugin::commands::GetDTCsRequest; using am::event_engine::Event; -using am::MockMessageHelper; using testing::Mock; +using vehicle_info_plugin::commands::GetDTCsRequest; namespace mobile_result = mobile_apis::Result; typedef std::shared_ptr GetDTCsRequestPtr; diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_vehicle_data_request_test.cc index cb78e44904..ed9fe9d1c0 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_vehicle_data_request_test.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_vehicle_data_request_test.cc @@ -36,17 +36,17 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_request_test.h" #include "application_manager/application.h" +#include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/event_engine/event.h" #include "application_manager/message_helper.h" -#include "application_manager/mock_message_helper.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/event_engine/event.h" -#include "mobile/get_vehicle_data_request.h" +#include "application_manager/mock_message_helper.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/MOBILE_API.h" +#include "mobile/get_vehicle_data_request.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -59,8 +59,8 @@ using ::testing::Return; using ::testing::ReturnRef; namespace am = ::application_manager; using am::commands::MessageSharedPtr; -using vehicle_info_plugin::commands::GetVehicleDataRequest; using am::event_engine::Event; +using vehicle_info_plugin::commands::GetVehicleDataRequest; namespace mobile_result = mobile_apis::Result; typedef std::shared_ptr GetVehicleDataRequestPtr; diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/on_vehicle_data_notification_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/on_vehicle_data_notification_test.cc index 1e8a289637..7081746f28 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/on_vehicle_data_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/on_vehicle_data_notification_test.cc @@ -31,19 +31,19 @@ */ #include -#include #include +#include #include "gtest/gtest.h" #include "mobile/on_vehicle_data_notification.h" -#include "utils/custom_string.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_impl.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/message_helper.h" #include "application_manager/mock_message_helper.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" +#include "utils/custom_string.h" #include "utils/helpers.h" namespace test { diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc index c0a07fb57c..baf75bd93b 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc @@ -35,17 +35,17 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/commands/commands_test.h" -#include "application_manager/commands/command_request_test.h" #include "application_manager/application.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" +#include "application_manager/event_engine/event.h" #include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_message_helper.h" -#include "interfaces/MOBILE_API.h" -#include "interfaces/HMI_API.h" #include "application_manager/smart_object_keys.h" -#include "application_manager/event_engine/event.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" #include "vehicle_info_plugin/commands/mobile/read_did_request.h" namespace test { @@ -59,9 +59,9 @@ using ::testing::DoAll; using ::testing::Return; using ::testing::SaveArg; namespace am = ::application_manager; -using vehicle_info_plugin::commands::ReadDIDRequest; using am::commands::MessageSharedPtr; using am::event_engine::Event; +using vehicle_info_plugin::commands::ReadDIDRequest; class ReadDIDRequestTest : public CommandRequestTest {}; diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_request_test.cc index 165c7694b1..0126e7c762 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_request_test.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_request_test.cc @@ -39,8 +39,8 @@ #include "application_manager/mock_application_manager.h" #include "application_manager/mock_message_helper.h" #include "mobile/unsubscribe_vehicle_data_request.h" -#include "vehicle_info_plugin/vehicle_info_plugin.h" #include "vehicle_info_plugin/vehicle_info_app_extension.h" +#include "vehicle_info_plugin/vehicle_info_plugin.h" namespace test { namespace components { @@ -53,8 +53,8 @@ namespace mobile_result = mobile_apis::Result; using ::testing::_; -using vehicle_info_plugin::commands::UnsubscribeVehicleDataRequest; using am::commands::MessageSharedPtr; +using vehicle_info_plugin::commands::UnsubscribeVehicleDataRequest; typedef std::shared_ptr CommandPtr; @@ -152,7 +152,8 @@ TEST_F(UnsubscribeVehicleRequestTest, ManageHMICommand( HMIResultCodeIs( hmi_apis::FunctionID::VehicleInfo_UnsubscribeVehicleData), - _)).WillOnce(Return(true)); + _)) + .WillOnce(Return(true)); vehicle_info_plugin::VehicleInfoAppExtension* vi_app_extension = dynamic_cast( vi_app_extension_ptr_.get()); diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_response_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_response_test.cc index a0d4699de8..89dbfe1cdb 100644 --- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_response_test.cc +++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_response_test.cc @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "mobile/unsubscribe_vehicle_data_response.h" #include #include #include "gtest/gtest.h" +#include "mobile/unsubscribe_vehicle_data_response.h" #include "application_manager/commands/commands_test.h" #include "application_manager/mock_application_manager.h" @@ -50,8 +50,8 @@ using ::testing::_; using ::testing::NotNull; using ::testing::Types; -using vehicle_info_plugin::commands::UnsubscribeVehicleDataResponse; using commands::MessageSharedPtr; +using vehicle_info_plugin::commands::UnsubscribeVehicleDataResponse; namespace am = ::application_manager; class UnsubscribeVehicleResponseTest diff --git a/src/components/application_manager/src/app_launch/app_launch_ctrl_impl.cc b/src/components/application_manager/src/app_launch/app_launch_ctrl_impl.cc index 8df3d436bd..691f8d3259 100644 --- a/src/components/application_manager/src/app_launch/app_launch_ctrl_impl.cc +++ b/src/components/application_manager/src/app_launch/app_launch_ctrl_impl.cc @@ -29,14 +29,14 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "application_manager/app_launch/app_launch_ctrl_impl.h" #include +#include #include #include -#include "application_manager/app_launch/app_launch_ctrl_impl.h" +#include "application_manager/application.h" #include "application_manager/resumption/resume_ctrl.h" #include "connection_handler/connection_handler.h" -#include "application_manager/application.h" #include "utils/timer_task_impl.h" namespace app_launch { diff --git a/src/components/application_manager/src/app_launch/app_launch_data_db.cc b/src/components/application_manager/src/app_launch/app_launch_data_db.cc index 22d2790183..a931b96fa1 100644 --- a/src/components/application_manager/src/app_launch/app_launch_data_db.cc +++ b/src/components/application_manager/src/app_launch/app_launch_data_db.cc @@ -29,14 +29,14 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include #include "application_manager/app_launch/app_launch_data_db.h" -#include "application_manager/application_manager.h" #include "application_manager/app_launch/app_launch_sql_queries.h" -#include "application_manager/smart_object_keys.h" +#include "application_manager/application_manager.h" #include "application_manager/message_helper.h" +#include "application_manager/smart_object_keys.h" namespace app_launch { CREATE_LOGGERPTR_GLOBAL(logger_, "AppLaunch") @@ -332,9 +332,9 @@ uint32_t AppLaunchDataDB::GetCurentNumberOfAppData() const { "Values of ignition off counts were updated successfully"); number_of_app_data = query.GetInteger(result_query); - LOG4CXX_DEBUG(logger_, - "Total cout saved mobile applications is " - << number_of_app_data); + LOG4CXX_DEBUG( + logger_, + "Total cout saved mobile applications is " << number_of_app_data); } else { LOG4CXX_WARN(logger_, "Failed execute query 'kGetNumberOfApplicationData'. Reson: " @@ -392,4 +392,4 @@ utils::dbms::SQLDatabase* AppLaunchDataDB::db() const { #endif // __QNX__ } -} // namespace resumption +} // namespace app_launch diff --git a/src/components/application_manager/src/app_launch/app_launch_data_json.cc b/src/components/application_manager/src/app_launch/app_launch_data_json.cc index d3e3b7d445..984997e424 100644 --- a/src/components/application_manager/src/app_launch/app_launch_data_json.cc +++ b/src/components/application_manager/src/app_launch/app_launch_data_json.cc @@ -29,13 +29,13 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include #include "application_manager/app_launch/app_launch_data_json.h" +#include #include "application_manager/smart_object_keys.h" #include "smart_objects/smart_object.h" -#include "utils/date_time.h" #include "json/json.h" +#include "utils/date_time.h" namespace app_launch { @@ -277,4 +277,4 @@ bool AppLaunchDataJson::Persist() { return true; } -} // app_launch +} // namespace app_launch diff --git a/src/components/application_manager/src/app_launch/app_launch_sql_queries.cc b/src/components/application_manager/src/app_launch/app_launch_sql_queries.cc index cc4765e6c9..7a9402d35e 100644 --- a/src/components/application_manager/src/app_launch/app_launch_sql_queries.cc +++ b/src/components/application_manager/src/app_launch/app_launch_sql_queries.cc @@ -75,4 +75,4 @@ const std::string kRefreshApplicationDataSessionTime = "SET `last_session` = STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')" "WHERE `deviceMac` = ? AND appID = ? AND bundleID = ?;"; -} // namespace resumption +} // namespace app_launch diff --git a/src/components/application_manager/src/app_launch/apps_launcher.cc b/src/components/application_manager/src/app_launch/apps_launcher.cc index f3851482c1..993a57364e 100644 --- a/src/components/application_manager/src/app_launch/apps_launcher.cc +++ b/src/components/application_manager/src/app_launch/apps_launcher.cc @@ -1,8 +1,8 @@ -#include #include "application_manager/app_launch/apps_launcher.h" +#include -#include "utils/timer_task_impl.h" #include +#include "utils/timer_task_impl.h" namespace app_launch { struct LauncherGenerator { diff --git a/src/components/application_manager/src/app_launch/device_apps_launcher.cc b/src/components/application_manager/src/app_launch/device_apps_launcher.cc index a4468d87bc..9a7a6658fe 100644 --- a/src/components/application_manager/src/app_launch/device_apps_launcher.cc +++ b/src/components/application_manager/src/app_launch/device_apps_launcher.cc @@ -1,15 +1,15 @@ +#include #include #include -#include -#include "application_manager/app_launch/device_apps_launcher.h" #include "application_manager/app_launch/app_launch_data.h" #include "application_manager/app_launch/apps_launcher.h" +#include "application_manager/app_launch/device_apps_launcher.h" #include "application_manager/resumption/resume_ctrl.h" +#include #include "utils/timer.h" #include "utils/timer_task_impl.h" -#include namespace app_launch { CREATE_LOGGERPTR_GLOBAL(logger_, "AppLaunch") @@ -58,9 +58,9 @@ class Launcher { device_launcher_.settings().wait_time_between_apps(), timer::kSingleShot); } else { - LOG4CXX_DEBUG(logger_, - "All Apps on " << apps_on_device_->first - << " postponed launched"); + LOG4CXX_DEBUG( + logger_, + "All Apps on " << apps_on_device_->first << " postponed launched"); device_launcher_.StopLaunchingAppsOnDevice(apps_on_device_->first); } } diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc index 3d17da51ce..cecd9865cf 100644 --- a/src/components/application_manager/src/application_impl.cc +++ b/src/components/application_manager/src/application_impl.cc @@ -31,21 +31,21 @@ */ #include "application_manager/application_impl.h" -#include #include -#include "application_manager/message_helper.h" -#include "protocol_handler/protocol_handler.h" +#include #include "application_manager/application_manager.h" +#include "application_manager/message_helper.h" #include "config_profile/profile.h" #include "interfaces/MOBILE_API.h" +#include "protocol_handler/protocol_handler.h" #include "utils/file_system.h" -#include "utils/logger.h" #include "utils/gen_hash.h" +#include "utils/logger.h" -#include "utils/timer_task_impl.h" #include "application_manager/policies/policy_handler_interface.h" #include "application_manager/resumption/resume_ctrl.h" #include "transport_manager/common.h" +#include "utils/timer_task_impl.h" namespace { @@ -849,8 +849,9 @@ bool ApplicationImpl::AreCommandLimitsExceeded( "Time Info: " << "\n Current: " << date_time::getSecs(current) << "\n Limit: (" << date_time::getSecs(limit.first) - << "," << limit.second << ")" - "\n frequency_restrictions: (" + << "," << limit.second + << ")" + "\n frequency_restrictions: (" << frequency_restrictions.first << "," << frequency_restrictions.second << ")"); if (date_time::getSecs(current) < @@ -1152,9 +1153,9 @@ bool ApplicationImpl::AddExtension(AppExtensionPtr extension) { bool ApplicationImpl::RemoveExtension(AppExtensionUID uid) { auto it = std::find_if( - extensions_.begin(), - extensions_.end(), - [uid](AppExtensionPtr extension) { return extension->uid() == uid; }); + extensions_.begin(), extensions_.end(), [uid](AppExtensionPtr extension) { + return extension->uid() == uid; + }); return it != extensions_.end(); } diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index b0a0514e77..d04b08f9f4 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -32,48 +32,48 @@ #include // for rand() +#include #include -#include #include +#include #include -#include +#include "application_manager/app_launch/app_launch_ctrl_impl.h" +#include "application_manager/app_launch/app_launch_data_db.h" +#include "application_manager/app_launch/app_launch_data_json.h" #include "application_manager/application_manager_impl.h" +#include "application_manager/command_holder_impl.h" #include "application_manager/commands/command_impl.h" #include "application_manager/commands/command_notification_impl.h" +#include "application_manager/helpers/application_helper.h" +#include "application_manager/hmi_capabilities_impl.h" #include "application_manager/message_helper.h" -#include "application_manager/rpc_service_impl.h" -#include "application_manager/rpc_handler_impl.h" #include "application_manager/mobile_message_handler.h" +#include "application_manager/plugin_manager/rpc_plugin_manager_impl.h" #include "application_manager/policies/policy_handler.h" -#include "application_manager/hmi_capabilities_impl.h" #include "application_manager/resumption/resume_ctrl_impl.h" -#include "application_manager/app_launch/app_launch_ctrl_impl.h" -#include "application_manager/app_launch/app_launch_data_db.h" -#include "application_manager/app_launch/app_launch_data_json.h" -#include "application_manager/helpers/application_helper.h" -#include "application_manager/plugin_manager/rpc_plugin_manager_impl.h" -#include "protocol_handler/protocol_handler.h" -#include "hmi_message_handler/hmi_message_handler.h" -#include "application_manager/command_holder_impl.h" +#include "application_manager/rpc_handler_impl.h" +#include "application_manager/rpc_service_impl.h" #include "connection_handler/connection_handler_impl.h" -#include "formatters/formatter_json_rpc.h" -#include "formatters/CFormatterJsonSDLRPCv2.h" #include "formatters/CFormatterJsonSDLRPCv1.h" +#include "formatters/CFormatterJsonSDLRPCv2.h" +#include "formatters/formatter_json_rpc.h" +#include "hmi_message_handler/hmi_message_handler.h" #include "protocol/bson_object_keys.h" +#include "protocol_handler/protocol_handler.h" -#include "utils/threads/thread.h" -#include "utils/file_system.h" -#include "utils/helpers.h" -#include "utils/timer_task_impl.h" -#include "smart_objects/enum_schema_item.h" -#include "interfaces/HMI_API_schema.h" +#include +#include #include "application_manager/application_impl.h" +#include "interfaces/HMI_API_schema.h" #include "media_manager/media_manager.h" #include "policy/usage_statistics/counter.h" +#include "smart_objects/enum_schema_item.h" #include "utils/custom_string.h" -#include -#include +#include "utils/file_system.h" +#include "utils/helpers.h" +#include "utils/threads/thread.h" +#include "utils/timer_task_impl.h" namespace { int get_rand_from_range(uint32_t from = 0, int to = RAND_MAX) { @@ -595,11 +595,13 @@ ApplicationSharedPtr ApplicationManagerImpl::RegisterApplication( Version version; int32_t min_version = message[strings::msg_params][strings::sync_msg_version] - [strings::minor_version].asInt(); + [strings::minor_version] + .asInt(); version.min_supported_api_version = static_cast(min_version); int32_t max_version = message[strings::msg_params][strings::sync_msg_version] - [strings::major_version].asInt(); + [strings::major_version] + .asInt(); version.max_supported_api_version = static_cast(max_version); application->set_version(version); @@ -1052,9 +1054,9 @@ void ApplicationManagerImpl::RefreshCloudAppInformation() { ApplicationSet::iterator it = std::find_if( apps_to_register_.begin(), apps_to_register_.end(), finder); if (it == apps_to_register_.end()) { - LOG4CXX_DEBUG(logger_, - "Unable to find app to remove (" << policy_app_id - << "), skipping"); + LOG4CXX_DEBUG( + logger_, + "Unable to find app to remove (" << policy_app_id << "), skipping"); continue; } app = *it; @@ -1873,9 +1875,9 @@ void ApplicationManagerImpl::OnServiceStartedCallback( using namespace helpers; using namespace protocol_handler; LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, - "ServiceType = " << type << ". Session = " << std::hex - << session_key); + LOG4CXX_DEBUG( + logger_, + "ServiceType = " << type << ". Session = " << std::hex << session_key); std::vector empty; if (type == kRpc) { @@ -1885,9 +1887,9 @@ void ApplicationManagerImpl::OnServiceStartedCallback( } ApplicationSharedPtr app = application(session_key); if (!app) { - LOG4CXX_WARN(logger_, - "The application with id:" << session_key - << " doesn't exists."); + LOG4CXX_WARN( + logger_, + "The application with id:" << session_key << " doesn't exists."); connection_handler().NotifyServiceStartedResult(session_key, false, empty); return; } @@ -2047,9 +2049,9 @@ void ApplicationManagerImpl::OnSecondaryTransportEndedCallback( connection_handler::DeviceHandle device_handle = app->secondary_device(); if (device_handle == 0) { - LOG4CXX_WARN(logger_, - "Secondary transport of app " << session_key - << " is not found"); + LOG4CXX_WARN( + logger_, + "Secondary transport of app " << session_key << " is not found"); return; } @@ -2516,9 +2518,8 @@ void ApplicationManagerImpl::CreateApplications(SmartArray& obj_array, connection_handler::DeviceHandle device_id = 0; - if (-1 == - connection_handler().get_session_observer().GetDataOnSessionKey( - connection_key, NULL, NULL, &device_id)) { + if (-1 == connection_handler().get_session_observer().GetDataOnSessionKey( + connection_key, NULL, NULL, &device_id)) { LOG4CXX_ERROR(logger_, "Failed to create application: no connection info."); continue; @@ -2857,9 +2858,9 @@ void ApplicationManagerImpl::RemoveAppsWaitingForRegistration( apps_to_register_.begin(), apps_to_register_.end(), device_finder); while (apps_to_register_.end() != it_app) { - LOG4CXX_DEBUG(logger_, - "Waiting app: " << (*it_app)->name().c_str() - << " is removed."); + LOG4CXX_DEBUG( + logger_, + "Waiting app: " << (*it_app)->name().c_str() << " is removed."); apps_to_register_.erase(it_app); it_app = std::find_if( apps_to_register_.begin(), apps_to_register_.end(), device_finder); @@ -3283,8 +3284,8 @@ void ApplicationManagerImpl::ProcessPostponedMessages(const uint32_t app_id) { } MobileMessageQueue messages; app->SwapMobileMessageQueue(messages); - auto push_allowed_messages = [this, &app]( - smart_objects::SmartObjectSPtr message) { + auto push_allowed_messages = [this, + &app](smart_objects::SmartObjectSPtr message) { const std::string function_id = MessageHelper::StringifiedFunctionID( static_cast( (*message)[strings::params][strings::function_id].asUInt())); @@ -4002,9 +4003,9 @@ bool ApplicationManagerImpl::InitDirectory( LOG4CXX_WARN(logger_, directory_type << " directory doesn't exist."); // if storage directory doesn't exist try to create it if (!file_system::CreateDirectoryRecursively(path)) { - LOG4CXX_ERROR(logger_, - "Unable to create " << directory_type << " directory " - << path); + LOG4CXX_ERROR( + logger_, + "Unable to create " << directory_type << " directory " << path); return false; } LOG4CXX_DEBUG(logger_, @@ -4019,9 +4020,9 @@ bool ApplicationManagerImpl::IsReadWriteAllowed(const std::string& path, const std::string directory_type = DirectoryTypeToString(type); if (!(file_system::IsWritingAllowed(path) && file_system::IsReadingAllowed(path))) { - LOG4CXX_ERROR(logger_, - directory_type - << " directory doesn't have read/write permissions."); + LOG4CXX_ERROR( + logger_, + directory_type << " directory doesn't have read/write permissions."); return false; } diff --git a/src/components/application_manager/src/application_state.cc b/src/components/application_manager/src/application_state.cc index 3f775ee4e2..2b02e9b658 100644 --- a/src/components/application_manager/src/application_state.cc +++ b/src/components/application_manager/src/application_state.cc @@ -45,7 +45,7 @@ struct StateIDComparator { return cur->state_id() == state_id_; } }; -} +} // namespace namespace application_manager { diff --git a/src/components/application_manager/src/command_holder_impl.cc b/src/components/application_manager/src/command_holder_impl.cc index ea74e78f4e..87ac50ebd7 100644 --- a/src/components/application_manager/src/command_holder_impl.cc +++ b/src/components/application_manager/src/command_holder_impl.cc @@ -139,4 +139,4 @@ void CommandHolderImpl::ResumeMobileCommand(ApplicationSharedPtr application) { app_mobile_commands_.erase(app_commands); } -} // application_manager +} // namespace application_manager diff --git a/src/components/application_manager/src/commands/command_impl.cc b/src/components/application_manager/src/commands/command_impl.cc index 04fabfb2ec..521a44890f 100644 --- a/src/components/application_manager/src/commands/command_impl.cc +++ b/src/components/application_manager/src/commands/command_impl.cc @@ -43,7 +43,7 @@ struct AppExtensionPredicate { return app ? (app->QueryInterface(uid).use_count() != 0) : false; } }; -} +} // namespace namespace commands { diff --git a/src/components/application_manager/src/commands/command_notification_from_mobile_impl.cc b/src/components/application_manager/src/commands/command_notification_from_mobile_impl.cc index f9b084323a..fa1006de2f 100644 --- a/src/components/application_manager/src/commands/command_notification_from_mobile_impl.cc +++ b/src/components/application_manager/src/commands/command_notification_from_mobile_impl.cc @@ -32,8 +32,8 @@ #include "application_manager/commands/command_notification_from_mobile_impl.h" #include "application_manager/application_manager.h" -#include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" +#include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/src/commands/command_notification_impl.cc b/src/components/application_manager/src/commands/command_notification_impl.cc index 70df95986b..cc2606ab6f 100644 --- a/src/components/application_manager/src/commands/command_notification_impl.cc +++ b/src/components/application_manager/src/commands/command_notification_impl.cc @@ -32,8 +32,8 @@ #include "application_manager/commands/command_notification_impl.h" #include "application_manager/application_manager.h" -#include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" +#include "application_manager/rpc_service.h" namespace application_manager { diff --git a/src/components/application_manager/src/event_engine/event_dispatcher_impl.cc b/src/components/application_manager/src/event_engine/event_dispatcher_impl.cc index 3f3cfae1d3..30b1b83e79 100644 --- a/src/components/application_manager/src/event_engine/event_dispatcher_impl.cc +++ b/src/components/application_manager/src/event_engine/event_dispatcher_impl.cc @@ -31,9 +31,9 @@ */ #include "application_manager/event_engine/event_dispatcher_impl.h" -#include "interfaces/HMI_API.h" -#include "application_manager/event_engine/event_observer.h" #include +#include "application_manager/event_engine/event_observer.h" +#include "interfaces/HMI_API.h" namespace application_manager { namespace event_engine { @@ -137,8 +137,9 @@ void EventDispatcherImpl::raise_mobile_event(const MobileEvent& event) { } if (mobile_apis::messageType::response == event.smart_object_type()) { - mobile_observers_ = mobile_observers_event_ - [event.id()][event.smart_object_correlation_id()]; + mobile_observers_ = + mobile_observers_event_[event.id()] + [event.smart_object_correlation_id()]; } } diff --git a/src/components/application_manager/src/help_prompt_manager_impl.cc b/src/components/application_manager/src/help_prompt_manager_impl.cc index 016e09635b..ec883e5fc2 100644 --- a/src/components/application_manager/src/help_prompt_manager_impl.cc +++ b/src/components/application_manager/src/help_prompt_manager_impl.cc @@ -28,7 +28,7 @@ * 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/help_prompt_manager_impl.h" @@ -90,9 +90,9 @@ bool HelpPromptManagerImpl::AddCommand( const bool limit_exceeded = kLimitCommand <= GetCommandsCount(vr_commands_.end()); - LOG4CXX_DEBUG(logger_, - "Will be added first command from array " - << strings::vr_commands); + LOG4CXX_DEBUG( + logger_, + "Will be added first command from array " << strings::vr_commands); smart_objects::SmartObjectSPtr vr_item = std::make_shared(commands.asArray()->front()); diff --git a/src/components/application_manager/src/helpers/application_helper.cc b/src/components/application_manager/src/helpers/application_helper.cc index 59f1c6caf2..fc86eb5e62 100644 --- a/src/components/application_manager/src/helpers/application_helper.cc +++ b/src/components/application_manager/src/helpers/application_helper.cc @@ -1,9 +1,9 @@ -#include -#include #include "application_manager/helpers/application_helper.h" +#include +#include #include "application_manager/message_helper.h" -#include "utils/logger.h" #include "utils/file_system.h" +#include "utils/logger.h" namespace { using namespace application_manager; diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc index 060eaf011c..0f5bc80d56 100644 --- a/src/components/application_manager/src/hmi_capabilities_impl.cc +++ b/src/components/application_manager/src/hmi_capabilities_impl.cc @@ -32,16 +32,16 @@ #include -#include "utils/logger.h" -#include "application_manager/hmi_capabilities_impl.h" #include "application_manager/application_manager.h" -#include "smart_objects/smart_object.h" +#include "application_manager/hmi_capabilities_impl.h" #include "application_manager/message_helper.h" #include "application_manager/smart_object_keys.h" #include "config_profile/profile.h" #include "formatters/CFormatterJsonBase.h" #include "interfaces/HMI_API.h" +#include "smart_objects/smart_object.h" #include "utils/file_system.h" +#include "utils/logger.h" namespace application_manager { namespace formatters = ns_smart_device_link::ns_json_handler::formatters; @@ -914,7 +914,8 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() { hmi_apis::Common_TextFieldName::eType>::const_iterator it_text_field_name = text_fields_enum_name.find( display_capabilities_so[hmi_response::text_fields][i] - [strings::name].asString()); + [strings::name] + .asString()); display_capabilities_so[hmi_response::text_fields][i].erase( strings::name); if (text_fields_enum_name.end() != it_text_field_name) { @@ -1031,19 +1032,21 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() { smart_objects::SmartObject(smart_objects::SmartType_Map); if (check_existing_json_member(audio_capabilities, "samplingRate")) { audio_capabilities_so["samplingRate"] = - sampling_rate_enum.find(audio_capabilities.get("samplingRate", "") - .asString())->second; + sampling_rate_enum + .find(audio_capabilities.get("samplingRate", "").asString()) + ->second; } if (check_existing_json_member(audio_capabilities, "bitsPerSample")) { audio_capabilities_so["bitsPerSample"] = - bit_per_sample_enum.find(audio_capabilities.get("bitsPerSample", - "").asString()) + bit_per_sample_enum + .find(audio_capabilities.get("bitsPerSample", "").asString()) ->second; } if (check_existing_json_member(audio_capabilities, "audioType")) { audio_capabilities_so["audioType"] = - audio_type_enum.find(audio_capabilities.get("audioType", "") - .asString())->second; + audio_type_enum + .find(audio_capabilities.get("audioType", "").asString()) + ->second; } set_audio_pass_thru_capabilities(audio_capabilities_so); } @@ -1055,18 +1058,21 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() { if (check_existing_json_member(pcm_capabilities, "samplingRate")) { pcm_capabilities_so["samplingRate"] = - sampling_rate_enum.find(pcm_capabilities.get("samplingRate", "") - .asString())->second; + sampling_rate_enum + .find(pcm_capabilities.get("samplingRate", "").asString()) + ->second; } if (check_existing_json_member(pcm_capabilities, "bitsPerSample")) { pcm_capabilities_so["bitsPerSample"] = - bit_per_sample_enum.find(pcm_capabilities.get("bitsPerSample", "") - .asString())->second; + bit_per_sample_enum + .find(pcm_capabilities.get("bitsPerSample", "").asString()) + ->second; } if (check_existing_json_member(pcm_capabilities, "audioType")) { pcm_capabilities_so["audioType"] = - audio_type_enum.find(pcm_capabilities.get("audioType", "") - .asString())->second; + audio_type_enum + .find(pcm_capabilities.get("audioType", "").asString()) + ->second; } set_pcm_stream_capabilities(pcm_capabilities_so); diff --git a/src/components/application_manager/src/hmi_language_handler.cc b/src/components/application_manager/src/hmi_language_handler.cc index 647df242df..e206633ae2 100644 --- a/src/components/application_manager/src/hmi_language_handler.cc +++ b/src/components/application_manager/src/hmi_language_handler.cc @@ -28,16 +28,16 @@ * 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/hmi_language_handler.h" #include "application_manager/application_manager.h" +#include "application_manager/hmi_capabilities.h" #include "application_manager/message_helper.h" #include "application_manager/rpc_service.h" -#include "application_manager/hmi_capabilities.h" -#include "utils/helpers.h" #include "resumption/last_state.h" #include "smart_objects/smart_object.h" +#include "utils/helpers.h" static const std::string LanguagesKey = "Languages"; static const std::string UIKey = "UI"; @@ -78,9 +78,9 @@ void HMILanguageHandler::set_language_for( LOG4CXX_WARN(logger_, "Unknown interface has been passed " << interface); return; } - LOG4CXX_DEBUG(logger_, - "Setting language " << language << " for interface " - << interface); + LOG4CXX_DEBUG( + logger_, + "Setting language " << language << " for interface " << interface); Json::Value& dictionary = last_state_->get_dictionary(); dictionary[LanguagesKey][key] = language; return; @@ -273,8 +273,9 @@ void HMILanguageHandler::VerifyWithPersistedLanguages() { LOG4CXX_INFO(logger_, "Application with app_id " - << app->app_id() << " will be unregistered because of " - "HMI language(s) mismatch."); + << app->app_id() + << " will be unregistered because of " + "HMI language(s) mismatch."); CheckApplication(std::make_pair(app->app_id(), false)); } diff --git a/src/components/application_manager/src/hmi_state.cc b/src/components/application_manager/src/hmi_state.cc index e220988f0e..77880eddc0 100644 --- a/src/components/application_manager/src/hmi_state.cc +++ b/src/components/application_manager/src/hmi_state.cc @@ -32,9 +32,9 @@ */ #include "application_manager/hmi_state.h" -#include #include #include +#include #include "application_manager/application_manager.h" #include "utils/helpers.h" diff --git a/src/components/application_manager/src/message.cc b/src/components/application_manager/src/message.cc index 332d68adbf..2ec5891ae3 100644 --- a/src/components/application_manager/src/message.cc +++ b/src/components/application_manager/src/message.cc @@ -36,7 +36,7 @@ namespace { bool BinaryDataPredicate(uint8_t i, uint8_t j) { return (i == j); } -} +} // namespace namespace application_manager { diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc index 0e44a53c6f..6530004499 100644 --- a/src/components/application_manager/src/message_helper/message_helper.cc +++ b/src/components/application_manager/src/message_helper/message_helper.cc @@ -39,13 +39,13 @@ #include #undef __STDC_FORMAT_MACROS -#include -#include #include #include -#include -#include #include +#include +#include +#include +#include #include "application_manager/application.h" #include "application_manager/application_manager.h" @@ -55,18 +55,18 @@ #include "application_manager/resumption/resume_ctrl.h" #include "application_manager/rpc_service.h" #include "connection_handler/connection_handler_impl.h" -#include "transport_manager/common.h" #include "interfaces/MOBILE_API.h" #include "smart_objects/enum_schema_item.h" +#include "transport_manager/common.h" #include "utils/file_system.h" -#include "utils/macro.h" #include "utils/logger.h" +#include "utils/macro.h" -#include "formatters/formatter_json_rpc.h" -#include "formatters/CFormatterJsonSDLRPCv2.h" +#include "formatters/CFormatterJsonBase.h" #include "formatters/CFormatterJsonSDLRPCv1.h" +#include "formatters/CFormatterJsonSDLRPCv2.h" +#include "formatters/formatter_json_rpc.h" #include "json/json.h" -#include "formatters/CFormatterJsonBase.h" CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationManager") @@ -162,71 +162,81 @@ struct ExternalConsentStatusAppender } // namespace -std::pair kVehicleDataInitializer[] = { - std::make_pair(strings::gps, mobile_apis::VehicleDataType::VEHICLEDATA_GPS), - std::make_pair(strings::speed, - mobile_apis::VehicleDataType::VEHICLEDATA_SPEED), - std::make_pair(strings::rpm, mobile_apis::VehicleDataType::VEHICLEDATA_RPM), - std::make_pair(strings::fuel_level, - mobile_apis::VehicleDataType::VEHICLEDATA_FUELLEVEL), - std::make_pair(strings::fuel_level_state, - mobile_apis::VehicleDataType::VEHICLEDATA_FUELLEVEL_STATE), - std::make_pair(strings::instant_fuel_consumption, - mobile_apis::VehicleDataType::VEHICLEDATA_FUELCONSUMPTION), - std::make_pair(strings::fuel_range, - mobile_apis::VehicleDataType::VEHICLEDATA_FUELRANGE), - std::make_pair(strings::cloud_app_vehicle_id, - mobile_apis::VehicleDataType::VEHICLEDATA_CLOUDAPPVEHICLEID), - std::make_pair(strings::external_temp, - mobile_apis::VehicleDataType::VEHICLEDATA_EXTERNTEMP), - std::make_pair(strings::turn_signal, - mobile_apis::VehicleDataType::VEHICLEDATA_TURNSIGNAL), - std::make_pair(strings::vin, mobile_apis::VehicleDataType::VEHICLEDATA_VIN), - std::make_pair(strings::prndl, - mobile_apis::VehicleDataType::VEHICLEDATA_PRNDL), - std::make_pair(strings::tire_pressure, - mobile_apis::VehicleDataType::VEHICLEDATA_TIREPRESSURE), - std::make_pair(strings::odometer, - mobile_apis::VehicleDataType::VEHICLEDATA_ODOMETER), - std::make_pair(strings::belt_status, - mobile_apis::VehicleDataType::VEHICLEDATA_BELTSTATUS), - std::make_pair( - strings::electronic_park_brake_status, - mobile_apis::VehicleDataType::VEHICLEDATA_ELECTRONICPARKBRAKESTATUS), - std::make_pair(strings::body_information, - mobile_apis::VehicleDataType::VEHICLEDATA_BODYINFO), - std::make_pair(strings::device_status, - mobile_apis::VehicleDataType::VEHICLEDATA_DEVICESTATUS), - std::make_pair(strings::driver_braking, - mobile_apis::VehicleDataType::VEHICLEDATA_BRAKING), - std::make_pair(strings::wiper_status, - mobile_apis::VehicleDataType::VEHICLEDATA_WIPERSTATUS), - std::make_pair(strings::head_lamp_status, - mobile_apis::VehicleDataType::VEHICLEDATA_HEADLAMPSTATUS), - std::make_pair(strings::e_call_info, - mobile_apis::VehicleDataType::VEHICLEDATA_ECALLINFO), - std::make_pair(strings::airbag_status, - mobile_apis::VehicleDataType::VEHICLEDATA_AIRBAGSTATUS), - std::make_pair(strings::emergency_event, - mobile_apis::VehicleDataType::VEHICLEDATA_EMERGENCYEVENT), - std::make_pair(strings::cluster_mode_status, - mobile_apis::VehicleDataType::VEHICLEDATA_CLUSTERMODESTATUS), - std::make_pair(strings::my_key, - mobile_apis::VehicleDataType::VEHICLEDATA_MYKEY), - /* - NOT DEFINED in mobile API - std::make_pair(strings::gps, - BATTVOLTAGE), - */ - std::make_pair(strings::engine_torque, - mobile_apis::VehicleDataType::VEHICLEDATA_ENGINETORQUE), - std::make_pair(strings::acc_pedal_pos, - mobile_apis::VehicleDataType::VEHICLEDATA_ACCPEDAL), - std::make_pair(strings::steering_wheel_angle, - mobile_apis::VehicleDataType::VEHICLEDATA_STEERINGWHEEL), - std::make_pair(strings::engine_oil_life, - mobile_apis::VehicleDataType::VEHICLEDATA_ENGINEOILLIFE)}; +std::pair + kVehicleDataInitializer[] = { + std::make_pair(strings::gps, + mobile_apis::VehicleDataType::VEHICLEDATA_GPS), + std::make_pair(strings::speed, + mobile_apis::VehicleDataType::VEHICLEDATA_SPEED), + std::make_pair(strings::rpm, + mobile_apis::VehicleDataType::VEHICLEDATA_RPM), + std::make_pair(strings::fuel_level, + mobile_apis::VehicleDataType::VEHICLEDATA_FUELLEVEL), + std::make_pair( + strings::fuel_level_state, + mobile_apis::VehicleDataType::VEHICLEDATA_FUELLEVEL_STATE), + std::make_pair( + strings::instant_fuel_consumption, + mobile_apis::VehicleDataType::VEHICLEDATA_FUELCONSUMPTION), + std::make_pair(strings::fuel_range, + mobile_apis::VehicleDataType::VEHICLEDATA_FUELRANGE), + std::make_pair( + strings::cloud_app_vehicle_id, + mobile_apis::VehicleDataType::VEHICLEDATA_CLOUDAPPVEHICLEID), + std::make_pair(strings::external_temp, + mobile_apis::VehicleDataType::VEHICLEDATA_EXTERNTEMP), + std::make_pair(strings::turn_signal, + mobile_apis::VehicleDataType::VEHICLEDATA_TURNSIGNAL), + std::make_pair(strings::vin, + mobile_apis::VehicleDataType::VEHICLEDATA_VIN), + std::make_pair(strings::prndl, + mobile_apis::VehicleDataType::VEHICLEDATA_PRNDL), + std::make_pair(strings::tire_pressure, + mobile_apis::VehicleDataType::VEHICLEDATA_TIREPRESSURE), + std::make_pair(strings::odometer, + mobile_apis::VehicleDataType::VEHICLEDATA_ODOMETER), + std::make_pair(strings::belt_status, + mobile_apis::VehicleDataType::VEHICLEDATA_BELTSTATUS), + std::make_pair(strings::electronic_park_brake_status, + mobile_apis::VehicleDataType:: + VEHICLEDATA_ELECTRONICPARKBRAKESTATUS), + std::make_pair(strings::body_information, + mobile_apis::VehicleDataType::VEHICLEDATA_BODYINFO), + std::make_pair(strings::device_status, + mobile_apis::VehicleDataType::VEHICLEDATA_DEVICESTATUS), + std::make_pair(strings::driver_braking, + mobile_apis::VehicleDataType::VEHICLEDATA_BRAKING), + std::make_pair(strings::wiper_status, + mobile_apis::VehicleDataType::VEHICLEDATA_WIPERSTATUS), + std::make_pair( + strings::head_lamp_status, + mobile_apis::VehicleDataType::VEHICLEDATA_HEADLAMPSTATUS), + std::make_pair(strings::e_call_info, + mobile_apis::VehicleDataType::VEHICLEDATA_ECALLINFO), + std::make_pair(strings::airbag_status, + mobile_apis::VehicleDataType::VEHICLEDATA_AIRBAGSTATUS), + std::make_pair( + strings::emergency_event, + mobile_apis::VehicleDataType::VEHICLEDATA_EMERGENCYEVENT), + std::make_pair( + strings::cluster_mode_status, + mobile_apis::VehicleDataType::VEHICLEDATA_CLUSTERMODESTATUS), + std::make_pair(strings::my_key, + mobile_apis::VehicleDataType::VEHICLEDATA_MYKEY), + /* + NOT DEFINED in mobile API + std::make_pair(strings::gps, + BATTVOLTAGE), + */ + std::make_pair(strings::engine_torque, + mobile_apis::VehicleDataType::VEHICLEDATA_ENGINETORQUE), + std::make_pair(strings::acc_pedal_pos, + mobile_apis::VehicleDataType::VEHICLEDATA_ACCPEDAL), + std::make_pair(strings::steering_wheel_angle, + mobile_apis::VehicleDataType::VEHICLEDATA_STEERINGWHEEL), + std::make_pair( + strings::engine_oil_life, + mobile_apis::VehicleDataType::VEHICLEDATA_ENGINEOILLIFE)}; const VehicleData MessageHelper::vehicle_data_( kVehicleDataInitializer, @@ -1130,12 +1140,11 @@ MessageHelper::CreateGlobalPropertiesRequestsToHMI( auto& help_prompt_manager = const_cast(app.get())->help_prompt_manager(); - const bool can_send_ui = helpers::Compare( - help_prompt_manager.GetSendingType(), - HelpPromptManager::SendingType::kSendVRHelp, - HelpPromptManager::SendingType::kSendBoth); + const bool can_send_ui = helpers:: + Compare( + help_prompt_manager.GetSendingType(), + HelpPromptManager::SendingType::kSendVRHelp, + HelpPromptManager::SendingType::kSendBoth); // UI global properties @@ -1173,12 +1182,11 @@ MessageHelper::CreateGlobalPropertiesRequestsToHMI( requests.push_back(ui_global_properties); } - const bool can_send_vr = helpers::Compare( - help_prompt_manager.GetSendingType(), - HelpPromptManager::SendingType::kSendHelpPrompt, - HelpPromptManager::SendingType::kSendBoth); + const bool can_send_vr = helpers:: + Compare( + help_prompt_manager.GetSendingType(), + HelpPromptManager::SendingType::kSendHelpPrompt, + HelpPromptManager::SendingType::kSendBoth); // TTS global properties if (can_send_vr && (app->help_prompt() || app->timeout_prompt())) { @@ -2930,7 +2938,7 @@ mobile_apis::Result::eType MessageHelper::ProcessSoftButtons( } if ((!request_soft_buttons[i].keyExists(strings::text)) || (!VerifyString( - request_soft_buttons[i][strings::text].asString()))) { + request_soft_buttons[i][strings::text].asString()))) { return Result::INVALID_DATA; } break; @@ -2939,7 +2947,7 @@ mobile_apis::Result::eType MessageHelper::ProcessSoftButtons( if ((!request_soft_buttons[i].keyExists(strings::text)) || ((request_soft_buttons[i][strings::text].length()) && (!VerifyString( - request_soft_buttons[i][strings::text].asString())))) { + request_soft_buttons[i][strings::text].asString())))) { return Result::INVALID_DATA; } diff --git a/src/components/application_manager/src/mobile_message_handler.cc b/src/components/application_manager/src/mobile_message_handler.cc index 1ee368a212..4c4cb251fc 100644 --- a/src/components/application_manager/src/mobile_message_handler.cc +++ b/src/components/application_manager/src/mobile_message_handler.cc @@ -32,12 +32,12 @@ #include -#include "utils/macro.h" #include "application_manager/mobile_message_handler.h" -#include "protocol_handler/protocol_payload.h" #include "protocol_handler/protocol_packet.h" +#include "protocol_handler/protocol_payload.h" #include "utils/bitstream.h" #include "utils/logger.h" +#include "utils/macro.h" #include #include @@ -48,7 +48,7 @@ const uint8_t kRequest = 0x0; const uint8_t kResponse = 0x1; const uint8_t kNotification = 0x2; const uint8_t kUnknown = 0xF; -} +} // namespace namespace application_manager { using protocol_handler::Extract; @@ -58,7 +58,7 @@ typedef std::map MessageTypeMap; MessageTypeMap message_types = {std::make_pair(kRequest, "Request"), std::make_pair(kResponse, "Response"), std::make_pair(kNotification, "Notification")}; -} +} // namespace CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationManager") application_manager::Message* diff --git a/src/components/application_manager/src/plugin_manager/plugin_keys.cc b/src/components/application_manager/src/plugin_manager/plugin_keys.cc index 9eabc67c09..80be2d1389 100644 --- a/src/components/application_manager/src/plugin_manager/plugin_keys.cc +++ b/src/components/application_manager/src/plugin_manager/plugin_keys.cc @@ -8,7 +8,7 @@ const char* vehicle_info_rpc_plugin = "Vehicle Info RPC Plugin"; const char* app_service_rpc_plugin = "App Service RPC Plugin"; const char* rc_rpc_plugin = "RC RPC Plugin"; const char* sdl_rpc_plugin = "SDL RPC Plugin"; -} +} // namespace plugin_names } // namespace plugin_manager } // namespace application_manager \ No newline at end of file diff --git a/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc b/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc index bbd0011298..ad313c638f 100644 --- a/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc +++ b/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc @@ -37,9 +37,9 @@ RPCPluginPtr LoadPlugin(const std::string& full_plugin_path) { void* plugin_dll = dlopen(full_plugin_path.c_str(), RTLD_LAZY); if (nullptr == plugin_dll) { - LOG4CXX_ERROR(logger_, - "Failed to open dll " << full_plugin_path << " : " - << dlerror()); + LOG4CXX_ERROR( + logger_, + "Failed to open dll " << full_plugin_path << " : " << dlerror()); return RPCPluginPtr(); } @@ -66,9 +66,9 @@ uint32_t RPCPluginManagerImpl::LoadPlugins(const std::string& plugins_path) { if (!plugin) { continue; } - LOG4CXX_DEBUG(logger_, - "Loaded " << plugin->PluginName() << " plugin from " - << full_name); + LOG4CXX_DEBUG( + logger_, + "Loaded " << plugin->PluginName() << " plugin from " << full_name); if (plugin->Init( app_manager_, rpc_service_, hmi_capabilities_, policy_handler_)) { loaded_plugins_.push_back(std::move(plugin)); diff --git a/src/components/application_manager/src/policies/policy_event_observer.cc b/src/components/application_manager/src/policies/policy_event_observer.cc index ea8935c8c5..afe909fee4 100644 --- a/src/components/application_manager/src/policies/policy_event_observer.cc +++ b/src/components/application_manager/src/policies/policy_event_observer.cc @@ -31,10 +31,10 @@ */ #include "application_manager/policies/policy_event_observer.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/policies/policy_handler.h" -#include "utils/date_time.h" +#include "application_manager/smart_object_keys.h" #include "smart_objects/smart_object.h" +#include "utils/date_time.h" namespace policy { using namespace application_manager; diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc index aeb5a8bd01..d94a364c8c 100644 --- a/src/components/application_manager/src/policies/policy_handler.cc +++ b/src/components/application_manager/src/policies/policy_handler.cc @@ -30,34 +30,34 @@ POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/policies/policy_handler.h" -#include #include +#include #include -#include #include #include -#include "application_manager/smart_object_keys.h" -#include "application_manager/policies/delegates/app_permission_delegate.h" -#include "policy/status.h" +#include #include "application_manager/application_manager.h" -#include "application_manager/state_controller.h" #include "application_manager/message_helper.h" +#include "application_manager/policies/delegates/app_permission_delegate.h" #include "application_manager/rpc_service.h" -#include "policy/policy_manager_impl.h" +#include "application_manager/smart_object_keys.h" +#include "application_manager/state_controller.h" +#include "application_manager/usage_statistics.h" #include "connection_handler/connection_handler.h" -#include "utils/macro.h" -#include "utils/date_time.h" +#include "interfaces/MOBILE_API.h" #include "json/value.h" #include "json/writer.h" -#include "application_manager/usage_statistics.h" +#include "policy/policy_manager_impl.h" #include "policy/policy_types.h" -#include "interfaces/MOBILE_API.h" +#include "policy/status.h" +#include "smart_objects/enum_schema_item.h" +#include "utils/date_time.h" #include "utils/file_system.h" +#include "utils/macro.h" #include "utils/scope_guard.h" -#include "smart_objects/enum_schema_item.h" -#include "utils/helpers.h" #include "policy/policy_manager.h" +#include "utils/helpers.h" namespace policy { @@ -107,13 +107,12 @@ const policy::DeviceParams GetDeviceParams( const protocol_handler::SessionObserver& session_observer) { CREATE_LOGGERPTR_LOCAL(logger_, "PolicyHandler"); policy::DeviceParams device_params; - if (-1 == - session_observer.GetDataOnDeviceID( - device_handle, - &device_params.device_name, - NULL, - &device_params.device_mac_address, - &device_params.device_connection_type)) { + if (-1 == session_observer.GetDataOnDeviceID( + device_handle, + &device_params.device_name, + NULL, + &device_params.device_mac_address, + &device_params.device_connection_type)) { LOG4CXX_ERROR(logger_, "Failed to extract information for device " << device_handle); } @@ -516,9 +515,9 @@ void PolicyHandler::OnDeviceConsentChanged(const std::string& device_id, void PolicyHandler::SendOnAppPermissionsChanged( const AppPermissions& permissions, const std::string& policy_app_id) const { LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, - "PolicyHandler::SendOnAppPermissionsChanged for " - << policy_app_id); + LOG4CXX_DEBUG( + logger_, + "PolicyHandler::SendOnAppPermissionsChanged for " << policy_app_id); ApplicationSharedPtr app = application_manager_.application_by_policy_id(policy_app_id); if (app.use_count() == 0) { @@ -812,9 +811,9 @@ bool PolicyHandler::IsAppSuitableForPolicyUpdate( LOG4CXX_AUTO_TRACE(logger_); if (!value->IsRegistered()) { - LOG4CXX_DEBUG(logger_, - "Application " << value->app_id() - << " is not marked as registered."); + LOG4CXX_DEBUG( + logger_, + "Application " << value->app_id() << " is not marked as registered."); return false; } @@ -827,9 +826,9 @@ bool PolicyHandler::IsAppSuitableForPolicyUpdate( value->device(), application_manager_.connection_handler().get_session_observer()); - const bool is_device_allowed = (kDeviceAllowed == - policy_manager_->GetUserConsentForDevice( - device_params.device_mac_address)); + const bool is_device_allowed = + (kDeviceAllowed == policy_manager_->GetUserConsentForDevice( + device_params.device_mac_address)); LOG4CXX_DEBUG(logger_, "Is device " << device_params.device_mac_address << " allowed " @@ -936,9 +935,9 @@ void PolicyHandler::OnVehicleDataUpdated( POLICY_LIB_CHECK_VOID(); #ifdef EXTERNAL_PROPRIETARY_MODE if (!message.keyExists(strings::msg_params)) { - LOG4CXX_ERROR(logger_, - "Message does not contains mandatory section " - << strings::msg_params); + LOG4CXX_ERROR( + logger_, + "Message does not contains mandatory section " << strings::msg_params); return; } if (message[strings::msg_params].keyExists(strings::vin)) { @@ -954,9 +953,9 @@ void PolicyHandler::OnVehicleDataUpdated( void PolicyHandler::OnPendingPermissionChange( const std::string& policy_app_id) { LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, - "PolicyHandler::OnPendingPermissionChange for " - << policy_app_id); + LOG4CXX_DEBUG( + logger_, + "PolicyHandler::OnPendingPermissionChange for " << policy_app_id); POLICY_LIB_CHECK_VOID(); ApplicationSharedPtr app = application_manager_.application_by_policy_id(policy_app_id); @@ -1051,14 +1050,17 @@ bool PolicyHandler::SendMessageToSDK(const BinaryMessage& pt_string, if (mobile_app_id.empty()) { LOG4CXX_WARN(logger_, "Application with connection key '" - << app_id << "'" - " has no application id."); + << app_id + << "'" + " has no application id."); return false; } LOG4CXX_DEBUG(logger_, - "Update url is " << url << " for application " - "with connection key " << app_id); + "Update url is " << url + << " for application " + "with connection key " + << app_id); MessageHelper::SendPolicySnapshotNotification( app_id, pt_string, url, application_manager_); @@ -1173,9 +1175,9 @@ void PolicyHandler::OnAllowSDLFunctionalityNotification( policy_manager_->SetUserConsentForDevice(device_id, is_allowed); connection_handler::DeviceHandle device_handle = 0; if (!connection_handler.GetDeviceID(device_id, &device_handle)) { - LOG4CXX_WARN(logger_, - "Device handle with mac " << device_id - << " wasn't found."); + LOG4CXX_WARN( + logger_, + "Device handle with mac " << device_id << " wasn't found."); } #ifdef EXTERNAL_PROPRIETARY_MODE @@ -1373,9 +1375,9 @@ void PolicyHandler::OnPermissionsUpdated(const std::string& policy_app_id, MessageHelper::StringToHMILevel(default_hmi); if (mobile_apis::HMILevel::INVALID_ENUM == hmi_level) { - LOG4CXX_WARN(logger_, - "Couldn't convert default hmi level " << default_hmi - << " to enum."); + LOG4CXX_WARN( + logger_, + "Couldn't convert default hmi level " << default_hmi << " to enum."); return; } if (current_hmi_level == hmi_level) { @@ -1703,9 +1705,9 @@ void PolicyHandler::OnCertificateUpdated(const std::string& certificate_data) { const bool is_written = file_system::Write( file_name, std::vector(certificate_data.begin(), certificate_data.end())); - LOG4CXX_DEBUG(logger_, - "Saving encrypted certificate data: \"" << certificate_data - << '"'); + LOG4CXX_DEBUG( + logger_, + "Saving encrypted certificate data: \"" << certificate_data << '"'); if (!is_written) { LOG4CXX_ERROR(logger_, "Unable to save encrypted certificate to file " << file_name); @@ -1752,9 +1754,9 @@ void PolicyHandler::OnCertificateDecrypted(bool is_succeeded) { "Unable to read certificate from file " << file_name); return; } - LOG4CXX_DEBUG(logger_, - "Loaded decrypted certificate data: \"" << certificate_data - << '"'); + LOG4CXX_DEBUG( + logger_, + "Loaded decrypted certificate data: \"" << certificate_data << '"'); policy_manager_->SetDecryptedCertificate(certificate_data); @@ -1910,24 +1912,24 @@ void PolicyHandler::OnSetCloudAppProperties( const smart_objects::SmartObject& message) { POLICY_LIB_CHECK_VOID(); if (!message.keyExists(strings::msg_params)) { - LOG4CXX_ERROR(logger_, - "Message does not contain mandatory section " - << strings::msg_params); + LOG4CXX_ERROR( + logger_, + "Message does not contain mandatory section " << strings::msg_params); return; } if (!message[strings::msg_params].keyExists(strings::properties)) { - LOG4CXX_ERROR(logger_, - "Message does not contain app properties " - << strings::msg_params); + LOG4CXX_ERROR( + logger_, + "Message does not contain app properties " << strings::msg_params); return; } const smart_objects::SmartObject& properties = message[strings::msg_params][strings::properties]; if (!properties.keyExists(strings::app_id)) { - LOG4CXX_ERROR(logger_, - "Message does not contain mandatory parameter " - << strings::app_id); + LOG4CXX_ERROR( + logger_, + "Message does not contain mandatory parameter " << strings::app_id); return; } std::string policy_app_id(properties[strings::app_id].asString()); @@ -2288,17 +2290,17 @@ void PolicyHandler::OnUpdateHMIStatus(const std::string& device_id, ApplicationSharedPtr app = application_manager_.application(device_id, policy_app_id); if (!app) { - LOG4CXX_WARN(logger_, - "Could not find application: " << device_id << " - " - << policy_app_id); + LOG4CXX_WARN( + logger_, + "Could not find application: " << device_id << " - " << policy_app_id); return; } mobile_apis::HMILevel::eType level = MessageHelper::StringToHMILevel(hmi_level); if (mobile_apis::HMILevel::INVALID_ENUM == level) { - LOG4CXX_WARN(logger_, - "Couldn't convert default hmi level " << hmi_level - << " to enum."); + LOG4CXX_WARN( + logger_, + "Couldn't convert default hmi level " << hmi_level << " to enum."); return; } @@ -2361,17 +2363,17 @@ void PolicyHandler::OnUpdateHMILevel(const std::string& device_id, ApplicationSharedPtr app = application_manager_.application(device_id, policy_app_id); if (!app) { - LOG4CXX_WARN(logger_, - "Could not find application: " << device_id << " - " - << policy_app_id); + LOG4CXX_WARN( + logger_, + "Could not find application: " << device_id << " - " << policy_app_id); return; } mobile_apis::HMILevel::eType level = MessageHelper::StringToHMILevel(hmi_level); if (mobile_apis::HMILevel::INVALID_ENUM == level) { - LOG4CXX_WARN(logger_, - "Couldn't convert default hmi level " << hmi_level - << " to enum."); + LOG4CXX_WARN( + logger_, + "Couldn't convert default hmi level " << hmi_level << " to enum."); return; } UpdateHMILevel(app, level); diff --git a/src/components/application_manager/src/request_controller.cc b/src/components/application_manager/src/request_controller.cc index 315cf6fdf8..93c45ed5dc 100644 --- a/src/components/application_manager/src/request_controller.cc +++ b/src/components/application_manager/src/request_controller.cc @@ -32,9 +32,9 @@ #include "utils/logger.h" -#include "application_manager/request_controller.h" #include "application_manager/commands/command_request_impl.h" #include "application_manager/commands/request_to_hmi.h" +#include "application_manager/request_controller.h" #include "utils/timer_task_impl.h" diff --git a/src/components/application_manager/src/request_tracker.cc b/src/components/application_manager/src/request_tracker.cc index c047c82579..052667dc3f 100644 --- a/src/components/application_manager/src/request_tracker.cc +++ b/src/components/application_manager/src/request_tracker.cc @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "utils/logger.h" -#include "utils/macro.h" #include "application_manager/request_tracker.h" #include "application_manager/message_helper.h" +#include "utils/logger.h" +#include "utils/macro.h" namespace application_manager { diff --git a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc index 6af8826491..fff1aefed3 100644 --- a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc +++ b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc @@ -31,23 +31,23 @@ */ #include "application_manager/resumption/resume_ctrl_impl.h" -#include #include +#include #include "application_manager/application_manager.h" #include "application_manager/rpc_service.h" -#include "utils/file_system.h" -#include "connection_handler/connection_handler_impl.h" -#include "application_manager/message_helper.h" -#include "connection_handler/connection.h" #include "application_manager/commands/command_impl.h" -#include "policy/policy_manager_impl.h" +#include "application_manager/message_helper.h" #include "application_manager/policies/policy_handler.h" -#include "application_manager/state_controller.h" -#include "utils/helpers.h" #include "application_manager/resumption/resumption_data_db.h" #include "application_manager/resumption/resumption_data_json.h" +#include "application_manager/state_controller.h" +#include "connection_handler/connection.h" +#include "connection_handler/connection_handler_impl.h" +#include "policy/policy_manager_impl.h" +#include "utils/file_system.h" +#include "utils/helpers.h" #include "utils/timer_task_impl.h" @@ -152,9 +152,9 @@ void ResumeCtrlImpl::SaveApplication(ApplicationSharedPtr application) { LOG4CXX_DEBUG(logger_, "Low Voltage state is active"); return; } - LOG4CXX_DEBUG(logger_, - "application with appID " << application->app_id() - << " will be saved"); + LOG4CXX_DEBUG( + logger_, + "application with appID " << application->app_id() << " will be saved"); resumption_storage_->SaveApplication(application); } @@ -515,9 +515,9 @@ void ResumeCtrlImpl::StartAppHmiStateResumption( } RemoveApplicationFromSaved(application); } else { - LOG4CXX_INFO(logger_, - "Do not need to resume application " - << application->policy_app_id()); + LOG4CXX_INFO( + logger_, + "Do not need to resume application " << application->policy_app_id()); } } @@ -1035,8 +1035,9 @@ void ResumeCtrlImpl::AddToResumptionTimerQueue(const uint32_t app_id) { } queue_lock_.Release(); LOG4CXX_DEBUG(logger_, - "Application ID " << app_id << " have been added" - " to resumption queue."); + "Application ID " << app_id + << " have been added" + " to resumption queue."); if (run_resumption) { LOG4CXX_DEBUG(logger_, "Application ID " << app_id << " will be restored by timer"); @@ -1197,4 +1198,4 @@ static mobile_api::HMILevel::eType ConvertHmiLevelString( } } -} // namespce resumption +} // namespace resumption diff --git a/src/components/application_manager/src/resumption/resumption_data.cc b/src/components/application_manager/src/resumption/resumption_data.cc index 856fb03750..b4d39eccc1 100644 --- a/src/components/application_manager/src/resumption/resumption_data.cc +++ b/src/components/application_manager/src/resumption/resumption_data.cc @@ -31,9 +31,9 @@ */ #include "application_manager/resumption/resumption_data.h" -#include "utils/logger.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/application_manager_settings.h" +#include "application_manager/smart_object_keys.h" +#include "utils/logger.h" namespace resumption { diff --git a/src/components/application_manager/src/resumption/resumption_data_db.cc b/src/components/application_manager/src/resumption/resumption_data_db.cc index 1591ce566a..02b7098414 100644 --- a/src/components/application_manager/src/resumption/resumption_data_db.cc +++ b/src/components/application_manager/src/resumption/resumption_data_db.cc @@ -29,18 +29,18 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include #include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager_settings.h" +#include "application_manager/message_helper.h" #include "application_manager/resumption/resumption_data_db.h" #include "application_manager/resumption/resumption_sql_queries.h" #include "application_manager/smart_object_keys.h" -#include "application_manager/message_helper.h" -#include "utils/helpers.h" #include "utils/gen_hash.h" +#include "utils/helpers.h" #include "utils/scope_guard.h" -#include "application_manager/application_manager_settings.h" namespace { const std::string kDatabaseName = "resumption"; diff --git a/src/components/application_manager/src/resumption/resumption_data_json.cc b/src/components/application_manager/src/resumption/resumption_data_json.cc index 584fb4e697..591166c687 100644 --- a/src/components/application_manager/src/resumption/resumption_data_json.cc +++ b/src/components/application_manager/src/resumption/resumption_data_json.cc @@ -30,14 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/application_manager.h" #include "application_manager/resumption/resumption_data_json.h" -#include "smart_objects/smart_object.h" -#include "json/json.h" -#include "formatters/CFormatterJsonBase.h" +#include "application_manager/application_manager.h" +#include "application_manager/application_manager_settings.h" #include "application_manager/message_helper.h" #include "application_manager/smart_object_keys.h" -#include "application_manager/application_manager_settings.h" +#include "formatters/CFormatterJsonBase.h" +#include "json/json.h" +#include "smart_objects/smart_object.h" namespace resumption { @@ -531,4 +531,4 @@ void ResumptionDataJson::Persist() { last_state().SaveStateToFileSystem(); } -} // resumption +} // namespace resumption diff --git a/src/components/application_manager/src/rpc_handler_impl.cc b/src/components/application_manager/src/rpc_handler_impl.cc index 28b3779dad..3fceaf573c 100644 --- a/src/components/application_manager/src/rpc_handler_impl.cc +++ b/src/components/application_manager/src/rpc_handler_impl.cc @@ -417,9 +417,9 @@ bool RPCHandlerImpl::ConvertMessageToSO( if (validate_params && output.validate(&report, empty_version, allow_unknown_parameters) != smart_objects::errors::OK) { - LOG4CXX_ERROR(logger_, - "Incorrect parameter from HMI - " - << rpc::PrettyFormat(report)); + LOG4CXX_ERROR( + logger_, + "Incorrect parameter from HMI - " << rpc::PrettyFormat(report)); output.erase(strings::msg_params); output[strings::params][hmi_response::code] = @@ -523,5 +523,5 @@ hmi_apis::HMI_API& RPCHandlerImpl::hmi_so_factory() { mobile_apis::MOBILE_API& RPCHandlerImpl::mobile_so_factory() { return mobile_so_factory_; } -} -} +} // namespace rpc_handler +} // namespace application_manager diff --git a/src/components/application_manager/src/rpc_passing_handler.cc b/src/components/application_manager/src/rpc_passing_handler.cc index 32eda4b9e8..feb3bccc1f 100644 --- a/src/components/application_manager/src/rpc_passing_handler.cc +++ b/src/components/application_manager/src/rpc_passing_handler.cc @@ -397,9 +397,9 @@ void RPCPassingHandler::ClearCompletedTimers() { for (auto it = timeout_queue_.begin(); it != timeout_queue_.end();) { TimerSPtr timer = it->first; if (timer->is_completed()) { - LOG4CXX_DEBUG(logger_, - "Removing completed timer for correlation id " - << it->second); + LOG4CXX_DEBUG( + logger_, + "Removing completed timer for correlation id " << it->second); it = timeout_queue_.erase(it); } else { ++it; @@ -415,9 +415,9 @@ void RPCPassingHandler::AddRequestTimer(uint32_t correlation_id) { const uint32_t timeout_ms = app_manager_.get_settings().rpc_pass_through_timeout(); rpc_passing_timer->Start(timeout_ms, timer::kSingleShot); - LOG4CXX_DEBUG(logger_, - "Adding and starting timer for correlation id " - << correlation_id); + LOG4CXX_DEBUG( + logger_, + "Adding and starting timer for correlation id " << correlation_id); sync_primitives::AutoLock lock(timeout_queue_lock_); timeout_queue_.push_back(std::make_pair(rpc_passing_timer, correlation_id)); } diff --git a/src/components/application_manager/src/rpc_service_impl.cc b/src/components/application_manager/src/rpc_service_impl.cc index daa8cb2ac5..b5cae1c126 100644 --- a/src/components/application_manager/src/rpc_service_impl.cc +++ b/src/components/application_manager/src/rpc_service_impl.cc @@ -431,9 +431,9 @@ void RPCServiceImpl::SendMessageToMobile( if (IsAppServiceRPC(function_id, commands::Command::CommandSource::SOURCE_SDL) || rpc_passing) { - LOG4CXX_DEBUG(logger_, - "Allowing unknown parameters for response function " - << function_id); + LOG4CXX_DEBUG( + logger_, + "Allowing unknown parameters for response function " << function_id); allow_unknown_parameters = true; } diff --git a/src/components/application_manager/src/state_controller_impl.cc b/src/components/application_manager/src/state_controller_impl.cc index f4852c532c..c791f58047 100644 --- a/src/components/application_manager/src/state_controller_impl.cc +++ b/src/components/application_manager/src/state_controller_impl.cc @@ -32,8 +32,8 @@ #include "application_manager/state_controller_impl.h" #include -#include "application_manager/usage_statistics.h" #include "application_manager/rpc_service.h" +#include "application_manager/usage_statistics.h" #include "utils/helpers.h" #include "connection_handler/connection_handler.h" @@ -627,8 +627,8 @@ void StateControllerImpl::ApplyRegularState(ApplicationSharedPtr app, void StateControllerImpl::on_event(const event_engine::MobileEvent& event) {} void StateControllerImpl::on_event(const event_engine::Event& event) { - using smart_objects::SmartObject; using event_engine::Event; + using smart_objects::SmartObject; using namespace hmi_apis; namespace FunctionID = hmi_apis::FunctionID; diff --git a/src/components/application_manager/src/usage_statistics.cc b/src/components/application_manager/src/usage_statistics.cc index 1cfccd816e..3f1831f449 100644 --- a/src/components/application_manager/src/usage_statistics.cc +++ b/src/components/application_manager/src/usage_statistics.cc @@ -31,9 +31,9 @@ */ #include "application_manager/usage_statistics.h" -#include "smart_objects/smart_object.h" -#include "smart_objects/enum_schema_item.h" #include "policy/usage_statistics/statistics_manager.h" +#include "smart_objects/enum_schema_item.h" +#include "smart_objects/smart_object.h" #include "utils/macro.h" using namespace mobile_apis; diff --git a/src/components/application_manager/test/app_launch/app_launch_ctrl_test.cc b/src/components/application_manager/test/app_launch/app_launch_ctrl_test.cc index 3293a8908d..b3bb8dd705 100644 --- a/src/components/application_manager/test/app_launch/app_launch_ctrl_test.cc +++ b/src/components/application_manager/test/app_launch/app_launch_ctrl_test.cc @@ -30,16 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include -#include "utils/macro.h" #include "application_manager/app_launch/app_launch_ctrl_impl.h" #include "application_manager/mock_app_launch_data.h" #include "application_manager/mock_app_launch_settings.h" -#include "application_manager/mock_resume_ctrl.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" +#include "application_manager/mock_resume_ctrl.h" #include "connection_handler/mock_connection_handler.h" +#include "gtest/gtest.h" +#include "utils/macro.h" #include "utils/test_async_waiter.h" @@ -47,14 +47,14 @@ namespace test { namespace components { namespace app_launch_test { +using ::testing::AtLeast; +using ::testing::DoAll; +using ::testing::InSequence; +using ::testing::Invoke; +using ::testing::NiceMock; using ::testing::Return; using ::testing::ReturnRef; using ::testing::Truly; -using ::testing::NiceMock; -using ::testing::Invoke; -using ::testing::AtLeast; -using ::testing::InSequence; -using ::testing::DoAll; namespace ch_test = test::components::connection_handler_test; namespace am_test = test::components::application_manager_test; diff --git a/src/components/application_manager/test/app_launch/app_launch_data_db_test.cc b/src/components/application_manager/test/app_launch/app_launch_data_db_test.cc index dc96fcf176..d0f2e21f4c 100644 --- a/src/components/application_manager/test/app_launch/app_launch_data_db_test.cc +++ b/src/components/application_manager/test/app_launch/app_launch_data_db_test.cc @@ -31,18 +31,18 @@ */ #include +#include #include #include -#include #include "gtest/gtest.h" -#include "utils/macro.h" #include "sql_database.h" #include "sql_query.h" +#include "utils/macro.h" -#include "utils/file_system.h" -#include "application_manager/mock_app_launch_settings.h" #include "application_manager/app_launch/app_launch_data_db.h" #include "application_manager/app_launch/app_launch_sql_queries.h" +#include "application_manager/mock_app_launch_settings.h" +#include "utils/file_system.h" namespace test { namespace components { @@ -51,9 +51,9 @@ namespace app_launch_test { using namespace file_system; using namespace app_launch; -using ::testing::ReturnRef; -using ::testing::Return; using ::testing::NiceMock; +using ::testing::Return; +using ::testing::ReturnRef; namespace { const std::string kEmptyString = ""; diff --git a/src/components/application_manager/test/app_launch/app_launch_data_json_test.cc b/src/components/application_manager/test/app_launch/app_launch_data_json_test.cc index 4541970c70..12a375685e 100644 --- a/src/components/application_manager/test/app_launch/app_launch_data_json_test.cc +++ b/src/components/application_manager/test/app_launch/app_launch_data_json_test.cc @@ -30,27 +30,27 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "application_manager/app_launch/app_launch_data_json.h" #include -#include #include -#include "json/json.h" +#include +#include "application_manager/mock_app_launch_settings.h" +#include "application_manager/smart_object_keys.h" #include "gtest/gtest.h" -#include "utils/macro.h" -#include "utils/file_system.h" -#include "utils/date_time.h" +#include "json/json.h" #include "resumption/last_state_impl.h" #include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/mock_app_launch_settings.h" -#include "application_manager/app_launch/app_launch_data_json.h" +#include "utils/date_time.h" +#include "utils/file_system.h" +#include "utils/macro.h" namespace test { namespace components { namespace test_app_launch { using ::testing::_; -using ::testing::Return; using ::testing::NiceMock; +using ::testing::Return; namespace am = application_manager; using namespace Json; @@ -339,6 +339,6 @@ TEST_F(AppLaunchDataJsonTest, SelectMultipleData) { } } -} // namespace app_launch +} // namespace test_app_launch } // namespace components } // namespace test diff --git a/src/components/application_manager/test/app_service_manager_test.cc b/src/components/application_manager/test/app_service_manager_test.cc index 526bbbdb7d..0f2b4469a2 100644 --- a/src/components/application_manager/test/app_service_manager_test.cc +++ b/src/components/application_manager/test/app_service_manager_test.cc @@ -134,13 +134,15 @@ class AppServiceManagerTest : public testing::Test { BroadcastCapabilityUpdate( CapabilityUpdateMatcher( mobile_apis::ServiceUpdateReason::PUBLISHED), - _)).WillOnce(Return()); + _)) + .WillOnce(Return()); if (first_run) { EXPECT_CALL(*mock_message_helper_, BroadcastCapabilityUpdate( CapabilityUpdateMatcher( mobile_apis::ServiceUpdateReason::ACTIVATED), - _)).WillOnce(Return()); + _)) + .WillOnce(Return()); } bool mobile_service = connection_key != kHMIConnectionKey; return app_service_manager_.PublishAppService( @@ -153,16 +155,17 @@ class AppServiceManagerTest : public testing::Test { mobile_apis::ServiceUpdateReason::eType reason, bool published, bool active) { - smart_objects::SmartObject& services_updated = msg_params - [am::strings::system_capability][am::strings::app_services_capabilities] - [am::strings::app_services]; + smart_objects::SmartObject& services_updated = + msg_params[am::strings::system_capability] + [am::strings::app_services_capabilities] + [am::strings::app_services]; ASSERT_EQ(smart_objects::SmartType_Array, services_updated.getType()); EXPECT_EQ(length, services_updated.length()); for (size_t i = 0; i < services_updated.length(); i++) { smart_objects::SmartObject& service_cap = services_updated[i]; - if (service_id == - service_cap[am::strings::updated_app_service_record] - [am::strings::service_id].asString()) { + if (service_id == service_cap[am::strings::updated_app_service_record] + [am::strings::service_id] + .asString()) { CheckCapability(service_cap, service_id, reason, published, active); return; } @@ -208,14 +211,16 @@ TEST_F(AppServiceManagerTest, PublishAppService_Mobile_SUCCESS) { *mock_message_helper_, BroadcastCapabilityUpdate( CapabilityUpdateMatcher(mobile_apis::ServiceUpdateReason::PUBLISHED), - _)).WillOnce(DoAll(SaveArg<0>(&syscap_update_published), Return())); + _)) + .WillOnce(DoAll(SaveArg<0>(&syscap_update_published), Return())); smart_objects::SmartObject syscap_update_activated; EXPECT_CALL( *mock_message_helper_, BroadcastCapabilityUpdate( CapabilityUpdateMatcher(mobile_apis::ServiceUpdateReason::ACTIVATED), - _)).WillOnce(DoAll(SaveArg<0>(&syscap_update_activated), Return())); + _)) + .WillOnce(DoAll(SaveArg<0>(&syscap_update_activated), Return())); auto record = app_service_manager_.PublishAppService(manifest, true, kConnectionKey); @@ -255,14 +260,16 @@ TEST_F(AppServiceManagerTest, PublishAppService_HMI_SUCCESS) { *mock_message_helper_, BroadcastCapabilityUpdate( CapabilityUpdateMatcher(mobile_apis::ServiceUpdateReason::PUBLISHED), - _)).WillOnce(DoAll(SaveArg<0>(&syscap_update_published), Return())); + _)) + .WillOnce(DoAll(SaveArg<0>(&syscap_update_published), Return())); smart_objects::SmartObject syscap_update_activated; EXPECT_CALL( *mock_message_helper_, BroadcastCapabilityUpdate( CapabilityUpdateMatcher(mobile_apis::ServiceUpdateReason::ACTIVATED), - _)).WillOnce(DoAll(SaveArg<0>(&syscap_update_activated), Return())); + _)) + .WillOnce(DoAll(SaveArg<0>(&syscap_update_activated), Return())); auto record = app_service_manager_.PublishAppService(manifest, false); @@ -297,7 +304,8 @@ TEST_F(AppServiceManagerTest, UnpublishAppService_SUCCESS) { *mock_message_helper_, BroadcastCapabilityUpdate( CapabilityUpdateMatcher(mobile_apis::ServiceUpdateReason::REMOVED), - _)).WillOnce(DoAll(SaveArg<0>(&syscap_update_unpublished), Return())); + _)) + .WillOnce(DoAll(SaveArg<0>(&syscap_update_unpublished), Return())); std::string service_id = record[am::strings::service_id].asString(); EXPECT_TRUE(app_service_manager_.UnpublishAppService(service_id)); @@ -319,7 +327,8 @@ TEST_F(AppServiceManagerTest, ActivateAppService_AlreadyActivated) { *mock_message_helper_, BroadcastCapabilityUpdate( CapabilityUpdateMatcher(mobile_apis::ServiceUpdateReason::ACTIVATED), - _)).Times(0); + _)) + .Times(0); std::string service_id = record[am::strings::service_id].asString(); EXPECT_TRUE(app_service_manager_.ActivateAppService(service_id)); @@ -337,7 +346,8 @@ TEST_F(AppServiceManagerTest, ActivateAppService_TwoApps_SUCCESS) { *mock_message_helper_, BroadcastCapabilityUpdate( CapabilityUpdateMatcher(mobile_apis::ServiceUpdateReason::ACTIVATED), - _)).WillOnce(DoAll(SaveArg<0>(&syscap_update_activated), Return())); + _)) + .WillOnce(DoAll(SaveArg<0>(&syscap_update_activated), Return())); std::string service_id = record[am::strings::service_id].asString(); std::string service_id2 = record2[am::strings::service_id].asString(); diff --git a/src/components/application_manager/test/application_helper_test.cc b/src/components/application_manager/test/application_helper_test.cc index 3203839fc2..d9d590a171 100644 --- a/src/components/application_manager/test/application_helper_test.cc +++ b/src/components/application_manager/test/application_helper_test.cc @@ -36,42 +36,42 @@ #include "application_manager/mock_application_manager_settings.h" #include "application_manager/mock_message_helper.h" -#include "policy/usage_statistics/mock_statistics_manager.h" #include "policy/mock_policy_settings.h" +#include "policy/usage_statistics/mock_statistics_manager.h" #include "application_manager/application.h" #include "application_manager/application_impl.h" #include "application_manager/application_manager_impl.h" -#include "application_manager/usage_statistics.h" #include "application_manager/helpers/application_helper.h" #include "application_manager/smart_object_keys.h" -#include "interfaces/MOBILE_API.h" +#include "application_manager/usage_statistics.h" #include "connection_handler/device.h" +#include "interfaces/MOBILE_API.h" #include "smart_objects/smart_object.h" #include "utils/custom_string.h" #include "utils/macro.h" -#include "test/resumption/mock_last_state.h" #include "media_manager/mock_media_manager.h" +#include "test/resumption/mock_last_state.h" namespace { const uint8_t expected_tread_pool_size = 2u; const uint8_t stop_streaming_timeout = 1u; const std::string kDirectoryName = "./test_storage"; const std::vector kTimeoutPrompt{"timeoutPrompt"}; -} +} // namespace namespace test { namespace components { namespace application_manager_test { +using resumption_test::MockLastState; +using test::components::media_manager_test::MockMediaManager; using testing::_; using ::testing::Mock; using ::testing::NiceMock; using ::testing::Return; using ::testing::ReturnRef; -using resumption_test::MockLastState; -using test::components::media_manager_test::MockMediaManager; using namespace application_manager; using namespace policy_handler_test; @@ -255,6 +255,6 @@ TEST_F(ApplicationHelperTest, RecallApplicationData_ExpectHMICleanupRequests) { application_manager::DeleteApplicationData(app_impl_, app_manager_impl_); } -} // application_manager_test -} // components -} // test +} // namespace application_manager_test +} // namespace components +} // namespace test diff --git a/src/components/application_manager/test/application_impl_test.cc b/src/components/application_manager/test/application_impl_test.cc index 437f567538..46d35bdbef 100644 --- a/src/components/application_manager/test/application_impl_test.cc +++ b/src/components/application_manager/test/application_impl_test.cc @@ -35,23 +35,23 @@ #include #include -#include "gtest/gtest.h" #include "application_manager/hmi_state.h" +#include "gtest/gtest.h" #include "utils/file_system.h" -#include "application_manager/mock_message_helper.h" -#include "utils/custom_string.h" +#include "application_manager/event_engine/event_dispatcher.h" #include "application_manager/mock_application_manager.h" #include "application_manager/mock_application_manager_settings.h" +#include "application_manager/mock_message_helper.h" #include "application_manager/mock_request_controller_settings.h" -#include "application_manager/event_engine/event_dispatcher.h" -#include "application_manager/state_controller.h" -#include "resumption/last_state.h" -#include "application_manager/resumption/resume_ctrl.h" -#include "application_manager/policies/mock_policy_handler_interface.h" #include "application_manager/mock_resume_ctrl.h" +#include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/resumption/resume_ctrl.h" +#include "application_manager/state_controller.h" #include "policy/usage_statistics/mock_statistics_manager.h" +#include "resumption/last_state.h" #include "smart_objects/smart_object.h" +#include "utils/custom_string.h" namespace test { namespace components { @@ -63,10 +63,10 @@ using namespace mobile_apis; namespace custom_str = utils::custom_string; using ::testing::_; +using ::testing::AtLeast; using ::testing::Mock; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::AtLeast; using usage_statistics_test::MockStatisticsManager; typedef void (ApplicationImpl::*AddSet)(HmiStatePtr args); @@ -91,9 +91,11 @@ class ApplicationImplTest : public ::testing::Test { EXPECT_CALL(mock_application_manager_settings_, app_storage_folder()) .WillRepeatedly(ReturnRef(directory_name)); EXPECT_CALL(mock_application_manager_settings_, - audio_data_stopped_timeout()).WillOnce(Return(0)); + audio_data_stopped_timeout()) + .WillOnce(Return(0)); EXPECT_CALL(mock_application_manager_settings_, - video_data_stopped_timeout()).WillOnce(Return(0)); + video_data_stopped_timeout()) + .WillOnce(Return(0)); app_impl.reset( new ApplicationImpl(app_id, policy_app_id, @@ -666,7 +668,8 @@ TEST_F(ApplicationImplTest, TEST_F(ApplicationImplTest, UpdateHash_AppMngrNotSuspended) { EXPECT_CALL(*MockMessageHelper::message_helper_mock(), - SendHashUpdateNotification(app_id, _)).Times(1); + SendHashUpdateNotification(app_id, _)) + .Times(1); resumprion_test::MockResumeCtrl mock_resume_ctrl; EXPECT_CALL(mock_application_manager_, resume_controller()) .WillOnce(ReturnRef(mock_resume_ctrl)); @@ -678,7 +681,8 @@ TEST_F(ApplicationImplTest, UpdateHash_AppMngrNotSuspended) { TEST_F(ApplicationImplTest, UpdateHash_AppMngrSuspended) { EXPECT_CALL(*MockMessageHelper::message_helper_mock(), - SendHashUpdateNotification(app_id, _)).Times(0); + SendHashUpdateNotification(app_id, _)) + .Times(0); resumprion_test::MockResumeCtrl mock_resume_ctrl; EXPECT_CALL(mock_application_manager_, resume_controller()) .WillOnce(ReturnRef(mock_resume_ctrl)); @@ -699,7 +703,8 @@ TEST_F(ApplicationImplTest, SetVideoConfig_MobileNavi_StreamingNotApproved) { TEST_F(ApplicationImplTest, SetVideoConfig_MobileNavi_StreamingApproved) { app_impl->set_video_streaming_approved(true); EXPECT_CALL(*MockMessageHelper::message_helper_mock(), - SendNaviSetVideoConfig(app_id, _, _)).Times(0); + SendNaviSetVideoConfig(app_id, _, _)) + .Times(0); smart_objects::SmartObject params; app_impl->SetVideoConfig(protocol_handler::ServiceType::kMobileNav, params); @@ -707,7 +712,8 @@ TEST_F(ApplicationImplTest, SetVideoConfig_MobileNavi_StreamingApproved) { TEST_F(ApplicationImplTest, SetVideoConfig_NotMobileNavi) { EXPECT_CALL(*MockMessageHelper::message_helper_mock(), - SendNaviSetVideoConfig(app_id, _, _)).Times(0); + SendNaviSetVideoConfig(app_id, _, _)) + .Times(0); smart_objects::SmartObject params; app_impl->SetVideoConfig(protocol_handler::ServiceType::kAudio, params); @@ -732,13 +738,15 @@ TEST_F(ApplicationImplTest, StartStreaming_Audio_StreamingNotApproved) { TEST_F(ApplicationImplTest, StartStreaming_StreamingApproved) { app_impl->set_video_streaming_approved(true); EXPECT_CALL(*MockMessageHelper::message_helper_mock(), - SendNaviStartStream(app_id, _)).Times(0); + SendNaviStartStream(app_id, _)) + .Times(0); app_impl->StartStreaming(protocol_handler::ServiceType::kMobileNav); app_impl->set_audio_streaming_approved(true); EXPECT_CALL(*MockMessageHelper::message_helper_mock(), - SendAudioStartStream(app_id, _)).Times(0); + SendAudioStartStream(app_id, _)) + .Times(0); app_impl->StartStreaming(protocol_handler::ServiceType::kAudio); } diff --git a/src/components/application_manager/test/application_manager_impl_mock_hmi_test.cc b/src/components/application_manager/test/application_manager_impl_mock_hmi_test.cc index 8ab852779a..939ef98620 100644 --- a/src/components/application_manager/test/application_manager_impl_mock_hmi_test.cc +++ b/src/components/application_manager/test/application_manager_impl_mock_hmi_test.cc @@ -33,25 +33,25 @@ #include #include -#include "gtest/gtest.h" #include "application_manager/application.h" #include "application_manager/application_impl.h" #include "application_manager/application_manager_impl.h" +#include "gtest/gtest.h" #include "utils/custom_string.h" #include "encryption/hashing.h" #include "application_manager/mock_application_manager_settings.h" -#include "application_manager/mock_resumption_data.h" #include "application_manager/mock_command_factory.h" #include "application_manager/mock_request.h" +#include "application_manager/mock_resumption_data.h" +#include "application_manager/mock_rpc_plugin.h" +#include "application_manager/mock_rpc_plugin_manager.h" #include "connection_handler/mock_connection_handler.h" #include "policy/mock_policy_settings.h" #include "policy/usage_statistics/mock_statistics_manager.h" -#include "protocol_handler/mock_session_observer.h" #include "protocol_handler/mock_protocol_handler.h" -#include "application_manager/mock_rpc_plugin_manager.h" -#include "application_manager/mock_rpc_plugin.h" +#include "protocol_handler/mock_session_observer.h" #include "utils/optional.h" namespace test { @@ -63,9 +63,9 @@ namespace am = application_manager; using testing::_; using ::testing::DoAll; using ::testing::Mock; +using ::testing::NiceMock; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::NiceMock; using ::testing::SetArgPointee; using namespace application_manager; @@ -269,6 +269,6 @@ TEST_F(ApplicationManagerImplMockHmiTest, Mock::VerifyAndClearExpectations(&mock_command_factory); } -} // application_manager_test +} // namespace application_manager_test } // namespace components } // namespace test diff --git a/src/components/application_manager/test/application_manager_impl_test.cc b/src/components/application_manager/test/application_manager_impl_test.cc index e4951880de..12ca199862 100644 --- a/src/components/application_manager/test/application_manager_impl_test.cc +++ b/src/components/application_manager/test/application_manager_impl_test.cc @@ -39,10 +39,10 @@ #include "application_manager/application.h" #include "application_manager/application_impl.h" #include "application_manager/application_manager_impl.h" +#include "application_manager/mock_app_service_manager.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager_settings.h" #include "application_manager/mock_resumption_data.h" -#include "application_manager/mock_app_service_manager.h" #include "application_manager/mock_rpc_plugin_manager.h" #include "application_manager/mock_rpc_service.h" #include "application_manager/policies/mock_policy_handler_interface.h" @@ -177,7 +177,8 @@ class ApplicationManagerImplTest : public ::testing::Test { ON_CALL(mock_application_manager_settings_, default_timeout()) .WillByDefault(ReturnRef(kTimeout)); ON_CALL(mock_application_manager_settings_, - application_list_update_timeout()).WillByDefault(Return(kTimeout)); + application_list_update_timeout()) + .WillByDefault(Return(kTimeout)); app_manager_impl_.reset(new am::ApplicationManagerImpl( mock_application_manager_settings_, mock_policy_settings_)); @@ -1154,9 +1155,10 @@ bool ApplicationManagerImplTest::CheckResumptionRequiredTransportAvailableTest( TransportTypeProfileStringFromDeviceHandle(secondary_device_handle)) .WillOnce(Return(secondary_transport_device_string)); } else { - EXPECT_CALL(mock_session_observer_, - TransportTypeProfileStringFromDeviceHandle( - secondary_device_handle)).WillOnce(Return(std::string(""))); + EXPECT_CALL( + mock_session_observer_, + TransportTypeProfileStringFromDeviceHandle(secondary_device_handle)) + .WillOnce(Return(std::string(""))); } return app_manager_impl_->CheckResumptionRequiredTransportAvailable( @@ -1572,7 +1574,8 @@ TEST_F(ApplicationManagerImplTest, testing::An())) .WillOnce(DoAll(SetArgPointee<3u>(kDeviceId), Return(0))); EXPECT_CALL(*mock_rpc_service_, - ManageMobileCommand(_, commands::Command::SOURCE_SDL)).Times(0); + ManageMobileCommand(_, commands::Command::SOURCE_SDL)) + .Times(0); smart_objects::SmartObject request_for_registration( smart_objects::SmartType_Map); diff --git a/src/components/application_manager/test/application_state_test.cc b/src/components/application_manager/test/application_state_test.cc index a0bfa2890f..5ebcdd29c7 100644 --- a/src/components/application_manager/test/application_state_test.cc +++ b/src/components/application_manager/test/application_state_test.cc @@ -31,15 +31,15 @@ */ #include "application_manager/application_state.h" -#include "gtest/gtest.h" +#include "application_manager/event_engine/event_dispatcher.h" #include "application_manager/hmi_state.h" -#include "application_manager/mock_application_manager.h" #include "application_manager/mock_application.h" -#include "application_manager/event_engine/event_dispatcher.h" -#include "resumption/last_state.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/policies/policy_handler.h" -#include "application_manager/state_controller.h" #include "application_manager/resumption/resume_ctrl.h" +#include "application_manager/state_controller.h" +#include "gtest/gtest.h" +#include "resumption/last_state.h" namespace test { namespace components { @@ -60,7 +60,7 @@ std::vector GenerateCurrentStates() { states.push_back(StateID::STATE_ID_DEACTIVATE_HMI); return states; } -} +} // namespace class ApplicationStateTest : public ::testing::Test { public: diff --git a/src/components/application_manager/test/command_holder_test.cc b/src/components/application_manager/test/command_holder_test.cc index 9496e37924..8a5c639775 100644 --- a/src/components/application_manager/test/command_holder_test.cc +++ b/src/components/application_manager/test/command_holder_test.cc @@ -36,8 +36,8 @@ #include "application_manager/commands/command.h" #include "smart_objects/smart_object.h" -#include "application_manager/mock_application_manager.h" #include "application_manager/mock_application.h" +#include "application_manager/mock_application_manager.h" #include "application_manager/mock_rpc_service.h" namespace test { @@ -173,6 +173,6 @@ TEST_F(CommandHolderImplTest, Hold_Mobile_and_HMI_commands_ExpectReleased) { am::CommandHolder::CommandType::kMobileCommand); } -} // application_manager_test -} // components -} // test +} // namespace application_manager_test +} // namespace components +} // namespace test diff --git a/src/components/application_manager/test/commands/command_impl_test.cc b/src/components/application_manager/test/commands/command_impl_test.cc index 53e8534c2b..734a7d91b8 100644 --- a/src/components/application_manager/test/commands/command_impl_test.cc +++ b/src/components/application_manager/test/commands/command_impl_test.cc @@ -31,35 +31,35 @@ */ #include -#include #include #include #include +#include #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" +#include "application_manager/application_manager.h" #include "application_manager/commands/command.h" #include "application_manager/commands/command_impl.h" -#include "application_manager/application_manager.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/mock_application.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { namespace commands_test { namespace command_impl { -using ::testing::Return; -using ::testing::AtLeast; using ::testing::_; +using ::testing::AtLeast; +using ::testing::Return; namespace strings = ::application_manager::strings; -using ::application_manager::commands::CommandImpl; using ::application_manager::ApplicationManager; -using ::application_manager::commands::MessageSharedPtr; using ::application_manager::ApplicationSharedPtr; +using ::application_manager::commands::CommandImpl; +using ::application_manager::commands::MessageSharedPtr; using ::test::components::application_manager_test::MockApplication; typedef std::shared_ptr MockAppPtr; @@ -82,8 +82,8 @@ class CommandImplTest : public CommandsTest { public: class UnwrappedCommandImpl : CommandImpl { public: - using CommandImpl::ReplaceMobileWithHMIAppId; using CommandImpl::ReplaceHMIWithMobileAppId; + using CommandImpl::ReplaceMobileWithHMIAppId; UnwrappedCommandImpl( const MessageSharedPtr& message, diff --git a/src/components/application_manager/test/commands/command_request_impl_test.cc b/src/components/application_manager/test/commands/command_request_impl_test.cc index 6d80a11440..cf26c19249 100644 --- a/src/components/application_manager/test/commands/command_request_impl_test.cc +++ b/src/components/application_manager/test/commands/command_request_impl_test.cc @@ -31,25 +31,25 @@ */ #include -#include #include +#include -#include "gtest/gtest.h" #include "application_manager/commands/command_impl.h" #include "application_manager/commands/command_request_impl.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command_request_test.h" +#include "application_manager/commands/commands_test.h" +#include "gtest/gtest.h" #include "utils/lock.h" -#include "utils/data_accessor.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" #include "application_manager/application_manager.h" -#include "application_manager/mock_application.h" #include "application_manager/event_engine/event.h" -#include "application_manager/mock_message_helper.h" +#include "application_manager/mock_application.h" #include "application_manager/mock_hmi_interface.h" +#include "application_manager/mock_message_helper.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" +#include "utils/data_accessor.h" #include "application_manager/mock_app_service_manager.h" #include "resumption/last_state_impl.h" @@ -64,20 +64,20 @@ namespace strings = am::strings; namespace hmi_response = am::hmi_response; using ::testing::_; +using ::testing::DoAll; using ::testing::Return; using ::testing::SaveArg; -using ::testing::DoAll; using ::testing::SetArgReferee; -using am::commands::MessageSharedPtr; -using am::CommandParametersPermissions; -using am::event_engine::EventObserver; -using am::commands::CommandImpl; -using am::commands::CommandRequestImpl; using am::ApplicationManager; using am::ApplicationSet; -using am::RPCParams; +using am::CommandParametersPermissions; using am::MockHmiInterfaces; +using am::RPCParams; +using am::commands::CommandImpl; +using am::commands::CommandRequestImpl; +using am::commands::MessageSharedPtr; +using am::event_engine::EventObserver; using test::components::application_manager_test::MockAppServiceManager; typedef am::commands::CommandRequestImpl::RequestState RequestState; @@ -105,10 +105,10 @@ class CommandRequestImplTest class UnwrappedCommandRequestImpl : public CommandRequestImpl { public: - using CommandRequestImpl::CheckAllowedParameters; - using CommandRequestImpl::RemoveDisallowedParameters; using CommandRequestImpl::AddDisallowedParameters; + using CommandRequestImpl::CheckAllowedParameters; using CommandRequestImpl::HasDisallowedParams; + using CommandRequestImpl::RemoveDisallowedParameters; UnwrappedCommandRequestImpl(const MessageSharedPtr& message, ApplicationManager& am, diff --git a/src/components/application_manager/test/commands/command_response_impl_test.cc b/src/components/application_manager/test/commands/command_response_impl_test.cc index 41cc654a24..6362ea702e 100644 --- a/src/components/application_manager/test/commands/command_response_impl_test.cc +++ b/src/components/application_manager/test/commands/command_response_impl_test.cc @@ -35,12 +35,12 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/commands/commands_test.h" #include "application_manager/commands/command.h" #include "application_manager/commands/command_response_impl.h" +#include "application_manager/commands/commands_test.h" #include "application_manager/mock_application.h" +#include "application_manager/smart_object_keys.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { @@ -50,8 +50,8 @@ namespace command_response_impl { namespace strings = ::application_manager::strings; namespace hmi_response = ::application_manager::hmi_response; -using ::application_manager::commands::MessageSharedPtr; using ::application_manager::commands::CommandResponseImpl; +using ::application_manager::commands::MessageSharedPtr; class CommandResponseImplTest : public CommandsTest {}; diff --git a/src/components/application_manager/test/event_engine_test.cc b/src/components/application_manager/test/event_engine_test.cc index de0b5afb3c..598d12f109 100644 --- a/src/components/application_manager/test/event_engine_test.cc +++ b/src/components/application_manager/test/event_engine_test.cc @@ -32,11 +32,11 @@ #include "gtest/gtest.h" -#include "application_manager/event_engine/event_observer.h" #include "application_manager/event_engine/event.h" #include "application_manager/event_engine/event_dispatcher_impl.h" -#include "application_manager/mock_event_observer.h" +#include "application_manager/event_engine/event_observer.h" #include "application_manager/mock_event_dispatcher.h" +#include "application_manager/mock_event_observer.h" #include "smart_objects/smart_object.h" #include "interfaces/HMI_API.h" @@ -45,8 +45,8 @@ namespace test { namespace components { namespace event_engine_test { -using application_manager::event_engine::EventDispatcherImpl; using application_manager::event_engine::Event; +using application_manager::event_engine::EventDispatcherImpl; using application_manager::event_engine::EventObserver; using testing::_; diff --git a/src/components/application_manager/test/hmi_capabilities_test.cc b/src/components/application_manager/test/hmi_capabilities_test.cc index d67dfebaa5..e883e7bddb 100644 --- a/src/components/application_manager/test/hmi_capabilities_test.cc +++ b/src/components/application_manager/test/hmi_capabilities_test.cc @@ -36,32 +36,32 @@ #include #include "application_manager/hmi_capabilities.h" -#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" #include "application_manager/mock_message_helper.h" -#include "smart_objects/enum_schema_item.h" +#include "gtest/gtest.h" #include "interfaces/HMI_API.h" +#include "smart_objects/enum_schema_item.h" +#include "smart_objects/smart_object.h" #include "application_manager/hmi_capabilities_for_testing.h" -#include "utils/file_system.h" #include "application_manager/mock_application_manager.h" #include "application_manager/mock_application_manager_settings.h" #include "application_manager/mock_event_dispatcher.h" #include "application_manager/mock_rpc_service.h" +#include "application_manager/resumption/resume_ctrl.h" #include "application_manager/state_controller.h" #include "resumption/last_state_impl.h" -#include "application_manager/resumption/resume_ctrl.h" +#include "utils/file_system.h" namespace test { namespace components { namespace application_manager_test { using ::testing::_; -using ::testing::Return; -using ::testing::ReturnRef; using ::testing::AtLeast; -using ::testing::Invoke; using ::testing::InSequence; +using ::testing::Invoke; +using ::testing::Return; +using ::testing::ReturnRef; using namespace application_manager; @@ -76,7 +76,8 @@ class HMICapabilitiesTest : public ::testing::Test { EXPECT_CALL(app_mngr_, get_settings()) .WillRepeatedly(ReturnRef(mock_application_manager_settings_)); EXPECT_CALL(mock_application_manager_settings_, - hmi_capabilities_file_name()).WillOnce(ReturnRef(file_name_)); + hmi_capabilities_file_name()) + .WillOnce(ReturnRef(file_name_)); EXPECT_CALL(mock_event_dispatcher, add_observer(_, _, _)).Times(1); EXPECT_CALL(mock_event_dispatcher, remove_observer(_)).Times(1); EXPECT_CALL(mock_application_manager_settings_, launch_hmi()) @@ -140,9 +141,9 @@ struct CStringComparator { } }; -typedef std::map CStringToEnumMap; +typedef std:: + map + CStringToEnumMap; CStringToEnumMap InitCStringToEnumMap() { size_t value = sizeof(cstring_values_) / sizeof(cstring_values_[0]); @@ -407,7 +408,8 @@ TEST_F(HMICapabilitiesTest, LoadCapabilitiesFromFile) { .asInt()); EXPECT_EQ(350, vs_capability_so[strings::preferred_resolution] - [strings::resolution_height].asInt()); + [strings::resolution_height] + .asInt()); EXPECT_TRUE(vs_capability_so.keyExists(strings::max_bitrate)); EXPECT_EQ(10000, vs_capability_so[strings::max_bitrate].asInt()); EXPECT_TRUE(vs_capability_so.keyExists(strings::supported_formats)); @@ -454,7 +456,8 @@ TEST_F(HMICapabilitiesTest, LoadCapabilitiesFromFile) { rc_capability_so["climateControlCapabilities"][0]["fanSpeedAvailable"] .asBool()); EXPECT_TRUE(rc_capability_so["climateControlCapabilities"][0] - ["desiredTemperatureAvailable"].asBool()); + ["desiredTemperatureAvailable"] + .asBool()); EXPECT_TRUE( rc_capability_so["climateControlCapabilities"][0]["acEnableAvailable"] .asBool()); @@ -582,7 +585,8 @@ TEST_F(HMICapabilitiesTest, VerifyImageType) { void HMICapabilitiesTest::SetCooperating() { smart_objects::SmartObjectSPtr test_so; EXPECT_CALL(*(MockMessageHelper::message_helper_mock()), - CreateModuleInfoSO(_, _)).WillRepeatedly(Return(test_so)); + CreateModuleInfoSO(_, _)) + .WillRepeatedly(Return(test_so)); EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _)) .WillRepeatedly(Return(true)); } diff --git a/src/components/application_manager/test/hmi_language_handler_test.cc b/src/components/application_manager/test/hmi_language_handler_test.cc index ec88075212..5f07c1b9d1 100644 --- a/src/components/application_manager/test/hmi_language_handler_test.cc +++ b/src/components/application_manager/test/hmi_language_handler_test.cc @@ -32,18 +32,18 @@ #include -#include "gtest/gtest.h" #include "application_manager/application_manager.h" #include "application_manager/hmi_language_handler.h" -#include "application_manager/state_controller.h" +#include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" #include "application_manager/mock_event_dispatcher.h" -#include "application_manager/mock_message_helper.h" -#include "application_manager/resumption/resume_ctrl_impl.h" #include "application_manager/mock_hmi_capabilities.h" -#include "application_manager/mock_application.h" +#include "application_manager/mock_message_helper.h" #include "application_manager/mock_rpc_service.h" +#include "application_manager/resumption/resume_ctrl_impl.h" #include "application_manager/smart_object_keys.h" +#include "application_manager/state_controller.h" +#include "gtest/gtest.h" #include "test/resumption/mock_last_state.h" #include "utils/lock.h" @@ -54,13 +54,13 @@ namespace hmi_language_handler { namespace am = ::application_manager; -using am::event_engine::Event; using am::ApplicationSet; +using am::event_engine::Event; +using ::testing::_; +using ::testing::NiceMock; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::NiceMock; -using ::testing::_; typedef NiceMock< ::test::components::application_manager_test::MockApplicationManager> diff --git a/src/components/application_manager/test/include/application_manager/commands/command_request_test.h b/src/components/application_manager/test/include/application_manager/commands/command_request_test.h index 8dd29ce244..3a44d7b3ff 100644 --- a/src/components/application_manager/test/include/application_manager/commands/command_request_test.h +++ b/src/components/application_manager/test/include/application_manager/commands/command_request_test.h @@ -37,11 +37,11 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" +#include "application_manager/commands/command_request_impl.h" #include "application_manager/smart_object_keys.h" #include "application_manager/test/include/application_manager/commands/commands_test.h" -#include "application_manager/commands/command_request_impl.h" #include "application_manager/test/include/application_manager/mock_event_dispatcher.h" +#include "smart_objects/smart_object.h" #include "application_manager/event_engine/event.h" @@ -49,12 +49,12 @@ namespace test { namespace components { namespace commands_test { +using ::test::components::event_engine_test::MockEventDispatcher; using ::testing::_; -using ::testing::Return; -using ::testing::SaveArg; using ::testing::DoAll; using ::testing::NiceMock; -using ::test::components::event_engine_test::MockEventDispatcher; +using ::testing::Return; +using ::testing::SaveArg; namespace am = ::application_manager; using am::commands::Command; using am::commands::CommandRequestImpl; diff --git a/src/components/application_manager/test/include/application_manager/commands/commands_test.h b/src/components/application_manager/test/include/application_manager/commands/commands_test.h index 9a961ea1a9..cd0514a0da 100644 --- a/src/components/application_manager/test/include/application_manager/commands/commands_test.h +++ b/src/components/application_manager/test/include/application_manager/commands/commands_test.h @@ -36,38 +36,38 @@ #include #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" #include "application_manager/commands/command.h" +#include "smart_objects/smart_object.h" #include "application_manager/mock_application_manager.h" -#include "test/application_manager/mock_application_manager_settings.h" -#include "application_manager/test/include/application_manager/mock_hmi_interface.h" -#include "application_manager/test/include/application_manager/mock_application.h" -#include "application_manager/test/include/application_manager/mock_message_helper.h" #include "application_manager/mock_application_manager_settings.h" -#include "application_manager/mock_rpc_service.h" #include "application_manager/mock_hmi_capabilities.h" +#include "application_manager/mock_rpc_service.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/test/include/application_manager/mock_application.h" +#include "application_manager/test/include/application_manager/mock_hmi_interface.h" +#include "application_manager/test/include/application_manager/mock_message_helper.h" +#include "test/application_manager/mock_application_manager_settings.h" namespace test { namespace components { namespace commands_test { namespace am = ::application_manager; -using ::testing::ReturnRef; -using ::testing::Return; -using ::testing::NiceMock; -using ::testing::Mock; using ::testing::_; +using ::testing::Mock; +using ::testing::NiceMock; +using ::testing::Return; +using ::testing::ReturnRef; -using ::smart_objects::SmartObject; +using am::ApplicationSharedPtr; +using am::MockMessageHelper; using am::commands::MessageSharedPtr; +using ::smart_objects::SmartObject; +using ::test::components::application_manager_test::MockApplication; using ::test::components::application_manager_test::MockApplicationManager; using ::test::components::application_manager_test:: MockApplicationManagerSettings; -using am::ApplicationSharedPtr; -using am::MockMessageHelper; -using ::test::components::application_manager_test::MockApplication; // Depending on the value type will be selected template @@ -100,9 +100,8 @@ class CommandsTest : public ::testing::Test { typedef typename TypeIf, MockApplicationManager>::Result MockAppManager; - typedef typename TypeIf, - MockApplication>::Result MockApp; + typedef typename TypeIf, MockApplication>:: + Result MockApp; typedef std::shared_ptr MockAppPtr; virtual ~CommandsTest() { @@ -183,11 +182,11 @@ class CommandsTest : public ::testing::Test { void InitHMIToMobileResultConverter() { namespace MobileResult = mobile_apis::Result; namespace HMIResult = hmi_apis::Common_Result; - auto link_hmi_to_mob_result = - [this](HMIResult::eType hmi_result, MobileResult::eType mobile_result) { - ON_CALL(mock_message_helper_, HMIToMobileResult(hmi_result)) - .WillByDefault(Return(mobile_result)); - }; + auto link_hmi_to_mob_result = [this](HMIResult::eType hmi_result, + MobileResult::eType mobile_result) { + ON_CALL(mock_message_helper_, HMIToMobileResult(hmi_result)) + .WillByDefault(Return(mobile_result)); + }; link_hmi_to_mob_result(HMIResult::INVALID_ENUM, MobileResult::INVALID_ENUM); link_hmi_to_mob_result(HMIResult::SUCCESS, MobileResult::SUCCESS); link_hmi_to_mob_result(HMIResult::UNSUPPORTED_REQUEST, @@ -233,17 +232,17 @@ class CommandsTest : public ::testing::Test { }; MATCHER_P(MobileResultCodeIs, result_code, "") { - return result_code == - static_cast( - (*arg)[application_manager::strings::msg_params] - [application_manager::strings::result_code].asInt()); + return result_code == static_cast( + (*arg)[application_manager::strings::msg_params] + [application_manager::strings::result_code] + .asInt()); } MATCHER_P(HMIResultCodeIs, result_code, "") { - return result_code == - static_cast( - (*arg)[application_manager::strings::params] - [application_manager::strings::function_id].asInt()); + return result_code == static_cast( + (*arg)[application_manager::strings::params] + [application_manager::strings::function_id] + .asInt()); } MATCHER_P3(MobileResponseIs, result_code, result_info, result_success, "") { diff --git a/src/components/application_manager/test/include/application_manager/mock_app_launch_data.h b/src/components/application_manager/test/include/application_manager/mock_app_launch_data.h index 881ebb2575..9f50a73075 100644 --- a/src/components/application_manager/test/include/application_manager/mock_app_launch_data.h +++ b/src/components/application_manager/test/include/application_manager/mock_app_launch_data.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_APP_LAUNCH_DATA_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_APP_LAUNCH_DATA_H_ -#include "gmock/gmock.h" #include "application_manager/app_launch/app_launch_data.h" +#include "gmock/gmock.h" namespace test { namespace components { diff --git a/src/components/application_manager/test/include/application_manager/mock_application.h b/src/components/application_manager/test/include/application_manager/mock_application.h index 36d20f227d..74d09661c7 100644 --- a/src/components/application_manager/test/include/application_manager/mock_application.h +++ b/src/components/application_manager/test/include/application_manager/mock_application.h @@ -1,43 +1,43 @@ /* * 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. -*/ + * 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. + */ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_APPLICATION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_APPLICATION_H_ #include -#include "gmock/gmock.h" -#include "application_manager/application.h" #include "application_manager/app_extension.h" +#include "application_manager/application.h" +#include "application_manager/usage_statistics.h" +#include "gmock/gmock.h" #include "smart_objects/smart_object.h" #include "utils/custom_string.h" -#include "application_manager/usage_statistics.h" #include "utils/semantic_version.h" namespace test { diff --git a/src/components/application_manager/test/include/application_manager/mock_event_observer.h b/src/components/application_manager/test/include/application_manager/mock_event_observer.h index 8af31c1998..54dcfc5774 100644 --- a/src/components/application_manager/test/include/application_manager/mock_event_observer.h +++ b/src/components/application_manager/test/include/application_manager/mock_event_observer.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_EVENT_OBSERVER_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_EVENT_OBSERVER_H_ -#include "application_manager/event_engine/event_observer.h" #include "application_manager/event_engine/event.h" +#include "application_manager/event_engine/event_observer.h" #include "gmock/gmock.h" namespace test { diff --git a/src/components/application_manager/test/include/application_manager/mock_help_prompt_manager.h b/src/components/application_manager/test/include/application_manager/mock_help_prompt_manager.h index a415f94d56..b44345deff 100644 --- a/src/components/application_manager/test/include/application_manager/mock_help_prompt_manager.h +++ b/src/components/application_manager/test/include/application_manager/mock_help_prompt_manager.h @@ -1,34 +1,34 @@ /* * Copyright (c) 2018, 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. -*/ + * 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. + */ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_HELP_PROMPT_MANAGER_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_HELP_PROMPT_MANAGER_H_ diff --git a/src/components/application_manager/test/include/application_manager/mock_message_helper.h b/src/components/application_manager/test/include/application_manager/mock_message_helper.h index ac39c39f22..ec13137abe 100644 --- a/src/components/application_manager/test/include/application_manager/mock_message_helper.h +++ b/src/components/application_manager/test/include/application_manager/mock_message_helper.h @@ -32,13 +32,13 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_MESSAGE_HELPER_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_MESSAGE_HELPER_H_ -#include "gmock/gmock.h" #include "application_manager/application.h" +#include "application_manager/application_manager.h" #include "application_manager/message_helper.h" +#include "application_manager/policies/policy_handler_interface.h" +#include "gmock/gmock.h" #include "interfaces/HMI_API.h" #include "policy/policy_types.h" -#include "application_manager/policies/policy_handler_interface.h" -#include "application_manager/application_manager.h" #include "smart_objects/smart_object.h" #include "transport_manager/common.h" diff --git a/src/components/application_manager/test/include/application_manager/mock_request.h b/src/components/application_manager/test/include/application_manager/mock_request.h index e4cfa84841..dfc6691ef4 100644 --- a/src/components/application_manager/test/include/application_manager/mock_request.h +++ b/src/components/application_manager/test/include/application_manager/mock_request.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_REQUEST_H_ -#include "gmock/gmock.h" #include "application_manager/commands/command.h" +#include "gmock/gmock.h" namespace test { namespace components { diff --git a/src/components/application_manager/test/include/application_manager/mock_resume_ctrl.h b/src/components/application_manager/test/include/application_manager/mock_resume_ctrl.h index 0fa7a898be..4fd3b7fc5a 100644 --- a/src/components/application_manager/test/include/application_manager/mock_resume_ctrl.h +++ b/src/components/application_manager/test/include/application_manager/mock_resume_ctrl.h @@ -31,9 +31,9 @@ */ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_RESUME_CTRL_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_RESUME_CTRL_H_ -#include "gmock/gmock.h" -#include "application_manager/resumption/resume_ctrl.h" #include "application_manager/application.h" +#include "application_manager/resumption/resume_ctrl.h" +#include "gmock/gmock.h" #include "resumption/last_state.h" namespace test { diff --git a/src/components/application_manager/test/include/application_manager/mock_resumption_data.h b/src/components/application_manager/test/include/application_manager/mock_resumption_data.h index 38d1944dba..7cabc12086 100644 --- a/src/components/application_manager/test/include/application_manager/mock_resumption_data.h +++ b/src/components/application_manager/test/include/application_manager/mock_resumption_data.h @@ -1,42 +1,42 @@ /* -* 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. -*/ + * 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. + */ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_RESUMPTION_DATA_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_RESUMPTION_DATA_H_ #include -#include "gmock/gmock.h" -#include "application_manager/resumption/resumption_data.h" #include "application_manager/application.h" -#include "application_manager/mock_application_manager_settings.h" #include "application_manager/mock_application_manager.h" +#include "application_manager/mock_application_manager_settings.h" +#include "application_manager/resumption/resumption_data.h" +#include "gmock/gmock.h" #include "smart_objects/smart_object.h" namespace test { diff --git a/src/components/application_manager/test/include/application_manager/mock_telemetry_observer.h b/src/components/application_manager/test/include/application_manager/mock_telemetry_observer.h index cd4632965c..c79a31817e 100644 --- a/src/components/application_manager/test/include/application_manager/mock_telemetry_observer.h +++ b/src/components/application_manager/test/include/application_manager/mock_telemetry_observer.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_TELEMETRY_OBSERVER_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_TELEMETRY_OBSERVER_H_ -#include "gmock/gmock.h" #include "application_manager/telemetry_observer.h" +#include "gmock/gmock.h" namespace test { namespace components { diff --git a/src/components/application_manager/test/include/application_manager/resumption_data_test.h b/src/components/application_manager/test/include/application_manager/resumption_data_test.h index 4e614c4d9f..cab3c23253 100644 --- a/src/components/application_manager/test/include/application_manager/resumption_data_test.h +++ b/src/components/application_manager/test/include/application_manager/resumption_data_test.h @@ -33,20 +33,20 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_RESUMPTION_DATA_TEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_RESUMPTION_DATA_TEST_H_ -#include #include -#include "gtest/gtest.h" -#include "application_manager/usage_statistics.h" +#include +#include "application_manager/event_engine/event_dispatcher.h" +#include "application_manager/mock_app_extension.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/mock_app_extension.h" -#include "utils/data_accessor.h" -#include "config_profile/profile.h" +#include "application_manager/mock_application_manager_settings.h" #include "application_manager/policies/policy_handler.h" -#include "application_manager/state_controller.h" #include "application_manager/resumption/resume_ctrl.h" -#include "application_manager/event_engine/event_dispatcher.h" -#include "application_manager/mock_application_manager_settings.h" +#include "application_manager/state_controller.h" +#include "application_manager/usage_statistics.h" +#include "config_profile/profile.h" +#include "gtest/gtest.h" +#include "utils/data_accessor.h" namespace test { namespace components { diff --git a/src/components/application_manager/test/include/application_manager/test_resumption_data_db.h b/src/components/application_manager/test/include/application_manager/test_resumption_data_db.h index e10f60afac..3f5802cb5a 100644 --- a/src/components/application_manager/test/include/application_manager/test_resumption_data_db.h +++ b/src/components/application_manager/test/include/application_manager/test_resumption_data_db.h @@ -33,10 +33,10 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_TEST_RESUMPTION_DATA_DB_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_TEST_RESUMPTION_DATA_DB_H_ -#include "utils/sqlite_wrapper/sql_database.h" -#include "application_manager/resumption/resumption_data_db.h" -#include "application_manager/mock_application_manager_settings.h" #include "application_manager/mock_application_manager.h" +#include "application_manager/mock_application_manager_settings.h" +#include "application_manager/resumption/resumption_data_db.h" +#include "utils/sqlite_wrapper/sql_database.h" using ::resumption::ResumptionDataDB; diff --git a/src/components/application_manager/test/message_helper/message_helper_test.cc b/src/components/application_manager/test/message_helper/message_helper_test.cc index 92be221ec9..d0fbe696cd 100644 --- a/src/components/application_manager/test/message_helper/message_helper_test.cc +++ b/src/components/application_manager/test/message_helper/message_helper_test.cc @@ -36,18 +36,18 @@ #include "gmock/gmock.h" #include "utils/macro.h" -#include "application_manager/policies/policy_handler.h" -#include "application_manager/mock_application.h" -#include "application_manager/mock_help_prompt_manager.h" -#include "utils/custom_string.h" -#include "utils/lock.h" -#include "policy/mock_policy_settings.h" #include "application_manager/commands/command_impl.h" +#include "application_manager/event_engine/event_dispatcher.h" +#include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" +#include "application_manager/mock_help_prompt_manager.h" #include "application_manager/mock_rpc_service.h" -#include "application_manager/event_engine/event_dispatcher.h" -#include "application_manager/state_controller.h" +#include "application_manager/policies/policy_handler.h" #include "application_manager/resumption/resume_ctrl.h" +#include "application_manager/state_controller.h" +#include "policy/mock_policy_settings.h" +#include "utils/custom_string.h" +#include "utils/lock.h" #include "policy/policy_table/types.h" #include "rpc_base/rpc_base_json_inl.h" @@ -70,12 +70,12 @@ typedef std::shared_ptr MockApplicationSharedPtr; typedef std::vector StringArray; typedef std::shared_ptr ApplicationSharedPtr; +using testing::_; using testing::AtLeast; -using testing::ReturnRefOfCopy; -using testing::ReturnRef; using testing::Return; +using testing::ReturnRef; +using testing::ReturnRefOfCopy; using testing::SaveArg; -using testing::_; TEST(MessageHelperTestCreate, CreateBlockedByPoliciesResponse_SmartObject_Equal) { @@ -951,7 +951,8 @@ TEST_F(MessageHelperTest, SubscribeApplicationToSoftButton_CallFromApp) { size_t function_id = 1; // EXPECT_CALL(*appSharedPtr, - SubscribeToSoftButtons(function_id, SoftButtonID())).Times(1); + SubscribeToSoftButtons(function_id, SoftButtonID())) + .Times(1); MessageHelper::SubscribeApplicationToSoftButton( message_params, appSharedPtr, function_id); } diff --git a/src/components/application_manager/test/mobile_message_handler_test.cc b/src/components/application_manager/test/mobile_message_handler_test.cc index 23957b61fb..cac04d4508 100644 --- a/src/components/application_manager/test/mobile_message_handler_test.cc +++ b/src/components/application_manager/test/mobile_message_handler_test.cc @@ -32,30 +32,30 @@ #include "application_manager/mobile_message_handler.h" -#include -#include #include +#include #include +#include #include -#include "gmock/gmock.h" #include "application_manager/message.h" +#include "gmock/gmock.h" #include "protocol/raw_message.h" namespace test { namespace components { namespace application_manager_test { +using ::application_manager::Message; +using ::application_manager::MobileMessage; +using application_manager::MobileMessageHandler; +using protocol_handler::MajorProtocolVersion; +using protocol_handler::MessagePriority; +using protocol_handler::PROTOCOL_HEADER_V2_SIZE; using protocol_handler::RawMessage; using protocol_handler::RawMessagePtr; using protocol_handler::ServiceType; -using protocol_handler::MessagePriority; -using protocol_handler::PROTOCOL_HEADER_V2_SIZE; -using application_manager::MobileMessageHandler; -using protocol_handler::MajorProtocolVersion; using ::testing::_; -using ::application_manager::Message; -using ::application_manager::MobileMessage; using testing::Return; diff --git a/src/components/application_manager/test/mobile_message_handler_v1_test.cc b/src/components/application_manager/test/mobile_message_handler_v1_test.cc index 5cbc28b20c..7801798705 100644 --- a/src/components/application_manager/test/mobile_message_handler_v1_test.cc +++ b/src/components/application_manager/test/mobile_message_handler_v1_test.cc @@ -32,19 +32,19 @@ #include "application_manager/mobile_message_handler.h" -#include -#include #include #include +#include +#include -#include "gmock/gmock.h" #include "application_manager/message.h" +#include "gmock/gmock.h" #include "protocol/raw_message.h" +using application_manager::MobileMessageHandler; +using protocol_handler::PROTOCOL_HEADER_V1_SIZE; using protocol_handler::RawMessage; using protocol_handler::RawMessagePtr; -using protocol_handler::PROTOCOL_HEADER_V1_SIZE; -using application_manager::MobileMessageHandler; namespace test { namespace components { diff --git a/src/components/application_manager/test/mock_application_helper.cc b/src/components/application_manager/test/mock_application_helper.cc index c64a56e53e..ea57709a73 100644 --- a/src/components/application_manager/test/mock_application_helper.cc +++ b/src/components/application_manager/test/mock_application_helper.cc @@ -41,15 +41,16 @@ MockApplicationHelper& MockApplicationHelper::application_helper_mock() { return application_helper_mock; } -} // application_manager_test -} // components -} // test +} // namespace application_manager_test +} // namespace components +} // namespace test namespace application_manager { void DeleteApplicationData(ApplicationSharedPtr app, ApplicationManager& app_manager) { test::components::application_manager_test::MockApplicationHelper:: - application_helper_mock().RecallApplicationData(app, app_manager); + application_helper_mock() + .RecallApplicationData(app, app_manager); } -} // application_managers +} // namespace application_manager diff --git a/src/components/application_manager/test/mock_hmi_command_factory.cc b/src/components/application_manager/test/mock_hmi_command_factory.cc index 375da26067..5f76a9300b 100644 --- a/src/components/application_manager/test/mock_hmi_command_factory.cc +++ b/src/components/application_manager/test/mock_hmi_command_factory.cc @@ -30,9 +30,9 @@ POSSIBILITY OF SUCH DAMAGE. */ +#include "application_manager/mock_hmi_command_factory.h" #include #include "application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/hmi_command_factory.h" -#include "application_manager/mock_hmi_command_factory.h" namespace test { namespace components { @@ -43,9 +43,9 @@ MockHMICommandFactory* MockHMICommandFactory::mock_hmi_command_factory() { return &mock_hmi_command_factory; } -} // application_manager_test -} // components -} // test +} // namespace application_manager_test +} // namespace components +} // namespace test namespace sdl_rpc_plugin { namespace app_mngr = application_manager; @@ -53,6 +53,7 @@ app_mngr::CommandSharedPtr HMICommandFactory::CreateCommand( const app_mngr::commands::MessageSharedPtr& message, app_mngr::ApplicationManager& application_manager) { return test::components::application_manager_test::MockHMICommandFactory:: - mock_hmi_command_factory()->CreateCommand(message, application_manager); + mock_hmi_command_factory() + ->CreateCommand(message, application_manager); } -} // application_manager +} // namespace sdl_rpc_plugin diff --git a/src/components/application_manager/test/mock_message_helper.cc b/src/components/application_manager/test/mock_message_helper.cc index 518761c315..0629619397 100644 --- a/src/components/application_manager/test/mock_message_helper.cc +++ b/src/components/application_manager/test/mock_message_helper.cc @@ -30,12 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/message_helper.h" #include "application_manager/mock_message_helper.h" +#include "application_manager/message_helper.h" #include "application_manager/policies/policy_handler_interface.h" -#include "transport_manager/common.h" -#include "gtest/gtest.h" #include "gmock/gmock.h" +#include "gtest/gtest.h" +#include "transport_manager/common.h" namespace application_manager { diff --git a/src/components/application_manager/test/policy_event_observer_test.cc b/src/components/application_manager/test/policy_event_observer_test.cc index 9b97f054b3..a74b12071c 100644 --- a/src/components/application_manager/test/policy_event_observer_test.cc +++ b/src/components/application_manager/test/policy_event_observer_test.cc @@ -33,10 +33,10 @@ #include "application_manager/policies/policy_event_observer.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/mock_event_dispatcher.h" #include "gmock/gmock.h" #include "policy/policy_types.h" #include "smart_objects/smart_object.h" -#include "application_manager/mock_event_dispatcher.h" namespace test { namespace components { diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc index af21a705bf..458b065cdd 100644 --- a/src/components/application_manager/test/policy_handler_test.cc +++ b/src/components/application_manager/test/policy_handler_test.cc @@ -30,48 +30,47 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include -#include #include "gmock/gmock.h" -#include "application_manager/policies/policy_handler.h" +#include "application_manager/application_impl.h" +#include "application_manager/application_manager_impl.h" #include "application_manager/policies/delegates/app_permission_delegate.h" +#include "application_manager/policies/policy_handler.h" #include "connection_handler/connection_handler_impl.h" -#include "application_manager/application_manager_impl.h" -#include "application_manager/application_impl.h" #ifdef ENABLE_SECURITY -#include "security_manager/mock_security_manager.h" #include "security_manager/mock_crypto_manager.h" +#include "security_manager/mock_security_manager.h" #endif // ENABLE_SECURITY #include "application_manager/mock_message_helper.h" #include "connection_handler/mock_connection_handler_settings.h" -#include "transport_manager/mock_transport_manager.h" -#include "policy/policy_types.h" #include "json/reader.h" -#include "json/writer.h" #include "json/value.h" +#include "json/writer.h" +#include "policy/policy_types.h" #include "smart_objects/smart_object.h" +#include "transport_manager/mock_transport_manager.h" #include "utils/file_system.h" -#include "utils/custom_string.h" -#include "policy/usage_statistics/counter.h" -#include "policy/usage_statistics/statistics_manager.h" #include "interfaces/MOBILE_API.h" #include "policy/mock_policy_settings.h" +#include "policy/usage_statistics/counter.h" +#include "policy/usage_statistics/statistics_manager.h" +#include "utils/custom_string.h" #include "application_manager/mock_application.h" -#include "policy/usage_statistics/mock_statistics_manager.h" -#include "protocol_handler/mock_session_observer.h" -#include "connection_handler/mock_connection_handler.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/policies/mock_policy_handler_observer.h" #include "application_manager/mock_event_dispatcher.h" -#include "application_manager/mock_state_controller.h" #include "application_manager/mock_hmi_capabilities.h" #include "application_manager/mock_rpc_service.h" +#include "application_manager/mock_state_controller.h" +#include "application_manager/policies/mock_policy_handler_observer.h" +#include "connection_handler/mock_connection_handler.h" #include "policy/mock_policy_manager.h" #include "policy/usage_statistics/mock_statistics_manager.h" +#include "protocol_handler/mock_session_observer.h" namespace test { namespace components { @@ -510,7 +509,8 @@ TEST_F(PolicyHandlerTest, OnPermissionsUpdated_TwoParams_InvalidApp_UNSUCCESS) { EXPECT_CALL(app_manager_, application_by_policy_id(kPolicyAppId_)) .WillOnce(Return(invalid_app)); EXPECT_CALL(mock_message_helper_, - SendOnPermissionsChangeNotification(_, _, _)).Times(0); + SendOnPermissionsChangeNotification(_, _, _)) + .Times(0); Permissions permissions; policy_handler_.OnPermissionsUpdated(kPolicyAppId_, permissions); @@ -978,7 +978,8 @@ TEST_F(PolicyHandlerTest, AppPermissions permissions(kPolicyAppId_); permissions.appPermissionsConsentNeeded = false; EXPECT_CALL(mock_message_helper_, - SendOnAppPermissionsChangedNotification(kAppId1_, _, _)).Times(0); + SendOnAppPermissionsChangedNotification(kAppId1_, _, _)) + .Times(0); EXPECT_CALL(*mock_policy_manager_, GetAppPermissionsChanges(_)) .WillOnce(Return(permissions)); @@ -1117,7 +1118,8 @@ TEST_F(PolicyHandlerTest, // Check expectations // Notification won't be sent EXPECT_CALL(mock_message_helper_, - SendOnAppPermissionsChangedNotification(kAppId1_, _, _)).Times(0); + SendOnAppPermissionsChangedNotification(kAppId1_, _, _)) + .Times(0); EXPECT_CALL(*mock_policy_manager_, GetAppPermissionsChanges(_)) .WillOnce(Return(permissions)); @@ -2242,7 +2244,8 @@ TEST_F(PolicyHandlerTest, _, NULL, _, - _)).WillOnce(Return(1u)); + _)) + .WillOnce(Return(1u)); EXPECT_CALL(app_manager_, application(kConnectionKey_)) .WillOnce(Return(mock_app_)); diff --git a/src/components/application_manager/test/rc_policy_handler_test.cc b/src/components/application_manager/test/rc_policy_handler_test.cc index b7caf635c9..818a014a3f 100644 --- a/src/components/application_manager/test/rc_policy_handler_test.cc +++ b/src/components/application_manager/test/rc_policy_handler_test.cc @@ -30,34 +30,34 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include -#include #include "gmock/gmock.h" -#include "application_manager/policies/policy_handler.h" -#include "application_manager/policies/delegates/app_permission_delegate.h" -#include "policy/mock_cache_manager.h" #include "application_manager/mock_message_helper.h" +#include "application_manager/policies/delegates/app_permission_delegate.h" +#include "application_manager/policies/policy_handler.h" #include "connection_handler/mock_connection_handler_settings.h" -#include "policy/policy_types.h" -#include "policy/access_remote.h" #include "json/reader.h" -#include "json/writer.h" #include "json/value.h" +#include "json/writer.h" +#include "policy/access_remote.h" +#include "policy/mock_cache_manager.h" +#include "policy/policy_types.h" #include "smart_objects/smart_object.h" -#include "utils/custom_string.h" -#include "interfaces/MOBILE_API.h" -#include "policy/mock_policy_settings.h" #include "application_manager/mock_application.h" -#include "policy/usage_statistics/mock_statistics_manager.h" -#include "protocol_handler/mock_session_observer.h" -#include "connection_handler/mock_connection_handler.h" #include "application_manager/mock_application_manager.h" -#include "application_manager/policies/mock_policy_handler_observer.h" #include "application_manager/mock_event_dispatcher.h" +#include "application_manager/policies/mock_policy_handler_observer.h" +#include "connection_handler/mock_connection_handler.h" +#include "interfaces/MOBILE_API.h" #include "policy/mock_policy_manager.h" +#include "policy/mock_policy_settings.h" +#include "policy/usage_statistics/mock_statistics_manager.h" +#include "protocol_handler/mock_session_observer.h" +#include "utils/custom_string.h" namespace test { namespace components { diff --git a/src/components/application_manager/test/request_controller/request_controller_test.cc b/src/components/application_manager/test/request_controller/request_controller_test.cc index 112e3c1c39..71e12b2825 100644 --- a/src/components/application_manager/test/request_controller/request_controller_test.cc +++ b/src/components/application_manager/test/request_controller/request_controller_test.cc @@ -32,24 +32,23 @@ #include -#include "gtest/gtest.h" +#include "application_manager/mock_request.h" #include "application_manager/request_controller.h" #include "application_manager/request_info.h" -#include "application_manager/mock_request.h" +#include "gtest/gtest.h" -#include "smart_objects/smart_object.h" +#include "application_manager/application_impl.h" #include "application_manager/commands/command_request_impl.h" #include "application_manager/message_helper.h" -#include "application_manager/application_impl.h" +#include "smart_objects/smart_object.h" -#include "application_manager/mock_application_manager.h" #include "application_manager/event_engine/event_dispatcher.h" -#include "resumption/last_state.h" +#include "application_manager/mock_application_manager.h" +#include "application_manager/mock_request_controller_settings.h" #include "application_manager/policies/policy_handler.h" -#include "application_manager/state_controller.h" #include "application_manager/resumption/resume_ctrl.h" -#include "application_manager/mock_request_controller_settings.h" -#include "application_manager/mock_application_manager.h" +#include "application_manager/state_controller.h" +#include "resumption/last_state.h" #include "utils/test_async_waiter.h" namespace test { @@ -59,10 +58,10 @@ namespace request_controller_test { using ::application_manager::request_controller::RequestController; using ::application_manager::request_controller::RequestInfo; +using ::testing::_; +using ::testing::NiceMock; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::NiceMock; -using ::testing::_; typedef NiceMock MRequest; typedef std::shared_ptr RequestPtr; diff --git a/src/components/application_manager/test/request_info_test.cc b/src/components/application_manager/test/request_info_test.cc index 0abef44e9a..a0b1793cf5 100644 --- a/src/components/application_manager/test/request_info_test.cc +++ b/src/components/application_manager/test/request_info_test.cc @@ -31,10 +31,10 @@ */ #include "application_manager/request_info.h" -#include "application_manager/mock_request.h" #include -#include #include +#include +#include "application_manager/mock_request.h" #include "gmock/gmock.h" namespace request_info = application_manager::request_controller; diff --git a/src/components/application_manager/test/request_tracker_test.cc b/src/components/application_manager/test/request_tracker_test.cc index ee09e0a3e0..9175652da6 100644 --- a/src/components/application_manager/test/request_tracker_test.cc +++ b/src/components/application_manager/test/request_tracker_test.cc @@ -30,13 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" -#include "utils/macro.h" #include "application_manager/request_tracker.h" #include "application_manager/mock_request_controller_settings.h" +#include "gtest/gtest.h" #include "interfaces/MOBILE_API.h" -#include "utils/lock.h" #include "utils/conditional_variable.h" +#include "utils/lock.h" +#include "utils/macro.h" namespace test { namespace components { @@ -246,6 +246,6 @@ TEST_F(RequestTrackerTestClass, tracker_.Track(app_id, none_level)); } -} // namespace request_controller +} // namespace request_controller_test } // namespace components } // namespace test diff --git a/src/components/application_manager/test/resumption/resume_ctrl_test.cc b/src/components/application_manager/test/resumption/resume_ctrl_test.cc index 2413421c7f..a82358b451 100644 --- a/src/components/application_manager/test/resumption/resume_ctrl_test.cc +++ b/src/components/application_manager/test/resumption/resume_ctrl_test.cc @@ -30,26 +30,26 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include -#include "gtest/gtest.h" -#include "application_manager/resumption/resume_ctrl_impl.h" -#include "application_manager/usage_statistics.h" -#include "application_manager/mock_application.h" +#include "application_manager/application.h" +#include "application_manager/application_manager_impl.h" #include "application_manager/mock_app_extension.h" +#include "application_manager/mock_application.h" #include "application_manager/mock_help_prompt_manager.h" #include "application_manager/mock_resumption_data.h" +#include "application_manager/resumption/resume_ctrl_impl.h" +#include "application_manager/usage_statistics.h" +#include "config_profile/profile.h" +#include "gtest/gtest.h" #include "interfaces/MOBILE_API.h" -#include "application_manager/application_manager_impl.h" -#include "application_manager/application.h" #include "utils/data_accessor.h" -#include "config_profile/profile.h" -#include "application_manager/mock_message_helper.h" #include "application_manager/mock_application_manager.h" #include "application_manager/mock_application_manager_settings.h" #include "application_manager/mock_event_dispatcher.h" +#include "application_manager/mock_message_helper.h" #include "application_manager/mock_state_controller.h" namespace test { @@ -64,10 +64,10 @@ using ::testing::Eq; using ::testing::Mock; using ::testing::NiceMock; using ::testing::Return; -using ::testing::ReturnRef; -using ::testing::SetArgReferee; using ::testing::ReturnPointee; +using ::testing::ReturnRef; using ::testing::SaveArg; +using ::testing::SetArgReferee; using namespace application_manager_test; using namespace resumption; @@ -501,7 +501,8 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithSubscribeOnButtons) { EXPECT_CALL(*mock_app_extension_, ProcessResumption(test_subscriptions)); EXPECT_CALL(*application_manager::MockMessageHelper::message_helper_mock(), - SendAllOnButtonSubscriptionNotificationsForApp(_, _)).Times(2); + SendAllOnButtonSubscriptionNotificationsForApp(_, _)) + .Times(2); const bool res = res_ctrl_->StartResumption(mock_app_, kHash_); EXPECT_TRUE(res); diff --git a/src/components/application_manager/test/resumption/resumption_data_db_test.cc b/src/components/application_manager/test/resumption/resumption_data_db_test.cc index 8423520b9f..d67c229cc3 100644 --- a/src/components/application_manager/test/resumption/resumption_data_db_test.cc +++ b/src/components/application_manager/test/resumption/resumption_data_db_test.cc @@ -30,30 +30,30 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include -#include "gtest/gtest.h" +#include #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager_settings.h" +#include "gtest/gtest.h" #include "interfaces/MOBILE_API.h" #include "utils/sqlite_wrapper/sql_database.h" #include "utils/sqlite_wrapper/sql_query.h" -#include "utils/file_system.h" #include "application_manager/resumption_data_test.h" #include "application_manager/test_resumption_data_db.h" +#include "utils/file_system.h" -#include "application_manager/resumption/resumption_sql_queries.h" #include "application_manager/resumption/resumption_data_db.h" +#include "application_manager/resumption/resumption_sql_queries.h" namespace test { namespace components { namespace resumption_test { +using application_manager_test::MockApplication; +using ::testing::_; using ::testing::NiceMock; using ::testing::ReturnRef; -using ::testing::_; -using application_manager_test::MockApplication; namespace am = application_manager; using namespace file_system; @@ -344,7 +344,8 @@ void ResumptionDataDBTest::CheckCharacters(int64_t global_properties_key) { while (select_characters.Next()) { std::string character = (*keyboard_props_)[am::strings::limited_character_list] - [characters_idx++].asString(); + [characters_idx++] + .asString(); EXPECT_EQ(character, select_characters.GetString(0)); } } @@ -392,16 +393,17 @@ void ResumptionDataDBTest::CheckCommandsData() { ++i; uint cmd = (*test_commands_map[i])[am::strings::cmd_id].asUInt(); EXPECT_EQ(cmd, select_commands.GetUInteger(1)); - std::string name = - (*test_commands_map[i])[am::strings::menu_params] - [am::strings::menu_name].asString(); + std::string name = (*test_commands_map[i])[am::strings::menu_params] + [am::strings::menu_name] + .asString(); EXPECT_EQ(name, select_commands.GetString(2)); int position = (*test_commands_map[i])[am::strings::menu_params] - [am::strings::position].asInt(); + [am::strings::position] + .asInt(); EXPECT_EQ(position, select_commands.GetInteger(4)); - int parent_id = - (*test_commands_map[i])[am::strings::menu_params] - [am::hmi_request::parent_id].asInt(); + int parent_id = (*test_commands_map[i])[am::strings::menu_params] + [am::hmi_request::parent_id] + .asInt(); EXPECT_EQ(parent_id, select_commands.GetInteger(3)); std::string icon_name = (*test_commands_map[i])[am::strings::cmd_icon][am::strings::value] @@ -409,7 +411,8 @@ void ResumptionDataDBTest::CheckCommandsData() { EXPECT_EQ(icon_name, select_commands.GetString(5)); int icon_type = (*test_commands_map[i])[am::strings::cmd_icon] - [am::strings::image_type].asInt(); + [am::strings::image_type] + .asInt(); EXPECT_EQ(icon_type, select_commands.GetInteger(6)); j = 0; @@ -461,12 +464,12 @@ void ResumptionDataDBTest::CheckChoiceSetData() { std::string menu_name = command[am::strings::choice_set][choice_idx][am::strings::menu_name] .asString(); - std::string secondary_text = - command[am::strings::choice_set][choice_idx] - [am::strings::secondary_text].asString(); - std::string tertiary_text = - command[am::strings::choice_set][choice_idx] - [am::strings::tertiary_text].asString(); + std::string secondary_text = command[am::strings::choice_set][choice_idx] + [am::strings::secondary_text] + .asString(); + std::string tertiary_text = command[am::strings::choice_set][choice_idx] + [am::strings::tertiary_text] + .asString(); EXPECT_EQ(choice_id, select_choice_set.GetInteger(4)); EXPECT_EQ(menu_name, select_choice_set.GetString(5)); @@ -478,12 +481,12 @@ void ResumptionDataDBTest::CheckChoiceSetData() { EXPECT_TRUE(select_image.Prepare(kSelectImage)); select_image.Bind(0, select_choice_set.GetLongInt(8)); EXPECT_TRUE(select_image.Exec()); - std::string image_value = - command[am::strings::choice_set][choice_idx][am::strings::image] - [am::strings::value].asString(); - int image_type = - command[am::strings::choice_set][choice_idx][am::strings::image] - [am::strings::image_type].asInt(); + std::string image_value = command[am::strings::choice_set][choice_idx] + [am::strings::image][am::strings::value] + .asString(); + int image_type = command[am::strings::choice_set][choice_idx] + [am::strings::image][am::strings::image_type] + .asInt(); EXPECT_EQ(image_value, select_image.GetString(1)); EXPECT_EQ(image_type, select_image.GetInteger(0)); @@ -491,9 +494,9 @@ void ResumptionDataDBTest::CheckChoiceSetData() { EXPECT_TRUE(select_image.Prepare(kSelectImage)); select_image.Bind(0, select_choice_set.GetLongInt(9)); EXPECT_TRUE(select_image.Exec()); - image_value = - command[am::strings::choice_set][choice_idx] - [am::strings::secondary_image][am::strings::value].asString(); + image_value = command[am::strings::choice_set][choice_idx] + [am::strings::secondary_image][am::strings::value] + .asString(); image_type = command[am::strings::choice_set][choice_idx] [am::strings::secondary_image][am::strings::image_type] @@ -503,9 +506,9 @@ void ResumptionDataDBTest::CheckChoiceSetData() { vr_cmd_idx = 0; } - std::string vr_comm = - command[am::strings::choice_set][choice_idx][am::strings::vr_commands] - [vr_cmd_idx++].asString(); + std::string vr_comm = command[am::strings::choice_set][choice_idx] + [am::strings::vr_commands][vr_cmd_idx++] + .asString(); EXPECT_EQ(vr_comm, select_choice_set.GetString(10)); } } diff --git a/src/components/application_manager/test/resumption/resumption_data_json_test.cc b/src/components/application_manager/test/resumption/resumption_data_json_test.cc index 40e61a3c53..955309e091 100644 --- a/src/components/application_manager/test/resumption/resumption_data_json_test.cc +++ b/src/components/application_manager/test/resumption/resumption_data_json_test.cc @@ -30,13 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include #include "gtest/gtest.h" -#include "application_manager/usage_statistics.h" #include "application_manager/mock_application.h" #include "application_manager/mock_resumption_data.h" +#include "application_manager/usage_statistics.h" #include "interfaces/MOBILE_API.h" #include "resumption/last_state_impl.h" @@ -51,9 +51,9 @@ namespace components { namespace resumption_test { using ::testing::_; +using ::testing::NiceMock; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::NiceMock; namespace am = application_manager; using namespace Json; diff --git a/src/components/application_manager/test/resumption/resumption_data_test.cc b/src/components/application_manager/test/resumption/resumption_data_test.cc index fe24ea39b6..29718b631c 100644 --- a/src/components/application_manager/test/resumption/resumption_data_test.cc +++ b/src/components/application_manager/test/resumption/resumption_data_test.cc @@ -30,16 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include #include "gtest/gtest.h" -#include "application_manager/usage_statistics.h" +#include "application_manager/application.h" +#include "application_manager/message_helper.h" #include "application_manager/mock_resumption_data.h" +#include "application_manager/usage_statistics.h" #include "utils/custom_string.h" -#include "application_manager/application.h" #include "utils/data_accessor.h" -#include "application_manager/message_helper.h" #include "application_manager/resumption_data_test.h" @@ -47,10 +47,10 @@ namespace test { namespace components { namespace resumption_test { namespace custom_str = utils::custom_string; +using ::testing::_; using ::testing::Return; -using ::testing::ReturnRef; using ::testing::ReturnPointee; -using ::testing::_; +using ::testing::ReturnRef; void ResumptionDataTest::CheckSavedApp(sm::SmartObject& resume_app_list) { EXPECT_EQ(policy_app_id_, resume_app_list[am::strings::app_id].asString()); @@ -79,9 +79,9 @@ void ResumptionDataTest::CheckSavedApp(sm::SmartObject& resume_app_list) { void ResumptionDataTest::CheckCommands(sm::SmartObject& res_list) { for (uint32_t i = 0; i < kCountOfCommands_; ++i) { EXPECT_EQ(i, res_list[i][am::strings::cmd_id].asUInt()); - std::string name = - (*test_commands_map[i])[am::strings::menu_params] - [am::strings::menu_name].asString(); + std::string name = (*test_commands_map[i])[am::strings::menu_params] + [am::strings::menu_name] + .asString(); EXPECT_EQ(name, res_list[i][am::strings::menu_params][am::strings::menu_name] .asString()); @@ -93,7 +93,8 @@ void ResumptionDataTest::CheckCommands(sm::SmartObject& res_list) { res_list[i][am::strings::menu_params][am::strings::position].asInt()); int parent_id = (*test_commands_map[i])[am::strings::menu_params] - [am::hmi_request::parent_id].asInt(); + [am::hmi_request::parent_id] + .asInt(); EXPECT_EQ(parent_id, res_list[i][am::strings::menu_params][am::hmi_request::parent_id] .asInt()); @@ -150,20 +151,24 @@ void ResumptionDataTest::CheckChoiceSet(sm::SmartObject& res_list) { std::snprintf(numb, 12, "%d", i + j); std::string test_choice = (*test_choiceset_map[i])[am::strings::choice_set][j] - [am::strings::vr_commands][0].asString(); + [am::strings::vr_commands][0] + .asString(); EXPECT_EQ(test_choice, command[am::strings::vr_commands][0].asString()); std::string menu_name = (*test_choiceset_map[i])[am::strings::choice_set][j] - [am::strings::menu_name].asString(); + [am::strings::menu_name] + .asString(); EXPECT_EQ(menu_name, command[am::strings::menu_name].asString()); std::string secondary_text = (*test_choiceset_map[i])[am::strings::choice_set][j] - [am::strings::secondary_text].asString(); + [am::strings::secondary_text] + .asString(); EXPECT_EQ(secondary_text, command[am::strings::secondary_text].asString()); std::string tertiary_text = (*test_choiceset_map[i])[am::strings::choice_set][j] - [am::strings::tertiary_text].asString(); + [am::strings::tertiary_text] + .asString(); EXPECT_EQ(tertiary_text, command[am::strings::tertiary_text].asString()); std::string image_value = @@ -181,13 +186,15 @@ void ResumptionDataTest::CheckChoiceSet(sm::SmartObject& res_list) { image_value = (*test_choiceset_map[i])[am::strings::choice_set][j] [am::strings::secondary_image] - [am::strings::value].asString(); + [am::strings::value] + .asString(); EXPECT_EQ( image_value, command[am::strings::secondary_image][am::strings::value].asString()); image_type = (*test_choiceset_map[i])[am::strings::choice_set][j] [am::strings::secondary_image] - [am::strings::image_type].asInt(); + [am::strings::image_type] + .asInt(); EXPECT_EQ(image_type, command[am::strings::secondary_image][am::strings::image_type] .asInt()); diff --git a/src/components/application_manager/test/resumption_sql_queries_test.cc b/src/components/application_manager/test/resumption_sql_queries_test.cc index 0ec902085f..61490ae4af 100644 --- a/src/components/application_manager/test/resumption_sql_queries_test.cc +++ b/src/components/application_manager/test/resumption_sql_queries_test.cc @@ -31,17 +31,17 @@ */ #include -#include -#include #include +#include #include +#include #include "gtest/gtest.h" -#include "utils/sqlite_wrapper/sql_database.h" -#include "utils/sqlite_wrapper/sql_query.h" -#include "utils/file_system.h" #include "application_manager/resumption/resumption_sql_queries.h" #include "policy/sql_pt_queries.h" +#include "utils/file_system.h" +#include "utils/sqlite_wrapper/sql_database.h" +#include "utils/sqlite_wrapper/sql_query.h" namespace test { namespace components { @@ -49,8 +49,8 @@ namespace resumption_test { using namespace ::resumption; -using std::string; using std::pair; +using std::string; using utils::dbms::SQLDatabase; using utils::dbms::SQLQuery; @@ -808,7 +808,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectCountHMILevel_ExpectDataCorrect) { int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -838,7 +839,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectHMILevel_ExpectDataCorrect) { int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -866,7 +868,8 @@ TEST_F(ResumptionSqlQueriesTest, kCheckHMIId_ExpectDataCorrect) { int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -894,7 +897,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectHMIId_ExpectDataCorrect) { int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -922,7 +926,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectCountHMIId_ExpectDataCorrect) { int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -951,7 +956,8 @@ TEST_F(ResumptionSqlQueriesTest, kCountHashId_ExpectDataCorrect) { int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -980,7 +986,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectHashId_ExpectDataCorrect) { int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -1017,7 +1024,8 @@ TEST_F(ResumptionSqlQueriesTest, kCheckApplication_ExpectDataCorrect) { int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -1045,7 +1053,8 @@ TEST_F(ResumptionSqlQueriesTest, kCountApplications_ExpectDataCorrect) { int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -1091,7 +1100,8 @@ TEST_F(ResumptionSqlQueriesTest, int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -1122,7 +1132,8 @@ TEST_F(ResumptionSqlQueriesTest, kUpdateHMILevel_ExpectDataUpdated) { int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -1158,7 +1169,8 @@ TEST_F(ResumptionSqlQueriesTest, kUpdateIgnOffCount_ExpectDataUpdated) { int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -1192,7 +1204,8 @@ TEST_F(ResumptionSqlQueriesTest, kCountApplicationsIgnOff_ExpectDataCorrect) { int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -1236,7 +1249,8 @@ TEST_F(ResumptionSqlQueriesTest, int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -1279,7 +1293,8 @@ TEST_F(ResumptionSqlQueriesTest, kUpdateSuspendData_ExpectDataUpdated) { int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -1311,7 +1326,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteFile_ExpectDataDeleted) { int64_t key1 = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key1 = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key1) .LastInsertId(); @@ -1326,7 +1342,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteFile_ExpectDataDeleted) { false, app_id2, device_id, - key1).LastInsertId(); + key1) + .LastInsertId(); int64_t key2 = FillFileTable(temp_query, 1, true, true, "tst_name").LastInsertId(); FillApplicationFilesArrayTable(temp_query, key1, key2); @@ -1344,7 +1361,8 @@ TEST_F(ResumptionSqlQueriesTest, int64_t key1 = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key1 = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key1) .LastInsertId(); @@ -1359,7 +1377,8 @@ TEST_F(ResumptionSqlQueriesTest, false, app_id2, device_id, - key1).LastInsertId(); + key1) + .LastInsertId(); int64_t key2 = FillFileTable(temp_query, 1, true, true, "tst_name").LastInsertId(); FillApplicationFilesArrayTable(temp_query, key1, key2); @@ -1383,7 +1402,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteSubMenu_ExpectDataDeleted) { int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -1398,7 +1418,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteSubMenu_ExpectDataDeleted) { false, app_id2, device_id, - key).LastInsertId(); + key) + .LastInsertId(); int64_t submenu_key = FillSubMenuTable(temp_query, 1, "tst_menuName", 2).LastInsertId(); @@ -1417,7 +1438,8 @@ TEST_F(ResumptionSqlQueriesTest, int64_t key = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key) .LastInsertId(); @@ -1432,7 +1454,8 @@ TEST_F(ResumptionSqlQueriesTest, false, app_id2, device_id, - key).LastInsertId(); + key) + .LastInsertId(); int64_t submenu_key = FillSubMenuTable(temp_query, 1, "tst_menuName", 2).LastInsertId(); @@ -1454,7 +1477,8 @@ TEST_F(ResumptionSqlQueriesTest, int64_t key1 = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); key1 = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key1) .LastInsertId(); @@ -1469,7 +1493,8 @@ TEST_F(ResumptionSqlQueriesTest, false, app_id2, device_id, - key1).LastInsertId(); + key1) + .LastInsertId(); int64_t key2 = FillFileTable(temp_query, 1, true, true, "tst_name").LastInsertId(); key1 = FillApplicationFilesArrayTable(temp_query, key1, key2).LastInsertId(); @@ -1494,7 +1519,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteImageFromCommands_ExpectDataDeleted) { int64_t key1 = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); int64_t key2 = FillCommandTable(temp_query, 1, "tst_menu_name", 1, 2, key1) .LastInsertId(); key1 = FillGlobalPropertiesTable( @@ -1511,7 +1537,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteImageFromCommands_ExpectDataDeleted) { false, app_id2, device_id, - key1).LastInsertId(); + key1) + .LastInsertId(); FillApplicationCommandsArrayTable(temp_query, key1, key2); // Check before action const std::string select_count_image = "SELECT COUNT(*) FROM image;"; @@ -1527,7 +1554,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteVrCommands_ExpectDataDeleted) { int64_t key1 = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); int64_t key2 = FillCommandTable(temp_query, 1, "tst_menu_name", 1, 2, key1) .LastInsertId(); key1 = FillGlobalPropertiesTable( @@ -1544,7 +1572,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteVrCommands_ExpectDataDeleted) { false, app_id2, device_id, - key1).LastInsertId(); + key1) + .LastInsertId(); FillVRCommandsArrayTable( temp_query, "tst_vr_command", kVRCommandFromCommand, key2); @@ -1564,7 +1593,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteCommands_ExpectDataDeleted) { int64_t key1 = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); int64_t key2 = FillCommandTable(temp_query, 1, "tst_menu_name", 1, 2, key1) .LastInsertId(); @@ -1582,7 +1612,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteCommands_ExpectDataDeleted) { false, app_id2, device_id, - key1).LastInsertId(); + key1) + .LastInsertId(); FillApplicationCommandsArrayTable(temp_query, key1, key2); // Check @@ -1599,7 +1630,8 @@ TEST_F(ResumptionSqlQueriesTest, int64_t key1 = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); int64_t key2 = FillCommandTable(temp_query, 1, "tst_menu_name", 1, 2, key1) .LastInsertId(); @@ -1617,7 +1649,8 @@ TEST_F(ResumptionSqlQueriesTest, false, app_id2, device_id, - key1).LastInsertId(); + key1) + .LastInsertId(); FillApplicationCommandsArrayTable(temp_query, key1, key2); // Check @@ -1640,13 +1673,15 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteImageFromChoiceSet_ExpectDataDeleted) { int64_t key1 = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); int64_t key2 = FillChoiceTable(temp_query, 2, "tst_menu_name", "secondary_txt", "tst_tert_text", - key1).LastInsertId(); + key1) + .LastInsertId(); int64_t key3 = FillApplicationTable(temp_query, connection_key, grammarID, @@ -1658,7 +1693,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteImageFromChoiceSet_ExpectDataDeleted) { false, app_id2, device_id, - key1).LastInsertId(); + key1) + .LastInsertId(); int64_t key4 = FillApplicationChoiceSetTable(temp_query, 1, 2).LastInsertId(); FillChoiceArrayTable(temp_query, key4, key2); FillApplicationChoiceSetArrayTable(temp_query, key4, key3); @@ -1678,7 +1714,8 @@ TEST_F(ResumptionSqlQueriesTest, int64_t key1 = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); int64_t key2 = FillChoiceTable( temp_query, 1, "tst_menu_name", "second_text", "tert_txt", key1) @@ -1694,7 +1731,8 @@ TEST_F(ResumptionSqlQueriesTest, false, app_id2, device_id, - key1).LastInsertId(); + key1) + .LastInsertId(); FillVRCommandsArrayTable( temp_query, "tst_vr_command", kVRCommandFromChoice, key2); @@ -1724,7 +1762,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteChoice_ExpectDataDeleted) { int64_t key1 = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); int64_t key2 = FillChoiceTable( temp_query, 1, "tst_menu_name", "second_text", "tert_txt", key1) @@ -1740,7 +1779,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteChoice_ExpectDataDeleted) { false, app_id2, device_id, - key1).LastInsertId(); + key1) + .LastInsertId(); int64_t key3 = FillApplicationChoiceSetTable(temp_query, 1, 2).LastInsertId(); FillChoiceArrayTable(temp_query, key3, key2); FillApplicationChoiceSetArrayTable(temp_query, key3, key1); @@ -1773,7 +1813,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteChoiceArray_ExpectDataDeleted) { false, app_id2, device_id, - 1).LastInsertId(); + 1) + .LastInsertId(); FillApplicationChoiceSetArrayTable( temp_query, application_choiceset_table_key, application_table_key); FillChoiceArrayTable( @@ -1803,7 +1844,8 @@ TEST_F(ResumptionSqlQueriesTest, false, app_id2, device_id, - 1).LastInsertId(); + 1) + .LastInsertId(); int64_t key2 = FillApplicationChoiceSetTable(temp_query, 1, 2).LastInsertId(); FillApplicationChoiceSetArrayTable(temp_query, key2, key1); @@ -1838,7 +1880,8 @@ TEST_F(ResumptionSqlQueriesTest, false, app_id2, device_id, - 1).LastInsertId(); + 1) + .LastInsertId(); int64_t key2 = FillApplicationChoiceSetTable(temp_query, 1, 2).LastInsertId(); FillApplicationChoiceSetArrayTable(temp_query, key2, key1); @@ -1864,7 +1907,8 @@ TEST_F(ResumptionSqlQueriesTest, int64_t key1 = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); int64_t key2 = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key1) .LastInsertId(); @@ -1896,7 +1940,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeletevrHelpItem_ExpectDataDeleted) { int64_t key1 = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); int64_t key2 = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key1) .LastInsertId(); @@ -1929,7 +1974,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeletevrHelpItemArray_ExpectDataDeleted) { int64_t key1 = FillImageTable(temp_query, /*image_type=*/1, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); int64_t key2 = FillGlobalPropertiesTable( temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", key1) .LastInsertId(); @@ -1963,9 +2009,9 @@ TEST_F(ResumptionSqlQueriesTest, string character_list = "abcdefghij"; int64_t key1 = FillTableLimitedCharacterListTable(temp_query, character_list) .LastInsertId(); - int64_t key2 = - FillGlobalPropertiesTable( - temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", 0).LastInsertId(); + int64_t key2 = FillGlobalPropertiesTable( + temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", 0) + .LastInsertId(); FillApplicationTable(temp_query, connection_key, grammarID, @@ -1999,9 +2045,9 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteCharacterArray_ExpectDataDeleted) { string character_list = "abcdefghij"; int64_t key1 = FillTableLimitedCharacterListTable(temp_query, character_list) .LastInsertId(); - int64_t key2 = - FillGlobalPropertiesTable( - temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", 0).LastInsertId(); + int64_t key2 = FillGlobalPropertiesTable( + temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", 0) + .LastInsertId(); FillApplicationTable(temp_query, connection_key, grammarID, @@ -2031,7 +2077,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteTTSChunk_ExpectDataDeleted) { FillTTSChunkTable(temp_query, 1, "tst_text").LastInsertId(); int64_t glob_prop_key = FillGlobalPropertiesTable( - temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", 0).LastInsertId(); + temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", 0) + .LastInsertId(); FillApplicationTable(temp_query, connection_key, @@ -2087,7 +2134,8 @@ TEST_F(ResumptionSqlQueriesTest, FillTTSChunkTable(temp_query, 1, "tst_text").LastInsertId(); int64_t glob_prop_key = FillGlobalPropertiesTable( - temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", 0).LastInsertId(); + temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", 0) + .LastInsertId(); FillApplicationTable(temp_query, connection_key, grammarID, @@ -2121,7 +2169,8 @@ TEST_F(ResumptionSqlQueriesTest, kDeleteGlobalProperties_ExpectDataDeleted) { SQLQuery temp_query(db()); int64_t glob_prop_key = FillGlobalPropertiesTable( - temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", 0).LastInsertId(); + temp_query, "vrHelp", "menuTitle", 1, 1, 2, "auto", 0) + .LastInsertId(); FillApplicationTable(temp_query, connection_key, grammarID, @@ -2160,7 +2209,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectPrimaryKeyImage_ExpectDataCorrect) { int64_t image_key = FillImageTable(temp_query, /*image_type=*/2, "tst_image", - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); ValToPosPair p1(0, "tst_image"); ValToPosPair p2(1, ""); // Check @@ -2588,7 +2638,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectCountFiles_ExpectDataCorrect) { false, app_id1, device_id, - 9).LastInsertId(); + 9) + .LastInsertId(); int64_t file_key = FillFileTable(temp_query, 1, true, true, "tst_name").LastInsertId(); FillApplicationFilesArrayTable(temp_query, app_key, file_key); @@ -2613,7 +2664,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectFiles_ExpectDataCorrect) { false, app_id1, device_id, - 9).LastInsertId(); + 9) + .LastInsertId(); int64_t file_key = FillFileTable(temp_query, 1, true, true, "tst_name").LastInsertId(); FillApplicationFilesArrayTable(temp_query, app_key, file_key); @@ -2640,7 +2692,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectCountSubMenu_ExpectDataCorrect) { false, app_id1, device_id, - 9).LastInsertId(); + 9) + .LastInsertId(); int64_t submenu_key = FillSubMenuTable(temp_query, 1, "menu_name", 1).LastInsertId(); FillApplicationSubMenuArrayTable(temp_query, app_key, submenu_key); @@ -2664,7 +2717,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectSubMenu_ExpectDataCorrect) { false, app_id1, device_id, - 9).LastInsertId(); + 9) + .LastInsertId(); int64_t submenu_key = FillSubMenuTable(temp_query, 1, "menu_name", 1).LastInsertId(); @@ -2691,7 +2745,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectCountCommands_ExpectDataCorrect) { false, app_id1, device_id, - 9).LastInsertId(); + 9) + .LastInsertId(); int64_t command_key = FillCommandTable(temp_query, 1, "menu_name", 1, 2, 5).LastInsertId(); FillApplicationCommandsArrayTable(temp_query, app_key, command_key); @@ -2715,11 +2770,13 @@ TEST_F(ResumptionSqlQueriesTest, kSelectCommandsFromCommand_ExpectDataCorrect) { false, app_id1, device_id, - 9).LastInsertId(); + 9) + .LastInsertId(); int64_t image_key = FillImageTable(temp_query, /*image_type=*/2, "tst_image", - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); FillChoiceTable( temp_query, 1, "menu_name", "sec_text", "tert_text", image_key) @@ -2758,11 +2815,13 @@ TEST_F(ResumptionSqlQueriesTest, kSelectCommandsFromChoice_ExpectDataCorrect) { false, app_id1, device_id, - 9).LastInsertId(); + 9) + .LastInsertId(); int64_t image_key = FillImageTable(temp_query, /*image_type=*/2, "tst_image", - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); int64_t choice_key = FillChoiceTable( @@ -2814,7 +2873,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectCountSubscriptions_ExpectDataCorrect) { false, app_id1, device_id, - 9).LastInsertId(); + 9) + .LastInsertId(); FillAppSubscriptionsArrayTable(temp_query, 2, 3, app_key); ValToPosPair p1(0, app_id1); ValToPosPair p2(1, device_id); @@ -2836,7 +2896,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectSubscriptions_ExpectDataCorrect) { false, app_id1, device_id, - 9).LastInsertId(); + 9) + .LastInsertId(); FillAppSubscriptionsArrayTable(temp_query, 2, 3, app_key); ValToPosPair p1(0, app_id1); ValToPosPair p2(1, device_id); @@ -2859,7 +2920,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectCountChoiceSet_ExpectDataCorrect) { false, app_id1, device_id, - 9).LastInsertId(); + 9) + .LastInsertId(); FillApplicationChoiceSetArrayTable(temp_query, 2, app_key); ValToPosPair p1(0, app_id1); ValToPosPair p2(1, device_id); @@ -2881,11 +2943,13 @@ TEST_F(ResumptionSqlQueriesTest, kSelectChoiceSets_ExpectDataCorrect) { false, app_id1, device_id, - 9).LastInsertId(); + 9) + .LastInsertId(); int64_t image_key = FillImageTable(temp_query, /*image_type=*/2, "tst_image", - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); int64_t choice_key = FillChoiceTable( temp_query, 1, "menu_name", "sec_text", "tert_text", image_key) @@ -2920,7 +2984,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectImage_ExpectDataCorrect) { int64_t image_key = FillImageTable(temp_query, /*image_type=*/2, "tst_image", - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); // Check ValToPosPair p1(0, IntToString(image_key)); ValToPosPair p2(1, ""); @@ -2947,7 +3012,8 @@ TEST_F(ResumptionSqlQueriesTest, false, app_id1, device_id, - glob_prop_key).LastInsertId(); + glob_prop_key) + .LastInsertId(); // Check ValToPosPair p1(0, app_id1); @@ -2961,7 +3027,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectGlobalProperties_ExpectDataCorrect) { int64_t image_key = FillImageTable(temp_query, /*image_type=*/2, test_image, - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); int64_t glob_prop_key = FillGlobalPropertiesTable( temp_query, "tst_vr_title", "tst_menu", 2, 3, 3, "auto", image_key) @@ -2977,7 +3044,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectGlobalProperties_ExpectDataCorrect) { false, app_id1, device_id, - glob_prop_key).LastInsertId(); + glob_prop_key) + .LastInsertId(); FillHelpTimeoutPromptArrayTable(temp_query, glob_prop_key, 3, 7); // Check @@ -3001,7 +3069,8 @@ TEST_F(ResumptionSqlQueriesTest, kChecksVrHelpItem_ExpectDataCorrect) { int64_t image_key = FillImageTable(temp_query, /*image_type=*/2, "tst_image", - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); int64_t glob_prop_key = FillGlobalPropertiesTable( temp_query, "tst_vr_title", "tst_menu", 2, 3, 3, "auto", image_key) @@ -3021,7 +3090,8 @@ TEST_F(ResumptionSqlQueriesTest, kSelectVrHelpItem_ExpectDataCorrect) { int64_t image_key = FillImageTable(temp_query, /*image_type=*/2, "tst_image", - /*is_template=*/true).LastInsertId(); + /*is_template=*/true) + .LastInsertId(); int64_t glob_prop_key = FillGlobalPropertiesTable( temp_query, "tst_vr_title", "tst_menu", 2, 3, 3, "auto", image_key) @@ -3046,8 +3116,9 @@ TEST_F(ResumptionSqlQueriesTest, kChecksCharacter_ExpectDataCorrect) { temp_query, "tst_vr_title", "tst_menu", 2, 3, 3, "auto", 2) .LastInsertId(); string character_list = "abcdefghijkl"; - int64_t lim_char_list_key = FillTableLimitedCharacterListTable( - temp_query, character_list).LastInsertId(); + int64_t lim_char_list_key = + FillTableLimitedCharacterListTable(temp_query, character_list) + .LastInsertId(); FillCharacterArrayTable(temp_query, glob_prop_key, lim_char_list_key); // Check ValToPosPair p1(0, IntToString(glob_prop_key)); @@ -3063,8 +3134,9 @@ TEST_F(ResumptionSqlQueriesTest, kSelectCharacter_ExpectDataCorrect) { temp_query, "tst_vr_title", "tst_menu", 2, 3, 3, "auto", 2) .LastInsertId(); string character_list = "abcdefghijkl"; - int64_t lim_char_list_key = FillTableLimitedCharacterListTable( - temp_query, character_list).LastInsertId(); + int64_t lim_char_list_key = + FillTableLimitedCharacterListTable(temp_query, character_list) + .LastInsertId(); FillCharacterArrayTable(temp_query, glob_prop_key, lim_char_list_key); // Check ValToPosPair p1(0, IntToString(glob_prop_key)); diff --git a/src/components/application_manager/test/state_controller/state_controller_test.cc b/src/components/application_manager/test/state_controller/state_controller_test.cc index 9574f8d00f..fbada47fec 100644 --- a/src/components/application_manager/test/state_controller/state_controller_test.cc +++ b/src/components/application_manager/test/state_controller/state_controller_test.cc @@ -30,46 +30,46 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" +#include "application_manager/application_manager_impl.h" #include "application_manager/hmi_state.h" +#include "application_manager/mock_application.h" #include "application_manager/state_controller_impl.h" #include "application_manager/usage_statistics.h" -#include "application_manager/application_manager_impl.h" -#include "application_manager/mock_application.h" -#include "connection_handler/mock_connection_handler_settings.h" #include "connection_handler/connection_handler_impl.h" +#include "connection_handler/mock_connection_handler_settings.h" +#include "gtest/gtest.h" #include "transport_manager/mock_transport_manager.h" -#include "utils/lock.h" #include "utils/data_accessor.h" +#include "utils/lock.h" -#include "application_manager/message_helper.h" #include "application_manager/event_engine/event.h" -#include "application_manager/smart_object_keys.h" +#include "application_manager/message_helper.h" +#include "application_manager/mock_application_manager.h" +#include "application_manager/mock_event_dispatcher.h" #include "application_manager/mock_message_helper.h" +#include "application_manager/mock_rpc_service.h" +#include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/resumption/resume_ctrl.h" +#include "application_manager/smart_object_keys.h" +#include "connection_handler/mock_connection_handler.h" #include "policy/mock_policy_settings.h" #include "policy/usage_statistics/mock_statistics_manager.h" #include "protocol_handler/mock_session_observer.h" -#include "connection_handler/mock_connection_handler.h" -#include "application_manager/policies/mock_policy_handler_interface.h" -#include "application_manager/mock_event_dispatcher.h" -#include "application_manager/resumption/resume_ctrl.h" -#include "application_manager/mock_application_manager.h" -#include "application_manager/mock_rpc_service.h" namespace am = application_manager; using am::HmiState; using am::HmiStatePtr; using am::UsageStatistics; using ::testing::_; +using ::testing::AtLeast; +using ::testing::InSequence; +using ::testing::Mock; +using ::testing::NiceMock; using ::testing::Return; -using ::testing::ReturnRef; using ::testing::ReturnPointee; +using ::testing::ReturnRef; using ::testing::SaveArg; -using ::testing::Mock; -using ::testing::NiceMock; -using ::testing::InSequence; using ::testing::Truly; -using ::testing::AtLeast; namespace test { namespace components { @@ -2063,7 +2063,8 @@ TEST_F(StateControllerImplTest, SendEventBCActivateApp_HMIReceivesError) { EXPECT_CALL(app_manager_mock_, SendHMIStatusNotification(simple_app_)) .Times(0); EXPECT_CALL(app_manager_mock_, - OnHMILevelChanged(simple_app_->app_id(), _, _)).Times(0); + OnHMILevelChanged(simple_app_->app_id(), _, _)) + .Times(0); smart_objects::SmartObject message; message[am::strings::params][am::hmi_response::code] = *it; @@ -2627,7 +2628,8 @@ TEST_F(StateControllerImplTest, SetRegularStateMediaToNonMediaApp_VR_Stopped) { EXPECT_CALL(*simple_app_ptr_, is_resuming()).WillRepeatedly(Return(false)); EXPECT_CALL(message_helper_mock_, - SendOnResumeAudioSourceToHMI(simple_app_id_, _)).Times(0); + SendOnResumeAudioSourceToHMI(simple_app_id_, _)) + .Times(0); EXPECT_CALL(*simple_app_ptr_, SetPostponedState(Truly(HmiStatesComparator(check_state)))) .Times(0); diff --git a/src/components/application_manager/test/usage_statistics_test.cc b/src/components/application_manager/test/usage_statistics_test.cc index dfc694f3c5..b494afb68e 100644 --- a/src/components/application_manager/test/usage_statistics_test.cc +++ b/src/components/application_manager/test/usage_statistics_test.cc @@ -33,9 +33,9 @@ #include "application_manager/usage_statistics.h" #include #include "gmock/gmock.h" -#include "smart_objects/enum_schema_item.h" -#include "policy/usage_statistics/mock_statistics_manager.h" #include "policy/usage_statistics/mock_app_stopwatch.h" +#include "policy/usage_statistics/mock_statistics_manager.h" +#include "smart_objects/enum_schema_item.h" namespace test { namespace components { diff --git a/src/components/application_manager/test/zero_request_amount_test.cc b/src/components/application_manager/test/zero_request_amount_test.cc index 640a186e2b..0166c036c1 100644 --- a/src/components/application_manager/test/zero_request_amount_test.cc +++ b/src/components/application_manager/test/zero_request_amount_test.cc @@ -30,19 +30,19 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include #include "gtest/gtest.h" -#include "application_manager/request_controller.h" -#include "application_manager/commands/command_request_impl.h" #include "application_manager/application_manager_impl.h" -#include "application_manager/message_helper.h" +#include "application_manager/commands/command_request_impl.h" #include "application_manager/commands/mobile/put_file_request.h" #include "application_manager/commands/mobile/register_app_interface_request.h" #include "application_manager/commands/mobile/unregister_app_interface_request.h" -#include "smart_objects/smart_object.h" +#include "application_manager/message_helper.h" +#include "application_manager/request_controller.h" #include "interfaces/MOBILE_API.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { diff --git a/src/components/config_profile/include/config_profile/profile.h b/src/components/config_profile/include/config_profile/profile.h index ba43ec9695..1d3766ca97 100644 --- a/src/components/config_profile/include/config_profile/profile.h +++ b/src/components/config_profile/include/config_profile/profile.h @@ -34,18 +34,18 @@ #define SRC_COMPONENTS_CONFIG_PROFILE_INCLUDE_CONFIG_PROFILE_PROFILE_H_ #include -#include -#include #include #include -#include "utils/macro.h" -#include "protocol_handler/protocol_handler_settings.h" +#include +#include +#include "application_manager/application_manager_settings.h" #include "connection_handler/connection_handler_settings.h" #include "hmi_message_handler/hmi_message_handler_settings.h" #include "media_manager/media_manager_settings.h" -#include "transport_manager/transport_manager_settings.h" -#include "application_manager/application_manager_settings.h" #include "policy/policy_settings.h" +#include "protocol_handler/protocol_handler_settings.h" +#include "transport_manager/transport_manager_settings.h" +#include "utils/macro.h" namespace profile { @@ -85,23 +85,23 @@ class Profile : public protocol_handler::ProtocolHandlerSettings, const std::string& sdl_version() const OVERRIDE; /** - * @brief Returns true if HMI should be started, otherwise false - */ + * @brief Returns true if HMI should be started, otherwise false + */ bool launch_hmi() const OVERRIDE; #ifdef WEB_HMI /** - * @brief Returns link to web hmi - */ + * @brief Returns link to web hmi + */ std::string link_to_web_hmi() const; #endif // WEB_HMI /** - * @brief Returns application configuration path - */ + * @brief Returns application configuration path + */ const std::string& app_config_folder() const; /** - * @brief Returns application storage path - */ + * @brief Returns application storage path + */ const std::string& app_storage_folder() const; /** @@ -110,24 +110,24 @@ class Profile : public protocol_handler::ProtocolHandlerSettings, const std::string& app_resource_folder() const; /** - * @brief Returns offset from SIGRTMIN for user defined signal - * SIGLOWVOLTAGE - * which is used for handling LOW Voltage functionality - */ + * @brief Returns offset from SIGRTMIN for user defined signal + * SIGLOWVOLTAGE + * which is used for handling LOW Voltage functionality + */ int low_voltage_signal_offset() const; /** - * @brief Returns offset from SIGRTMIN for user defined signal - * SIGWAKEUP - * which is used for handling LOW Voltage functionality - */ + * @brief Returns offset from SIGRTMIN for user defined signal + * SIGWAKEUP + * which is used for handling LOW Voltage functionality + */ int wake_up_signal_offset() const; /** - * @brief Returns offset from SIGRTMIN for user defined signal - * SIGIGNITIONOFF - * which is used for handling LOW Voltage functionality - */ + * @brief Returns offset from SIGRTMIN for user defined signal + * SIGIGNITIONOFF + * which is used for handling LOW Voltage functionality + */ int ignition_off_signal_offset() const; /** @@ -202,8 +202,8 @@ class Profile : public protocol_handler::ProtocolHandlerSettings, uint32_t stop_streaming_timeout() const; /** - * @brief Returns port for time reports - */ + * @brief Returns port for time reports + */ const uint16_t& time_testing_port() const; /** @@ -228,8 +228,8 @@ class Profile : public protocol_handler::ProtocolHandlerSettings, const std::vector& vr_commands() const; /** - * @brief Returns folder containing all plugins - */ + * @brief Returns folder containing all plugins + */ const std::string& plugins_folder() const OVERRIDE; /** @@ -254,38 +254,38 @@ class Profile : public protocol_handler::ProtocolHandlerSettings, const uint64_t thread_min_stack_size() const; /** - * @brief Returns true if audio mixing is supported - */ + * @brief Returns true if audio mixing is supported + */ bool is_mixing_audio_supported() const; /** - * @brief Returns true if video re-decoding enabled - */ + * @brief Returns true if video re-decoding enabled + */ bool is_redecoding_enabled() const; /** - * @brief Returns title for Vr Help - */ + * @brief Returns title for Vr Help + */ const std::string& vr_help_title() const; /** - * @brief Returns application directory quota size - */ + * @brief Returns application directory quota size + */ const uint32_t& app_dir_quota() const; /** - * @brief Returns the video server type - */ + * @brief Returns the video server type + */ const std::string& video_server_type() const; /** - * @brief Returns the audio server type - */ + * @brief Returns the audio server type + */ const std::string& audio_server_type() const; /** - * @brief Returns the video pipe path - */ + * @brief Returns the video pipe path + */ const std::string& named_video_pipe_path() const; /** @@ -300,13 +300,13 @@ class Profile : public protocol_handler::ProtocolHandlerSettings, const uint32_t& app_hmi_level_none_time_scale() const; /** - * @brief Returns path to testing file to which redirects video stream - */ + * @brief Returns path to testing file to which redirects video stream + */ const std::string& video_stream_file() const; /** - * @brief Returns path to testing file to which redirects audio stream - */ + * @brief Returns path to testing file to which redirects audio stream + */ const std::string& audio_stream_file() const; /** @@ -452,8 +452,8 @@ class Profile : public protocol_handler::ProtocolHandlerSettings, const std::vector& supported_diag_modes() const OVERRIDE; /** - * @brief Returns system files folder path - */ + * @brief Returns system files folder path + */ const std::string& system_files_path() const OVERRIDE; /** @@ -750,9 +750,9 @@ class Profile : public protocol_handler::ProtocolHandlerSettings, const bool enable_app_launch_ios() const OVERRIDE; /** - * @brief Returns the millisecond count before timeout - * for transport change feature occures. - */ + * @brief Returns the millisecond count before timeout + * for transport change feature occures. + */ uint32_t app_transport_change_timer() const OVERRIDE; /** diff --git a/src/components/config_profile/src/ini_file.cc b/src/components/config_profile/src/ini_file.cc index 3245b096cb..024c75de3e 100644 --- a/src/components/config_profile/src/ini_file.cc +++ b/src/components/config_profile/src/ini_file.cc @@ -31,13 +31,13 @@ */ #include "config_profile/ini_file.h" -#include -#include -#include -#include #include +#include #include #include +#include +#include +#include #include "utils/logger.h" @@ -157,7 +157,7 @@ char ini_write_value(const char* fname, const char* item, const char* value, uint8_t flag) { - FILE* rd_fp, * wr_fp = 0; + FILE *rd_fp, *wr_fp = 0; uint16_t i, cr_count; int32_t wr_result; bool chapter_found = false; diff --git a/src/components/config_profile/src/profile.cc b/src/components/config_profile/src/profile.cc index e5a32f4560..a5b2daa130 100644 --- a/src/components/config_profile/src/profile.cc +++ b/src/components/config_profile/src/profile.cc @@ -33,18 +33,18 @@ #include "config_profile/profile.h" #include -#include -#include #include -#include +#include #include +#include +#include #include #include "config_profile/ini_file.h" +#include "utils/file_system.h" #include "utils/logger.h" #include "utils/threads/thread.h" -#include "utils/file_system.h" #ifdef ENABLE_SECURITY #include @@ -2460,7 +2460,7 @@ std::string trim_string(const std::string& str) { return str.substr(start, end - start + 1); } -} +} // namespace std::vector Profile::ReadIntContainer(const char* const pSection, const char* const pKey, diff --git a/src/components/config_profile/test/ini_file_test.cc b/src/components/config_profile/test/ini_file_test.cc index 0443f061a2..ca4f2fc849 100644 --- a/src/components/config_profile/test/ini_file_test.cc +++ b/src/components/config_profile/test/ini_file_test.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "config_profile/ini_file.h" +#include "gtest/gtest.h" #include "utils/file_system.h" namespace test { diff --git a/src/components/config_profile/test/profile_test.cc b/src/components/config_profile/test/profile_test.cc index 64bafdd6bf..6dc0434440 100644 --- a/src/components/config_profile/test/profile_test.cc +++ b/src/components/config_profile/test/profile_test.cc @@ -33,8 +33,8 @@ #include #include -#include "gtest/gtest.h" #include "config_profile/profile.h" +#include "gtest/gtest.h" #include "utils/file_system.h" #include "utils/threads/thread.h" diff --git a/src/components/connection_handler/include/connection_handler/connection.h b/src/components/connection_handler/include/connection_handler/connection.h index 4f900bb65e..7e4ab6a24e 100644 --- a/src/components/connection_handler/include/connection_handler/connection.h +++ b/src/components/connection_handler/include/connection_handler/connection.h @@ -36,12 +36,12 @@ #include #include -#include "utils/lock.h" -#include "utils/threads/thread.h" #include "connection_handler/device.h" #include "connection_handler/heartbeat_monitor.h" #include "protocol/service_type.h" #include "protocol_handler/protocol_packet.h" +#include "utils/lock.h" +#include "utils/threads/thread.h" #ifdef ENABLE_SECURITY namespace security_manager { diff --git a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h index 06eb4f232d..cca11e5f57 100644 --- a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h +++ b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h @@ -33,26 +33,26 @@ #ifndef SRC_COMPONENTS_CONNECTION_HANDLER_INCLUDE_CONNECTION_HANDLER_CONNECTION_HANDLER_IMPL_H_ #define SRC_COMPONENTS_CONNECTION_HANDLER_INCLUDE_CONNECTION_HANDLER_CONNECTION_HANDLER_IMPL_H_ -#include #include +#include #include #include -#include "transport_manager/transport_manager_listener_empty.h" -#include "protocol_handler/session_observer.h" -#include "protocol_handler/protocol_handler.h" +#include "connection_handler/connection.h" +#include "connection_handler/connection_handler.h" #include "connection_handler/connection_handler_observer.h" #include "connection_handler/device.h" -#include "connection_handler/connection.h" #include "connection_handler/devices_discovery_starter.h" -#include "connection_handler/connection_handler.h" +#include "protocol_handler/protocol_handler.h" +#include "protocol_handler/session_observer.h" +#include "transport_manager/transport_manager_listener_empty.h" +#include "utils/lock.h" #include "utils/logger.h" #include "utils/macro.h" #include "utils/message_queue.h" -#include "utils/lock.h" -#include "utils/stl_utils.h" #include "utils/rwlock.h" +#include "utils/stl_utils.h" const transport_manager::ConnectionUID kDisabledSecondary = 0xFFFFFFFF; diff --git a/src/components/connection_handler/include/connection_handler/device.h b/src/components/connection_handler/include/connection_handler/device.h index 26376c1d8d..1cad7a72c5 100644 --- a/src/components/connection_handler/include/connection_handler/device.h +++ b/src/components/connection_handler/include/connection_handler/device.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_CONNECTION_HANDLER_INCLUDE_CONNECTION_HANDLER_DEVICE_H_ #define SRC_COMPONENTS_CONNECTION_HANDLER_INCLUDE_CONNECTION_HANDLER_DEVICE_H_ -#include #include +#include #include #include "transport_manager/common.h" @@ -77,9 +77,9 @@ class Device { std::string user_friendly_name() const; /** - *\brief Also should be used for iOS USB connections - *(better not know why this same method) - */ + *\brief Also should be used for iOS USB connections + *(better not know why this same method) + */ std::string mac_address() const; /** diff --git a/src/components/connection_handler/include/connection_handler/heartbeat_monitor.h b/src/components/connection_handler/include/connection_handler/heartbeat_monitor.h index cf956353dd..9e04929f79 100644 --- a/src/components/connection_handler/include/connection_handler/heartbeat_monitor.h +++ b/src/components/connection_handler/include/connection_handler/heartbeat_monitor.h @@ -35,11 +35,11 @@ #include #include -#include "utils/threads/thread.h" -#include "utils/threads/thread_delegate.h" #include "utils/date_time.h" -#include "utils/macro.h" #include "utils/lock.h" +#include "utils/macro.h" +#include "utils/threads/thread.h" +#include "utils/threads/thread_delegate.h" namespace connection_handler { @@ -64,7 +64,7 @@ class HeartBeatMonitor : public threads::ThreadDelegate { void RemoveSession(uint8_t session_id); /** - * \brief Resets timer preventing session from being killed + * \brief Resets timer preventing session from being killed */ void KeepAlive(uint8_t session_id); diff --git a/src/components/connection_handler/src/connection.cc b/src/components/connection_handler/src/connection.cc index 3f5b0e1901..304be9ddb0 100644 --- a/src/components/connection_handler/src/connection.cc +++ b/src/components/connection_handler/src/connection.cc @@ -37,13 +37,13 @@ #include "connection_handler/connection.h" #include "connection_handler/connection_handler.h" #include "protocol_handler/protocol_packet.h" +#include "utils/helpers.h" #include "utils/logger.h" #include "utils/macro.h" -#include "utils/helpers.h" #ifdef ENABLE_SECURITY -#include "security_manager/ssl_context.h" #include "security_manager/security_manager.h" +#include "security_manager/ssl_context.h" #endif // ENABLE_SECURITY /** @@ -190,12 +190,11 @@ bool Connection::AddNewService(uint8_t session_id, Session& session = session_it->second; if (session.protocol_version <= protocol_handler::PROTOCOL_VERSION_2 && - helpers::Compare( - service_type, - protocol_handler::ServiceType::kAudio, - protocol_handler::ServiceType::kMobileNav)) { + helpers:: + Compare( + service_type, + protocol_handler::ServiceType::kAudio, + protocol_handler::ServiceType::kMobileNav)) { LOG4CXX_WARN(logger_, "Audio and video services are disallowed for protocol version " "2 or lower"); @@ -265,8 +264,10 @@ bool Connection::RemoveService(uint8_t session_id, find(service_list.begin(), service_list.end(), service_type); if (service_list.end() == service_it) { LOG4CXX_WARN(logger_, - "Session " << session_id << " didn't established" - " service " << service_type); + "Session " << session_id + << " didn't established" + " service " + << service_type); return false; } service_list.erase(service_it); diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc index c412c9c637..84609d47b8 100644 --- a/src/components/connection_handler/src/connection_handler_impl.cc +++ b/src/components/connection_handler/src/connection_handler_impl.cc @@ -31,14 +31,14 @@ */ #include -#include -#include #include +#include #include +#include #include "connection_handler/connection_handler_impl.h" -#include "transport_manager/info.h" #include "encryption/hashing.h" +#include "transport_manager/info.h" #ifdef ENABLE_SECURITY #include "security_manager/security_manager.h" @@ -95,9 +95,9 @@ void ConnectionHandlerImpl::Stop() { void ConnectionHandlerImpl::set_connection_handler_observer( ConnectionHandlerObserver* observer) { - LOG4CXX_DEBUG(logger_, - "ConnectionHandlerImpl::set_connection_handler_observer() " - << observer); + LOG4CXX_DEBUG( + logger_, + "ConnectionHandlerImpl::set_connection_handler_observer() " << observer); sync_primitives::AutoWriteLock write_lock(connection_handler_observer_lock_); if (!observer) { LOG4CXX_WARN(logger_, "Set Null pointer to observer."); @@ -107,9 +107,9 @@ void ConnectionHandlerImpl::set_connection_handler_observer( void ConnectionHandlerImpl::set_protocol_handler( protocol_handler::ProtocolHandler* protocol_handler) { - LOG4CXX_DEBUG(logger_, - "ConnectionHandlerImpl::set_protocol_handler()" - << protocol_handler); + LOG4CXX_DEBUG( + logger_, + "ConnectionHandlerImpl::set_protocol_handler()" << protocol_handler); if (!protocol_handler) { LOG4CXX_WARN(logger_, "Set Null pointer to protocol handler."); } @@ -392,9 +392,9 @@ bool AllowProtection(const ConnectionHandlerSettings& settings, if (std::find(force_unprotected_list.begin(), force_unprotected_list.end(), service_type) != force_unprotected_list.end()) { - LOG4CXX_ERROR(logger_, - "Service " << static_cast(service_type) - << " shall be protected"); + LOG4CXX_ERROR( + logger_, + "Service " << static_cast(service_type) << " shall be protected"); return false; } LOG4CXX_DEBUG(logger_, @@ -686,34 +686,34 @@ uint32_t ConnectionHandlerImpl::OnSessionEndedCallback( KeyFromPair(primary_connection_handle, session_id); if (protocol_handler::kRpc == service_type) { - LOG4CXX_INFO(logger_, - "Session " << static_cast(session_id) - << " to be removed"); + LOG4CXX_INFO( + logger_, + "Session " << static_cast(session_id) << " to be removed"); // old version of protocol doesn't support hash if (protocol_handler::HASH_ID_NOT_SUPPORTED != *hashCode) { if (protocol_handler::HASH_ID_WRONG == *hashCode || session_key != *hashCode) { - LOG4CXX_WARN(logger_, - "Wrong hash_id for session " - << static_cast(session_id)); + LOG4CXX_WARN( + logger_, + "Wrong hash_id for session " << static_cast(session_id)); *hashCode = protocol_handler::HASH_ID_WRONG; return 0; } } if (!connection->RemoveSession(session_id)) { - LOG4CXX_WARN(logger_, - "Couldn't remove session " - << static_cast(session_id)); + LOG4CXX_WARN( + logger_, + "Couldn't remove session " << static_cast(session_id)); return 0; } } else { - LOG4CXX_INFO(logger_, - "Service " << static_cast(service_type) - << " to be removed"); + LOG4CXX_INFO( + logger_, + "Service " << static_cast(service_type) << " to be removed"); if (!connection->RemoveService(session_id, service_type)) { - LOG4CXX_WARN(logger_, - "Couldn't remove service " - << static_cast(service_type)); + LOG4CXX_WARN( + logger_, + "Couldn't remove service " << static_cast(service_type)); return 0; } } @@ -1480,9 +1480,9 @@ void ConnectionHandlerImpl::CloseSession(ConnectionHandle connection_handle, return; } - LOG4CXX_DEBUG(logger_, - "Session with id: " << session_id - << " has been closed successfully"); + LOG4CXX_DEBUG( + logger_, + "Session with id: " << session_id << " has been closed successfully"); } void ConnectionHandlerImpl::CloseConnectionSessions( diff --git a/src/components/connection_handler/src/device.cc b/src/components/connection_handler/src/device.cc index 0ecb439172..515304778b 100644 --- a/src/components/connection_handler/src/device.cc +++ b/src/components/connection_handler/src/device.cc @@ -54,9 +54,9 @@ Device::Device(DeviceHandle device_handle, , mac_address_(mac_address) , connection_type_(connection_type) { mac_address_ = encryption::MakeHash(mac_address); - LOG4CXX_DEBUG(logger_, - "Device: MAC address - " << mac_address << ", hash - " - << mac_address_); + LOG4CXX_DEBUG( + logger_, + "Device: MAC address - " << mac_address << ", hash - " << mac_address_); } DeviceHandle Device::device_handle() const { diff --git a/src/components/connection_handler/src/heartbeat_monitor.cc b/src/components/connection_handler/src/heartbeat_monitor.cc index 4c2d5899af..2b50f1ce1b 100644 --- a/src/components/connection_handler/src/heartbeat_monitor.cc +++ b/src/components/connection_handler/src/heartbeat_monitor.cc @@ -34,8 +34,8 @@ #include #include -#include "utils/logger.h" #include "connection_handler/connection.h" +#include "utils/logger.h" namespace connection_handler { @@ -79,9 +79,9 @@ void HeartBeatMonitor::Process() { void HeartBeatMonitor::threadMain() { AutoLock main_lock(main_thread_lock_); - LOG4CXX_DEBUG(logger_, - "Start heart beat monitor. Timeout is " - << default_heartbeat_timeout_); + LOG4CXX_DEBUG( + logger_, + "Start heart beat monitor. Timeout is " << default_heartbeat_timeout_); while (run_) { heartbeat_monitor_.WaitFor(main_lock, kDefaultCycleTimeout); Process(); @@ -94,9 +94,9 @@ void HeartBeatMonitor::AddSession(uint8_t session_id) { LOG4CXX_DEBUG(logger_, "Add session with id " << converted_session_id); AutoLock auto_lock(sessions_list_lock_); if (sessions_.end() != sessions_.find(session_id)) { - LOG4CXX_WARN(logger_, - "Session with id: " << converted_session_id - << " already exists"); + LOG4CXX_WARN( + logger_, + "Session with id: " << converted_session_id << " already exists"); return; } sessions_.insert( diff --git a/src/components/connection_handler/test/connection_handler_impl_test.cc b/src/components/connection_handler/test/connection_handler_impl_test.cc index 64de24b103..af7009c2f5 100644 --- a/src/components/connection_handler/test/connection_handler_impl_test.cc +++ b/src/components/connection_handler/test/connection_handler_impl_test.cc @@ -30,22 +30,22 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" -#include +#include "connection_handler/connection_handler_impl.h" #include +#include #include -#include "connection_handler/connection_handler_impl.h" +#include "gtest/gtest.h" #include "protocol/common.h" // TODO(EZamakhov): move security test #ifdef ENABLE_SECURITY #include "security_manager/mock_security_manager.h" #include "security_manager/mock_ssl_context.h" #endif // ENABLE_SECURITY -#include "protocol_handler/mock_protocol_handler.h" #include "connection_handler/mock_connection_handler_observer.h" #include "connection_handler/mock_connection_handler_settings.h" -#include "transport_manager/mock_transport_manager.h" #include "encryption/hashing.h" +#include "protocol_handler/mock_protocol_handler.h" +#include "transport_manager/mock_transport_manager.h" #include "utils/test_async_waiter.h" namespace test { @@ -333,7 +333,8 @@ class ConnectionHandlerTest : public ::testing::Test { connection_handler_->set_connection_handler_observer( &temp_connection_handler_observer); EXPECT_CALL(temp_connection_handler_observer, - OnServiceStartedCallback(_, _, service_type, _)).Times(1); + OnServiceStartedCallback(_, _, service_type, _)) + .Times(1); connection_handler_->OnSessionStartedCallback(2u, out_context_.new_session_id_, @@ -635,7 +636,8 @@ TEST_F(ConnectionHandlerTest, OnApplicationFloodCallBack) { connection_handler_->set_protocol_handler(&mock_protocol_handler_); EXPECT_CALL(mock_protocol_handler_, - SendEndSession(uid_, out_context_.new_session_id_)).Times(1); + SendEndSession(uid_, out_context_.new_session_id_)) + .Times(1); InSequence seq; EXPECT_CALL(mock_connection_handler_observer, OnServiceEndedCallback(connection_key_, kMobileNav, kCommon)); @@ -753,7 +755,8 @@ TEST_F(ConnectionHandlerTest, UpdateDeviceList) { // New value that sets in OnDeviceListUpdated does not add EXPECT_CALL(mock_connection_handler_observer, - OnDeviceListUpdated(CheckDevList(map_with_unused_var))).Times(0); + OnDeviceListUpdated(CheckDevList(map_with_unused_var))) + .Times(0); connection_handler_->OnDeviceListUpdated(unused_info); } @@ -1021,7 +1024,8 @@ TEST_F(ConnectionHandlerTest, CloseSessionWithMalformedMessage) { TestAsyncWaiter waiter; uint32_t times = 0; EXPECT_CALL(mock_protocol_handler_, - SendEndSession(uid_, out_context_.new_session_id_)).Times(0); + SendEndSession(uid_, out_context_.new_session_id_)) + .Times(0); InSequence seq; EXPECT_CALL(mock_connection_handler_observer, @@ -1061,7 +1065,8 @@ TEST_F(ConnectionHandlerTest, CloseConnectionSessionsWithMalformedMessage) { TestAsyncWaiter waiter; uint32_t times = 0; EXPECT_CALL(mock_protocol_handler_, - SendEndSession(uid_, out_context_.new_session_id_)).Times(0); + SendEndSession(uid_, out_context_.new_session_id_)) + .Times(0); InSequence seq; EXPECT_CALL(mock_connection_handler_observer, @@ -2063,7 +2068,8 @@ TEST_F(ConnectionHandlerTest, StartStopSecondarySession) { secondary_uid); EXPECT_CALL(mock_connection_handler_observer, - OnSecondaryTransportStartedCallback(device_handle_, _)).Times(1); + OnSecondaryTransportStartedCallback(device_handle_, _)) + .Times(1); connection_handler_->OnSecondaryTransportStarted( uid_, secondary_uid, out_context_.new_session_id_); @@ -2084,11 +2090,14 @@ TEST_F(ConnectionHandlerTest, StartStopSecondarySession) { connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); EXPECT_CALL(mock_connection_handler_observer, - OnSecondaryTransportEndedCallback(_)).Times(1); + OnSecondaryTransportEndedCallback(_)) + .Times(1); EXPECT_CALL(mock_connection_handler_observer, - OnServiceEndedCallback(_, kAudio, _)).Times(1); + OnServiceEndedCallback(_, kAudio, _)) + .Times(1); EXPECT_CALL(mock_connection_handler_observer, - OnServiceEndedCallback(_, kMobileNav, _)).Times(1); + OnServiceEndedCallback(_, kMobileNav, _)) + .Times(1); connection_handler_->OnSecondaryTransportEnded(uid_, secondary_uid); @@ -2120,7 +2129,8 @@ TEST_F(ConnectionHandlerTest, StopSecondarySession_NoService) { secondary_uid); EXPECT_CALL(mock_connection_handler_observer, - OnSecondaryTransportStartedCallback(device_handle_, _)).Times(1); + OnSecondaryTransportStartedCallback(device_handle_, _)) + .Times(1); connection_handler_->OnSecondaryTransportStarted( uid_, secondary_uid, out_context_.new_session_id_); diff --git a/src/components/connection_handler/test/connection_test.cc b/src/components/connection_handler/test/connection_test.cc index 98b83f5fc4..dd86831225 100644 --- a/src/components/connection_handler/test/connection_test.cc +++ b/src/components/connection_handler/test/connection_test.cc @@ -34,12 +34,12 @@ #include "gtest/gtest.h" -#include "protocol/common.h" #include "connection_handler/connection.h" -#include "connection_handler/mock_connection_handler.h" #include "connection_handler/connection_handler_impl.h" -#include "protocol/service_type.h" +#include "connection_handler/mock_connection_handler.h" #include "connection_handler/mock_connection_handler_settings.h" +#include "protocol/common.h" +#include "protocol/service_type.h" #include "transport_manager/mock_transport_manager.h" #ifdef ENABLE_SECURITY #include "security_manager/mock_security_manager.h" diff --git a/src/components/connection_handler/test/device_test.cc b/src/components/connection_handler/test/device_test.cc index 8c6d0af57a..555bd8ed2a 100644 --- a/src/components/connection_handler/test/device_test.cc +++ b/src/components/connection_handler/test/device_test.cc @@ -30,9 +30,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "connection_handler/device.h" #include #include "encryption/hashing.h" -#include "connection_handler/device.h" namespace test { namespace components { @@ -75,6 +75,6 @@ TEST(ConnectionDevice, MacAddressHash) { EXPECT_EQ(hashed_mac_address, test_device.mac_address()); } -} // namespace connection_handlet_test +} // namespace connection_handler_test } // namespace components } // namespace test diff --git a/src/components/connection_handler/test/heart_beat_monitor_test.cc b/src/components/connection_handler/test/heart_beat_monitor_test.cc index ccfff34116..d736255134 100644 --- a/src/components/connection_handler/test/heart_beat_monitor_test.cc +++ b/src/components/connection_handler/test/heart_beat_monitor_test.cc @@ -30,13 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include -#include "gtest/gtest.h" -#include "connection_handler/heartbeat_monitor.h" +#include #include "connection_handler/connection.h" #include "connection_handler/connection_handler.h" +#include "connection_handler/heartbeat_monitor.h" #include "connection_handler/mock_connection_handler.h" +#include "gtest/gtest.h" #include "utils/test_async_waiter.h" namespace { @@ -44,14 +44,14 @@ const int32_t MILLISECONDS_IN_SECOND = 1000; const int32_t MICROSECONDS_IN_MILLISECONDS = 1000; const int32_t MICROSECONDS_IN_SECOND = 1000 * 1000; const uint32_t kTime_offset = 20u; -} +} // namespace namespace test { namespace components { namespace connection_handler_test { -using ::testing::DoAll; using ::testing::_; +using ::testing::DoAll; using ::testing::Return; class HeartBeatMonitorTest : public testing::Test { diff --git a/src/components/formatters/include/formatters/CFormatterJsonBase.h b/src/components/formatters/include/formatters/CFormatterJsonBase.h index 66ffa0c1c5..b800ac1559 100644 --- a/src/components/formatters/include/formatters/CFormatterJsonBase.h +++ b/src/components/formatters/include/formatters/CFormatterJsonBase.h @@ -35,8 +35,8 @@ #ifndef SRC_COMPONENTS_FORMATTERS_INCLUDE_FORMATTERS_CFORMATTERJSONBASE_H_ #define SRC_COMPONENTS_FORMATTERS_INCLUDE_FORMATTERS_CFORMATTERJSONBASE_H_ -#include "smart_objects/smart_object.h" #include "json/json.h" +#include "smart_objects/smart_object.h" namespace ns_smart_device_link { namespace ns_json_handler { @@ -44,33 +44,33 @@ namespace formatters { namespace meta_formatter_error_code { /** - * @brief Error codes of MetaFormatter represented as bitmask - **/ + * @brief Error codes of MetaFormatter represented as bitmask + **/ typedef long tMetaFormatterErrorCode; /** - * @brief OK, no error - */ + * @brief OK, no error + */ static const tMetaFormatterErrorCode kErrorOk = 0x0; /** - * @brief origin smart object is not function - */ + * @brief origin smart object is not function + */ static const tMetaFormatterErrorCode kErrorObjectIsNotFunction = 0x01; /** - * @brief smart shema describes object which is not function - */ + * @brief smart shema describes object which is not function + */ static const tMetaFormatterErrorCode kErrorSchemaIsNotFunction = 0x02; /** - * @brief result smart object has invalid type (SmartType_Invalid) - * before passing to MetaFormatter, i.e. result object can not - * be changed, i.e. result object can not be built - * - */ + * @brief result smart object has invalid type (SmartType_Invalid) + * before passing to MetaFormatter, i.e. result object can not + * be changed, i.e. result object can not be built + * + */ static const tMetaFormatterErrorCode kErrorFailedCreateObjectBySchema = 0x04; -} +} // namespace meta_formatter_error_code /** * @brief The base class for all JSON based formatters. @@ -102,18 +102,18 @@ class CFormatterJsonBase { ns_smart_device_link::ns_smart_objects::SmartObject& obj); /** - * @brief The method constructs a JSON object from the input SmartObject - * - * @param obj Input SmartObject. Can contain a complex structure of objects. - * @param value The resulting JSON object. It has the same structure as the - *input SmartObject. - */ + * @brief The method constructs a JSON object from the input SmartObject + * + * @param obj Input SmartObject. Can contain a complex structure of objects. + * @param value The resulting JSON object. It has the same structure as the + *input SmartObject. + */ static void objToJsonValue( const ns_smart_device_link::ns_smart_objects::SmartObject& obj, Json::Value& value); }; -} -} -} // namespace ns_smart_device_link::ns_json_handler::formatters +} // namespace formatters +} // namespace ns_json_handler +} // namespace ns_smart_device_link #endif // SRC_COMPONENTS_FORMATTERS_INCLUDE_FORMATTERS_CFORMATTERJSONBASE_H_ diff --git a/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv1.h b/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv1.h index cd3e50212a..b1054100df 100644 --- a/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv1.h +++ b/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv1.h @@ -32,8 +32,8 @@ #include "json/json.h" -#include "smart_objects/smart_object.h" #include "smart_objects/enum_schema_item.h" +#include "smart_objects/smart_object.h" #include "CFormatterJsonBase.h" @@ -238,8 +238,8 @@ int32_t formatters::CFormatterJsonSDLRPCv1::fromString( return result; } -} -} -} // namespace ns_smart_device_link::ns_json_handler::formatters +} // namespace formatters +} // namespace ns_json_handler +} // namespace ns_smart_device_link #endif // SRC_COMPONENTS_FORMATTERS_INCLUDE_FORMATTERS_CFORMATTERJSONSDLRPCV1_H_ diff --git a/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv2.h b/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv2.h index f86e4e51cb..ab0289b293 100644 --- a/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv2.h +++ b/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv2.h @@ -188,8 +188,8 @@ inline bool CFormatterJsonSDLRPCv2::fromString( return result; } -} -} -} // namespace ns_smart_device_link::ns_json_handler::formatters +} // namespace formatters +} // namespace ns_json_handler +} // namespace ns_smart_device_link #endif // SRC_COMPONENTS_FORMATTERS_INCLUDE_FORMATTERS_CFORMATTERJSONSDLRPCV2_H_ diff --git a/src/components/formatters/include/formatters/CSmartFactory.h b/src/components/formatters/include/formatters/CSmartFactory.h index f3c3fbe207..c384dbf01d 100644 --- a/src/components/formatters/include/formatters/CSmartFactory.h +++ b/src/components/formatters/include/formatters/CSmartFactory.h @@ -35,10 +35,10 @@ #ifndef SRC_COMPONENTS_FORMATTERS_INCLUDE_FORMATTERS_CSMARTFACTORY_H_ #define SRC_COMPONENTS_FORMATTERS_INCLUDE_FORMATTERS_CSMARTFACTORY_H_ -#include "smart_objects/smart_object.h" -#include "smart_objects/smart_schema.h" #include #include +#include "smart_objects/smart_object.h" +#include "smart_objects/smart_schema.h" namespace ns_smart_device_link { namespace ns_json_handler { @@ -94,7 +94,7 @@ extern const std::string kCode; * @brief String constant for "message" param name. */ extern const std::string kMessage; -} +} // namespace strings /** * @brief Smart Schema key. @@ -286,11 +286,11 @@ bool CSmartFactory::attachSchema( return false; MessageTypeEnum msgtype( - (MessageTypeEnum) - object[strings::S_PARAMS][strings::S_MESSAGE_TYPE].asInt()); + (MessageTypeEnum)object[strings::S_PARAMS][strings::S_MESSAGE_TYPE] + .asInt()); FunctionIdEnum fid( - (FunctionIdEnum) - object[strings::S_PARAMS][strings::S_FUNCTION_ID].asInt()); + (FunctionIdEnum)object[strings::S_PARAMS][strings::S_FUNCTION_ID] + .asInt()); SmartSchemaKey key(fid, msgtype); @@ -415,6 +415,6 @@ bool operator<(const SmartSchemaKey& l, return false; } -} -} +} // namespace ns_json_handler +} // namespace ns_smart_device_link #endif // SRC_COMPONENTS_FORMATTERS_INCLUDE_FORMATTERS_CSMARTFACTORY_H_ diff --git a/src/components/formatters/include/formatters/formatter_json_rpc.h b/src/components/formatters/include/formatters/formatter_json_rpc.h index 3503767988..593c837877 100644 --- a/src/components/formatters/include/formatters/formatter_json_rpc.h +++ b/src/components/formatters/include/formatters/formatter_json_rpc.h @@ -35,12 +35,12 @@ #ifndef SRC_COMPONENTS_FORMATTERS_INCLUDE_FORMATTERS_FORMATTER_JSON_RPC_H_ #define SRC_COMPONENTS_FORMATTERS_INCLUDE_FORMATTERS_FORMATTER_JSON_RPC_H_ -#include #include +#include -#include "smart_objects/smart_object.h" -#include "smart_objects/enum_schema_item.h" #include "json/json.h" +#include "smart_objects/enum_schema_item.h" +#include "smart_objects/smart_object.h" #include "CFormatterJsonBase.h" #include "formatters/CSmartFactory.h" diff --git a/src/components/formatters/include/formatters/meta_formatter.h b/src/components/formatters/include/formatters/meta_formatter.h index 36e39301f6..b2ff546bfc 100644 --- a/src/components/formatters/include/formatters/meta_formatter.h +++ b/src/components/formatters/include/formatters/meta_formatter.h @@ -44,35 +44,35 @@ namespace ns_json_handler { namespace formatters { /** - * @brief Formats to string the smart object against given schema for given - *formatter - * - * Sample usage: - * CSmartFactory factory; - * SmartObject object; - * CSmartSchmema schema; - * - */ + * @brief Formats to string the smart object against given schema for given + *formatter + * + * Sample usage: + * CSmartFactory factory; + * SmartObject object; + * CSmartSchmema schema; + * + */ class CMetaFormatter { public: /** - * @brief Creates smart object by the given schema having copied - * matched tree elements from original object. - * - * @param object Original smart object which macthed tree elements - * will be copied from - * @param schema Smart schema which describes result smart object - * @param result_object createdsmart object - * @return true if successful, false - otherwise - */ + * @brief Creates smart object by the given schema having copied + * matched tree elements from original object. + * + * @param object Original smart object which macthed tree elements + * will be copied from + * @param schema Smart schema which describes result smart object + * @param result_object createdsmart object + * @return true if successful, false - otherwise + */ static bool CreateObjectByPattern( const ns_smart_device_link::ns_smart_objects::SmartObject& object, const ns_smart_device_link::ns_smart_objects::CSmartSchema& schema, ns_smart_device_link::ns_smart_objects::SmartObject& result_object); }; +} // namespace formatters +} // namespace ns_json_handler } // namespace ns_smart_device_link -} // namespace ns_smart_device_link::ns_json_handler -} // namespace ns_smart_device_link::ns_json_handler::formatters #endif // SRC_COMPONENTS_FORMATTERS_INCLUDE_FORMATTERS_META_FORMATTER_H_ diff --git a/src/components/formatters/src/CFormatterJsonBase.cc b/src/components/formatters/src/CFormatterJsonBase.cc index af8668543a..6dc3d28f16 100644 --- a/src/components/formatters/src/CFormatterJsonBase.cc +++ b/src/components/formatters/src/CFormatterJsonBase.cc @@ -31,8 +31,8 @@ // 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 "json/json.h" #include "formatters/CFormatterJsonBase.h" +#include "json/json.h" #include "utils/convert_utils.h" void ns_smart_device_link::ns_json_handler::formatters::CFormatterJsonBase:: diff --git a/src/components/formatters/src/CFormatterJsonSDLRPCv1.cc b/src/components/formatters/src/CFormatterJsonSDLRPCv1.cc index a5c3d1a103..2f47c83a6b 100644 --- a/src/components/formatters/src/CFormatterJsonSDLRPCv1.cc +++ b/src/components/formatters/src/CFormatterJsonSDLRPCv1.cc @@ -164,6 +164,6 @@ CFormatterJsonSDLRPCv1::MetaFormatToString( return result_code; } -} -} -} +} // namespace formatters +} // namespace ns_json_handler +} // namespace ns_smart_device_link diff --git a/src/components/formatters/src/CFormatterJsonSDLRPCv2.cc b/src/components/formatters/src/CFormatterJsonSDLRPCv2.cc index a582b52462..bee92fbbee 100644 --- a/src/components/formatters/src/CFormatterJsonSDLRPCv2.cc +++ b/src/components/formatters/src/CFormatterJsonSDLRPCv2.cc @@ -107,6 +107,6 @@ CFormatterJsonSDLRPCv2::MetaFormatToString( return result_code; } -} -} -} +} // namespace formatters +} // namespace ns_json_handler +} // namespace ns_smart_device_link diff --git a/src/components/formatters/test/CFormatterJsonBase_test.cc b/src/components/formatters/test/CFormatterJsonBase_test.cc index 1cd9c55bbc..91700b3f99 100644 --- a/src/components/formatters/test/CFormatterJsonBase_test.cc +++ b/src/components/formatters/test/CFormatterJsonBase_test.cc @@ -30,13 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "formatters/CFormatterJsonBase.h" #include -#include "json/value.h" +#include +#include "formatters/generic_json_formatter.h" #include "gtest/gtest.h" #include "json/reader.h" -#include "formatters/CFormatterJsonBase.h" -#include "formatters/generic_json_formatter.h" +#include "json/value.h" namespace test { namespace components { diff --git a/src/components/formatters/test/CSmartFactory_test.cc b/src/components/formatters/test/CSmartFactory_test.cc index 3aba109e58..5bd212f431 100644 --- a/src/components/formatters/test/CSmartFactory_test.cc +++ b/src/components/formatters/test/CSmartFactory_test.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "formatters/SmartFactoryTestHelper.h" #include "formatters/CSmartFactory.h" +#include "formatters/SmartFactoryTestHelper.h" #include "gtest/gtest.h" namespace test { diff --git a/src/components/formatters/test/cFormatterJsonSDLRPCv2_test.cc b/src/components/formatters/test/cFormatterJsonSDLRPCv2_test.cc index 628e9956bb..34cde397aa 100644 --- a/src/components/formatters/test/cFormatterJsonSDLRPCv2_test.cc +++ b/src/components/formatters/test/cFormatterJsonSDLRPCv2_test.cc @@ -30,9 +30,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" -#include "formatters/create_smartSchema.h" #include "formatters/CFormatterJsonSDLRPCv2.h" +#include "formatters/create_smartSchema.h" +#include "gtest/gtest.h" namespace test { namespace components { diff --git a/src/components/formatters/test/formatter_json_rpc_test.cc b/src/components/formatters/test/formatter_json_rpc_test.cc index f397accbd4..6e2e8753ca 100644 --- a/src/components/formatters/test/formatter_json_rpc_test.cc +++ b/src/components/formatters/test/formatter_json_rpc_test.cc @@ -30,18 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include "formatters/formatter_json_rpc.h" -#include -#include -#include #include -#include "gtest/gtest.h" -#include "formatters/formatter_json_rpc.h" -#include +#include #include -#include "gtest/gtest.h" +#include #include "formatters/CSmartFactory.h" +#include "formatters/formatter_json_rpc.h" +#include "gtest/gtest.h" #include "interfaces/HMI_API_schema.h" #include "interfaces/MOBILE_API_schema.h" diff --git a/src/components/formatters/test/generic_json_formatter_test.cc b/src/components/formatters/test/generic_json_formatter_test.cc index 97840eb110..39f0fd6e7e 100644 --- a/src/components/formatters/test/generic_json_formatter_test.cc +++ b/src/components/formatters/test/generic_json_formatter_test.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "formatters/generic_json_formatter.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -169,6 +169,6 @@ TEST(GenericJsonFormatter, FromString) { result.getElement("subobject").getElement("strField").asString().c_str()); } -} // formatters -} // components -} // test +} // namespace formatters +} // namespace components +} // namespace test diff --git a/src/components/formatters/test/include/formatters/SmartFactoryTestHelper.h b/src/components/formatters/test/include/formatters/SmartFactoryTestHelper.h index 4b1ca94b98..08962db120 100644 --- a/src/components/formatters/test/include/formatters/SmartFactoryTestHelper.h +++ b/src/components/formatters/test/include/formatters/SmartFactoryTestHelper.h @@ -38,15 +38,15 @@ #include "formatters/CSmartFactory.h" #include "interfaces/HMI_API_schema.h" -#include "smart_objects/always_true_schema_item.h" #include "smart_objects/always_false_schema_item.h" +#include "smart_objects/always_true_schema_item.h" #include "smart_objects/array_schema_item.h" #include "smart_objects/bool_schema_item.h" -#include "smart_objects/object_schema_item.h" -#include "smart_objects/string_schema_item.h" #include "smart_objects/enum_schema_item.h" #include "smart_objects/number_schema_item.h" +#include "smart_objects/object_schema_item.h" #include "smart_objects/schema_item_parameter.h" +#include "smart_objects/string_schema_item.h" namespace test { namespace components { @@ -107,7 +107,8 @@ class CSmartFactoryTest : public CSmartFactory > TStructsSchemaItems; + std::shared_ptr > + TStructsSchemaItems; static std::shared_ptr ProvideObjectSchemaItemForStruct( TStructsSchemaItems& struct_schema_items, diff --git a/src/components/formatters/test/include/formatters/create_smartSchema.h b/src/components/formatters/test/include/formatters/create_smartSchema.h index 73ff9ba77b..4fd0f200d3 100644 --- a/src/components/formatters/test/include/formatters/create_smartSchema.h +++ b/src/components/formatters/test/include/formatters/create_smartSchema.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_FORMATTERS_TEST_INCLUDE_FORMATTERS_CREATE_SMARTSCHEMA_H_ #define SRC_COMPONENTS_FORMATTERS_TEST_INCLUDE_FORMATTERS_CREATE_SMARTSCHEMA_H_ -#include "formatters/CFormatterJsonSDLRPCv1.h" #include "SmartFactoryTestHelper.h" +#include "formatters/CFormatterJsonSDLRPCv1.h" namespace test { namespace components { diff --git a/src/components/formatters/test/include/formatters/meta_formatter_test_helper.h b/src/components/formatters/test/include/formatters/meta_formatter_test_helper.h index 0ee21d092c..8a2b5abf0d 100644 --- a/src/components/formatters/test/include/formatters/meta_formatter_test_helper.h +++ b/src/components/formatters/test/include/formatters/meta_formatter_test_helper.h @@ -35,10 +35,10 @@ #include "gtest/gtest.h" -#include "smart_objects/smart_object.h" +#include "create_smartSchema.h" #include "formatters/CFormatterJsonSDLRPCv1.h" #include "formatters/CSmartFactory.h" -#include "create_smartSchema.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { diff --git a/src/components/formatters/test/meta_formatter_test.cc b/src/components/formatters/test/meta_formatter_test.cc index 87f05ab50e..e405ff68eb 100644 --- a/src/components/formatters/test/meta_formatter_test.cc +++ b/src/components/formatters/test/meta_formatter_test.cc @@ -30,9 +30,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "formatters/meta_formatter.h" #include "formatters/meta_formatter_test_helper.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -44,7 +44,8 @@ TEST_F(CMetaFormatterTestHelper, Json::Reader reader; CSmartFactory factory_; + StructIdentifiers::eType> + factory_; SmartObject object1 = factory_.CreateSmartObject( FunctionIDTest::RegisterAppInterface, MessageTypeTest::request); diff --git a/src/components/formatters/test/src/meta_formatter_test_helper.cc b/src/components/formatters/test/src/meta_formatter_test_helper.cc index b322510f6c..4f8975fe53 100644 --- a/src/components/formatters/test/src/meta_formatter_test_helper.cc +++ b/src/components/formatters/test/src/meta_formatter_test_helper.cc @@ -29,8 +29,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "formatters/meta_formatter_test_helper.h" +#include "gtest/gtest.h" namespace test { namespace components { diff --git a/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_handler_impl.h b/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_handler_impl.h index 0d85c30fc2..167e2f84e6 100644 --- a/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_handler_impl.h +++ b/src/components/hmi_message_handler/include/hmi_message_handler/hmi_message_handler_impl.h @@ -47,12 +47,12 @@ namespace hmi_message_handler { namespace impl { /* -* These dummy classes are here to locally impose strong typing on different -* kinds of messages -* Currently there is no type difference between incoming and outgoing messages -* TODO(ik): replace these with globally defined message types -* when we have them. -*/ + * These dummy classes are here to locally impose strong typing on different + * kinds of messages + * Currently there is no type difference between incoming and outgoing messages + * TODO(ik): replace these with globally defined message types + * when we have them. + */ struct MessageFromHmi : public MessageSharedPointer { MessageFromHmi() {} explicit MessageFromHmi(const MessageSharedPointer& message) @@ -77,7 +77,7 @@ typedef threads::MessageLoopThread > FromHmiQueue; typedef threads::MessageLoopThread > ToHmiQueue; -} +} // namespace impl class ToHMIThreadImpl; class FromHMIThreadImpl; diff --git a/src/components/hmi_message_handler/include/hmi_message_handler/mb_controller.h b/src/components/hmi_message_handler/include/hmi_message_handler/mb_controller.h index 0a2e3e0f99..544a3ca275 100644 --- a/src/components/hmi_message_handler/include/hmi_message_handler/mb_controller.h +++ b/src/components/hmi_message_handler/include/hmi_message_handler/mb_controller.h @@ -31,28 +31,27 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef MB_CONTROLLER_H #define MB_CONTROLLER_H -#include -#include -#include +#include +#include #include -#include -#include #include +#include +#include +#include +#include #include #include -#include #include #include #include +#include #include #include #include #include -#include #include "json/json.h" -#include "utils/macro.h" #include "utils/lock.h" -#include +#include "utils/macro.h" #include "websocket_session.h" using namespace boost::beast::websocket; @@ -181,6 +180,6 @@ class CMessageBrokerController std::atomic_bool shutdown_; }; -} // hmi_message_handler +} // namespace hmi_message_handler #endif /* MB_CONTROLLER_H */ \ No newline at end of file diff --git a/src/components/hmi_message_handler/include/hmi_message_handler/messagebroker_adapter.h b/src/components/hmi_message_handler/include/hmi_message_handler/messagebroker_adapter.h index 423f331297..41bb7efa5d 100644 --- a/src/components/hmi_message_handler/include/hmi_message_handler/messagebroker_adapter.h +++ b/src/components/hmi_message_handler/include/hmi_message_handler/messagebroker_adapter.h @@ -35,8 +35,8 @@ #include -#include "hmi_message_handler/mb_controller.h" #include "hmi_message_handler/hmi_message_adapter_impl.h" +#include "hmi_message_handler/mb_controller.h" #include "utils/threads/thread_validator.h" namespace hmi_message_handler { diff --git a/src/components/hmi_message_handler/include/hmi_message_handler/websocket_session.h b/src/components/hmi_message_handler/include/hmi_message_handler/websocket_session.h index 4d177d250f..8edcfc1a36 100644 --- a/src/components/hmi_message_handler/include/hmi_message_handler/websocket_session.h +++ b/src/components/hmi_message_handler/include/hmi_message_handler/websocket_session.h @@ -31,43 +31,42 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef WEBSOCKET_SESSION_H #define WEBSOCKET_SESSION_H -#include -#include -#include +#include +#include #include -#include -#include #include +#include +#include +#include +#include #include #include -#include #include #include #include #include +#include +#include #include #include #include -#include -#include #include "json/json.h" -#include "utils/macro.h" #include "utils/lock.h" -#include -#include "utils/threads/thread.h" -#include "utils/threads/message_loop_thread.h" +#include "utils/macro.h" #include "utils/message_queue.h" +#include "utils/threads/message_loop_thread.h" +#include "utils/threads/thread.h" using namespace boost::beast::websocket; using ::utils::MessageQueue; #ifdef DEBUG_ON /** -* \def DBG_MSG -* \brief Debug message output with file name and line number. -* \param x formatted debug message. -* \return printf construction. -*/ + * \def DBG_MSG + * \brief Debug message output with file name and line number. + * \param x formatted debug message. + * \return printf construction. + */ #define DBG_MSG(x) \ printf("%s:%d ", __FILE__, __LINE__); \ printf x @@ -203,6 +202,6 @@ class WebsocketSession : public std::enable_shared_from_this { threads::Thread* thread_; }; -} // hmi_message_handler +} // namespace hmi_message_handler #endif /* WEBSOCKET_SESSION_H */ \ No newline at end of file diff --git a/src/components/hmi_message_handler/src/mb_controller.cc b/src/components/hmi_message_handler/src/mb_controller.cc index 4f46026039..ffc6ef23a3 100644 --- a/src/components/hmi_message_handler/src/mb_controller.cc +++ b/src/components/hmi_message_handler/src/mb_controller.cc @@ -337,8 +337,8 @@ bool CMessageBrokerController::addSubscriber(WebsocketSession* ws_session, bool result = true; sync_primitives::AutoLock lock(mSubscribersListLock); std::pair::iterator, - std::multimap::iterator> p = - mSubscribersList.equal_range(name); + std::multimap::iterator> + p = mSubscribersList.equal_range(name); if (p.first != p.second) { std::multimap::iterator itr; for (itr = p.first; itr != p.second; itr++) { @@ -359,8 +359,8 @@ void CMessageBrokerController::deleteSubscriber(WebsocketSession* ws, std::string name) { sync_primitives::AutoLock lock(mSubscribersListLock); std::pair::iterator, - std::multimap::iterator> p = - mSubscribersList.equal_range(name); + std::multimap::iterator> + p = mSubscribersList.equal_range(name); if (p.first != p.second) { std::multimap::iterator itr; for (itr = p.first; itr != p.second;) { @@ -380,8 +380,8 @@ int CMessageBrokerController::getSubscribersFd( sync_primitives::AutoLock lock(mSubscribersListLock); std::pair::iterator, - std::multimap::iterator> p = - mSubscribersList.equal_range(name); + std::multimap::iterator> + p = mSubscribersList.equal_range(name); if (p.first != p.second) { std::multimap::iterator itr; for (itr = p.first; itr != p.second; itr++) { @@ -501,4 +501,4 @@ void CMessageBrokerController::processInternalRequest( int CMessageBrokerController::getNextControllerId() { return 1000 * mControllersIdCounter++; } -} +} // namespace hmi_message_handler diff --git a/src/components/hmi_message_handler/src/websocket_session.cc b/src/components/hmi_message_handler/src/websocket_session.cc index a148f48661..3d18da19d2 100644 --- a/src/components/hmi_message_handler/src/websocket_session.cc +++ b/src/components/hmi_message_handler/src/websocket_session.cc @@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "hmi_message_handler/websocket_session.h" -#include "hmi_message_handler/mb_controller.h" #include +#include "hmi_message_handler/mb_controller.h" using namespace boost::beast::websocket; namespace hmi_message_handler { @@ -319,4 +319,4 @@ void WebsocketSession::LoopThreadDelegate::SetShutdown() { message_queue_.Shutdown(); } } -} +} // namespace hmi_message_handler diff --git a/src/components/hmi_message_handler/test/hmi_message_adapter_test.cc b/src/components/hmi_message_handler/test/hmi_message_adapter_test.cc index 73fe76640d..5762566b96 100644 --- a/src/components/hmi_message_handler/test/hmi_message_adapter_test.cc +++ b/src/components/hmi_message_handler/test/hmi_message_adapter_test.cc @@ -40,8 +40,8 @@ namespace test { namespace components { namespace hmi_message_handler_test { -using ::testing::Return; using hmi_message_handler::HMIMessageHandlerImpl; +using ::testing::Return; typedef std::shared_ptr MockHMIMessageAdapterImplSPtr; @@ -74,6 +74,6 @@ TEST(HMIMessageAdapterImplTest, Handler_NULLPointer_CorrectReturnedPointer) { EXPECT_EQ(NULL, message_adapter_impl->get_handler()); } -} // namespace hmi_message_helper_test +} // namespace hmi_message_handler_test } // namespace components } // namespace test diff --git a/src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc b/src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc index e66f900299..eaa274d0f4 100644 --- a/src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc +++ b/src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc @@ -30,21 +30,21 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" -#include "application_manager/message.h" #include "hmi_message_handler/hmi_message_handler_impl.h" +#include "application_manager/message.h" +#include "gtest/gtest.h" #include "hmi_message_handler/messagebroker_adapter.h" -#include "hmi_message_handler/mock_hmi_message_observer.h" -#include "hmi_message_handler/mock_hmi_message_handler_settings.h" #include "hmi_message_handler/mock_hmi_message_adapter_impl.h" +#include "hmi_message_handler/mock_hmi_message_handler_settings.h" +#include "hmi_message_handler/mock_hmi_message_observer.h" #include "utils/test_async_waiter.h" namespace test { namespace components { namespace hmi_message_handler_test { -using ::testing::Return; using ::testing::_; +using ::testing::Return; class HMIMessageHandlerImplTest : public ::testing::Test { public: diff --git a/src/components/hmi_message_handler/test/include/hmi_message_handler/mock_hmi_message_adapter_impl.h b/src/components/hmi_message_handler/test/include/hmi_message_handler/mock_hmi_message_adapter_impl.h index 0ec82b7862..4984fce23d 100644 --- a/src/components/hmi_message_handler/test/include/hmi_message_handler/mock_hmi_message_adapter_impl.h +++ b/src/components/hmi_message_handler/test/include/hmi_message_handler/mock_hmi_message_adapter_impl.h @@ -1,34 +1,34 @@ /* -* Copyright (c) 2015, 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. -*/ + * Copyright (c) 2015, 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 "gmock/gmock.h" #include "hmi_message_handler/hmi_message_adapter_impl.h" diff --git a/src/components/include/application_manager/app_launch_settings.h b/src/components/include/application_manager/app_launch_settings.h index 47daf2f87c..fb65997c69 100644 --- a/src/components/include/application_manager/app_launch_settings.h +++ b/src/components/include/application_manager/app_launch_settings.h @@ -17,6 +17,6 @@ class AppLaunchSettings { virtual const std::string& app_storage_folder() const = 0; }; -} // namespace application_manager +} // namespace app_launch #endif // SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_APP_LAUNCH_SETTINGS_H_ diff --git a/src/components/include/application_manager/application_manager.h b/src/components/include/application_manager/application_manager.h index e8f646c1e5..1a12e973b2 100644 --- a/src/components/include/application_manager/application_manager.h +++ b/src/components/include/application_manager/application_manager.h @@ -34,23 +34,23 @@ #define SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_APPLICATION_MANAGER_H_ #include +#include #include #include -#include #include "application_manager/application.h" -#include "application_manager/hmi_capabilities.h" -#include "application_manager/commands/command.h" #include "application_manager/command_factory.h" +#include "application_manager/commands/command.h" +#include "application_manager/hmi_capabilities.h" #include "connection_handler/connection_handler.h" #include "utils/data_accessor.h" -#include "telemetry_monitor/telemetry_observable.h" -#include "application_manager/policies/policy_handler_interface.h" #include "application_manager/application_manager_settings.h" -#include "application_manager/state_controller.h" #include "application_manager/hmi_interfaces.h" -#include "policy/policy_types.h" #include "application_manager/plugin_manager/rpc_plugin_manager.h" +#include "application_manager/policies/policy_handler_interface.h" +#include "application_manager/state_controller.h" +#include "policy/policy_types.h" +#include "telemetry_monitor/telemetry_observable.h" namespace resumption { class LastState; @@ -181,12 +181,12 @@ class ApplicationManager { virtual AppSharedPtrs applications_with_navi() = 0; /** - * @brief application find application by device and policy identifier - * @param device_id device id - * @param policy_app_id poilcy identifier - * @return pointer to application in case if application exist, in other case - * return empty shared pointer - */ + * @brief application find application by device and policy identifier + * @param device_id device id + * @param policy_app_id poilcy identifier + * @return pointer to application in case if application exist, in other case + * return empty shared pointer + */ virtual ApplicationSharedPtr application( const std::string& device_id, const std::string& policy_app_id) const = 0; @@ -470,8 +470,9 @@ class ApplicationManager { virtual void IviInfoUpdated(mobile_apis::VehicleDataType::eType vehicle_info, int value) = 0; - virtual ApplicationSharedPtr RegisterApplication(const std::shared_ptr< - smart_objects::SmartObject>& request_for_registration) = 0; + virtual ApplicationSharedPtr RegisterApplication( + const std::shared_ptr& + request_for_registration) = 0; virtual void SendUpdateAppList() = 0; @@ -644,10 +645,10 @@ class ApplicationManager { virtual resumption::ResumeCtrl& resume_controller() = 0; /** - * @brief hmi_interfaces getter for hmi_interfaces component, that handle - * hmi_instrfaces state - * @return reference to hmi_interfaces component - */ + * @brief hmi_interfaces getter for hmi_interfaces component, that handle + * hmi_instrfaces state + * @return reference to hmi_interfaces component + */ virtual HmiInterfaces& hmi_interfaces() = 0; virtual app_launch::AppLaunchCtrl& app_launch_ctrl() = 0; @@ -675,19 +676,19 @@ class ApplicationManager { virtual void AddAppToTTSGlobalPropertiesList(const uint32_t app_id) = 0; /** - * Generate grammar ID - * - * @return New grammar ID - */ + * Generate grammar ID + * + * @return New grammar ID + */ virtual uint32_t GenerateGrammarID() = 0; virtual policy::DeviceConsent GetUserConsentForDevice( const std::string& device_id) const = 0; /** - * @brief Handle sequence for unauthorized application - * @param app_id Application id - */ + * @brief Handle sequence for unauthorized application + * @param app_id Application id + */ virtual void OnAppUnauthorized(const uint32_t& app_id) = 0; virtual bool ActivateApplication(ApplicationSharedPtr app) = 0; diff --git a/src/components/include/application_manager/application_manager_settings.h b/src/components/include/application_manager/application_manager_settings.h index b206e56125..0f73ea94ed 100644 --- a/src/components/include/application_manager/application_manager_settings.h +++ b/src/components/include/application_manager/application_manager_settings.h @@ -33,12 +33,12 @@ #ifndef SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_APPLICATION_MANAGER_SETTINGS_H_ #define SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_APPLICATION_MANAGER_SETTINGS_H_ -#include "application_manager/request_controller_settings.h" #include "application_manager/app_launch_settings.h" +#include "application_manager/request_controller_settings.h" #include -#include #include +#include #include namespace application_manager { diff --git a/src/components/include/application_manager/hmi_capabilities.h b/src/components/include/application_manager/hmi_capabilities.h index 1283584ef8..215a549579 100644 --- a/src/components/include/application_manager/hmi_capabilities.h +++ b/src/components/include/application_manager/hmi_capabilities.h @@ -28,17 +28,17 @@ * 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. -*/ + */ #ifndef SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_HMI_CAPABILITIES_H_ #define SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_HMI_CAPABILITIES_H_ +#include "application_manager/hmi_language_handler.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" #include "json/json.h" -#include "utils/macro.h" -#include "application_manager/hmi_language_handler.h" #include "smart_objects/smart_object.h" +#include "utils/macro.h" namespace resumption { class LastState; @@ -56,10 +56,10 @@ class HMICapabilities { virtual ~HMICapabilities() {} /** - * @brief return component which follows for correctness of - * languages - * @return HMI language handler - */ + * @brief return component which follows for correctness of + * languages + * @return HMI language handler + */ virtual HMILanguageHandler& get_hmi_language_handler() = 0; /* diff --git a/src/components/include/application_manager/policies/policy_handler_interface.h b/src/components/include/application_manager/policies/policy_handler_interface.h index c7caae1d28..708c4ddd32 100644 --- a/src/components/include/application_manager/policies/policy_handler_interface.h +++ b/src/components/include/application_manager/policies/policy_handler_interface.h @@ -33,22 +33,22 @@ #ifndef SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_POLICIES_POLICY_HANDLER_INTERFACE_H_ #define SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_POLICIES_POLICY_HANDLER_INTERFACE_H_ -#include #include +#include #include +#include #include -#include -#include "interfaces/MOBILE_API.h" -#include "application_manager/policies/policy_handler_observer.h" #include "application_manager/application.h" -#include "policy/usage_statistics/statistics_manager.h" -#include "utils/custom_string.h" -#include "utils/callable.h" +#include "application_manager/policies/policy_handler_observer.h" +#include "interfaces/MOBILE_API.h" +#include "policy/cache_manager_interface.h" #include "policy/policy_settings.h" -#include "smart_objects/smart_object.h" -#include "policy/policy_types.h" #include "policy/policy_table/types.h" -#include "policy/cache_manager_interface.h" +#include "policy/policy_types.h" +#include "policy/usage_statistics/statistics_manager.h" +#include "smart_objects/smart_object.h" +#include "utils/callable.h" +#include "utils/custom_string.h" using namespace ::rpc::policy_table_interface_base; namespace policy { @@ -194,13 +194,13 @@ class PolicyHandlerInterface { const DeviceInfo& device_info) = 0; /** -*@brief Processes data from OnAppPermissionConsent notification with -*permissions changes and ExternalConsent status changes done by user -*@param connection_key Connection key of application, 0 if no key has been -*provided -*@param permissions Groups permissions changes -*@param external_consent_status Customer connectivity settings status changes -*/ + *@brief Processes data from OnAppPermissionConsent notification with + *permissions changes and ExternalConsent status changes done by user + *@param connection_key Connection key of application, 0 if no key has been + *provided + *@param permissions Groups permissions changes + *@param external_consent_status Customer connectivity settings status changes + */ #ifdef EXTERNAL_PROPRIETARY_MODE virtual void OnAppPermissionConsent( const uint32_t connection_key, @@ -519,7 +519,7 @@ class PolicyHandlerInterface { * @brief Check if an app can send unknown rpc requests to an app service * provider * @param policy_app_id Unique application id - */ + */ virtual bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const = 0; @@ -626,14 +626,14 @@ class PolicyHandlerInterface { * @brief Processes data received via OnAppPermissionChanged notification * from. Being started asyncronously from AppPermissionDelegate class. * Sets updated permissions and ExternalConsent for registered applications -*and + *and * applications which already have appropriate group assigned which related to * devices already known by policy * @param connection_key Connection key of application, 0 if no key has been * provided within notification * @param external_consent_status Customer connectivity settings changes to -*process -*@param permissions Permissions changes to process + *process + *@param permissions Permissions changes to process */ #ifdef EXTERNAL_PROPRIETARY_MODE virtual void OnAppPermissionConsentInternal( diff --git a/src/components/include/application_manager/policies/policy_handler_observer.h b/src/components/include/application_manager/policies/policy_handler_observer.h index c13846dff2..9c1091d0a8 100644 --- a/src/components/include/application_manager/policies/policy_handler_observer.h +++ b/src/components/include/application_manager/policies/policy_handler_observer.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_POLICIES_POLICY_HANDLER_OBSERVER_H_ #include -#include #include +#include namespace policy { diff --git a/src/components/include/application_manager/rpc_handler.h b/src/components/include/application_manager/rpc_handler.h index 2ada9e7901..f42d7deb2f 100644 --- a/src/components/include/application_manager/rpc_handler.h +++ b/src/components/include/application_manager/rpc_handler.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_RPC_HANDLER_H #define SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_RPC_HANDLER_H -#include "protocol_handler/protocol_observer.h" #include "hmi_message_handler/hmi_message_handler.h" +#include "protocol_handler/protocol_observer.h" #ifdef TELEMETRY_MONITOR #include "application_manager/telemetry_observer.h" @@ -47,10 +47,10 @@ class RPCHandler : public hmi_message_handler::HMIMessageObserver, public protocol_handler::ProtocolObserver #ifdef TELEMETRY_MONITOR - , + , public telemetry_monitor::TelemetryObservable #endif // TELEMETRY_MONITOR - { +{ public: virtual bool ValidateRpcSO(smart_objects::SmartObject& message, utils::SemanticVersion& msg_version, diff --git a/src/components/include/application_manager/rpc_service.h b/src/components/include/application_manager/rpc_service.h index e0127eac80..d052c4ed0a 100644 --- a/src/components/include/application_manager/rpc_service.h +++ b/src/components/include/application_manager/rpc_service.h @@ -35,8 +35,8 @@ #include "application_manager/commands/command.h" #include "application_manager/message.h" -#include "protocol_handler/protocol_handler.h" #include "hmi_message_handler/hmi_message_handler.h" +#include "protocol_handler/protocol_handler.h" namespace application_manager { namespace rpc_service { @@ -59,8 +59,8 @@ class RPCService { * @return true if command is executed, otherwise return false */ virtual bool ManageHMICommand(const commands::MessageSharedPtr message, - commands::Command::CommandSource - source = commands::Command::SOURCE_HMI) = 0; + commands::Command::CommandSource source = + commands::Command::SOURCE_HMI) = 0; /** * @brief SendMessageToMobile Put message to the queue to be sent to mobile. diff --git a/src/components/include/application_manager/state_controller.h b/src/components/include/application_manager/state_controller.h index 8f608488e9..753581db0e 100644 --- a/src/components/include/application_manager/state_controller.h +++ b/src/components/include/application_manager/state_controller.h @@ -33,10 +33,10 @@ #ifndef SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_STATE_CONTROLLER_H_ #define SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_STATE_CONTROLLER_H_ -#include "stdint.h" -#include "application_manager/request_controller_settings.h" -#include "application_manager/application_manager.h" #include "application_manager/application.h" +#include "application_manager/application_manager.h" +#include "application_manager/request_controller_settings.h" +#include "stdint.h" namespace application_manager { class StateController { diff --git a/src/components/include/connection_handler/connection_handler.h b/src/components/include/connection_handler/connection_handler.h index ea9cc6c039..eb92336b4f 100644 --- a/src/components/include/connection_handler/connection_handler.h +++ b/src/components/include/connection_handler/connection_handler.h @@ -33,14 +33,14 @@ #ifndef SRC_COMPONENTS_INCLUDE_CONNECTION_HANDLER_CONNECTION_HANDLER_H_ #define SRC_COMPONENTS_INCLUDE_CONNECTION_HANDLER_CONNECTION_HANDLER_H_ +#include "connection_handler/connection.h" #include "connection_handler/connection_handler_settings.h" -#include "transport_manager/transport_manager_listener.h" -#include "protocol_handler/session_observer.h" #include "connection_handler/device.h" -#include "connection_handler/connection.h" #include "connection_handler/devices_discovery_starter.h" -#include "utils/macro.h" +#include "protocol_handler/session_observer.h" +#include "transport_manager/transport_manager_listener.h" #include "utils/data_accessor.h" +#include "utils/macro.h" /** * \namespace connection_handler @@ -158,12 +158,12 @@ class ConnectionHandler { CloseSessionReason close_reason) = 0; /** - * @brief SendEndService allows to end up specific service. - * - * @param key application identifier whose service should be closed. - * - * @param service_type the service that should be closed. - */ + * @brief SendEndService allows to end up specific service. + * + * @param key application identifier whose service should be closed. + * + * @param service_type the service that should be closed. + */ virtual void SendEndService(uint32_t key, uint8_t service_type) = 0; /** @@ -188,9 +188,9 @@ class ConnectionHandler { uint32_t timeout) = 0; /** - * \brief Keep connection associated with the key from being closed by - * heartbeat monitor - */ + * \brief Keep connection associated with the key from being closed by + * heartbeat monitor + */ virtual void KeepConnectionAlive(uint32_t connection_key, uint8_t session_id) = 0; diff --git a/src/components/include/connection_handler/connection_handler_observer.h b/src/components/include/connection_handler/connection_handler_observer.h index b9d6a18926..48e4263959 100644 --- a/src/components/include/connection_handler/connection_handler_observer.h +++ b/src/components/include/connection_handler/connection_handler_observer.h @@ -34,9 +34,9 @@ #define SRC_COMPONENTS_INCLUDE_CONNECTION_HANDLER_CONNECTION_HANDLER_OBSERVER_H_ #include -#include "connection_handler/device.h" #include "connection_handler/connection.h" #include "connection_handler/connection_handler.h" +#include "connection_handler/device.h" #include "protocol/service_type.h" #ifdef ENABLE_SECURITY diff --git a/src/components/include/hmi_message_handler/hmi_message_handler.h b/src/components/include/hmi_message_handler/hmi_message_handler.h index 411d19fb75..0bcc38d380 100644 --- a/src/components/include/hmi_message_handler/hmi_message_handler.h +++ b/src/components/include/hmi_message_handler/hmi_message_handler.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_INCLUDE_HMI_MESSAGE_HANDLER_HMI_MESSAGE_HANDLER_H_ #define SRC_COMPONENTS_INCLUDE_HMI_MESSAGE_HANDLER_HMI_MESSAGE_HANDLER_H_ -#include "hmi_message_handler/hmi_message_sender.h" -#include "hmi_message_handler/hmi_message_observer.h" #include "hmi_message_handler/hmi_message_handler_settings.h" +#include "hmi_message_handler/hmi_message_observer.h" +#include "hmi_message_handler/hmi_message_sender.h" namespace hmi_message_handler { diff --git a/src/components/include/hmi_message_handler/hmi_message_observer.h b/src/components/include/hmi_message_handler/hmi_message_observer.h index e7ba2619ee..5c104312f7 100644 --- a/src/components/include/hmi_message_handler/hmi_message_observer.h +++ b/src/components/include/hmi_message_handler/hmi_message_observer.h @@ -47,6 +47,6 @@ class HMIMessageObserver { virtual void OnErrorSending( std::shared_ptr message) = 0; }; -} +} // namespace hmi_message_handler #endif // SRC_COMPONENTS_INCLUDE_HMI_MESSAGE_HANDLER_HMI_MESSAGE_OBSERVER_H_ diff --git a/src/components/include/hmi_message_handler/hmi_message_sender.h b/src/components/include/hmi_message_handler/hmi_message_sender.h index 3f70f78a97..c4183f0838 100644 --- a/src/components/include/hmi_message_handler/hmi_message_sender.h +++ b/src/components/include/hmi_message_handler/hmi_message_sender.h @@ -43,6 +43,6 @@ class HMIMessageSender { virtual ~HMIMessageSender() {} virtual void SendMessageToHMI(MessageSharedPointer message) = 0; }; -} +} // namespace hmi_message_handler #endif // SRC_COMPONENTS_INCLUDE_HMI_MESSAGE_HANDLER_HMI_MESSAGE_SENDER_H_ diff --git a/src/components/include/media_manager/media_manager.h b/src/components/include/media_manager/media_manager.h index 64acbcbc0b..0998899bc5 100644 --- a/src/components/include/media_manager/media_manager.h +++ b/src/components/include/media_manager/media_manager.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_INCLUDE_MEDIA_MANAGER_MEDIA_MANAGER_H_ #include -#include "protocol/service_type.h" #include "media_manager/media_manager_settings.h" +#include "protocol/service_type.h" namespace media_manager { class MediaManager { diff --git a/src/components/include/media_manager/media_manager_settings.h b/src/components/include/media_manager/media_manager_settings.h index e48a74b08d..183a7e6f5b 100644 --- a/src/components/include/media_manager/media_manager_settings.h +++ b/src/components/include/media_manager/media_manager_settings.h @@ -32,8 +32,8 @@ #ifndef SRC_COMPONENTS_INCLUDE_MEDIA_MANAGER_MEDIA_MANAGER_SETTINGS_H_ #define SRC_COMPONENTS_INCLUDE_MEDIA_MANAGER_MEDIA_MANAGER_SETTINGS_H_ -#include #include +#include namespace media_manager { diff --git a/src/components/include/policy/policy_external/policy/policy_manager.h b/src/components/include/policy/policy_external/policy/policy_manager.h index a2eb2db0c9..331b579365 100644 --- a/src/components/include/policy/policy_external/policy/policy_manager.h +++ b/src/components/include/policy/policy_external/policy/policy_manager.h @@ -37,12 +37,12 @@ #include "utils/callable.h" -#include "policy/policy_types.h" -#include "policy/policy_table/types.h" +#include "policy/access_remote.h" +#include "policy/cache_manager_interface.h" #include "policy/policy_listener.h" +#include "policy/policy_table/types.h" +#include "policy/policy_types.h" #include "policy/usage_statistics/statistics_manager.h" -#include "policy/cache_manager_interface.h" -#include "policy/access_remote.h" namespace policy { class PolicySettings; @@ -518,10 +518,10 @@ class PolicyManager : public usage_statistics::StatisticsManager { const std::string policy_app_id) const = 0; /** - * @brief Gets request subtypes for application - * @param policy_app_id Unique application id - * @return request subtypes of application - */ + * @brief Gets request subtypes for application + * @param policy_app_id Unique application id + * @return request subtypes of application + */ virtual const std::vector GetAppRequestSubTypes( const std::string& policy_app_id) const = 0; @@ -629,7 +629,7 @@ class PolicyManager : public usage_statistics::StatisticsManager { * @brief Check if an app can send unknown rpc requests to an app service * provider * @param policy_app_id Unique application id - */ + */ virtual bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const = 0; @@ -707,11 +707,11 @@ class PolicyManager : public usage_statistics::StatisticsManager { const std::string& application_id) = 0; /** - * @brief Gets all allowed module types - * @param policy_app_id unique identifier of application - * @param modules list of allowed module types - * @return true if application has allowed modules - */ + * @brief Gets all allowed module types + * @param policy_app_id unique identifier of application + * @param modules list of allowed module types + * @return true if application has allowed modules + */ virtual bool GetModuleTypes(const std::string& policy_app_id, std::vector* modules) const = 0; diff --git a/src/components/include/policy/policy_external/policy/policy_settings.h b/src/components/include/policy/policy_external/policy/policy_settings.h index 7eca5129ad..d9d2493d10 100644 --- a/src/components/include/policy/policy_external/policy/policy_settings.h +++ b/src/components/include/policy/policy_external/policy/policy_settings.h @@ -1,7 +1,7 @@ #ifndef SRC_COMPONENTS_INCLUDE_POLICY_POLICY_SETTINGS_H_ #define SRC_COMPONENTS_INCLUDE_POLICY_POLICY_SETTINGS_H_ -#include #include +#include namespace policy { class PolicySettings { @@ -17,8 +17,8 @@ class PolicySettings { virtual const std::string& preloaded_pt_file() const = 0; /** - * @brief Returns application storage path - */ + * @brief Returns application storage path + */ virtual const std::string& app_storage_folder() const = 0; virtual uint16_t attempts_to_open_policy_db() const = 0; @@ -34,8 +34,8 @@ class PolicySettings { virtual bool use_full_app_id() const = 0; /** - * @brief Returns system files folder path - */ + * @brief Returns system files folder path + */ virtual const std::string& system_files_path() const = 0; virtual ~PolicySettings() {} diff --git a/src/components/include/policy/policy_regular/policy/policy_listener.h b/src/components/include/policy/policy_regular/policy/policy_listener.h index 56e674e81b..0907e42142 100644 --- a/src/components/include/policy/policy_regular/policy/policy_listener.h +++ b/src/components/include/policy/policy_regular/policy/policy_listener.h @@ -61,12 +61,12 @@ class PolicyListener { std::map app_hmi_types) = 0; /** - * @brief CanUpdate allows to find active application - * and check whether related device consented. - * - * @return true if there are at least one application has been registered - * with consented device. - */ + * @brief CanUpdate allows to find active application + * and check whether related device consented. + * + * @return true if there are at least one application has been registered + * with consented device. + */ virtual bool CanUpdate() = 0; /** diff --git a/src/components/include/policy/policy_regular/policy/policy_manager.h b/src/components/include/policy/policy_regular/policy/policy_manager.h index 18fb3e1c2b..f82657ef26 100644 --- a/src/components/include/policy/policy_regular/policy/policy_manager.h +++ b/src/components/include/policy/policy_regular/policy/policy_manager.h @@ -33,16 +33,16 @@ #ifndef SRC_COMPONENTS_INCLUDE_POLICY_POLICY_REGULAR_POLICY_POLICY_MANAGER_H_ #define SRC_COMPONENTS_INCLUDE_POLICY_POLICY_REGULAR_POLICY_POLICY_MANAGER_H_ -#include #include +#include -#include "utils/callable.h" -#include "policy/policy_types.h" -#include "policy/policy_table/types.h" +#include "policy/access_remote.h" +#include "policy/cache_manager_interface.h" #include "policy/policy_listener.h" +#include "policy/policy_table/types.h" +#include "policy/policy_types.h" #include "policy/usage_statistics/statistics_manager.h" -#include "policy/cache_manager_interface.h" -#include "policy/access_remote.h" +#include "utils/callable.h" namespace policy { class PolicySettings; @@ -610,7 +610,7 @@ class PolicyManager : public usage_statistics::StatisticsManager { * @brief Check if an app can send unknown rpc requests to an app service * provider * @param policy_app_id Unique application id - */ + */ virtual bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const = 0; @@ -688,11 +688,11 @@ class PolicyManager : public usage_statistics::StatisticsManager { const std::string& application_id) = 0; /** - * @brief Gets all allowed module types - * @param policy_app_id unique identifier of application - * @param modules list of allowed module types - * @return true if application has allowed modules - */ + * @brief Gets all allowed module types + * @param policy_app_id unique identifier of application + * @param modules list of allowed module types + * @return true if application has allowed modules + */ virtual bool GetModuleTypes(const std::string& policy_app_id, std::vector* modules) const = 0; diff --git a/src/components/include/policy/policy_regular/policy/policy_settings.h b/src/components/include/policy/policy_regular/policy/policy_settings.h index 35a2d54c3a..3529a32717 100644 --- a/src/components/include/policy/policy_regular/policy/policy_settings.h +++ b/src/components/include/policy/policy_regular/policy/policy_settings.h @@ -1,7 +1,7 @@ #ifndef SRC_COMPONENTS_INCLUDE_POLICY_POLICY_SETTINGS_H_ #define SRC_COMPONENTS_INCLUDE_POLICY_POLICY_SETTINGS_H_ -#include #include +#include namespace policy { class PolicySettings { @@ -17,8 +17,8 @@ class PolicySettings { virtual const std::string& preloaded_pt_file() const = 0; /** - * @brief Returns application storage path - */ + * @brief Returns application storage path + */ virtual const std::string& app_storage_folder() const = 0; virtual uint16_t attempts_to_open_policy_db() const = 0; @@ -32,8 +32,8 @@ class PolicySettings { virtual const std::string& policies_snapshot_file_name() const = 0; /** - * @brief Returns system files folder path - */ + * @brief Returns system files folder path + */ virtual const std::string& system_files_path() const = 0; virtual bool use_full_app_id() const = 0; diff --git a/src/components/include/protocol/common.h b/src/components/include/protocol/common.h index 1c95020a96..4b227eeff1 100644 --- a/src/components/include/protocol/common.h +++ b/src/components/include/protocol/common.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_INCLUDE_PROTOCOL_COMMON_H_ #define SRC_COMPONENTS_INCLUDE_PROTOCOL_COMMON_H_ -#include "utils/macro.h" #include "protocol/raw_message.h" +#include "utils/macro.h" /** *\namespace protocol_handlerHandler @@ -111,20 +111,20 @@ const bool PROTECTION_OFF = false; */ enum { /** - *\brief Constant: Control type of frame - */ + *\brief Constant: Control type of frame + */ FRAME_TYPE_CONTROL = 0x00, /** - *\brief Constant: Single type of frame. - */ + *\brief Constant: Single type of frame. + */ FRAME_TYPE_SINGLE = 0x01, /** - *\brief Constant: First frame for multiple frames - */ + *\brief Constant: First frame for multiple frames + */ FRAME_TYPE_FIRST = 0x02, /** - *\brief Constant: Consecutive type of frame for multiple frames - */ + *\brief Constant: Consecutive type of frame for multiple frames + */ FRAME_TYPE_CONSECUTIVE = 0x03, /** *\brief Maximum value of frame type field (size 3-bit) diff --git a/src/components/include/protocol/raw_message.h b/src/components/include/protocol/raw_message.h index 5171d42593..21b324417c 100644 --- a/src/components/include/protocol/raw_message.h +++ b/src/components/include/protocol/raw_message.h @@ -32,10 +32,10 @@ #ifndef SRC_COMPONENTS_INCLUDE_PROTOCOL_RAW_MESSAGE_H_ #define SRC_COMPONENTS_INCLUDE_PROTOCOL_RAW_MESSAGE_H_ -#include "utils/macro.h" #include -#include "protocol/service_type.h" #include "protocol/message_priority.h" +#include "protocol/service_type.h" +#include "utils/macro.h" namespace protocol_handler { /** diff --git a/src/components/include/protocol_handler/protocol_handler.h b/src/components/include/protocol_handler/protocol_handler.h index d65902030b..5e65fc69d4 100644 --- a/src/components/include/protocol_handler/protocol_handler.h +++ b/src/components/include/protocol_handler/protocol_handler.h @@ -86,27 +86,27 @@ class ProtocolHandler { /** * \brief Prepare and send heartbeat message to mobile app - * \param connection_id Identifier of connection within which - * session exists - * \param session_id ID of session to be ended + * \param connection_id Identifier of connection within which + * session exists + * \param session_id ID of session to be ended */ virtual void SendHeartBeat(int32_t connection_id, uint8_t session_id) = 0; /** - * \brief Sends ending session to mobile application - * \param connection_id Identifier of connection within which - * session exists - * \param session_id ID of session to be ended - */ + * \brief Sends ending session to mobile application + * \param connection_id Identifier of connection within which + * session exists + * \param session_id ID of session to be ended + */ virtual void SendEndSession(int32_t connection_id, uint8_t session_id) = 0; /** - * \brief Sends ending session to mobile application - * \param primary_connection_id Identifier of connection within which - * service exists - * \param connection_id Identifier of the actual transport for the service - * \param session_id ID of session to be ended - */ + * \brief Sends ending session to mobile application + * \param primary_connection_id Identifier of connection within which + * service exists + * \param connection_id Identifier of the actual transport for the service + * \param session_id ID of session to be ended + */ virtual void SendEndService(int32_t primary_connection_id, int32_t connection_id, uint8_t session_id, diff --git a/src/components/include/protocol_handler/telemetry_observer.h b/src/components/include/protocol_handler/telemetry_observer.h index b2bf94de35..0fdbd07aff 100644 --- a/src/components/include/protocol_handler/telemetry_observer.h +++ b/src/components/include/protocol_handler/telemetry_observer.h @@ -53,5 +53,5 @@ class PHTelemetryObserver { virtual void EndMessageProcess(std::shared_ptr m) = 0; virtual ~PHTelemetryObserver() {} }; -} // protocol_handler +} // namespace protocol_handler #endif // SRC_COMPONENTS_INCLUDE_PROTOCOL_HANDLER_TELEMETRY_OBSERVER_H_ diff --git a/src/components/include/rpc_base/validation_report.h b/src/components/include/rpc_base/validation_report.h index 82f265e594..c138ac143f 100644 --- a/src/components/include/rpc_base/validation_report.h +++ b/src/components/include/rpc_base/validation_report.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_RPC_BASE_INCLUDE_RPC_BASE_VALIDATION_REPORT_H_ #define SRC_COMPONENTS_RPC_BASE_INCLUDE_RPC_BASE_VALIDATION_REPORT_H_ -#include #include +#include namespace rpc { diff --git a/src/components/include/security_manager/crypto_manager.h b/src/components/include/security_manager/crypto_manager.h index 486b6da64f..ba50820a81 100644 --- a/src/components/include/security_manager/crypto_manager.h +++ b/src/components/include/security_manager/crypto_manager.h @@ -45,7 +45,7 @@ **security_manager::CryptoManager::CreateSSLContext() * \brief Creates an instance of \ref SSLContext class * - * \fn void + * \fn void *security_manager::CryptoManager::ReleaseSSLContext(security_manager::SSLContext **context) * \brief Frees \ref SSLContext instance @@ -67,19 +67,19 @@ class CryptoManager : public policy::PolicyHandlerObserver { virtual void ReleaseSSLContext(SSLContext* context) = 0; virtual std::string LastError() const = 0; /** - * @brief IsCertificateUpdateRequired checks if certificate update is needed - * @param system_time - time with which certificate expiration time - * should be compared - * @param certificates_time - certificate expiration time - * @return True if certificate expired and need to be updated - * otherwise False - */ + * @brief IsCertificateUpdateRequired checks if certificate update is needed + * @param system_time - time with which certificate expiration time + * should be compared + * @param certificates_time - certificate expiration time + * @return True if certificate expired and need to be updated + * otherwise False + */ virtual bool IsCertificateUpdateRequired( const time_t system_time, const time_t certificates_time) const = 0; /** - * \brief Crypto manager settings getter - * \return pointer to crypto manager settings class - */ + * \brief Crypto manager settings getter + * \return pointer to crypto manager settings class + */ virtual const CryptoManagerSettings& get_settings() const = 0; virtual ~CryptoManager() {} }; diff --git a/src/components/include/security_manager/security_manager.h b/src/components/include/security_manager/security_manager.h index 61ba43c74f..e02a3a1cbe 100644 --- a/src/components/include/security_manager/security_manager.h +++ b/src/components/include/security_manager/security_manager.h @@ -40,8 +40,8 @@ #include "protocol_handler/protocol_observer.h" #include "protocol_handler/session_observer.h" -#include "security_manager/security_manager_listener.h" #include "application_manager/policies/policy_handler_observer.h" +#include "security_manager/security_manager_listener.h" namespace security_manager { diff --git a/src/components/include/security_manager/security_query.h b/src/components/include/security_manager/security_query.h index 8aa5b60853..5e66466663 100644 --- a/src/components/include/security_manager/security_query.h +++ b/src/components/include/security_manager/security_query.h @@ -35,9 +35,9 @@ #include #include -#include -#include #include +#include +#include namespace security_manager { /** @@ -187,8 +187,8 @@ class SecurityQuery { std::string json_message_; }; /** -*\brief SmartPointer wrapper -*/ + *\brief SmartPointer wrapper + */ typedef std::shared_ptr SecurityQueryPtr; } // namespace security_manager #endif // SRC_COMPONENTS_INCLUDE_SECURITY_MANAGER_SECURITY_QUERY_H_ diff --git a/src/components/include/security_manager/ssl_context.h b/src/components/include/security_manager/ssl_context.h index 7d52c72abe..397cf89347 100644 --- a/src/components/include/security_manager/ssl_context.h +++ b/src/components/include/security_manager/ssl_context.h @@ -33,10 +33,10 @@ #ifndef SRC_COMPONENTS_INCLUDE_SECURITY_MANAGER_SSL_CONTEXT_H_ #define SRC_COMPONENTS_INCLUDE_SECURITY_MANAGER_SSL_CONTEXT_H_ -#include // for size_t typedef -#include #include #include +#include // for size_t typedef +#include #include "utils/custom_string.h" // TODO(EZamakhov): update brief info @@ -106,11 +106,11 @@ class SSLContext { virtual bool IsInitCompleted() const = 0; virtual bool IsHandshakePending() const = 0; /** - * @brief GetCertificateDueDate gets certificate expiration date - * @param due_date - certificate expiration time to be received - * @return True if certificate expiration date received - * otherwise False - */ + * @brief GetCertificateDueDate gets certificate expiration date + * @param due_date - certificate expiration time to be received + * @return True if certificate expiration date received + * otherwise False + */ virtual bool GetCertificateDueDate(time_t& due_date) const = 0; virtual bool HasCertificate() const = 0; virtual size_t get_max_block_size(size_t mtu) const = 0; diff --git a/src/components/include/test/application_manager/mock_app_extension.h b/src/components/include/test/application_manager/mock_app_extension.h index 5898bc9b72..10a911e799 100644 --- a/src/components/include/test/application_manager/mock_app_extension.h +++ b/src/components/include/test/application_manager/mock_app_extension.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_APP_EXTENSION_H_ #define SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_APP_EXTENSION_H_ -#include "gmock/gmock.h" #include "application_manager/app_extension.h" +#include "gmock/gmock.h" namespace test { namespace components { diff --git a/src/components/include/test/application_manager/mock_app_launch_settings.h b/src/components/include/test/application_manager/mock_app_launch_settings.h index c59eb276ce..57bd708d62 100644 --- a/src/components/include/test/application_manager/mock_app_launch_settings.h +++ b/src/components/include/test/application_manager/mock_app_launch_settings.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_APP_LAUNCH_SETTINGS_H_ #define SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_APP_LAUNCH_SETTINGS_H_ -#include "gmock/gmock.h" #include "application_manager/app_launch_settings.h" +#include "gmock/gmock.h" namespace test { namespace components { diff --git a/src/components/include/test/application_manager/mock_application_manager.h b/src/components/include/test/application_manager/mock_application_manager.h index 679e6ccfb3..fcedcebcf8 100644 --- a/src/components/include/test/application_manager/mock_application_manager.h +++ b/src/components/include/test/application_manager/mock_application_manager.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_APPLICATION_MANAGER_H_ #define SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_APPLICATION_MANAGER_H_ +#include #include #include -#include #include "gmock/gmock.h" @@ -197,8 +197,9 @@ class MockApplicationManager : public application_manager::ApplicationManager { void(mobile_apis::VehicleDataType::eType vehicle_info, int value)); MOCK_METHOD1(RegisterApplication, - application_manager::ApplicationSharedPtr(const std::shared_ptr< - smart_objects::SmartObject>& request_for_registration)); + application_manager::ApplicationSharedPtr( + const std::shared_ptr& + request_for_registration)); MOCK_METHOD0(SendUpdateAppList, void()); MOCK_METHOD2(MarkAppsGreyOut, void(const connection_handler::DeviceHandle handle, diff --git a/src/components/include/test/application_manager/mock_application_manager_settings.h b/src/components/include/test/application_manager/mock_application_manager_settings.h index a4ec7c0317..483e78b3f0 100644 --- a/src/components/include/test/application_manager/mock_application_manager_settings.h +++ b/src/components/include/test/application_manager/mock_application_manager_settings.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_APPLICATION_MANAGER_SETTINGS_H_ #include -#include "gmock/gmock.h" #include "application_manager/application_manager_settings.h" +#include "gmock/gmock.h" namespace test { namespace components { diff --git a/src/components/include/test/application_manager/mock_request_controller_settings.h b/src/components/include/test/application_manager/mock_request_controller_settings.h index fe848f4a75..d4d4e29a61 100644 --- a/src/components/include/test/application_manager/mock_request_controller_settings.h +++ b/src/components/include/test/application_manager/mock_request_controller_settings.h @@ -37,8 +37,8 @@ #include #include -#include "gmock/gmock.h" #include "application_manager/request_controller_settings.h" +#include "gmock/gmock.h" namespace test { namespace components { diff --git a/src/components/include/test/application_manager/mock_rpc_plugin.h b/src/components/include/test/application_manager/mock_rpc_plugin.h index 1f7dd8951b..94ce8ccbb6 100644 --- a/src/components/include/test/application_manager/mock_rpc_plugin.h +++ b/src/components/include/test/application_manager/mock_rpc_plugin.h @@ -1,8 +1,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_PLUGIN_MANAGER_MOCK_RPC_PLUGIN_H #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_PLUGIN_MANAGER_MOCK_RPC_PLUGIN_H -#include "gmock/gmock.h" #include "application_manager/plugin_manager/rpc_plugin.h" +#include "gmock/gmock.h" namespace application_manager { class CommandFactory; diff --git a/src/components/include/test/application_manager/mock_rpc_plugin_manager.h b/src/components/include/test/application_manager/mock_rpc_plugin_manager.h index 74763f00d6..db0c04624b 100644 --- a/src/components/include/test/application_manager/mock_rpc_plugin_manager.h +++ b/src/components/include/test/application_manager/mock_rpc_plugin_manager.h @@ -2,8 +2,8 @@ #define SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_RPC_PLUGIN_MANAGER_H_ #include -#include "gmock/gmock.h" #include "application_manager/plugin_manager/rpc_plugin_manager.h" +#include "gmock/gmock.h" namespace application_manager { namespace plugin_manager { diff --git a/src/components/include/test/application_manager/mock_rpc_service.h b/src/components/include/test/application_manager/mock_rpc_service.h index aacb48a5ab..fbdc451265 100644 --- a/src/components/include/test/application_manager/mock_rpc_service.h +++ b/src/components/include/test/application_manager/mock_rpc_service.h @@ -1,8 +1,8 @@ #ifndef MOCK_RPC_SERVICE_H #define MOCK_RPC_SERVICE_H -#include "gmock/gmock.h" #include "application_manager/rpc_service.h" +#include "gmock/gmock.h" namespace test { namespace components { @@ -32,8 +32,8 @@ class MockRPCService : public application_manager::rpc_service::RPCService { bool(int32_t function_id, application_manager::commands::Command::CommandSource source)); }; -} -} -} +} // namespace application_manager_test +} // namespace components +} // namespace test #endif // MOCK_RPC_SERVICE_H diff --git a/src/components/include/test/application_manager/mock_state_controller.h b/src/components/include/test/application_manager/mock_state_controller.h index 0165180a0a..5518e01383 100644 --- a/src/components/include/test/application_manager/mock_state_controller.h +++ b/src/components/include/test/application_manager/mock_state_controller.h @@ -33,12 +33,11 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_STATE_CONTROLLER_H_ #define SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_MOCK_STATE_CONTROLLER_H_ -#include "gmock/gmock.h" #include "application_manager/application.h" #include "application_manager/hmi_state.h" #include "application_manager/state_controller.h" +#include "gmock/gmock.h" #include "interfaces/MOBILE_API.h" -#include "application_manager/application.h" namespace test { namespace components { diff --git a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h index 3521d84a84..059442f424 100644 --- a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h +++ b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_POLICIES_MOCK_POLICY_HANDLER_INTERFACE_H_ #define SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_POLICIES_MOCK_POLICY_HANDLER_INTERFACE_H_ -#include "application_manager/policies/policy_handler_interface.h" #include "application_manager/application_manager.h" +#include "application_manager/policies/policy_handler_interface.h" #include "gmock/gmock.h" #include "policy/policy_types.h" #include "smart_objects/smart_object.h" diff --git a/src/components/include/test/application_manager/policies/mock_policy_handler_observer.h b/src/components/include/test/application_manager/policies/mock_policy_handler_observer.h index bd8c83d897..43e4983368 100644 --- a/src/components/include/test/application_manager/policies/mock_policy_handler_observer.h +++ b/src/components/include/test/application_manager/policies/mock_policy_handler_observer.h @@ -37,8 +37,8 @@ #include #include -#include "gmock/gmock.h" #include "application_manager/policies/policy_handler_observer.h" +#include "gmock/gmock.h" namespace test { namespace components { diff --git a/src/components/include/test/connection_handler/mock_connection_handler.h b/src/components/include/test/connection_handler/mock_connection_handler.h index 8cc439c78a..41c2f04ebb 100644 --- a/src/components/include/test/connection_handler/mock_connection_handler.h +++ b/src/components/include/test/connection_handler/mock_connection_handler.h @@ -33,23 +33,23 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_CONNECTION_HANDLER_MOCK_CONNECTION_HANDLER_H_ #define SRC_COMPONENTS_INCLUDE_TEST_CONNECTION_HANDLER_MOCK_CONNECTION_HANDLER_H_ -#include #include +#include #include -#include "gmock/gmock.h" #include "connection_handler/connection_handler.h" #include "connection_handler/connection_handler_observer.h" -#include "connection_handler/devices_discovery_starter.h" #include "connection_handler/connection_handler_settings.h" +#include "connection_handler/devices_discovery_starter.h" +#include "gmock/gmock.h" namespace test { namespace components { namespace connection_handler_test { +using connection_handler::CloseSessionReason; using connection_handler::ConnectionHandle; using connection_handler::DeviceHandle; -using connection_handler::CloseSessionReason; using connection_handler::DevicesDiscoveryStarter; using connection_handler::SessionTransports; diff --git a/src/components/include/test/connection_handler/mock_connection_handler_observer.h b/src/components/include/test/connection_handler/mock_connection_handler_observer.h index 552be4bee0..8f7ec90550 100644 --- a/src/components/include/test/connection_handler/mock_connection_handler_observer.h +++ b/src/components/include/test/connection_handler/mock_connection_handler_observer.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_CONNECTION_HANDLER_MOCK_CONNECTION_HANDLER_OBSERVER_H_ #define SRC_COMPONENTS_INCLUDE_TEST_CONNECTION_HANDLER_MOCK_CONNECTION_HANDLER_OBSERVER_H_ -#include "gmock/gmock.h" #include "connection_handler/connection_handler_observer.h" +#include "gmock/gmock.h" namespace test { namespace components { diff --git a/src/components/include/test/connection_handler/mock_connection_handler_settings.h b/src/components/include/test/connection_handler/mock_connection_handler_settings.h index c813455698..38bd41e431 100644 --- a/src/components/include/test/connection_handler/mock_connection_handler_settings.h +++ b/src/components/include/test/connection_handler/mock_connection_handler_settings.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_INCLUDE_TEST_CONNECTION_HANDLER_MOCK_CONNECTION_HANDLER_SETTINGS_H_ #include -#include "gmock/gmock.h" #include "connection_handler/connection_handler_settings.h" +#include "gmock/gmock.h" namespace test { namespace components { diff --git a/src/components/include/test/hmi_message_handler/mock_hmi_message_observer.h b/src/components/include/test/hmi_message_handler/mock_hmi_message_observer.h index 17ec69ccf8..221b353a51 100644 --- a/src/components/include/test/hmi_message_handler/mock_hmi_message_observer.h +++ b/src/components/include/test/hmi_message_handler/mock_hmi_message_observer.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_INCLUDE_TEST_HMI_MESSAGE_HANDLER_MOCK_HMI_MESSAGE_OBSERVER_H_ #include "gmock/gmock.h" -#include "utils/singleton.h" #include "hmi_message_handler/hmi_message_observer.h" +#include "utils/singleton.h" namespace test { namespace components { diff --git a/src/components/include/test/policy/policy_external/policy/mock_policy_listener.h b/src/components/include/test/policy/policy_external/policy/mock_policy_listener.h index 720a81862a..1e42423a03 100644 --- a/src/components/include/test/policy/policy_external/policy/mock_policy_listener.h +++ b/src/components/include/test/policy/policy_external/policy/mock_policy_listener.h @@ -32,16 +32,16 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_POLICY_POLICY_EXTERNAL_POLICY_MOCK_POLICY_LISTENER_H_ #define SRC_COMPONENTS_INCLUDE_TEST_POLICY_POLICY_EXTERNAL_POLICY_MOCK_POLICY_LISTENER_H_ -#include #include #include +#include #include #include "gmock/gmock.h" #include "policy/policy_listener.h" -#include "rpc_base/rpc_base.h" #include "policy/policy_table/types.h" +#include "rpc_base/rpc_base.h" #include "utils/custom_string.h" namespace policy_table = ::rpc::policy_table_interface_base; diff --git a/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h b/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h index 8fc8a9c358..7ebf73ae54 100644 --- a/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h +++ b/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h @@ -40,9 +40,9 @@ #include "policy/policy_types.h" #include "policy/usage_statistics/statistics_manager.h" -#include "rpc_base/rpc_base.h" -#include "policy/policy_table/types.h" #include "policy/policy_manager.h" +#include "policy/policy_table/types.h" +#include "rpc_base/rpc_base.h" namespace policy_table = ::rpc::policy_table_interface_base; diff --git a/src/components/include/test/policy/policy_external/policy/mock_policy_settings.h b/src/components/include/test/policy/policy_external/policy/mock_policy_settings.h index fe051aaae0..16239bfb76 100644 --- a/src/components/include/test/policy/policy_external/policy/mock_policy_settings.h +++ b/src/components/include/test/policy/policy_external/policy/mock_policy_settings.h @@ -32,8 +32,8 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_POLICY_MOCK_POLICY_SETTINGS_H_ #define SRC_COMPONENTS_INCLUDE_TEST_POLICY_MOCK_POLICY_SETTINGS_H_ -#include "gmock/gmock.h" #include +#include "gmock/gmock.h" #include "policy/policy_settings.h" namespace test { @@ -52,7 +52,7 @@ class MockPolicySettings : public ::policy::PolicySettings { MOCK_CONST_METHOD0(use_full_app_id, bool()); }; -} // namespace policy_test +} // namespace policy_handler_test } // namespace components } // namespace test diff --git a/src/components/include/test/policy/policy_regular/policy/mock_policy_listener.h b/src/components/include/test/policy/policy_regular/policy/mock_policy_listener.h index 045d4f4e4f..f409100a49 100644 --- a/src/components/include/test/policy/policy_regular/policy/mock_policy_listener.h +++ b/src/components/include/test/policy/policy_regular/policy/mock_policy_listener.h @@ -37,8 +37,8 @@ #include "gmock/gmock.h" #include "policy/policy_listener.h" -#include "rpc_base/rpc_base.h" #include "policy/policy_table/types.h" +#include "rpc_base/rpc_base.h" #include "utils/custom_string.h" namespace policy_table = ::rpc::policy_table_interface_base; diff --git a/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h b/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h index b6fdc2c2c9..73bf2d387b 100644 --- a/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h +++ b/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h @@ -40,8 +40,8 @@ #include "policy/policy_types.h" #include "policy/usage_statistics/statistics_manager.h" -#include "rpc_base/rpc_base.h" #include "policy/policy_manager.h" +#include "rpc_base/rpc_base.h" namespace policy_table = ::rpc::policy_table_interface_base; diff --git a/src/components/include/test/policy/policy_regular/policy/mock_policy_settings.h b/src/components/include/test/policy/policy_regular/policy/mock_policy_settings.h index 6e0acae33c..26c5572d99 100644 --- a/src/components/include/test/policy/policy_regular/policy/mock_policy_settings.h +++ b/src/components/include/test/policy/policy_regular/policy/mock_policy_settings.h @@ -32,8 +32,8 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_POLICY_MOCK_POLICY_SETTINGS_H_ #define SRC_COMPONENTS_INCLUDE_TEST_POLICY_MOCK_POLICY_SETTINGS_H_ -#include "gmock/gmock.h" #include +#include "gmock/gmock.h" #include "policy/policy_settings.h" namespace test { @@ -52,7 +52,7 @@ class MockPolicySettings : public ::policy::PolicySettings { MOCK_CONST_METHOD0(use_full_app_id, bool()); }; -} // namespace policy_test +} // namespace policy_handler_test } // namespace components } // namespace test diff --git a/src/components/include/test/protocol_handler/mock_protocol_handler.h b/src/components/include/test/protocol_handler/mock_protocol_handler.h index f6db0c7097..4468914a26 100644 --- a/src/components/include/test/protocol_handler/mock_protocol_handler.h +++ b/src/components/include/test/protocol_handler/mock_protocol_handler.h @@ -33,9 +33,9 @@ #define SRC_COMPONENTS_INCLUDE_TEST_PROTOCOL_HANDLER_MOCK_PROTOCOL_HANDLER_H_ #include "gmock/gmock.h" -#include "protocol_handler/protocol_packet.h" #include "protocol_handler/protocol_handler.h" #include "protocol_handler/protocol_handler_settings.h" +#include "protocol_handler/protocol_packet.h" #include "protocol_handler/session_observer.h" namespace test { diff --git a/src/components/include/test/protocol_handler/mock_protocol_observer.h b/src/components/include/test/protocol_handler/mock_protocol_observer.h index 257ea5ad9f..ef28d80d0b 100644 --- a/src/components/include/test/protocol_handler/mock_protocol_observer.h +++ b/src/components/include/test/protocol_handler/mock_protocol_observer.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_PROTOCOL_HANDLER_MOCK_PROTOCOL_OBSERVER_H_ #define SRC_COMPONENTS_INCLUDE_TEST_PROTOCOL_HANDLER_MOCK_PROTOCOL_OBSERVER_H_ -#include "gmock/gmock.h" #include +#include "gmock/gmock.h" #include "protocol_handler/protocol_observer.h" namespace test { diff --git a/src/components/include/test/protocol_handler/mock_session_observer.h b/src/components/include/test/protocol_handler/mock_session_observer.h index 0d74b15f64..01bb41a96e 100644 --- a/src/components/include/test/protocol_handler/mock_session_observer.h +++ b/src/components/include/test/protocol_handler/mock_session_observer.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_INCLUDE_TEST_PROTOCOL_HANDLER_MOCK_SESSION_OBSERVER_H_ #include -#include #include +#include #include "protocol_handler/session_observer.h" #include "transport_manager/common.h" diff --git a/src/components/include/test/security_manager/mock_security_manager.h b/src/components/include/test/security_manager/mock_security_manager.h index b2c2e3bf17..2b5d99c156 100644 --- a/src/components/include/test/security_manager/mock_security_manager.h +++ b/src/components/include/test/security_manager/mock_security_manager.h @@ -33,12 +33,12 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_SECURITY_MANAGER_MOCK_SECURITY_MANAGER_H_ #define SRC_COMPONENTS_INCLUDE_TEST_SECURITY_MANAGER_MOCK_SECURITY_MANAGER_H_ -#include #include +#include #include "gmock/gmock.h" -#include "utils/byte_order.h" #include "security_manager/security_manager.h" #include "security_manager/security_query.h" +#include "utils/byte_order.h" namespace test { namespace components { diff --git a/src/components/include/test/telemetry_monitor/mock_telemetry_observable.h b/src/components/include/test/telemetry_monitor/mock_telemetry_observable.h index dd07f1d3c8..eb106db9a2 100644 --- a/src/components/include/test/telemetry_monitor/mock_telemetry_observable.h +++ b/src/components/include/test/telemetry_monitor/mock_telemetry_observable.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_TELEMETRY_MONITOR_MOCK_TELEMETRY_OBSERVABLE_H_ #define SRC_COMPONENTS_INCLUDE_TEST_TELEMETRY_MONITOR_MOCK_TELEMETRY_OBSERVABLE_H_ +#include "application_manager/telemetry_observer.h" #include "gmock/gmock.h" #include "telemetry_monitor/telemetry_observable.h" -#include "application_manager/telemetry_observer.h" namespace test { namespace components { diff --git a/src/components/include/test/transport_manager/mock_transport_manager.h b/src/components/include/test/transport_manager/mock_transport_manager.h index 2ef79f930c..395beeff7b 100644 --- a/src/components/include/test/transport_manager/mock_transport_manager.h +++ b/src/components/include/test/transport_manager/mock_transport_manager.h @@ -33,22 +33,22 @@ #ifndef SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_H_ #define SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_H_ -#include "gmock/gmock.h" #include -#include "transport_manager/transport_manager.h" -#include "transport_manager/transport_adapter/transport_adapter_event.h" -#include "telemetry_monitor/telemetry_observable.h" +#include "gmock/gmock.h" #include "resumption/last_state.h" +#include "telemetry_monitor/telemetry_observable.h" +#include "transport_manager/transport_adapter/transport_adapter_event.h" +#include "transport_manager/transport_manager.h" namespace test { namespace components { namespace transport_manager_test { -using ::transport_manager::DeviceHandle; using ::transport_manager::ConnectionUID; -using ::transport_manager::transport_adapter::TransportAdapter; +using ::transport_manager::DeviceHandle; using ::transport_manager::TransportAdapterEvent; using ::transport_manager::TransportManagerListener; +using ::transport_manager::transport_adapter::TransportAdapter; /* * MOCK implementation of ::transport_manager::TransportManager interface */ diff --git a/src/components/include/test/transport_manager/mock_transport_manager_settings.h b/src/components/include/test/transport_manager/mock_transport_manager_settings.h index bed0d5e6e6..2d9f25a44c 100644 --- a/src/components/include/test/transport_manager/mock_transport_manager_settings.h +++ b/src/components/include/test/transport_manager/mock_transport_manager_settings.h @@ -33,9 +33,9 @@ #define SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_SETTINGS_H_ #include "gmock/gmock.h" +#include "mock_transport_manager_mme_settings.h" #include "protocol_handler/protocol_handler.h" #include "transport_manager/transport_manager_settings.h" -#include "mock_transport_manager_mme_settings.h" namespace test { namespace components { diff --git a/src/components/include/test/transport_manager/transport_adapter/mock_device.h b/src/components/include/test/transport_manager/transport_adapter/mock_device.h index 6829e98d1d..c1e0153a76 100644 --- a/src/components/include/test/transport_manager/transport_adapter/mock_device.h +++ b/src/components/include/test/transport_manager/transport_adapter/mock_device.h @@ -34,9 +34,9 @@ #define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_MOCK_DEVICE_H_ #include "gmock/gmock.h" -#include "transport_manager/transport_adapter/device.h" #include "transport_manager/common.h" #include "transport_manager/tcp/tcp_device.h" +#include "transport_manager/transport_adapter/device.h" namespace test { namespace components { diff --git a/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h b/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h index 3864c3f6f9..3ac6331f71 100644 --- a/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h +++ b/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_TRANSPORT_ADAPTER_H_ #include "gmock/gmock.h" -#include "transport_manager/transport_adapter/transport_adapter.h" #include "transport_manager/transport_adapter/device.h" +#include "transport_manager/transport_adapter/transport_adapter.h" namespace test { namespace components { diff --git a/src/components/include/test/utils/test_async_waiter.h b/src/components/include/test/utils/test_async_waiter.h index fee7672e93..12d6cd04b7 100644 --- a/src/components/include/test/utils/test_async_waiter.h +++ b/src/components/include/test/utils/test_async_waiter.h @@ -35,8 +35,8 @@ #include -#include "utils/lock.h" #include "utils/conditional_variable.h" +#include "utils/lock.h" namespace test { diff --git a/src/components/include/transport_manager/common.h b/src/components/include/transport_manager/common.h index b36dcde67e..300ce26d0b 100644 --- a/src/components/include/transport_manager/common.h +++ b/src/components/include/transport_manager/common.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_COMMON_H_ #define SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_COMMON_H_ -#include -#include #include +#include +#include /** * @brief - transport_manager namespace diff --git a/src/components/include/transport_manager/error.h b/src/components/include/transport_manager/error.h index ba357dd54b..eb0f702717 100644 --- a/src/components/include/transport_manager/error.h +++ b/src/components/include/transport_manager/error.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_ERROR_H_ #define SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_ERROR_H_ -#include #include +#include namespace transport_manager { diff --git a/src/components/include/transport_manager/transport_adapter/device.h b/src/components/include/transport_manager/transport_adapter/device.h index ad035245d8..184616d714 100644 --- a/src/components/include/transport_manager/transport_adapter/device.h +++ b/src/components/include/transport_manager/transport_adapter/device.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_DEVICE_H_ #define SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_DEVICE_H_ +#include #include #include -#include #include "transport_manager/common.h" diff --git a/src/components/include/transport_manager/transport_adapter/transport_adapter.h b/src/components/include/transport_manager/transport_adapter/transport_adapter.h index eaa1fa9955..1d21ff4ae4 100644 --- a/src/components/include/transport_manager/transport_adapter/transport_adapter.h +++ b/src/components/include/transport_manager/transport_adapter/transport_adapter.h @@ -36,15 +36,15 @@ #ifndef SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_TRANSPORT_ADAPTER_H_ #define SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_TRANSPORT_ADAPTER_H_ -#include -#include #include #include +#include +#include -#include "transport_manager/transport_adapter/device.h" +#include "protocol/common.h" #include "transport_manager/common.h" #include "transport_manager/error.h" -#include "protocol/common.h" +#include "transport_manager/transport_adapter/device.h" namespace transport_manager { diff --git a/src/components/include/transport_manager/transport_adapter/transport_adapter_event.h b/src/components/include/transport_manager/transport_adapter/transport_adapter_event.h index 63d1678ed0..79daa51c36 100644 --- a/src/components/include/transport_manager/transport_adapter/transport_adapter_event.h +++ b/src/components/include/transport_manager/transport_adapter/transport_adapter_event.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_TRANSPORT_ADAPTER_EVENT_H_ #define SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_TRANSPORT_ADAPTER_EVENT_H_ +#include "protocol/common.h" #include "transport_manager/common.h" #include "transport_manager/transport_adapter/transport_adapter.h" -#include "protocol/common.h" namespace transport_manager { diff --git a/src/components/include/transport_manager/transport_manager.h b/src/components/include/transport_manager/transport_manager.h index eabb4f7028..275608c315 100644 --- a/src/components/include/transport_manager/transport_manager.h +++ b/src/components/include/transport_manager/transport_manager.h @@ -33,10 +33,10 @@ #ifndef SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_H_ #define SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_H_ +#include "protocol/common.h" #include "transport_manager/common.h" -#include "transport_manager/transport_manager_listener.h" #include "transport_manager/transport_adapter/transport_adapter_event.h" -#include "protocol/common.h" +#include "transport_manager/transport_manager_listener.h" namespace resumption { class LastState; @@ -69,10 +69,10 @@ class TransportManager { virtual int Reinit() = 0; /** - * @brief Start scanning for new devices. - * - * @return Code error. - **/ + * @brief Start scanning for new devices. + * + * @return Code error. + **/ virtual int SearchDevices() = 0; virtual void AddCloudDevice( diff --git a/src/components/include/transport_manager/transport_manager_listener.h b/src/components/include/transport_manager/transport_manager_listener.h index 22ee519a67..a733dc7d1c 100644 --- a/src/components/include/transport_manager/transport_manager_listener.h +++ b/src/components/include/transport_manager/transport_manager_listener.h @@ -35,10 +35,10 @@ #include #include +#include "protocol/common.h" #include "transport_manager/common.h" -#include "transport_manager/info.h" #include "transport_manager/error.h" -#include "protocol/common.h" +#include "transport_manager/info.h" namespace transport_manager { @@ -57,8 +57,8 @@ class TransportManagerListener { virtual void OnDeviceListUpdated(const std::vector&) = 0; /** - * @brief Reaction to "Find new applications" request - */ + * @brief Reaction to "Find new applications" request + */ virtual void OnFindNewApplicationsRequest() = 0; /** diff --git a/src/components/include/transport_manager/transport_manager_listener_empty.h b/src/components/include/transport_manager/transport_manager_listener_empty.h index 193a86819c..6754540b4c 100644 --- a/src/components/include/transport_manager/transport_manager_listener_empty.h +++ b/src/components/include/transport_manager/transport_manager_listener_empty.h @@ -35,8 +35,8 @@ #include -#include "transport_manager/transport_manager_listener.h" #include "protocol/common.h" +#include "transport_manager/transport_manager_listener.h" namespace transport_manager { diff --git a/src/components/include/transport_manager/transport_manager_mme_settings.h b/src/components/include/transport_manager/transport_manager_mme_settings.h index efe26468ab..721df03d34 100644 --- a/src/components/include/transport_manager/transport_manager_mme_settings.h +++ b/src/components/include/transport_manager/transport_manager_mme_settings.h @@ -60,6 +60,6 @@ class TransportManagerMMESettings { virtual uint32_t iap_hub_connection_wait_timeout() const = 0; }; -} +} // namespace transport_manager #endif // SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_MME_SETTINGS_H_ diff --git a/src/components/include/utils/custom_string.h b/src/components/include/utils/custom_string.h index 7b21e7a64d..0e5ef244f0 100644 --- a/src/components/include/utils/custom_string.h +++ b/src/components/include/utils/custom_string.h @@ -81,8 +81,8 @@ class CustomString { CustomString(size_t n, char c); /** - * @brief Returns the length of the string, in terms of characters. - */ + * @brief Returns the length of the string, in terms of characters. + */ size_t size() const; /** diff --git a/src/components/include/utils/logger.h b/src/components/include/utils/logger.h index 75daa552a2..907f8f4db0 100644 --- a/src/components/include/utils/logger.h +++ b/src/components/include/utils/logger.h @@ -35,13 +35,13 @@ #ifdef ENABLE_LOG #include -#include -#include #include #include -#include "utils/push_log.h" -#include "utils/logger_status.h" +#include +#include #include "utils/auto_trace.h" +#include "utils/logger_status.h" +#include "utils/push_log.h" #endif // ENABLE_LOG #ifdef ENABLE_LOG @@ -121,15 +121,15 @@ log4cxx_time_t time_now(); #define LOG4CXX_FATAL(loggerPtr, logEvent) \ LOG_WITH_LEVEL(loggerPtr, ::log4cxx::Level::getFatal(), logEvent) -#define LOG4CXX_ERROR_WITH_ERRNO(loggerPtr, message) \ - LOG4CXX_ERROR(loggerPtr, \ - message << ", error code " << errno << " (" << strerror(errno) \ - << ")") +#define LOG4CXX_ERROR_WITH_ERRNO(loggerPtr, message) \ + LOG4CXX_ERROR( \ + loggerPtr, \ + message << ", error code " << errno << " (" << strerror(errno) << ")") -#define LOG4CXX_WARN_WITH_ERRNO(loggerPtr, message) \ - LOG4CXX_WARN(loggerPtr, \ - message << ", error code " << errno << " (" << strerror(errno) \ - << ")") +#define LOG4CXX_WARN_WITH_ERRNO(loggerPtr, message) \ + LOG4CXX_WARN( \ + loggerPtr, \ + message << ", error code " << errno << " (" << strerror(errno) << ")") #else // ENABLE_LOG is OFF diff --git a/src/components/include/utils/macro.h b/src/components/include/utils/macro.h index e6f3b6b3ca..00298f690e 100644 --- a/src/components/include/utils/macro.h +++ b/src/components/include/utils/macro.h @@ -40,7 +40,7 @@ #include "logger.h" // A macro to set some action for variable to avoid "unused variable" warning -#define UNUSED(x) (void) x; +#define UNUSED(x) (void)x; // A macro to disallow the copy constructor and operator= functions // This should be used in the private: declarations for a class #define DISALLOW_COPY_AND_ASSIGN(TypeName) \ @@ -133,9 +133,9 @@ #endif /* -* @brief Calculate size of na array -* @param arr array, which size need to calculate -*/ + * @brief Calculate size of na array + * @param arr array, which size need to calculate + */ #define ARRAYSIZE(arr) sizeof(arr) / sizeof(*arr) #ifdef BUILD_TESTS @@ -146,9 +146,9 @@ #endif // BUILD_TESTS /* -* @brief deprecate a method declaration, a warning will be thrown by your -* compiler if a method with this macro is used -*/ + * @brief deprecate a method declaration, a warning will be thrown by your + * compiler if a method with this macro is used + */ #if __cplusplus > 201103L #define DEPRECATED [[deprecated]] #else diff --git a/src/components/include/utils/message_queue.h b/src/components/include/utils/message_queue.h index 093aa4cac2..8dfe7afa52 100644 --- a/src/components/include/utils/message_queue.h +++ b/src/components/include/utils/message_queue.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_INCLUDE_UTILS_MESSAGE_QUEUE_H_ #define SRC_COMPONENTS_INCLUDE_UTILS_MESSAGE_QUEUE_H_ -#include #include +#include #include "utils/conditional_variable.h" #include "utils/lock.h" @@ -97,9 +97,9 @@ class MessageQueue { void wait(); /** - * \brief waitUntilEmpty message queue - * Wait until message queue is empty - */ + * \brief waitUntilEmpty message queue + * Wait until message queue is empty + */ void WaitUntilEmpty(); /** @@ -112,8 +112,8 @@ class MessageQueue { void Shutdown(); /** - * \brief Clears queue. - */ + * \brief Clears queue. + */ void Reset(); private: @@ -131,8 +131,7 @@ class MessageQueue { }; template -MessageQueue::MessageQueue() - : shutting_down_(false) {} +MessageQueue::MessageQueue() : shutting_down_(false) {} template MessageQueue::~MessageQueue() {} diff --git a/src/components/include/utils/prioritized_queue.h b/src/components/include/utils/prioritized_queue.h index eb4ba6a6c3..a2eb200012 100644 --- a/src/components/include/utils/prioritized_queue.h +++ b/src/components/include/utils/prioritized_queue.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_INCLUDE_UTILS_PRIORITIZED_QUEUE_H_ #define SRC_COMPONENTS_INCLUDE_UTILS_PRIORITIZED_QUEUE_H_ -#include -#include #include +#include +#include #include "utils/macro.h" diff --git a/src/components/include/utils/rwlock.h b/src/components/include/utils/rwlock.h index b7e7484b48..5c7735713e 100644 --- a/src/components/include/utils/rwlock.h +++ b/src/components/include/utils/rwlock.h @@ -98,15 +98,15 @@ class RWLock { bool TryAcquireForReading(); /** - * @brief Try to Acqure read-write lock for writing. - * Applies a write lock like AcquireForWriting(), with the exception that + * @brief Try to Acqure read-write lock for writing. + * Applies a write lock like AcquireForWriting(), with the exception that * the - * function fails if any thread currently holds rwlock (for reading or + * function fails if any thread currently holds rwlock (for reading or * writing) - * Invoke of TryAcquireForWriting will not block calling thread and returns + * Invoke of TryAcquireForWriting will not block calling thread and returns * "false" - * @returns true if lock was acquired and false if was not - */ + * @returns true if lock was acquired and false if was not + */ bool TryAcquireForWriting(); /** @@ -126,12 +126,12 @@ class RWLock { bool AcquireForWriting(); /** - * @brief Release read-write lock. - * Releases a lock held on the read-write lock object. - * Results are undefined if the read-write lock rwlock - * is not held by the calling thread. - * @returns true if lock was released and false if was not - */ + * @brief Release read-write lock. + * Releases a lock held on the read-write lock object. + * Results are undefined if the read-write lock rwlock + * is not held by the calling thread. + * @returns true if lock was released and false if was not + */ bool Release(); private: diff --git a/src/components/include/utils/scope_guard.h b/src/components/include/utils/scope_guard.h index a425356c0e..a05be6dc11 100644 --- a/src/components/include/utils/scope_guard.h +++ b/src/components/include/utils/scope_guard.h @@ -322,5 +322,5 @@ ObjScopeGuardImpl1 MakeObjGuard(Obj& obj, const P1& p1) { return ObjScopeGuardImpl1::MakeObjGuard(obj, memFun, p1); } -} +} // namespace utils #endif // SRC_COMPONENTS_INCLUDE_UTILS_SCOPE_GUARD_H_ diff --git a/src/components/include/utils/semantic_version.h b/src/components/include/utils/semantic_version.h index 5fe7ce1deb..5b2f2a1cdf 100644 --- a/src/components/include/utils/semantic_version.h +++ b/src/components/include/utils/semantic_version.h @@ -120,6 +120,6 @@ struct SemanticVersion { extern const SemanticVersion base_rpc_version; extern const SemanticVersion rpc_version_5; -} +} // namespace utils #endif // SRC_COMPONENTS_INCLUDE_UTILS_CALLABLE_H \ No newline at end of file diff --git a/src/components/include/utils/threads/async_runner.h b/src/components/include/utils/threads/async_runner.h index 64c9d09939..5c88112267 100644 --- a/src/components/include/utils/threads/async_runner.h +++ b/src/components/include/utils/threads/async_runner.h @@ -33,14 +33,14 @@ #ifndef SRC_COMPONENTS_INCLUDE_UTILS_THREADS_ASYNC_RUNNER_H_ #define SRC_COMPONENTS_INCLUDE_UTILS_THREADS_ASYNC_RUNNER_H_ -#include #include +#include -#include "thread_delegate.h" #include "thread.h" +#include "thread_delegate.h" -#include "utils/lock.h" #include "utils/conditional_variable.h" +#include "utils/lock.h" namespace threads { diff --git a/src/components/include/utils/threads/message_loop_thread.h b/src/components/include/utils/threads/message_loop_thread.h index add7fc38b8..26ae127b69 100644 --- a/src/components/include/utils/threads/message_loop_thread.h +++ b/src/components/include/utils/threads/message_loop_thread.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_INCLUDE_UTILS_THREADS_MESSAGE_LOOP_THREAD_H_ #define SRC_COMPONENTS_INCLUDE_UTILS_THREADS_MESSAGE_LOOP_THREAD_H_ -#include #include +#include #include "utils/logger.h" #include "utils/macro.h" diff --git a/src/components/include/utils/threads/thread.h b/src/components/include/utils/threads/thread.h index cba79b20bd..6f72679d63 100644 --- a/src/components/include/utils/threads/thread.h +++ b/src/components/include/utils/threads/thread.h @@ -40,11 +40,11 @@ #include #include +#include "utils/conditional_variable.h" +#include "utils/lock.h" #include "utils/macro.h" #include "utils/threads/thread_delegate.h" #include "utils/threads/thread_options.h" -#include "utils/conditional_variable.h" -#include "utils/lock.h" namespace threads { diff --git a/src/components/include/utils/typed_enum_print.h b/src/components/include/utils/typed_enum_print.h index e2b903c948..0f3cc41bf8 100644 --- a/src/components/include/utils/typed_enum_print.h +++ b/src/components/include/utils/typed_enum_print.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_INCLUDE_UTILS_TYPED_ENUM_PRINT_H_ #define SRC_COMPONENTS_INCLUDE_UTILS_TYPED_ENUM_PRINT_H_ -#include #include +#include namespace utils { diff --git a/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h b/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h index 54d898b7b2..cd594ee8b1 100644 --- a/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h +++ b/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h @@ -34,10 +34,10 @@ #define SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_AUDIO_A2DP_SOURCE_PLAYER_ADAPTER_H_ #include -#include "protocol/common.h" +#include "connection_handler/connection_handler_impl.h" #include "media_manager/media_adapter_impl.h" +#include "protocol/common.h" #include "utils/threads/thread_delegate.h" -#include "connection_handler/connection_handler_impl.h" namespace protocol_handler { class SessionObserver; diff --git a/src/components/media_manager/include/media_manager/audio/audio_stream_sender_thread.h b/src/components/media_manager/include/media_manager/audio/audio_stream_sender_thread.h index a246e468b7..cb0ea8aa11 100644 --- a/src/components/media_manager/include/media_manager/audio/audio_stream_sender_thread.h +++ b/src/components/media_manager/include/media_manager/audio/audio_stream_sender_thread.h @@ -34,11 +34,11 @@ #define SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_AUDIO_AUDIO_STREAM_SENDER_THREAD_H_ #include -#include "utils/macro.h" -#include "utils/threads/thread_delegate.h" +#include "smart_objects/smart_object.h" #include "utils/conditional_variable.h" #include "utils/lock.h" -#include "smart_objects/smart_object.h" +#include "utils/macro.h" +#include "utils/threads/thread_delegate.h" namespace application_manager { class ApplicationManager; diff --git a/src/components/media_manager/include/media_manager/audio/from_mic_to_file_recorder_thread.h b/src/components/media_manager/include/media_manager/audio/from_mic_to_file_recorder_thread.h index ded709b1fa..e6b54cc487 100644 --- a/src/components/media_manager/include/media_manager/audio/from_mic_to_file_recorder_thread.h +++ b/src/components/media_manager/include/media_manager/audio/from_mic_to_file_recorder_thread.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_AUDIO_FROM_MIC_TO_FILE_RECORDER_THREAD_H_ #define SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_AUDIO_FROM_MIC_TO_FILE_RECORDER_THREAD_H_ -#include #include +#include #include #include "utils/lock.h" diff --git a/src/components/media_manager/include/media_manager/file_streamer_adapter.h b/src/components/media_manager/include/media_manager/file_streamer_adapter.h index c4c91a98d8..a11b05b2ee 100644 --- a/src/components/media_manager/include/media_manager/file_streamer_adapter.h +++ b/src/components/media_manager/include/media_manager/file_streamer_adapter.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_FILE_STREAMER_ADAPTER_H_ #define SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_FILE_STREAMER_ADAPTER_H_ -#include #include +#include #include "media_manager/streamer_adapter.h" #include "utils/threads/thread_delegate.h" diff --git a/src/components/media_manager/include/media_manager/media_manager_impl.h b/src/components/media_manager/include/media_manager/media_manager_impl.h index 749356e656..30b05d5c6b 100644 --- a/src/components/media_manager/include/media_manager/media_manager_impl.h +++ b/src/components/media_manager/include/media_manager/media_manager_impl.h @@ -33,13 +33,13 @@ #ifndef SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_MEDIA_MANAGER_IMPL_H_ #define SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_MEDIA_MANAGER_IMPL_H_ -#include #include -#include "protocol_handler/protocol_observer.h" -#include "protocol_handler/protocol_handler.h" -#include "media_manager/media_manager.h" +#include #include "media_manager/media_adapter_impl.h" #include "media_manager/media_adapter_listener.h" +#include "media_manager/media_manager.h" +#include "protocol_handler/protocol_handler.h" +#include "protocol_handler/protocol_observer.h" namespace application_manager { class ApplicationManager; diff --git a/src/components/media_manager/include/media_manager/streamer_adapter.h b/src/components/media_manager/include/media_manager/streamer_adapter.h index 56bf941f8e..16696e81d1 100644 --- a/src/components/media_manager/include/media_manager/streamer_adapter.h +++ b/src/components/media_manager/include/media_manager/streamer_adapter.h @@ -33,12 +33,12 @@ #ifndef SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_STREAMER_ADAPTER_H_ #define SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_STREAMER_ADAPTER_H_ +#include #include "media_manager/media_adapter_impl.h" +#include "protocol/raw_message.h" #include "utils/message_queue.h" #include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" -#include -#include "protocol/raw_message.h" namespace media_manager { diff --git a/src/components/media_manager/include/media_manager/video/socket_video_streamer_adapter.h b/src/components/media_manager/include/media_manager/video/socket_video_streamer_adapter.h index ad5739bd5f..d3d5111a60 100644 --- a/src/components/media_manager/include/media_manager/video/socket_video_streamer_adapter.h +++ b/src/components/media_manager/include/media_manager/video/socket_video_streamer_adapter.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_VIDEO_SOCKET_VIDEO_STREAMER_ADAPTER_H_ #define SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_VIDEO_SOCKET_VIDEO_STREAMER_ADAPTER_H_ -#include #include +#include #include "media_manager/socket_streamer_adapter.h" diff --git a/src/components/media_manager/src/audio/a2dp_source_player_adapter.cc b/src/components/media_manager/src/audio/a2dp_source_player_adapter.cc index 91e3c5465d..581997f610 100644 --- a/src/components/media_manager/src/audio/a2dp_source_player_adapter.cc +++ b/src/components/media_manager/src/audio/a2dp_source_player_adapter.cc @@ -29,17 +29,17 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include "media_manager/audio/a2dp_source_player_adapter.h" #include -#include #include +#include #include #include -#include "utils/threads/thread.h" -#include "media_manager/audio/a2dp_source_player_adapter.h" -#include "utils/lock.h" -#include "utils/logger.h" #include "connection_handler/connection_handler_impl.h" #include "protocol_handler/session_observer.h" +#include "utils/lock.h" +#include "utils/logger.h" +#include "utils/threads/thread.h" namespace media_manager { @@ -60,7 +60,7 @@ class A2DPSourcePlayerAdapter::A2DPSourcePlayerThread // The Sample format to use static const pa_sample_spec sSampleFormat_; - pa_simple* s_in, *s_out; + pa_simple *s_in, *s_out; std::string device_; bool should_be_stopped_; sync_primitives::Lock should_be_stopped_lock_; @@ -85,9 +85,9 @@ A2DPSourcePlayerAdapter::~A2DPSourcePlayerAdapter() { } void A2DPSourcePlayerAdapter::StartActivity(int32_t application_key) { - LOG4CXX_INFO(logger_, - "Starting a2dp playing music for " << application_key - << " application."); + LOG4CXX_INFO( + logger_, + "Starting a2dp playing music for " << application_key << " application."); if (application_key != current_application_) { current_application_ = application_key; @@ -110,9 +110,9 @@ void A2DPSourcePlayerAdapter::StartActivity(int32_t application_key) { } void A2DPSourcePlayerAdapter::StopActivity(int32_t application_key) { - LOG4CXX_INFO(logger_, - "Stopping 2dp playing for " << application_key - << " application."); + LOG4CXX_INFO( + logger_, + "Stopping 2dp playing for " << application_key << " application."); if (application_key != current_application_) { return; } diff --git a/src/components/media_manager/src/audio/audio_stream_sender_thread.cc b/src/components/media_manager/src/audio/audio_stream_sender_thread.cc index 23181e7431..078841f2a4 100644 --- a/src/components/media_manager/src/audio/audio_stream_sender_thread.cc +++ b/src/components/media_manager/src/audio/audio_stream_sender_thread.cc @@ -35,20 +35,20 @@ #include #endif -#include #include -#include "application_manager/application_manager.h" +#include #include "application_manager/application_impl.h" -#include "application_manager/rpc_service.h" +#include "application_manager/application_manager.h" #include "application_manager/commands/command.h" -#include "smart_objects/smart_object.h" +#include "application_manager/message.h" +#include "application_manager/rpc_service.h" +#include "application_manager/smart_object_keys.h" #include "interfaces/MOBILE_API.h" +#include "media_manager/audio/audio_stream_sender_thread.h" +#include "media_manager/media_manager_settings.h" +#include "smart_objects/smart_object.h" #include "utils/file_system.h" #include "utils/logger.h" -#include "media_manager/media_manager_settings.h" -#include "media_manager/audio/audio_stream_sender_thread.h" -#include "application_manager/smart_object_keys.h" -#include "application_manager/message.h" namespace media_manager { using sync_primitives::AutoLock; diff --git a/src/components/media_manager/src/audio/from_mic_recorder_adapter.cc b/src/components/media_manager/src/audio/from_mic_recorder_adapter.cc index d9735fcbbc..e55efed4ce 100644 --- a/src/components/media_manager/src/audio/from_mic_recorder_adapter.cc +++ b/src/components/media_manager/src/audio/from_mic_recorder_adapter.cc @@ -30,11 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "media_manager/audio/from_mic_recorder_adapter.h" #include -#include "utils/threads/thread.h" -#include "utils/logger.h" #include "media_manager/audio/from_mic_to_file_recorder_thread.h" -#include "media_manager/audio/from_mic_recorder_adapter.h" +#include "utils/logger.h" +#include "utils/threads/thread.h" namespace media_manager { diff --git a/src/components/media_manager/src/audio/from_mic_recorder_listener.cc b/src/components/media_manager/src/audio/from_mic_recorder_listener.cc index 647db1e1a3..721229b250 100644 --- a/src/components/media_manager/src/audio/from_mic_recorder_listener.cc +++ b/src/components/media_manager/src/audio/from_mic_recorder_listener.cc @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "utils/threads/thread.h" -#include "utils/logger.h" #include "media_manager/audio/from_mic_recorder_listener.h" #include "media_manager/audio/audio_stream_sender_thread.h" +#include "utils/logger.h" +#include "utils/threads/thread.h" namespace media_manager { @@ -63,9 +63,9 @@ void FromMicRecorderListener::OnErrorReceived(int32_t application_key, const DataForListener& data) {} void FromMicRecorderListener::OnActivityStarted(int32_t application_key) { - LOG4CXX_INFO(logger_, - "FromMicRecorderListener::OnActivityStarted " - << application_key); + LOG4CXX_INFO( + logger_, + "FromMicRecorderListener::OnActivityStarted " << application_key); if (application_key == current_application_) { return; } diff --git a/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc b/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc index 5c12614662..a34bdd3f09 100644 --- a/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc +++ b/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc @@ -84,7 +84,7 @@ void FromMicToFileRecorderThread::set_record_duration(int32_t duration) { void FromMicToFileRecorderThread::initArgs() { LOG4CXX_AUTO_TRACE(logger_); - argv_ = new gchar* [argc_]; + argv_ = new gchar*[argc_]; argv_[0] = new gchar[14]; argv_[1] = new gchar[3]; @@ -122,7 +122,7 @@ void FromMicToFileRecorderThread::threadMain() { initArgs(); GstElement* pipeline; - GstElement* alsasrc, *audioconvert, *capsfilter, *wavenc, *filesink; + GstElement *alsasrc, *audioconvert, *capsfilter, *wavenc, *filesink; GstCaps* audiocaps; GstBus* bus; @@ -155,7 +155,7 @@ void FromMicToFileRecorderThread::threadMain() { {NULL}}; // g_option_context_parse() modifies params, so keep argc_ and argv_ int32_t argc = argc_; - gchar** argv = new gchar* [argc]; + gchar** argv = new gchar*[argc]; for (int32_t i = 0; i < argc; i++) { argv[i] = argv_[i]; } diff --git a/src/components/media_manager/src/audio/socket_audio_streamer_adapter.cc b/src/components/media_manager/src/audio/socket_audio_streamer_adapter.cc index 429fab01b3..373d92cdde 100644 --- a/src/components/media_manager/src/audio/socket_audio_streamer_adapter.cc +++ b/src/components/media_manager/src/audio/socket_audio_streamer_adapter.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include "media_manager/audio/socket_audio_streamer_adapter.h" +#include namespace { const std::string kHeader = diff --git a/src/components/media_manager/src/file_streamer_adapter.cc b/src/components/media_manager/src/file_streamer_adapter.cc index 3418f7d963..7761e13601 100644 --- a/src/components/media_manager/src/file_streamer_adapter.cc +++ b/src/components/media_manager/src/file_streamer_adapter.cc @@ -30,9 +30,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "utils/logger.h" -#include "utils/file_system.h" #include "media_manager/file_streamer_adapter.h" +#include "utils/file_system.h" +#include "utils/logger.h" namespace media_manager { diff --git a/src/components/media_manager/src/media_manager_impl.cc b/src/components/media_manager/src/media_manager_impl.cc index ec88e910d3..90b891133d 100644 --- a/src/components/media_manager/src/media_manager_impl.cc +++ b/src/components/media_manager/src/media_manager_impl.cc @@ -31,27 +31,27 @@ */ #include "media_manager/media_manager_impl.h" -#include "media_manager/audio/from_mic_recorder_listener.h" -#include "media_manager/streamer_listener.h" -#include "application_manager/message_helper.h" #include "application_manager/application.h" -#include "application_manager/application_manager.h" #include "application_manager/application_impl.h" +#include "application_manager/application_manager.h" +#include "application_manager/message_helper.h" +#include "media_manager/audio/from_mic_recorder_listener.h" +#include "media_manager/streamer_listener.h" #include "protocol_handler/protocol_handler.h" #include "utils/file_system.h" -#include "utils/logger.h" #include "utils/helpers.h" +#include "utils/logger.h" #if defined(EXTENDED_MEDIA_MODE) #include "media_manager/audio/a2dp_source_player_adapter.h" #include "media_manager/audio/from_mic_recorder_adapter.h" #endif -#include "media_manager/video/socket_video_streamer_adapter.h" -#include "media_manager/audio/socket_audio_streamer_adapter.h" -#include "media_manager/video/pipe_video_streamer_adapter.h" -#include "media_manager/audio/pipe_audio_streamer_adapter.h" -#include "media_manager/video/file_video_streamer_adapter.h" #include "media_manager/audio/file_audio_streamer_adapter.h" +#include "media_manager/audio/pipe_audio_streamer_adapter.h" +#include "media_manager/audio/socket_audio_streamer_adapter.h" #include "media_manager/media_manager_settings.h" +#include "media_manager/video/file_video_streamer_adapter.h" +#include "media_manager/video/pipe_video_streamer_adapter.h" +#include "media_manager/video/socket_video_streamer_adapter.h" namespace media_manager { @@ -220,9 +220,9 @@ void MediaManagerImpl::StartMicrophoneRecording(int32_t application_key, std::vector buf; if (file_system::ReadBinaryFile(record_file_source, buf)) { if (file_system::Write(file_path, buf)) { - LOG4CXX_INFO(logger_, - "File " << record_file_source << " copied to " - << output_file); + LOG4CXX_INFO( + logger_, + "File " << record_file_source << " copied to " << output_file); } else { LOG4CXX_WARN(logger_, "Could not write to file " << output_file); } diff --git a/src/components/media_manager/src/pipe_streamer_adapter.cc b/src/components/media_manager/src/pipe_streamer_adapter.cc index 8bf14a546e..c692a0e266 100644 --- a/src/components/media_manager/src/pipe_streamer_adapter.cc +++ b/src/components/media_manager/src/pipe_streamer_adapter.cc @@ -30,13 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "media_manager/pipe_streamer_adapter.h" #include #include #include #include -#include "utils/logger.h" #include "utils/file_system.h" -#include "media_manager/pipe_streamer_adapter.h" +#include "utils/logger.h" namespace media_manager { @@ -88,9 +88,9 @@ bool PipeStreamerAdapter::PipeStreamer::Connect() { return false; } - LOG4CXX_INFO(logger_, - "Pipe " << named_pipe_path_ - << " was successfuly opened for writing"); + LOG4CXX_INFO( + logger_, + "Pipe " << named_pipe_path_ << " was successfuly opened for writing"); return true; } diff --git a/src/components/media_manager/src/socket_streamer_adapter.cc b/src/components/media_manager/src/socket_streamer_adapter.cc index 60b01c901b..624e388a0c 100644 --- a/src/components/media_manager/src/socket_streamer_adapter.cc +++ b/src/components/media_manager/src/socket_streamer_adapter.cc @@ -30,15 +30,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include +#include "media_manager/socket_streamer_adapter.h" #include #include +#include +#include +#include +#include #include #include "utils/logger.h" -#include "media_manager/socket_streamer_adapter.h" namespace media_manager { diff --git a/src/components/media_manager/src/video/video_stream_to_file_adapter.cc b/src/components/media_manager/src/video/video_stream_to_file_adapter.cc index f41954b117..d907211d16 100644 --- a/src/components/media_manager/src/video/video_stream_to_file_adapter.cc +++ b/src/components/media_manager/src/video/video_stream_to_file_adapter.cc @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "utils/logger.h" -#include "utils/file_system.h" -#include "config_profile/profile.h" #include "media_manager/video/video_stream_to_file_adapter.h" +#include "config_profile/profile.h" +#include "utils/file_system.h" +#include "utils/logger.h" namespace media_manager { diff --git a/src/components/media_manager/test/include/media_manager/mock_media_adapter.h b/src/components/media_manager/test/include/media_manager/mock_media_adapter.h index 908b371b26..78d44695e5 100644 --- a/src/components/media_manager/test/include/media_manager/mock_media_adapter.h +++ b/src/components/media_manager/test/include/media_manager/mock_media_adapter.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_MEDIA_MANAGER_TEST_INCLUDE_MEDIA_MANAGER_MOCK_MEDIA_ADAPTER_H_ #include "gmock/gmock.h" -#include "media_manager/media_manager.h" #include "media_manager/media_adapter.h" +#include "media_manager/media_manager.h" namespace test { namespace components { diff --git a/src/components/media_manager/test/media_manager_impl_test.cc b/src/components/media_manager/test/media_manager_impl_test.cc index c77c984a75..9d721fd7cf 100644 --- a/src/components/media_manager/test/media_manager_impl_test.cc +++ b/src/components/media_manager/test/media_manager_impl_test.cc @@ -30,20 +30,20 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gmock/gmock.h" #include "media_manager/media_manager_impl.h" -#include "media_manager/mock_media_adapter.h" -#include "media_manager/mock_media_adapter_impl.h" -#include "media_manager/mock_media_adapter_listener.h" -#include "media_manager/mock_media_manager_settings.h" #include "application_manager/event_engine/event_dispatcher.h" #include "application_manager/message.h" #include "application_manager/mock_application.h" #include "application_manager/mock_application_manager.h" #include "application_manager/resumption/resume_ctrl.h" #include "application_manager/state_controller.h" -#include "protocol_handler/mock_protocol_handler.h" +#include "gmock/gmock.h" +#include "media_manager/mock_media_adapter.h" +#include "media_manager/mock_media_adapter_impl.h" +#include "media_manager/mock_media_adapter_listener.h" +#include "media_manager/mock_media_manager_settings.h" #include "protocol/common.h" +#include "protocol_handler/mock_protocol_handler.h" #include "utils/file_system.h" #include "utils/scope_guard.h" @@ -58,13 +58,13 @@ using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; -using ::utils::ScopeGuard; -using ::utils::MakeGuard; -using ::testing::NiceMock; -using ::protocol_handler::ServiceType; -using ::protocol_handler::RawMessagePtr; using application_manager::ApplicationSharedPtr; using application_manager::BinaryData; +using ::protocol_handler::RawMessagePtr; +using ::protocol_handler::ServiceType; +using ::testing::NiceMock; +using ::utils::MakeGuard; +using ::utils::ScopeGuard; namespace { const uint16_t kVideoStreamingPort = 8901u; diff --git a/src/components/policy/policy_external/include/policy/access_remote.h b/src/components/policy/policy_external/include/policy/access_remote.h index fd185af075..eadef088ad 100644 --- a/src/components/policy/policy_external/include/policy/access_remote.h +++ b/src/components/policy/policy_external/include/policy/access_remote.h @@ -32,9 +32,9 @@ #ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_ACCESS_REMOTE_H_ #define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_ACCESS_REMOTE_H_ -#include #include #include +#include #include "policy/policy_table/types.h" #include "policy/policy_types.h" diff --git a/src/components/policy/policy_external/include/policy/cache_manager.h b/src/components/policy/policy_external/include/policy/cache_manager.h index 2c35b2a378..15eb51565d 100644 --- a/src/components/policy/policy_external/include/policy/cache_manager.h +++ b/src/components/policy/policy_external/include/policy/cache_manager.h @@ -35,15 +35,15 @@ #include -#include "policy/pt_representation.h" +#include "policy/cache_manager_interface.h" #include "policy/pt_ext_representation.h" +#include "policy/pt_representation.h" #include "policy/usage_statistics/statistics_manager.h" -#include "policy/cache_manager_interface.h" #include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" -#include "utils/lock.h" #include "utils/conditional_variable.h" +#include "utils/lock.h" namespace policy { class PolicySettings; @@ -256,7 +256,7 @@ class CacheManager : public CacheManagerInterface { * @brief Check if an app can send unknown rpc requests to an app service * provider * @param policy_app_id Unique application id - */ + */ virtual bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const; @@ -798,35 +798,36 @@ class CacheManager : public CacheManagerInterface { ExternalConsentStatus GetExternalConsentEntities() OVERRIDE; /** - * @brief Creates collection of ExternalConsent items known by current - * functional - * groupings and appropiate section - * (disallowed_by_external_consent_entities_on/off) where - * is item is being holded. If item is not found it's not included into - * collection - * @param status Current status containing collection of ExternalConsent items - * @return Collection of ExternalConsent items mapped to list of groups with - * section - * marker where the item is found - */ + * @brief Creates collection of ExternalConsent items known by current + * functional + * groupings and appropiate section + * (disallowed_by_external_consent_entities_on/off) where + * is item is being holded. If item is not found it's not included into + * collection + * @param status Current status containing collection of ExternalConsent items + * @return Collection of ExternalConsent items mapped to list of groups with + * section + * marker where the item is found + */ GroupsByExternalConsentStatus GetGroupsWithSameEntities( const ExternalConsentStatus& status) OVERRIDE; /** - * @brief Gets collection of links device-to-application from device_data - * section of policy table if there any application records present, i.e. if - * any specific user consent is present - * @return Collection of device-to-application links - */ + * @brief Gets collection of links device-to-application from device_data + * section of policy table if there any application records present, i.e. if + * any specific user consent is present + * @return Collection of device-to-application links + */ std::map GetKnownLinksFromPT() OVERRIDE; /** - * @brief Sets groups permissions affected by customer connectivity settings - * entities status, i.e. groups assigned to particular application on - * particular device which have same entities as current ExternalConsent status - * @param permissions Groups permissions which result current ExternalConsent - * status - */ + * @brief Sets groups permissions affected by customer connectivity settings + * entities status, i.e. groups assigned to particular application on + * particular device which have same entities as current ExternalConsent + * status + * @param permissions Groups permissions which result current ExternalConsent + * status + */ void SetExternalConsentForApp(const PermissionConsent& permissions) OVERRIDE; #ifdef BUILD_TESTS diff --git a/src/components/policy/policy_external/include/policy/cache_manager_interface.h b/src/components/policy/policy_external/include/policy/cache_manager_interface.h index 6465c79c05..980ad42dcd 100644 --- a/src/components/policy/policy_external/include/policy/cache_manager_interface.h +++ b/src/components/policy/policy_external/include/policy/cache_manager_interface.h @@ -39,9 +39,9 @@ #include "policy/policy_table/types.h" #include "policy/pt_representation.h" -#include "policy/usage_statistics/counter.h" -#include "policy/policy_types.h" #include "policy/policy_settings.h" +#include "policy/policy_types.h" +#include "policy/usage_statistics/counter.h" namespace policy_table = rpc::policy_table_interface_base; @@ -199,11 +199,11 @@ class CacheManagerInterface { std::string& hybrid_app_preference) const = 0; /** - * Initializes a new cloud application with default policies - * Then adds cloud specific policies - * @param app_id application id - * @return true if success - */ + * Initializes a new cloud application with default policies + * Then adds cloud specific policies + * @param app_id application id + * @return true if success + */ virtual void InitCloudApp(const std::string& policy_app_id) = 0; /** @@ -265,7 +265,7 @@ class CacheManagerInterface { * @brief Check if an app can send unknown rpc requests to an app service * provider * @param policy_app_id Unique application id - */ + */ virtual bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const = 0; @@ -867,9 +867,9 @@ class CacheManagerInterface { virtual std::string GetCertificate() const = 0; /** - * @brief Sets decrypted certificate in policy table - * @param certificate content of certificate - */ + * @brief Sets decrypted certificate in policy table + * @param certificate content of certificate + */ virtual void SetDecryptedCertificate(const std::string& certificate) = 0; /** @@ -894,34 +894,35 @@ class CacheManagerInterface { virtual ExternalConsentStatus GetExternalConsentEntities() = 0; /** - * @brief Creates collection of ExternalConsent items known by current - * functional - * groupings and appropiate section - * (disallowed_by_external_consent_entities_on/off) where - * is item is being holded - * @param status Current status containing collection of ExternalConsent items - * @return Collection of ExternalConsent items mapped to list of groups with - * section - * marker where the item is found - */ + * @brief Creates collection of ExternalConsent items known by current + * functional + * groupings and appropiate section + * (disallowed_by_external_consent_entities_on/off) where + * is item is being holded + * @param status Current status containing collection of ExternalConsent items + * @return Collection of ExternalConsent items mapped to list of groups with + * section + * marker where the item is found + */ virtual GroupsByExternalConsentStatus GetGroupsWithSameEntities( const ExternalConsentStatus& status) = 0; /** - * @brief Gets collection of links device-to-application from device_data - * section of policy table if there any application records present, i.e. if - * any specific user consent is present - * @return Collection of device-to-application links - */ + * @brief Gets collection of links device-to-application from device_data + * section of policy table if there any application records present, i.e. if + * any specific user consent is present + * @return Collection of device-to-application links + */ virtual std::map GetKnownLinksFromPT() = 0; /** - * @brief Sets groups permissions affected by customer connectivity settings - * entities status, i.e. groups assigned to particular application on - * particular device which have same entities as current ExternalConsent status - * @param permissions Groups permissions which result current ExternalConsent - * status - */ + * @brief Sets groups permissions affected by customer connectivity settings + * entities status, i.e. groups assigned to particular application on + * particular device which have same entities as current ExternalConsent + * status + * @param permissions Groups permissions which result current ExternalConsent + * status + */ virtual void SetExternalConsentForApp( const PermissionConsent& permissions) = 0; diff --git a/src/components/policy/policy_external/include/policy/policy_helper.h b/src/components/policy/policy_external/include/policy/policy_helper.h index e3cb509c15..bce2559431 100644 --- a/src/components/policy/policy_external/include/policy/policy_helper.h +++ b/src/components/policy/policy_external/include/policy/policy_helper.h @@ -243,13 +243,13 @@ struct FillActionsForAppPolicies { */ struct FillNotificationData { /** - * @brief Constructor - * @param data Output structure with filled data - * @param group_state Consent of the group processed by instance - * @param undefined_group_consent Defines how to treat 'undefined' consent - * @param does_require_user_consent Specifies whether processed group requires - * user consent - */ + * @brief Constructor + * @param data Output structure with filled data + * @param group_state Consent of the group processed by instance + * @param undefined_group_consent Defines how to treat 'undefined' consent + * @param does_require_user_consent Specifies whether processed group requires + * user consent + */ FillNotificationData(Permissions& data, GroupConsent group_state, GroupConsent undefined_group_consent, diff --git a/src/components/policy/policy_external/include/policy/policy_manager_impl.h b/src/components/policy/policy_external/include/policy/policy_manager_impl.h index 8a2e5b93f5..2f8f6cf070 100644 --- a/src/components/policy/policy_external/include/policy/policy_manager_impl.h +++ b/src/components/policy/policy_external/include/policy/policy_manager_impl.h @@ -35,15 +35,15 @@ #include -#include "utils/lock.h" +#include "policy/access_remote.h" +#include "policy/access_remote_impl.h" +#include "policy/cache_manager_interface.h" #include "policy/policy_manager.h" #include "policy/policy_table.h" -#include "policy/cache_manager_interface.h" -#include "policy/update_status_manager.h" #include "policy/policy_table/functions.h" +#include "policy/update_status_manager.h" #include "policy/usage_statistics/statistics_manager.h" -#include "policy/access_remote.h" -#include "policy/access_remote_impl.h" +#include "utils/lock.h" namespace policy_table = rpc::policy_table_interface_base; @@ -542,10 +542,10 @@ class PolicyManagerImpl : public PolicyManager { void OnAppsSearchCompleted(const bool trigger_ptu) OVERRIDE; /** - * @brief Get state of request types for given application - * @param policy_app_id Unique application id - * @return request type state - */ + * @brief Get state of request types for given application + * @param policy_app_id Unique application id + * @return request type state + */ RequestType::State GetAppRequestTypesState( const std::string& policy_app_id) const OVERRIDE; @@ -566,10 +566,10 @@ class PolicyManagerImpl : public PolicyManager { const std::string policy_app_id) const OVERRIDE; /** - * @brief Gets request subtypes for application - * @param policy_app_id Unique application id - * @return request subtypes of application - */ + * @brief Gets request subtypes for application + * @param policy_app_id Unique application id + * @return request subtypes of application + */ const std::vector GetAppRequestSubTypes( const std::string& policy_app_id) const OVERRIDE; @@ -677,7 +677,7 @@ class PolicyManagerImpl : public PolicyManager { * provider * @param policy_app_id Unique application id * @return bool true if allowed - */ + */ bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const OVERRIDE; @@ -1009,11 +1009,11 @@ class PolicyManagerImpl : public PolicyManager { void SendAuthTokenUpdated(const std::string policy_app_id); /** - * @brief Gets all allowed module types - * @param policy_app_id unique identifier of application - * @param modules list of allowed module types - * @return true if application has allowed modules - */ + * @brief Gets all allowed module types + * @param policy_app_id unique identifier of application + * @param modules list of allowed module types + * @return true if application has allowed modules + */ bool GetModuleTypes(const std::string& policy_app_id, std::vector* modules) const OVERRIDE; diff --git a/src/components/policy/policy_external/include/policy/policy_table.h b/src/components/policy/policy_external/include/policy/policy_table.h index fe27f1cb57..8f0d5f7efb 100644 --- a/src/components/policy/policy_external/include/policy/policy_table.h +++ b/src/components/policy/policy_external/include/policy/policy_table.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_H_ #define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_H_ -#include "policy/pt_representation.h" #include "policy/pt_ext_representation.h" +#include "policy/pt_representation.h" namespace policy { diff --git a/src/components/policy/policy_external/include/policy/policy_types.h b/src/components/policy/policy_external/include/policy/policy_types.h index 84d9376a93..7247995f48 100644 --- a/src/components/policy/policy_external/include/policy/policy_types.h +++ b/src/components/policy/policy_external/include/policy/policy_types.h @@ -34,15 +34,15 @@ #define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TYPES_H_ #include -#include -#include #include +#include #include +#include #include -#include +#include -#include "utils/helpers.h" #include "transport_manager/common.h" +#include "utils/helpers.h" namespace policy { @@ -119,10 +119,10 @@ typedef std::vector StringArray; enum PermitResult { kRpcAllowed = 0, kRpcDisallowed, kRpcUserDisallowed }; /** - * @struct Stores result of check: - * if HMI Level was allowed for RPC to work in - * and list of parameters allowed for RPC if specified in PT. - */ + * @struct Stores result of check: + * if HMI Level was allowed for RPC to work in + * and list of parameters allowed for RPC if specified in PT. + */ struct CheckPermissionResult { CheckPermissionResult() : hmi_level_permitted(kRpcDisallowed) {} diff --git a/src/components/policy/policy_external/include/policy/pt_ext_representation.h b/src/components/policy/policy_external/include/policy/pt_ext_representation.h index 0aa284b707..f03947268a 100644 --- a/src/components/policy/policy_external/include/policy/pt_ext_representation.h +++ b/src/components/policy/policy_external/include/policy/pt_ext_representation.h @@ -280,10 +280,10 @@ class PTExtRepresentation : public virtual PTRepresentation { virtual bool GetFunctionalGroupNames(policy::FunctionalGroupNames& names) = 0; /** - * @brief Set app policy to pre_DataConsented policy - * @param app_id Policy ID of application to be changed - * @return true, if succeeded, otherwise - false - */ + * @brief Set app policy to pre_DataConsented policy + * @param app_id Policy ID of application to be changed + * @return true, if succeeded, otherwise - false + */ virtual bool SetPredataPolicy(const std::string& app_id) = 0; /** diff --git a/src/components/policy/policy_external/include/policy/pt_representation.h b/src/components/policy/policy_external/include/policy/pt_representation.h index f25fcc6cab..6eaa718cf0 100644 --- a/src/components/policy/policy_external/include/policy/pt_representation.h +++ b/src/components/policy/policy_external/include/policy/pt_representation.h @@ -33,11 +33,11 @@ #ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_PT_REPRESENTATION_H_ #define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_PT_REPRESENTATION_H_ -#include #include -#include "policy/policy_types.h" -#include "policy/policy_table/types.h" +#include #include "policy/policy_settings.h" +#include "policy/policy_table/types.h" +#include "policy/policy_types.h" namespace policy_table = rpc::policy_table_interface_base; @@ -268,10 +268,10 @@ class PTRepresentation { virtual bool IsDefaultPolicy(const std::string& app_id) const = 0; /** - * Checks if the application has pre_data policy - * @param app_id application id - * @return true if application has pre_data policy - */ + * Checks if the application has pre_data policy + * @param app_id application id + * @return true if application has pre_data policy + */ virtual bool IsPredataPolicy(const std::string& app_id) const = 0; /** diff --git a/src/components/policy/policy_external/include/policy/sql_pt_ext_representation.h b/src/components/policy/policy_external/include/policy/sql_pt_ext_representation.h index bd2097cfe3..889ede9d20 100644 --- a/src/components/policy/policy_external/include/policy/sql_pt_ext_representation.h +++ b/src/components/policy/policy_external/include/policy/sql_pt_ext_representation.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_SQL_PT_EXT_REPRESENTATION_H_ #include -#include "policy/sql_pt_representation.h" #include "policy/pt_ext_representation.h" +#include "policy/sql_pt_representation.h" namespace policy { diff --git a/src/components/policy/policy_external/include/policy/sql_pt_representation.h b/src/components/policy/policy_external/include/policy/sql_pt_representation.h index 581340ba02..826c9b3b6e 100644 --- a/src/components/policy/policy_external/include/policy/sql_pt_representation.h +++ b/src/components/policy/policy_external/include/policy/sql_pt_representation.h @@ -35,9 +35,9 @@ #include #include +#include "policy/policy_table/types.h" #include "policy/pt_representation.h" #include "rpc_base/rpc_base.h" -#include "policy/policy_table/types.h" namespace policy_table = rpc::policy_table_interface_base; diff --git a/src/components/policy/policy_external/include/policy/status.h b/src/components/policy/policy_external/include/policy/status.h index 18789ecf99..336d59e869 100644 --- a/src/components/policy/policy_external/include/policy/status.h +++ b/src/components/policy/policy_external/include/policy/status.h @@ -75,41 +75,41 @@ class Status { const policy::PolicyTableStatus enum_status); /** - * @brief Destructor - */ + * @brief Destructor + */ virtual ~Status(); /** - * @brief Process event by setting next status in case event can affect - * current status or ignores the event - * @param manager Status manager pointer - * @param event Event which needs to be processed - */ + * @brief Process event by setting next status in case event can affect + * current status or ignores the event + * @param manager Status manager pointer + * @param event Event which needs to be processed + */ virtual void ProcessEvent(UpdateStatusManager* manager, UpdateEvent event) = 0; /** - * @brief Return current status as string value - * @return Status as string - */ + * @brief Return current status as string value + * @return Status as string + */ const std::string get_status_string() const; /** - * @brief Return status as enum value - * @return Status as enum value - */ + * @brief Return status as enum value + * @return Status as enum value + */ PolicyTableStatus get_status() const; /** - * @brief Check whether update is required in terms of status - * @return True if update is required, otherwise - false - */ + * @brief Check whether update is required in terms of status + * @return True if update is required, otherwise - false + */ virtual bool IsUpdateRequired() const; /** - * @brief Check whether update is pending in terms of status - * @return True if update is pending, otherwise - false - */ + * @brief Check whether update is pending in terms of status + * @return True if update is pending, otherwise - false + */ virtual bool IsUpdatePending() const; private: @@ -128,11 +128,11 @@ class UpToDateStatus : public Status { UpToDateStatus(); /** - * @brief Process event by setting next status in case event can affect - * current status or ignores the event - * @param manager Status manager pointer - * @param event Event which needs to be processed - */ + * @brief Process event by setting next status in case event can affect + * current status or ignores the event + * @param manager Status manager pointer + * @param event Event which needs to be processed + */ void ProcessEvent(UpdateStatusManager* manager, UpdateEvent event) OVERRIDE; }; @@ -147,17 +147,17 @@ class UpdateNeededStatus : public Status { UpdateNeededStatus(); /** - * @brief Process event by setting next status in case event can affect - * current status or ignores the event - * @param manager Status manager pointer - * @param event Event which needs to be processed - */ + * @brief Process event by setting next status in case event can affect + * current status or ignores the event + * @param manager Status manager pointer + * @param event Event which needs to be processed + */ void ProcessEvent(UpdateStatusManager* manager, UpdateEvent event) OVERRIDE; /** - * @brief Check whether update is required in terms of status - * @return True if update is required, otherwise - false - */ + * @brief Check whether update is required in terms of status + * @return True if update is required, otherwise - false + */ bool IsUpdateRequired() const OVERRIDE; }; @@ -172,25 +172,25 @@ class UpdatingStatus : public Status { UpdatingStatus(); /** - * @brief Process event by setting next status in case event can affect - * current status or ignores the event - * @param manager Status manager pointer - * @param event Event which needs to be processed - */ + * @brief Process event by setting next status in case event can affect + * current status or ignores the event + * @param manager Status manager pointer + * @param event Event which needs to be processed + */ void ProcessEvent(UpdateStatusManager* manager, UpdateEvent event) OVERRIDE; /** - * @brief Check whether update is required in terms of status - * @return True if update is required, otherwise - false - */ + * @brief Check whether update is required in terms of status + * @return True if update is required, otherwise - false + */ bool IsUpdateRequired() const OVERRIDE; /** - * @brief Check whether update is pending in terms of status - * @return True if update is pending, otherwise - false - */ + * @brief Check whether update is pending in terms of status + * @return True if update is pending, otherwise - false + */ bool IsUpdatePending() const OVERRIDE; }; -} +} // namespace policy #endif // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_STATUS_H_ diff --git a/src/components/policy/policy_external/include/policy/update_status_manager.h b/src/components/policy/policy_external/include/policy/update_status_manager.h index 3a9e13b83f..9c0e29407e 100644 --- a/src/components/policy/policy_external/include/policy/update_status_manager.h +++ b/src/components/policy/policy_external/include/policy/update_status_manager.h @@ -34,14 +34,13 @@ #define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_UPDATE_STATUS_MANAGER_H_ #include "policy/policy_types.h" -#include "utils/lock.h" -#include "utils/threads/thread.h" -#include "utils/threads/thread_delegate.h" +#include "policy/status.h" #include "utils/conditional_variable.h" #include "utils/lock.h" #include "utils/logger.h" #include "utils/macro.h" -#include "policy/status.h" +#include "utils/threads/thread.h" +#include "utils/threads/thread_delegate.h" namespace policy { @@ -235,6 +234,6 @@ class UpdateStatusManager { UpdateThreadDelegate* update_status_thread_delegate_; threads::Thread* thread_; }; -} +} // namespace policy #endif // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_UPDATE_STATUS_MANAGER_H_ diff --git a/src/components/policy/policy_external/include/policy/usage_statistics/counter.h b/src/components/policy/policy_external/include/policy/usage_statistics/counter.h index c145bb432b..047a545150 100644 --- a/src/components/policy/policy_external/include/policy/usage_statistics/counter.h +++ b/src/components/policy/policy_external/include/policy/usage_statistics/counter.h @@ -34,11 +34,11 @@ #define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_USAGE_STATISTICS_COUNTER_H_ #include -#include "policy/usage_statistics/statistics_manager.h" #include "policy/usage_statistics/app_stopwatch.h" +#include "policy/usage_statistics/statistics_manager.h" -#include "utils/timer.h" #include "utils/macro.h" +#include "utils/timer.h" namespace usage_statistics { diff --git a/src/components/policy/policy_external/src/cache_manager.cc b/src/components/policy/policy_external/src/cache_manager.cc index 4a738aa6ed..1eb103be26 100644 --- a/src/components/policy/policy_external/src/cache_manager.cc +++ b/src/components/policy/policy_external/src/cache_manager.cc @@ -33,27 +33,27 @@ #include "policy/cache_manager.h" #include -#include -#include #include -#include +#include +#include #include +#include #include -#include "utils/file_system.h" -#include "utils/helpers.h" -#include "json/reader.h" #include "json/features.h" +#include "json/reader.h" #include "json/writer.h" -#include "utils/logger.h" +#include "policy/policy_helper.h" +#include "policy/policy_table/enums.h" +#include "policy/sql_pt_ext_representation.h" +#include "rpc_base/rpc_base.h" #include "utils/date_time.h" +#include "utils/file_system.h" #include "utils/gen_hash.h" +#include "utils/helpers.h" +#include "utils/logger.h" #include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" -#include "rpc_base/rpc_base.h" -#include "policy/policy_table/enums.h" -#include "policy/policy_helper.h" -#include "policy/sql_pt_ext_representation.h" namespace policy_table = rpc::policy_table_interface_base; @@ -904,9 +904,9 @@ bool CacheManager::HasDeviceSpecifiedConsent(const std::string& device_id, return false; } const std::string consent = is_allowed ? "allowed" : "disallowed"; - LOG4CXX_INFO(logger_, - "DeviceGetDeviceGroupsFromPolicies is already " << consent - << "."); + LOG4CXX_INFO( + logger_, + "DeviceGetDeviceGroupsFromPolicies is already " << consent << "."); return true; } @@ -2184,9 +2184,9 @@ bool CacheManager::CleanupUnpairedDevices() { LOG4CXX_DEBUG(logger_, "Device_data size is: " << device_data.size()); device_data.erase(it_device); - LOG4CXX_INFO(logger_, - "Device id " << *iter - << " had been deleted from device_data section."); + LOG4CXX_INFO( + logger_, + "Device id " << *iter << " had been deleted from device_data section."); LOG4CXX_DEBUG(logger_, "Device_data size is: " << device_data.size()); } is_unpaired_.clear(); @@ -2763,7 +2763,7 @@ ExternalConsentStatus CacheManager::GetExternalConsentEntities() { policy_table::DisallowedByExternalConsentEntities::const_iterator it_2 = (*it->second.disallowed_by_external_consent_entities_off).begin(); for (; it_2 != - (*it->second.disallowed_by_external_consent_entities_off).end(); + (*it->second.disallowed_by_external_consent_entities_off).end(); ++it_2) { items.insert(ExternalConsentStatusItem( it_2->entity_type, it_2->entity_id, EntityStatus::kStatusOff)); @@ -2912,8 +2912,9 @@ void CacheManager::MergeFG(const policy_table::PolicyTable& new_pt, void CacheManager::MergeAP(const policy_table::PolicyTable& new_pt, policy_table::PolicyTable& pt) { LOG4CXX_AUTO_TRACE(logger_); - pt.app_policies_section.device = const_cast( - new_pt).app_policies_section.device; + pt.app_policies_section.device = + const_cast(new_pt) + .app_policies_section.device; pt.app_policies_section.apps[kDefaultId] = const_cast(new_pt) diff --git a/src/components/policy/policy_external/src/policy_helper.cc b/src/components/policy/policy_external/src/policy_helper.cc index c9df969bd1..e8855bb11a 100644 --- a/src/components/policy/policy_external/src/policy_helper.cc +++ b/src/components/policy/policy_external/src/policy_helper.cc @@ -30,13 +30,13 @@ POSSIBILITY OF SUCH DAMAGE. */ +#include "policy/policy_helper.h" +#include #include #include -#include -#include "utils/logger.h" -#include "utils/custom_string.h" -#include "policy/policy_helper.h" #include "policy/policy_manager_impl.h" +#include "utils/custom_string.h" +#include "utils/logger.h" namespace policy { @@ -360,16 +360,16 @@ bool CheckAppPolicy::operator()(const AppPoliciesValueType& app_policy) { } if (RESULT_NO_CHANGES == result) { - LOG4CXX_INFO(logger_, - "Permissions for application:" << app_id - << " wasn't changed."); + LOG4CXX_INFO( + logger_, + "Permissions for application:" << app_id << " wasn't changed."); AddResult(app_id, result); return true; } - LOG4CXX_INFO(logger_, - "Permissions for application:" << app_id - << " have been changed."); + LOG4CXX_INFO( + logger_, + "Permissions for application:" << app_id << " have been changed."); if (!IsPredefinedApp(app_policy)) { SetPendingPermissions(app_policy, result, permissions_diff); diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc index 742435098e..15900f0187 100644 --- a/src/components/policy/policy_external/src/policy_manager_impl.cc +++ b/src/components/policy/policy_external/src/policy_manager_impl.cc @@ -32,23 +32,23 @@ #include "policy/policy_manager_impl.h" #include -#include -#include +#include #include #include +#include +#include #include -#include +#include "config_profile/profile.h" #include "json/reader.h" #include "json/writer.h" +#include "policy/cache_manager.h" +#include "policy/policy_helper.h" #include "policy/policy_table.h" #include "policy/pt_representation.h" -#include "policy/policy_helper.h" +#include "policy/update_status_manager.h" +#include "utils/date_time.h" #include "utils/file_system.h" #include "utils/logger.h" -#include "utils/date_time.h" -#include "policy/cache_manager.h" -#include "policy/update_status_manager.h" -#include "config_profile/profile.h" #include "policy/access_remote.h" #include "policy/access_remote_impl.h" @@ -954,8 +954,9 @@ void PolicyManagerImpl::CheckPermissions(const PTString& app_id, for (; end != parameter; ++parameter) { if (!result.HasParameter(*parameter)) { LOG4CXX_DEBUG(logger_, - "Parameter " << *parameter << " is unknown." - " Adding to undefined list."); + "Parameter " << *parameter + << " is unknown." + " Adding to undefined list."); result.list_of_undefined_params.insert(*parameter); } } @@ -990,7 +991,8 @@ void PolicyManagerImpl::SendNotificationOnPermissionsUpdated( if (device_id.empty()) { LOG4CXX_WARN(logger_, "Couldn't find device info for application id " - "'" << application_id << "'"); + "'" << application_id + << "'"); return; } @@ -2189,9 +2191,9 @@ void PolicyManagerImpl::SendHMILevelChanged(const ApplicationOnDevice& who) { if (GetDefaultHmi(who.app_id, &default_hmi)) { listener()->OnUpdateHMIStatus(who.dev_id, who.app_id, default_hmi); } else { - LOG4CXX_WARN(logger_, - "Couldn't get default HMI level for application " - << who.app_id); + LOG4CXX_WARN( + logger_, + "Couldn't get default HMI level for application " << who.app_id); } } diff --git a/src/components/policy/policy_external/src/policy_table/types.cc b/src/components/policy/policy_external/src/policy_table/types.cc index f95b270fdf..ca3f8a1648 100644 --- a/src/components/policy/policy_external/src/policy_table/types.cc +++ b/src/components/policy/policy_external/src/policy_table/types.cc @@ -1,5 +1,5 @@ -#include #include "policy/policy_table/types.h" +#include #include "rpc_base/rpc_base_json_inl.h" namespace rpc { diff --git a/src/components/policy/policy_external/src/policy_table/validation.cc b/src/components/policy/policy_external/src/policy_table/validation.cc index fad8509711..f9c3f82793 100644 --- a/src/components/policy/policy_external/src/policy_table/validation.cc +++ b/src/components/policy/policy_external/src/policy_table/validation.cc @@ -1,15 +1,15 @@ -#include #include +#include #include "policy/policy_table/types.h" -#include "utils/logger.h" #include "utils/helpers.h" +#include "utils/logger.h" namespace { bool IsPredefinedApplication(const std::string& app_id) { using namespace rpc::policy_table_interface_base; return kPreDataConsentApp == app_id || kDefaultApp == app_id; } -} +} // namespace namespace rpc { namespace policy_table_interface_base { @@ -102,9 +102,9 @@ bool ApplicationPoliciesSection::Validate() const { } if (!app_request_types.is_valid()) { - LOG4CXX_WARN(logger_, - "Invalid RequestTypes for " << app_id - << " Will be cleaned up."); + LOG4CXX_WARN( + logger_, + "Invalid RequestTypes for " << app_id << " Will be cleaned up."); app_request_types.CleanUp(); if (app_request_types.is_cleaned_up()) { if (PT_PRELOADED == pt_type) { diff --git a/src/components/policy/policy_external/src/sql_pt_ext_representation.cc b/src/components/policy/policy_external/src/sql_pt_ext_representation.cc index b19feddee6..e4711a3cd2 100644 --- a/src/components/policy/policy_external/src/sql_pt_ext_representation.cc +++ b/src/components/policy/policy_external/src/sql_pt_ext_representation.cc @@ -29,15 +29,15 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "policy/sql_pt_ext_representation.h" #include #include -#include "utils/logger.h" -#include "policy/sql_pt_ext_representation.h" -#include "policy/sql_wrapper.h" -#include "policy/sql_pt_queries.h" -#include "policy/sql_pt_ext_queries.h" -#include "policy/policy_helper.h" #include "policy/cache_manager.h" +#include "policy/policy_helper.h" +#include "policy/sql_pt_ext_queries.h" +#include "policy/sql_pt_queries.h" +#include "policy/sql_wrapper.h" +#include "utils/logger.h" namespace policy { diff --git a/src/components/policy/policy_external/src/sql_pt_representation.cc b/src/components/policy/policy_external/src/sql_pt_representation.cc index dce86f6d52..1bb0cf0fa1 100644 --- a/src/components/policy/policy_external/src/sql_pt_representation.cc +++ b/src/components/policy/policy_external/src/sql_pt_representation.cc @@ -30,24 +30,24 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include #include +#include +#include #include +#include -#include "utils/logger.h" +#include "config_profile/profile.h" +#include "policy/cache_manager.h" +#include "policy/policy_helper.h" +#include "policy/sql_pt_ext_queries.h" +#include "policy/sql_pt_queries.h" +#include "policy/sql_pt_representation.h" +#include "policy/sql_wrapper.h" #include "utils/date_time.h" -#include "utils/sqlite_wrapper/sql_database.h" #include "utils/file_system.h" #include "utils/gen_hash.h" -#include "policy/sql_pt_representation.h" -#include "policy/sql_wrapper.h" -#include "policy/sql_pt_ext_queries.h" -#include "policy/sql_pt_queries.h" -#include "policy/policy_helper.h" -#include "policy/cache_manager.h" -#include "config_profile/profile.h" +#include "utils/logger.h" +#include "utils/sqlite_wrapper/sql_database.h" namespace policy { @@ -130,9 +130,9 @@ void SQLPTRepresentation::CheckPermissions(const PTString& app_id, utils::dbms::SQLQuery query(db()); if (!query.Prepare(sql_pt::kSelectRpc)) { - LOG4CXX_WARN(logger_, - "Incorrect select statement from rpcs" - << query.LastError().text()); + LOG4CXX_WARN( + logger_, + "Incorrect select statement from rpcs" << query.LastError().text()); return; } query.Bind(0, app_id); @@ -408,9 +408,9 @@ InitResult SQLPTRepresentation::Init(const PolicySettings* settings) { utils::dbms::SQLQuery check_first_run(db()); if (check_first_run.Prepare(sql_pt::kIsFirstRun) && check_first_run.Next()) { - LOG4CXX_INFO(logger_, - "Selecting is first run " - << check_first_run.GetBoolean(0)); + LOG4CXX_INFO( + logger_, + "Selecting is first run " << check_first_run.GetBoolean(0)); if (check_first_run.GetBoolean(0)) { utils::dbms::SQLQuery set_not_first_run(db()); set_not_first_run.Exec(sql_pt::kSetNotFirstRun); @@ -1183,9 +1183,9 @@ bool SQLPTRepresentation::SaveAppGroup( query.Bind(0, app_id); query.Bind(1, *it); if (!query.Exec() || !query.Reset()) { - LOG4CXX_WARN(logger_, - "Incorrect insert into app group." - << query.LastError().text()); + LOG4CXX_WARN( + logger_, + "Incorrect insert into app group." << query.LastError().text()); return false; } } diff --git a/src/components/policy/policy_external/src/usage_statistics/counter.cc b/src/components/policy/policy_external/src/usage_statistics/counter.cc index d46f6a315a..5165c46edb 100644 --- a/src/components/policy/policy_external/src/usage_statistics/counter.cc +++ b/src/components/policy/policy_external/src/usage_statistics/counter.cc @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_POLICY_INCLUDE_POLICY_STATISTICS_MANAGER_H_ #define SRC_COMPONENTS_POLICY_INCLUDE_POLICY_STATISTICS_MANAGER_H_ -#include #include "policy/usage_statistics/counter.h" +#include #include "utils/date_time.h" #include "utils/timer_task_impl.h" diff --git a/src/components/policy/policy_external/test/counter_test.cc b/src/components/policy/policy_external/test/counter_test.cc index 22b19c878e..af166f96ad 100644 --- a/src/components/policy/policy_external/test/counter_test.cc +++ b/src/components/policy/policy_external/test/counter_test.cc @@ -29,12 +29,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "policy/usage_statistics/counter.h" #include "gtest/gtest.h" #include "policy/usage_statistics/mock_statistics_manager.h" -#include "policy/usage_statistics/counter.h" -using ::testing::StrictMock; using ::testing::InSequence; +using ::testing::StrictMock; namespace test { namespace components { @@ -179,6 +179,6 @@ TEST( // Act hmi_full_stopwatch.WriteTime(); } -} // namespace usage_statistics -} // components +} // namespace usage_statistics_test +} // namespace components } // namespace test diff --git a/src/components/policy/policy_external/test/include/policy/mock_pt_ext_representation.h b/src/components/policy/policy_external/test/include/policy/mock_pt_ext_representation.h index 3225e79e01..b307270b10 100644 --- a/src/components/policy/policy_external/test/include/policy/mock_pt_ext_representation.h +++ b/src/components/policy/policy_external/test/include/policy/mock_pt_ext_representation.h @@ -37,10 +37,10 @@ #include "gmock/gmock.h" +#include "mock_pt_representation.h" +#include "policy/policy_table/types.h" #include "policy/pt_ext_representation.h" #include "rpc_base/rpc_base.h" -#include "policy/policy_table/types.h" -#include "mock_pt_representation.h" namespace policy_table = ::rpc::policy_table_interface_base; diff --git a/src/components/policy/policy_external/test/include/policy/mock_pt_representation.h b/src/components/policy/policy_external/test/include/policy/mock_pt_representation.h index 3870e4ece1..33d4c46e64 100644 --- a/src/components/policy/policy_external/test/include/policy/mock_pt_representation.h +++ b/src/components/policy/policy_external/test/include/policy/mock_pt_representation.h @@ -37,9 +37,9 @@ #include "gmock/gmock.h" +#include "policy/policy_table/types.h" #include "policy/pt_representation.h" #include "rpc_base/rpc_base.h" -#include "policy/policy_table/types.h" namespace policy_table = ::rpc::policy_table_interface_base; diff --git a/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h b/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h index 23701e86de..65972e0a82 100644 --- a/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h +++ b/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h @@ -40,16 +40,16 @@ #include "policy/policy_manager_impl.h" #include "policy/mock_cache_manager.h" -#include "policy/mock_update_status_manager.h" #include "policy/mock_policy_listener.h" #include "policy/mock_policy_settings.h" +#include "policy/mock_update_status_manager.h" namespace test { namespace components { namespace policy_test { -using ::testing::NiceMock; using ::policy::PolicyManagerImpl; +using ::testing::NiceMock; typedef std::multimap UserConsentPromptToRpcsConnections; diff --git a/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc index 93d4e19751..066b5756e2 100644 --- a/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc +++ b/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc @@ -30,19 +30,19 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include #include -#include #include "gtest/gtest.h" #include "policy/policy_manager_impl_test_base.h" #include "policy/policy_table/types.h" +#include "json/reader.h" #include "utils/date_time.h" #include "utils/gen_hash.h" -#include "json/reader.h" namespace test { namespace components { @@ -1713,6 +1713,6 @@ TEST_F( CompareRequestTypesContainers(correct_types, received_types); } -} // namespace policy +} // namespace policy_test } // namespace components } // namespace test diff --git a/src/components/policy/policy_external/test/policy_manager_impl_snapshot_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_snapshot_test.cc index c1ff31f748..3c6377cf5f 100644 --- a/src/components/policy/policy_external/test/policy_manager_impl_snapshot_test.cc +++ b/src/components/policy/policy_external/test/policy_manager_impl_snapshot_test.cc @@ -63,9 +63,8 @@ TEST_F(PolicyManagerImplTest2, UpdatedPreloadedPT_ExpectLPT_IsUpdated) { Json::Value val2(Json::arrayValue); val2[0] = hmi_level_[index_]; val[new_data.new_field_value_]["hmi_levels"] = val2; - root["policy_table"]["functional_groupings"][new_data - .new_field_name_]["rpcs"] = - val; + root["policy_table"]["functional_groupings"][new_data.new_field_name_] + ["rpcs"] = val; root["policy_table"]["functional_groupings"][new_data.new_field_name_] ["user_consent_prompt"] = new_data.new_field_name_; } @@ -333,6 +332,6 @@ TEST_F(PolicyManagerImplTest2, AddDevice_RegisterDevice_TRUE) { EXPECT_TRUE(result); } -} // namespace policy +} // namespace policy_test } // namespace components } // namespace test diff --git a/src/components/policy/policy_external/test/policy_manager_impl_stress_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_stress_test.cc index 2f1cc5a9d3..f886108463 100644 --- a/src/components/policy/policy_external/test/policy_manager_impl_stress_test.cc +++ b/src/components/policy/policy_external/test/policy_manager_impl_stress_test.cc @@ -29,15 +29,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include +#include "gtest/gtest.h" #include "mock_policy_listener.h" #include "policy/policy_manager_impl.h" -using ::testing::_; -using ::policy::PolicyManagerImpl; using ::policy::BinaryMessage; using ::policy::MockPolicyListener; +using ::policy::PolicyManagerImpl; +using ::testing::_; namespace test { namespace components { diff --git a/src/components/policy/policy_external/test/policy_manager_impl_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_test.cc index 1916e09efc..47b3959aee 100644 --- a/src/components/policy/policy_external/test/policy_manager_impl_test.cc +++ b/src/components/policy/policy_external/test/policy_manager_impl_test.cc @@ -32,16 +32,16 @@ #include -#include "json/reader.h" -#include "gtest/gtest.h" #include +#include "gtest/gtest.h" +#include "json/reader.h" #include "policy/policy_manager_impl_test_base.h" using ::testing::_; +using ::testing::AtLeast; using ::testing::Return; using ::testing::SetArgReferee; -using ::testing::AtLeast; namespace test { namespace components { @@ -1151,6 +1151,6 @@ TEST_F( EXPECT_EQ(Boolean(false), updated_group_2->second); } -} // namespace policy +} // namespace policy_test } // namespace components } // namespace test diff --git a/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc b/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc index 13efa39805..82d87cd7ba 100644 --- a/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc +++ b/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc @@ -30,17 +30,17 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include #include +#include +#include #include #include "policy/policy_manager_impl_test_base.h" #include "utils/file_system.h" -#include "utils/gen_hash.h" #include "json/reader.h" +#include "utils/gen_hash.h" #include "policy/mock_pt_ext_representation.h" @@ -48,10 +48,10 @@ namespace test { namespace components { namespace policy_test { +using ::testing::_; +using ::testing::ContainerEq; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::ContainerEq; -using ::testing::_; // Help functions char GenRandomChar(char range_from, char range_to) { diff --git a/src/components/policy/policy_external/test/policy_manager_impl_user_consent_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_user_consent_test.cc index 93cfa36277..c58ae00ff4 100644 --- a/src/components/policy/policy_external/test/policy_manager_impl_user_consent_test.cc +++ b/src/components/policy/policy_external/test/policy_manager_impl_user_consent_test.cc @@ -670,6 +670,6 @@ TEST_F( policy_manager_->SendNotificationOnPermissionsUpdated(app_id_2_); } -} // namespace policy +} // namespace policy_test } // namespace components } // namespace test diff --git a/src/components/policy/policy_external/test/sql_pt_ext_representation_test.cc b/src/components/policy/policy_external/test/sql_pt_ext_representation_test.cc index b87598b986..a9c7667ba6 100644 --- a/src/components/policy/policy_external/test/sql_pt_ext_representation_test.cc +++ b/src/components/policy/policy_external/test/sql_pt_ext_representation_test.cc @@ -29,27 +29,27 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include "policy/sql_pt_ext_representation.h" #include -#include -#include -#include #include +#include +#include +#include +#include +#include #include "gtest/gtest.h" -#include "policy/sql_pt_ext_representation.h" -#include "utils/gen_hash.h" -#include "utils/file_system.h" -#include "sqlite_wrapper/sql_query.h" -#include "rpc_base/rpc_base.h" -#include "policy/policy_table/types.h" #include "policy/mock_policy_settings.h" +#include "policy/policy_table/types.h" +#include "rpc_base/rpc_base.h" +#include "sqlite_wrapper/sql_query.h" +#include "utils/file_system.h" +#include "utils/gen_hash.h" using namespace ::policy; namespace policy_table = rpc::policy_table_interface_base; -using std::string; using std::map; using std::pair; +using std::string; using std::vector; using testing::ReturnRef; diff --git a/src/components/policy/policy_external/test/sql_pt_representation_test.cc b/src/components/policy/policy_external/test/sql_pt_representation_test.cc index c43c9dace6..9e6e18b77d 100644 --- a/src/components/policy/policy_external/test/sql_pt_representation_test.cc +++ b/src/components/policy/policy_external/test/sql_pt_representation_test.cc @@ -29,38 +29,38 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include -#include #include #include +#include +#include #include +#include +#include #include "gtest/gtest.h" -#include "policy/sql_pt_representation.h" -#include "utils/file_system.h" -#include "utils/system.h" -#include "policy/sql_wrapper.h" -#include "policy/policy_types.h" -#include "json/writer.h" #include "json/reader.h" -#include "policy/policy_table/types.h" +#include "json/writer.h" +#include "policy/mock_policy_settings.h" #include "policy/policy_table/enums.h" +#include "policy/policy_table/types.h" +#include "policy/policy_types.h" +#include "policy/sql_pt_representation.h" +#include "policy/sql_wrapper.h" #include "rpc_base/rpc_base.h" -#include "policy/mock_policy_settings.h" +#include "utils/file_system.h" +#include "utils/system.h" namespace policy_table = rpc::policy_table_interface_base; -using policy::SQLPTRepresentation; using policy::CheckPermissionResult; -using policy::UserFriendlyMessage; using policy::EndpointUrls; +using policy::SQLPTRepresentation; +using policy::UserFriendlyMessage; using policy::VehicleInfo; -using testing::ReturnRef; -using testing::Return; -using testing::NiceMock; using testing::Mock; +using testing::NiceMock; +using testing::Return; +using testing::ReturnRef; namespace test { namespace components { diff --git a/src/components/policy/policy_external/test/update_status_manager_test.cc b/src/components/policy/policy_external/test/update_status_manager_test.cc index bf443bb201..f5192471cc 100644 --- a/src/components/policy/policy_external/test/update_status_manager_test.cc +++ b/src/components/policy/policy_external/test/update_status_manager_test.cc @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "policy/update_status_manager.h" #include "gtest/gtest.h" #include "policy/mock_policy_listener.h" #include "policy/policy_manager_impl.h" -#include "policy/update_status_manager.h" #include "utils/conditional_variable.h" @@ -43,8 +43,8 @@ namespace policy_test { using namespace ::policy; using ::testing::_; -using ::testing::Return; using testing::NiceMock; +using ::testing::Return; class UpdateStatusManagerTest : public ::testing::Test { protected: @@ -105,7 +105,7 @@ class WaitAsync { const uint32_t timeout_; sync_primitives::ConditionalVariable cond_var_; }; -} +} // namespace ACTION_P(NotifyAsync, waiter) { waiter->Notify(); @@ -298,6 +298,6 @@ TEST_F(UpdateStatusManagerTest, EXPECT_FALSE(manager_->IsAppsSearchInProgress()); } -} // namespace policy +} // namespace policy_test } // namespace components } // namespace test diff --git a/src/components/policy/policy_regular/include/policy/access_remote.h b/src/components/policy/policy_regular/include/policy/access_remote.h index c4de9b7e1f..c0df6b729f 100644 --- a/src/components/policy/policy_regular/include/policy/access_remote.h +++ b/src/components/policy/policy_regular/include/policy/access_remote.h @@ -32,9 +32,9 @@ #ifndef SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_ACCESS_REMOTE_H_ #define SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_ACCESS_REMOTE_H_ -#include #include #include +#include #include "policy/policy_table/types.h" #include "policy/policy_types.h" diff --git a/src/components/policy/policy_regular/include/policy/cache_manager.h b/src/components/policy/policy_regular/include/policy/cache_manager.h index 840b706c8b..30732f685c 100644 --- a/src/components/policy/policy_regular/include/policy/cache_manager.h +++ b/src/components/policy/policy_regular/include/policy/cache_manager.h @@ -35,15 +35,15 @@ #include +#include "policy/cache_manager_interface.h" #include "policy/pt_representation.h" #include "policy/usage_statistics/statistics_manager.h" -#include "policy/cache_manager_interface.h" #include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" -#include "utils/lock.h" -#include "utils/conditional_variable.h" #include "policy/policy_types.h" +#include "utils/conditional_variable.h" +#include "utils/lock.h" namespace policy { class PolicySettings; @@ -244,7 +244,7 @@ class CacheManager : public CacheManagerInterface { * @brief Check if an app can send unknown rpc requests to an app service * provider * @param policy_app_id Unique application id - */ + */ virtual bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const; diff --git a/src/components/policy/policy_regular/include/policy/cache_manager_interface.h b/src/components/policy/policy_regular/include/policy/cache_manager_interface.h index 2c14fd8cba..da15a4ecab 100644 --- a/src/components/policy/policy_regular/include/policy/cache_manager_interface.h +++ b/src/components/policy/policy_regular/include/policy/cache_manager_interface.h @@ -36,10 +36,10 @@ #include #include -#include "policy/usage_statistics/counter.h" -#include "policy/policy_types.h" #include "policy/policy_settings.h" #include "policy/policy_table/types.h" +#include "policy/policy_types.h" +#include "policy/usage_statistics/counter.h" namespace policy_table = rpc::policy_table_interface_base; @@ -250,7 +250,7 @@ class CacheManagerInterface { * @brief Check if an app can send unknown rpc requests to an app service * provider * @param policy_app_id Unique application id - */ + */ virtual bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const = 0; @@ -460,10 +460,10 @@ class CacheManagerInterface { std::string& default_hmi) const = 0; /** - * Gets HMI types from specific policy - * @param app_id ID application - * @return list of HMI types - */ + * Gets HMI types from specific policy + * @param app_id ID application + * @return list of HMI types + */ virtual const policy_table::AppHMITypes* GetHMITypes( const std::string& app_id) = 0; diff --git a/src/components/policy/policy_regular/include/policy/policy_helper.h b/src/components/policy/policy_regular/include/policy/policy_helper.h index 3ca0f93ebd..4c697858f5 100644 --- a/src/components/policy/policy_regular/include/policy/policy_helper.h +++ b/src/components/policy/policy_regular/include/policy/policy_helper.h @@ -246,6 +246,6 @@ FunctionalGroupIDs FindSame(const FunctionalGroupIDs& first, * @return true, if succeded, otherwise - false */ bool UnwrapAppPolicies(policy_table::ApplicationPolicies& app_policies); -} +} // namespace policy #endif // SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_POLICY_HELPER_H_ diff --git a/src/components/policy/policy_regular/include/policy/policy_manager_impl.h b/src/components/policy/policy_regular/include/policy/policy_manager_impl.h index 911ce65a11..1860f7e591 100644 --- a/src/components/policy/policy_regular/include/policy/policy_manager_impl.h +++ b/src/components/policy/policy_regular/include/policy/policy_manager_impl.h @@ -33,21 +33,21 @@ #ifndef SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_POLICY_MANAGER_IMPL_H_ #define SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_POLICY_MANAGER_IMPL_H_ -#include -#include #include +#include +#include -#include "utils/lock.h" +#include "policy/access_remote.h" +#include "policy/access_remote_impl.h" +#include "policy/cache_manager_interface.h" +#include "policy/policy_helper.h" #include "policy/policy_manager.h" #include "policy/policy_table.h" -#include "policy/cache_manager_interface.h" -#include "policy/update_status_manager.h" #include "policy/policy_table/functions.h" +#include "policy/update_status_manager.h" #include "policy/usage_statistics/statistics_manager.h" -#include "policy/policy_helper.h" +#include "utils/lock.h" #include "utils/timer.h" -#include "policy/access_remote.h" -#include "policy/access_remote_impl.h" namespace policy_table = rpc::policy_table_interface_base; @@ -672,7 +672,7 @@ class PolicyManagerImpl : public PolicyManager { * provider * @param policy_app_id Unique application id * @return bool true if allowed - */ + */ bool UnknownRPCPassthroughAllowed( const std::string& policy_app_id) const OVERRIDE; @@ -958,11 +958,11 @@ class PolicyManagerImpl : public PolicyManager { void SendAuthTokenUpdated(const std::string policy_app_id); /** - * @brief Gets all allowed module types - * @param policy_app_id unique identifier of application - * @param modules list of allowed module types - * @return true if application has allowed modules - */ + * @brief Gets all allowed module types + * @param policy_app_id unique identifier of application + * @param modules list of allowed module types + * @return true if application has allowed modules + */ bool GetModuleTypes(const std::string& policy_app_id, std::vector* modules) const OVERRIDE; diff --git a/src/components/policy/policy_regular/include/policy/policy_types.h b/src/components/policy/policy_regular/include/policy/policy_types.h index 276a0a5dca..0be5919126 100644 --- a/src/components/policy/policy_regular/include/policy/policy_types.h +++ b/src/components/policy/policy_regular/include/policy/policy_types.h @@ -34,15 +34,15 @@ #define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TYPES_H_ #include -#include -#include #include +#include #include +#include #include -#include +#include -#include "utils/helpers.h" #include "transport_manager/common.h" +#include "utils/helpers.h" namespace policy { @@ -119,10 +119,10 @@ typedef std::vector StringArray; enum PermitResult { kRpcAllowed = 0, kRpcDisallowed, kRpcUserDisallowed }; /** - * @struct Stores result of check: - * if HMI Level was allowed for RPC to work in - * and list of parameters allowed for RPC if specified in PT. - */ + * @struct Stores result of check: + * if HMI Level was allowed for RPC to work in + * and list of parameters allowed for RPC if specified in PT. + */ struct CheckPermissionResult { CheckPermissionResult() : hmi_level_permitted(kRpcDisallowed) {} diff --git a/src/components/policy/policy_regular/include/policy/pt_representation.h b/src/components/policy/policy_regular/include/policy/pt_representation.h index 378a294532..0534b27093 100644 --- a/src/components/policy/policy_regular/include/policy/pt_representation.h +++ b/src/components/policy/policy_regular/include/policy/pt_representation.h @@ -33,12 +33,12 @@ #ifndef SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_PT_REPRESENTATION_H_ #define SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_PT_REPRESENTATION_H_ -#include -#include #include -#include "policy/policy_types.h" -#include "policy/policy_table/types.h" +#include +#include #include "policy/policy_settings.h" +#include "policy/policy_table/types.h" +#include "policy/policy_types.h" #include "utils/macro.h" namespace policy { @@ -265,10 +265,10 @@ class PTRepresentation { virtual bool IsDefaultPolicy(const std::string& app_id) const = 0; /** - * Checks if the application has pre_data policy - * @param app_id application id - * @return true if application has pre_data policy - */ + * Checks if the application has pre_data policy + * @param app_id application id + * @return true if application has pre_data policy + */ virtual bool IsPredataPolicy(const std::string& app_id) const = 0; /** diff --git a/src/components/policy/policy_regular/include/policy/sql_pt_representation.h b/src/components/policy/policy_regular/include/policy/sql_pt_representation.h index dfa318454b..e95620fbc2 100644 --- a/src/components/policy/policy_regular/include/policy/sql_pt_representation.h +++ b/src/components/policy/policy_regular/include/policy/sql_pt_representation.h @@ -35,9 +35,9 @@ #include #include +#include "policy/policy_table/types.h" #include "policy/pt_representation.h" #include "rpc_base/rpc_base.h" -#include "policy/policy_table/types.h" namespace policy_table = rpc::policy_table_interface_base; diff --git a/src/components/policy/policy_regular/include/policy/status.h b/src/components/policy/policy_regular/include/policy/status.h index c1ea2de4c1..8fd3ff559e 100644 --- a/src/components/policy/policy_regular/include/policy/status.h +++ b/src/components/policy/policy_regular/include/policy/status.h @@ -75,41 +75,41 @@ class Status { const policy::PolicyTableStatus enum_status); /** - * @brief Destructor - */ + * @brief Destructor + */ virtual ~Status(); /** - * @brief Process event by setting next status in case event can affect - * current status or ignores the event - * @param manager Status manager pointer - * @param event Event which needs to be processed - */ + * @brief Process event by setting next status in case event can affect + * current status or ignores the event + * @param manager Status manager pointer + * @param event Event which needs to be processed + */ virtual void ProcessEvent(UpdateStatusManagerInterface* manager, UpdateEvent event) = 0; /** - * @brief Return current status as string value - * @return Status as string - */ + * @brief Return current status as string value + * @return Status as string + */ virtual const std::string get_status_string() const; /** - * @brief Return status as enum value - * @return Status as enum value - */ + * @brief Return status as enum value + * @return Status as enum value + */ virtual PolicyTableStatus get_status() const; /** - * @brief Check whether update is required in terms of status - * @return True if update is required, otherwise - false - */ + * @brief Check whether update is required in terms of status + * @return True if update is required, otherwise - false + */ virtual bool IsUpdateRequired() const; /** - * @brief Check whether update is pending in terms of status - * @return True if update is pending, otherwise - false - */ + * @brief Check whether update is pending in terms of status + * @return True if update is pending, otherwise - false + */ virtual bool IsUpdatePending() const; private: @@ -128,11 +128,11 @@ class UpToDateStatus : public Status { UpToDateStatus(); /** - * @brief Process event by setting next status in case event can affect - * current status or ignores the event - * @param manager Status manager pointer - * @param event Event which needs to be processed - */ + * @brief Process event by setting next status in case event can affect + * current status or ignores the event + * @param manager Status manager pointer + * @param event Event which needs to be processed + */ void ProcessEvent(UpdateStatusManagerInterface* manager, UpdateEvent event) OVERRIDE; }; @@ -148,18 +148,18 @@ class UpdateNeededStatus : public Status { UpdateNeededStatus(); /** - * @brief Process event by setting next status in case event can affect - * current status or ignores the event - * @param manager Status manager pointer - * @param event Event which needs to be processed - */ + * @brief Process event by setting next status in case event can affect + * current status or ignores the event + * @param manager Status manager pointer + * @param event Event which needs to be processed + */ void ProcessEvent(UpdateStatusManagerInterface* manager, UpdateEvent event) OVERRIDE; /** - * @brief Check whether update is required in terms of status - * @return True if update is required, otherwise - false - */ + * @brief Check whether update is required in terms of status + * @return True if update is required, otherwise - false + */ bool IsUpdateRequired() const OVERRIDE; }; @@ -174,26 +174,26 @@ class UpdatingStatus : public Status { UpdatingStatus(); /** - * @brief Process event by setting next status in case event can affect - * current status or ignores the event - * @param manager Status manager pointer - * @param event Event which needs to be processed - */ + * @brief Process event by setting next status in case event can affect + * current status or ignores the event + * @param manager Status manager pointer + * @param event Event which needs to be processed + */ void ProcessEvent(UpdateStatusManagerInterface* manager, UpdateEvent event) OVERRIDE; /** - * @brief Check whether update is required in terms of status - * @return True if update is required, otherwise - false - */ + * @brief Check whether update is required in terms of status + * @return True if update is required, otherwise - false + */ bool IsUpdateRequired() const OVERRIDE; /** - * @brief Check whether update is pending in terms of status - * @return True if update is pending, otherwise - false - */ + * @brief Check whether update is pending in terms of status + * @return True if update is pending, otherwise - false + */ bool IsUpdatePending() const OVERRIDE; }; -} +} // namespace policy #endif // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_STATUS_H_ diff --git a/src/components/policy/policy_regular/include/policy/update_status_manager.h b/src/components/policy/policy_regular/include/policy/update_status_manager.h index c90acd4957..0c79bf0ba4 100644 --- a/src/components/policy/policy_regular/include/policy/update_status_manager.h +++ b/src/components/policy/policy_regular/include/policy/update_status_manager.h @@ -33,15 +33,14 @@ #ifndef SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_UPDATE_STATUS_MANAGER_H_ #define SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_UPDATE_STATUS_MANAGER_H_ -#include "policy/update_status_manager_interface.h" #include "policy/policy_types.h" -#include "utils/lock.h" -#include "utils/threads/thread.h" -#include "utils/threads/thread_delegate.h" +#include "policy/update_status_manager_interface.h" #include "utils/conditional_variable.h" #include "utils/lock.h" #include "utils/logger.h" #include "utils/macro.h" +#include "utils/threads/thread.h" +#include "utils/threads/thread_delegate.h" namespace policy { @@ -216,6 +215,6 @@ class UpdateStatusManager : public UpdateStatusManagerInterface { bool app_registered_from_non_consented_device_; sync_primitives::Lock apps_search_in_progress_lock_; }; -} +} // namespace policy #endif // SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_UPDATE_STATUS_MANAGER_H_ diff --git a/src/components/policy/policy_regular/include/policy/usage_statistics/counter.h b/src/components/policy/policy_regular/include/policy/usage_statistics/counter.h index 72ae5fd9e0..bd88815012 100644 --- a/src/components/policy/policy_regular/include/policy/usage_statistics/counter.h +++ b/src/components/policy/policy_regular/include/policy/usage_statistics/counter.h @@ -34,11 +34,11 @@ #define SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_USAGE_STATISTICS_COUNTER_H_ #include -#include "policy/usage_statistics/statistics_manager.h" #include "policy/usage_statistics/app_stopwatch.h" +#include "policy/usage_statistics/statistics_manager.h" -#include "utils/timer.h" #include "utils/macro.h" +#include "utils/timer.h" namespace usage_statistics { diff --git a/src/components/policy/policy_regular/src/cache_manager.cc b/src/components/policy/policy_regular/src/cache_manager.cc index 991c6a1363..ef4937e336 100644 --- a/src/components/policy/policy_regular/src/cache_manager.cc +++ b/src/components/policy/policy_regular/src/cache_manager.cc @@ -33,19 +33,19 @@ #include "policy/cache_manager.h" #include -#include -#include #include +#include +#include #include -#include "utils/file_system.h" -#include "utils/helpers.h" -#include "json/reader.h" #include "json/features.h" +#include "json/reader.h" #include "json/writer.h" -#include "utils/logger.h" #include "utils/date_time.h" +#include "utils/file_system.h" #include "utils/gen_hash.h" +#include "utils/helpers.h" +#include "utils/logger.h" #include "utils/macro.h" #include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" @@ -1901,8 +1901,9 @@ void CacheManager::MergeFG(const policy_table::PolicyTable& new_pt, void CacheManager::MergeAP(const policy_table::PolicyTable& new_pt, policy_table::PolicyTable& pt) { LOG4CXX_AUTO_TRACE(logger_); - pt.app_policies_section.device = const_cast( - new_pt).app_policies_section.device; + pt.app_policies_section.device = + const_cast(new_pt) + .app_policies_section.device; pt.app_policies_section.apps[kDefaultId] = const_cast(new_pt) diff --git a/src/components/policy/policy_regular/src/policy_helper.cc b/src/components/policy/policy_regular/src/policy_helper.cc index bae9fceb49..5fa0b314b3 100644 --- a/src/components/policy/policy_regular/src/policy_helper.cc +++ b/src/components/policy/policy_regular/src/policy_helper.cc @@ -30,13 +30,13 @@ POSSIBILITY OF SUCH DAMAGE. */ +#include "policy/policy_helper.h" +#include #include #include -#include -#include "utils/logger.h" -#include "utils/custom_string.h" -#include "policy/policy_helper.h" #include "policy/policy_manager_impl.h" +#include "utils/custom_string.h" +#include "utils/logger.h" namespace policy { @@ -355,15 +355,15 @@ bool CheckAppPolicy::operator()(const AppPoliciesValueType& app_policy) { } } if (RESULT_NO_CHANGES == result) { - LOG4CXX_INFO(logger_, - "Permissions for application:" << app_id - << " wasn't changed."); + LOG4CXX_INFO( + logger_, + "Permissions for application:" << app_id << " wasn't changed."); return true; } - LOG4CXX_INFO(logger_, - "Permissions for application:" << app_id - << " have been changed."); + LOG4CXX_INFO( + logger_, + "Permissions for application:" << app_id << " have been changed."); if (IsPredefinedApp(app_policy)) { for (const policy_table::ApplicationPolicies::value_type& app : @@ -853,4 +853,4 @@ bool UnwrapAppPolicies(policy_table::ApplicationPolicies& app_policies) { return true; } -} +} // namespace policy diff --git a/src/components/policy/policy_regular/src/policy_manager_impl.cc b/src/components/policy/policy_regular/src/policy_manager_impl.cc index 10e1c73e9a..0884fc53b6 100644 --- a/src/components/policy/policy_regular/src/policy_manager_impl.cc +++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc @@ -32,22 +32,22 @@ #include "policy/policy_manager_impl.h" #include -#include -#include #include #include +#include +#include #include "json/reader.h" #include "json/writer.h" +#include "policy/policy_helper.h" #include "policy/policy_table.h" #include "policy/pt_representation.h" -#include "policy/policy_helper.h" +#include "utils/date_time.h" #include "utils/file_system.h" #include "utils/logger.h" -#include "utils/date_time.h" +#include "config_profile/profile.h" #include "policy/cache_manager.h" #include "policy/update_status_manager.h" -#include "config_profile/profile.h" #include "utils/timer_task_impl.h" #include "policy/access_remote.h" @@ -675,7 +675,8 @@ void PolicyManagerImpl::SendNotificationOnPermissionsUpdated( if (device_id.empty()) { LOG4CXX_WARN(logger_, "Couldn't find device info for application id " - "'" << application_id << "'"); + "'" << application_id + << "'"); return; } @@ -1457,9 +1458,9 @@ void PolicyManagerImpl::SendHMILevelChanged(const ApplicationOnDevice& who) { if (GetDefaultHmi(who.app_id, &default_hmi)) { listener()->OnUpdateHMIStatus(who.dev_id, who.app_id, default_hmi); } else { - LOG4CXX_WARN(logger_, - "Couldn't get default HMI level for application " - << who.app_id); + LOG4CXX_WARN( + logger_, + "Couldn't get default HMI level for application " << who.app_id); } } diff --git a/src/components/policy/policy_regular/src/policy_table/validation.cc b/src/components/policy/policy_regular/src/policy_table/validation.cc index 4db84e06ff..059c18d00e 100644 --- a/src/components/policy/policy_regular/src/policy_table/validation.cc +++ b/src/components/policy/policy_regular/src/policy_table/validation.cc @@ -7,7 +7,7 @@ bool IsTypeInvalid( rpc::Enum request) { return !request.is_valid(); } -} +} // namespace namespace rpc { namespace policy_table_interface_base { diff --git a/src/components/policy/policy_regular/src/sql_pt_representation.cc b/src/components/policy/policy_regular/src/sql_pt_representation.cc index c6f78d6d70..20ba9ec651 100644 --- a/src/components/policy/policy_regular/src/sql_pt_representation.cc +++ b/src/components/policy/policy_regular/src/sql_pt_representation.cc @@ -30,22 +30,22 @@ POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include #include +#include +#include #include +#include -#include "utils/logger.h" +#include "config_profile/profile.h" +#include "policy/cache_manager.h" +#include "policy/policy_helper.h" +#include "policy/sql_pt_queries.h" +#include "policy/sql_pt_representation.h" +#include "policy/sql_wrapper.h" #include "utils/date_time.h" #include "utils/file_system.h" #include "utils/gen_hash.h" -#include "policy/sql_pt_representation.h" -#include "policy/sql_wrapper.h" -#include "policy/sql_pt_queries.h" -#include "policy/policy_helper.h" -#include "policy/cache_manager.h" -#include "config_profile/profile.h" +#include "utils/logger.h" namespace policy { @@ -81,9 +81,9 @@ void SQLPTRepresentation::CheckPermissions(const PTString& app_id, utils::dbms::SQLQuery query(db()); if (!query.Prepare(sql_pt::kSelectRpc)) { - LOG4CXX_WARN(logger_, - "Incorrect select statement from rpcs" - << query.LastError().text()); + LOG4CXX_WARN( + logger_, + "Incorrect select statement from rpcs" << query.LastError().text()); return; } query.Bind(0, app_id); @@ -378,9 +378,9 @@ InitResult SQLPTRepresentation::Init(const PolicySettings* settings) { utils::dbms::SQLQuery check_first_run(db()); if (check_first_run.Prepare(sql_pt::kIsFirstRun) && check_first_run.Next()) { - LOG4CXX_INFO(logger_, - "Selecting is first run " - << check_first_run.GetBoolean(0)); + LOG4CXX_INFO( + logger_, + "Selecting is first run " << check_first_run.GetBoolean(0)); if (check_first_run.GetBoolean(0)) { utils::dbms::SQLQuery set_not_first_run(db()); set_not_first_run.Exec(sql_pt::kSetNotFirstRun); @@ -1125,9 +1125,9 @@ bool SQLPTRepresentation::SaveAppGroup( query.Bind(0, app_id); query.Bind(1, *it); if (!query.Exec() || !query.Reset()) { - LOG4CXX_WARN(logger_, - "Incorrect insert into app group." - << query.LastError().text()); + LOG4CXX_WARN( + logger_, + "Incorrect insert into app group." << query.LastError().text()); return false; } } diff --git a/src/components/policy/policy_regular/src/usage_statistics/counter.cc b/src/components/policy/policy_regular/src/usage_statistics/counter.cc index ed16fa3e8d..340f900cac 100644 --- a/src/components/policy/policy_regular/src/usage_statistics/counter.cc +++ b/src/components/policy/policy_regular/src/usage_statistics/counter.cc @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_POLICY_INCLUDE_POLICY_STATISTICS_MANAGER_H_ #define SRC_COMPONENTS_POLICY_INCLUDE_POLICY_STATISTICS_MANAGER_H_ -#include #include "policy/usage_statistics/counter.h" +#include #include "utils/date_time.h" #include "utils/timer_task_impl.h" diff --git a/src/components/policy/policy_regular/test/access_remote_impl_test.cc b/src/components/policy/policy_regular/test/access_remote_impl_test.cc index f79bb683f8..d9dba45ef2 100644 --- a/src/components/policy/policy_regular/test/access_remote_impl_test.cc +++ b/src/components/policy/policy_regular/test/access_remote_impl_test.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "policy/access_remote_impl.h" +#include "gtest/gtest.h" namespace policy { diff --git a/src/components/policy/policy_regular/test/counter_test.cc b/src/components/policy/policy_regular/test/counter_test.cc index d11bcec2ac..c09347fd9c 100644 --- a/src/components/policy/policy_regular/test/counter_test.cc +++ b/src/components/policy/policy_regular/test/counter_test.cc @@ -31,11 +31,11 @@ #include "gmock/gmock.h" -#include "policy/usage_statistics/mock_statistics_manager.h" #include "policy/usage_statistics/counter.h" +#include "policy/usage_statistics/mock_statistics_manager.h" -using ::testing::StrictMock; using ::testing::InSequence; +using ::testing::StrictMock; namespace test { namespace components { diff --git a/src/components/policy/policy_regular/test/include/policy/driver_dbms.h b/src/components/policy/policy_regular/test/include/policy/driver_dbms.h index 78b7add643..aa6fb0828b 100644 --- a/src/components/policy/policy_regular/test/include/policy/driver_dbms.h +++ b/src/components/policy/policy_regular/test/include/policy/driver_dbms.h @@ -152,7 +152,7 @@ class DBMS { }; #endif // __QNX__ -} // namespace policy +} // namespace policy_test } // namespace components } // namespace test diff --git a/src/components/policy/policy_regular/test/include/policy/mock_pt_representation.h b/src/components/policy/policy_regular/test/include/policy/mock_pt_representation.h index 72f183175c..44f7733985 100644 --- a/src/components/policy/policy_regular/test/include/policy/mock_pt_representation.h +++ b/src/components/policy/policy_regular/test/include/policy/mock_pt_representation.h @@ -37,9 +37,9 @@ #include "gmock/gmock.h" +#include "policy/policy_table/types.h" #include "policy/pt_representation.h" #include "rpc_base/rpc_base.h" -#include "policy/policy_table/types.h" namespace policy_table = ::rpc::policy_table_interface_base; diff --git a/src/components/policy/policy_regular/test/policy_manager_impl_test.cc b/src/components/policy/policy_regular/test/policy_manager_impl_test.cc index 97b1768666..39ff0efa7e 100644 --- a/src/components/policy/policy_regular/test/policy_manager_impl_test.cc +++ b/src/components/policy/policy_regular/test/policy_manager_impl_test.cc @@ -30,39 +30,38 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include -#include +#include +#include "gtest/gtest.h" #include "json/reader.h" #include "json/writer.h" -#include "gtest/gtest.h" #include "config_profile/profile.h" +#include "policy/mock_cache_manager.h" +#include "policy/mock_policy_listener.h" +#include "policy/mock_policy_settings.h" +#include "policy/mock_update_status_manager.h" #include "policy/policy_manager_impl.h" #include "policy/policy_table/enums.h" #include "policy/policy_table/types.h" -#include "policy/mock_policy_settings.h" -#include "policy/mock_policy_listener.h" -#include "policy/mock_cache_manager.h" -#include "policy/mock_update_status_manager.h" -#include "utils/macro.h" -#include "utils/file_system.h" #include "utils/date_time.h" +#include "utils/file_system.h" +#include "utils/macro.h" -#include "utils/gen_hash.h" #include "policy/mock_access_remote.h" +#include "utils/gen_hash.h" -using ::testing::ReturnRef; -using ::testing::DoAll; -using ::testing::SetArgReferee; -using ::testing::NiceMock; using ::testing::_; -using ::testing::SetArgReferee; using ::testing::AtLeast; +using ::testing::DoAll; +using ::testing::NiceMock; using ::testing::Return; +using ::testing::ReturnRef; +using ::testing::SetArgReferee; using ::policy::PolicyManagerImpl; using ::policy::PolicyTable; @@ -932,9 +931,8 @@ TEST_F(PolicyManagerImplTest2, NextRetryTimeout_ExpectTimeoutsFromPT) { date_time::MILLISECONDS_IN_SECOND; const uint32_t first_retry = timeout_after_x_seconds; EXPECT_EQ(first_retry, manager->NextRetryTimeout()); - uint32_t next_retry = - first_retry + - seconds_between_retries[0].asInt() * date_time::MILLISECONDS_IN_SECOND; + uint32_t next_retry = first_retry + seconds_between_retries[0].asInt() * + date_time::MILLISECONDS_IN_SECOND; EXPECT_EQ(next_retry, manager->NextRetryTimeout()); next_retry = first_retry + next_retry + @@ -977,9 +975,8 @@ TEST_F(PolicyManagerImplTest2, UpdatedPreloadedPT_ExpectLPT_IsUpdated) { Json::Value val2(Json::arrayValue); val2[0] = hmi_level[index]; val[new_data.new_field_value_]["hmi_levels"] = val2; - root["policy_table"]["functional_groupings"][new_data - .new_field_name_]["rpcs"] = - val; + root["policy_table"]["functional_groupings"][new_data.new_field_name_] + ["rpcs"] = val; root["policy_table"]["functional_groupings"][new_data.new_field_name_] ["user_consent_prompt"] = new_data.new_field_name_; } diff --git a/src/components/policy/policy_regular/test/sql_pt_representation_test.cc b/src/components/policy/policy_regular/test/sql_pt_representation_test.cc index 675d708843..dc11e11f12 100644 --- a/src/components/policy/policy_regular/test/sql_pt_representation_test.cc +++ b/src/components/policy/policy_regular/test/sql_pt_representation_test.cc @@ -29,39 +29,39 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include #include "gtest/gtest.h" +#include "json/reader.h" +#include "json/writer.h" #include "policy/driver_dbms.h" -#include "policy/sql_pt_representation.h" -#include "policy/policy_types.h" #include "policy/mock_policy_settings.h" -#include "policy/policy_table/types.h" #include "policy/policy_table/enums.h" -#include "json/writer.h" -#include "json/reader.h" +#include "policy/policy_table/types.h" +#include "policy/policy_types.h" +#include "policy/sql_pt_representation.h" #include "rpc_base/rpc_base.h" #include "utils/file_system.h" #include "utils/sqlite_wrapper/sql_database.h" namespace policy_table = rpc::policy_table_interface_base; -using policy::SQLPTRepresentation; using policy::CheckPermissionResult; -using policy::UserFriendlyMessage; using policy::EndpointUrls; +using policy::SQLPTRepresentation; +using policy::UserFriendlyMessage; using policy::VehicleInfo; -using testing::ReturnRef; -using testing::Return; -using testing::NiceMock; using testing::Mock; +using testing::NiceMock; +using testing::Return; +using testing::ReturnRef; namespace test { namespace components { diff --git a/src/components/policy/policy_regular/test/update_status_manager_test.cc b/src/components/policy/policy_regular/test/update_status_manager_test.cc index 244858554f..459913fe72 100644 --- a/src/components/policy/policy_regular/test/update_status_manager_test.cc +++ b/src/components/policy/policy_regular/test/update_status_manager_test.cc @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "policy/update_status_manager.h" #include "gtest/gtest.h" #include "policy/mock_policy_listener.h" #include "policy/policy_manager_impl.h" -#include "policy/update_status_manager.h" namespace test { namespace components { diff --git a/src/components/protocol_handler/include/protocol_handler/incoming_data_handler.h b/src/components/protocol_handler/include/protocol_handler/incoming_data_handler.h index 4633be6c6e..82bf563bc5 100644 --- a/src/components/protocol_handler/include/protocol_handler/incoming_data_handler.h +++ b/src/components/protocol_handler/include/protocol_handler/incoming_data_handler.h @@ -34,9 +34,9 @@ #include #include -#include "utils/macro.h" #include "protocol_handler/protocol_packet.h" #include "transport_manager/common.h" +#include "utils/macro.h" namespace protocol_handler { diff --git a/src/components/protocol_handler/include/protocol_handler/multiframe_builder.h b/src/components/protocol_handler/include/protocol_handler/multiframe_builder.h index 84ec3c9e30..3da63bd79f 100644 --- a/src/components/protocol_handler/include/protocol_handler/multiframe_builder.h +++ b/src/components/protocol_handler/include/protocol_handler/multiframe_builder.h @@ -33,13 +33,13 @@ #ifndef SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_MULTIFRAME_BUILDER_H_ #define SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_MULTIFRAME_BUILDER_H_ -#include -#include // std::basic_ostream -#include // std::ostream_iterator #include // std::copy +#include // std::ostream_iterator +#include +#include // std::basic_ostream -#include "utils/date_time.h" #include "protocol_handler/protocol_packet.h" +#include "utils/date_time.h" /** *\namespace protocol_handlerHandler @@ -86,36 +86,36 @@ typedef std::map MultiFrameMap; class MultiFrameBuilder { public: /** - * @brief Constructor - */ + * @brief Constructor + */ MultiFrameBuilder(); /** - *\brief Set timeout of waiting CONSECUTIVE frames - */ + *\brief Set timeout of waiting CONSECUTIVE frames + */ void set_waiting_timeout(const uint32_t consecutive_frame_wait_msecs); /** - * @brief Add connection for pending data - * @return true on success - */ + * @brief Add connection for pending data + * @return true on success + */ bool AddConnection(const ConnectionID connection_id); /** - * @brief Clear all data related to connection_id - * @return true on success - */ + * @brief Clear all data related to connection_id + * @return true on success + */ bool RemoveConnection(const ConnectionID connection_id); /** - *\brief Pop assembled and expired frames - */ + *\brief Pop assembled and expired frames + */ ProtocolFramePtrList PopMultiframes(); /** - *\brief Handle Single or Consecutive frame - * @return RESULT_OK on success, or RESULT_FAIL in case of any error - */ + *\brief Handle Single or Consecutive frame + * @return RESULT_OK on success, or RESULT_FAIL in case of any error + */ RESULT_CODE AddFrame(const ProtocolFramePtr packet); private: diff --git a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h index 7c2b411dcb..15996bb4e2 100644 --- a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h +++ b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h @@ -33,33 +33,33 @@ #ifndef SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_PROTOCOL_HANDLER_IMPL_H_ #define SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_PROTOCOL_HANDLER_IMPL_H_ +#include #include #include #include -#include #include // std::make_pair #include -#include "utils/prioritized_queue.h" #include "utils/message_queue.h" +#include "utils/prioritized_queue.h" #include "utils/threads/message_loop_thread.h" -#include "utils/messagemeter.h" #include "utils/custom_string.h" +#include "utils/messagemeter.h" #include "utils/semantic_version.h" +#include "application_manager/policies/policy_handler_observer.h" +#include "connection_handler/connection_handler.h" +#include "protocol_handler/incoming_data_handler.h" +#include "protocol_handler/multiframe_builder.h" #include "protocol_handler/protocol_handler.h" -#include "protocol_handler/protocol_packet.h" #include "protocol_handler/protocol_handler_settings.h" -#include "protocol_handler/session_observer.h" #include "protocol_handler/protocol_observer.h" -#include "protocol_handler/incoming_data_handler.h" -#include "protocol_handler/multiframe_builder.h" +#include "protocol_handler/protocol_packet.h" +#include "protocol_handler/session_observer.h" #include "transport_manager/common.h" +#include "transport_manager/transport_adapter/transport_adapter.h" #include "transport_manager/transport_manager.h" #include "transport_manager/transport_manager_listener_empty.h" -#include "transport_manager/transport_adapter/transport_adapter.h" -#include "connection_handler/connection_handler.h" -#include "application_manager/policies/policy_handler_observer.h" #ifdef TELEMETRY_MONITOR #include "protocol_handler/telemetry_observer.h" @@ -67,8 +67,8 @@ #endif // TELEMETRY_MONITOR #ifdef ENABLE_SECURITY -#include "security_manager/security_manager.h" #include "protocol_handler/handshake_handler.h" +#include "security_manager/security_manager.h" #endif // ENABLE_SECURITY namespace connection_handler { @@ -110,7 +110,8 @@ struct RawFordMessageFromMobile : public ProtocolFramePtr { // PrioritizedQueue requires this method to decide which priority to assign size_t PriorityOrder() const { return MessagePriority::FromServiceType( - ServiceTypeFromByte(get()->service_type())).OrderingValue(); + ServiceTypeFromByte(get()->service_type())) + .OrderingValue(); } }; @@ -122,7 +123,8 @@ struct RawFordMessageToMobile : public ProtocolFramePtr { // PrioritizedQueue requires this method to decide which priority to assign size_t PriorityOrder() const { return MessagePriority::FromServiceType( - ServiceTypeFromByte(get()->service_type())).OrderingValue(); + ServiceTypeFromByte(get()->service_type())) + .OrderingValue(); } // Signals whether connection to mobile must be closed after processing this // message @@ -131,9 +133,11 @@ struct RawFordMessageToMobile : public ProtocolFramePtr { // Short type names for prioritized message queues typedef threads::MessageLoopThread< - utils::PrioritizedQueue > FromMobileQueue; + utils::PrioritizedQueue > + FromMobileQueue; typedef threads::MessageLoopThread< - utils::PrioritizedQueue > ToMobileQueue; + utils::PrioritizedQueue > + ToMobileQueue; // Type to allow easy mapping between a device type and transport // characteristics @@ -176,10 +180,10 @@ class ProtocolHandlerImpl public impl::FromMobileQueue::Handler, public impl::ToMobileQueue::Handler #ifdef TELEMETRY_MONITOR - , + , public telemetry_monitor::TelemetryObservable #endif // TELEMETRY_MONITOR - { +{ public: /** * @brief Constructor @@ -252,20 +256,20 @@ class ProtocolHandlerImpl void SendHeartBeat(int32_t connection_id, uint8_t session_id); /** - * \brief Sends ending session to mobile application - * \param connection_id Identifier of connection within which - * session exists - * \param session_id ID of session to be ended - */ + * \brief Sends ending session to mobile application + * \param connection_id Identifier of connection within which + * session exists + * \param session_id ID of session to be ended + */ void SendEndSession(int32_t connection_id, uint8_t session_id); /** - * \brief Sends ending session to mobile application - * \param primary_connection_id Identifier of connection within which - * service exists - * \param connection_id Identifier of the actual transport for the service - * \param session_id ID of session to be ended - */ + * \brief Sends ending session to mobile application + * \param primary_connection_id Identifier of connection within which + * service exists + * \param connection_id Identifier of the actual transport for the service + * \param session_id ID of session to be ended + */ void SendEndService(int32_t primary_connection_id, int32_t connection_id, uint8_t session_id, diff --git a/src/components/protocol_handler/include/protocol_handler/protocol_packet.h b/src/components/protocol_handler/include/protocol_handler/protocol_packet.h index de4af84915..215c63c685 100644 --- a/src/components/protocol_handler/include/protocol_handler/protocol_packet.h +++ b/src/components/protocol_handler/include/protocol_handler/protocol_packet.h @@ -34,9 +34,9 @@ #define SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_PROTOCOL_PACKET_H_ #include -#include "utils/macro.h" #include "protocol/common.h" #include "transport_manager/common.h" +#include "utils/macro.h" /** *\namespace protocol_handlerHandler @@ -275,8 +275,8 @@ class ProtocolPacket { /*End of Deserialization*/ /** - * \brief Getter for Connection Identifier - */ + * \brief Getter for Connection Identifier + */ ConnectionID connection_id() const; /** @@ -285,13 +285,13 @@ class ProtocolPacket { void set_connection_id(ConnectionID connection_id); /** - * \brief Getter for data payload size - */ + * \brief Getter for data payload size + */ uint32_t payload_size() const; /** - * \brief Getter for full header information - */ + * \brief Getter for full header information + */ const ProtocolHeader& packet_header() const; private: @@ -311,9 +311,9 @@ class ProtocolPacket { uint32_t payload_size_; /** - * \brief Connection Identifier - * Obtained from connection_handler - */ + * \brief Connection Identifier + * Obtained from connection_handler + */ ConnectionID connection_id_; DISALLOW_COPY_AND_ASSIGN(ProtocolPacket); diff --git a/src/components/protocol_handler/src/handshake_handler.cc b/src/components/protocol_handler/src/handshake_handler.cc index 775d77db66..fa0b375018 100644 --- a/src/components/protocol_handler/src/handshake_handler.cc +++ b/src/components/protocol_handler/src/handshake_handler.cc @@ -36,8 +36,8 @@ #include "protocol_handler/protocol_handler_impl.h" #include "protocol_handler/protocol_packet.h" -#include "security_manager/security_manager.h" #include "protocol_handler/session_observer.h" +#include "security_manager/security_manager.h" namespace protocol_handler { diff --git a/src/components/protocol_handler/src/incoming_data_handler.cc b/src/components/protocol_handler/src/incoming_data_handler.cc index 4944ea9cc7..566b36f46d 100644 --- a/src/components/protocol_handler/src/incoming_data_handler.cc +++ b/src/components/protocol_handler/src/incoming_data_handler.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "protocol_handler/incoming_data_handler.h" -#include "utils/logger.h" #include "protocol/common.h" +#include "utils/logger.h" namespace protocol_handler { diff --git a/src/components/protocol_handler/src/multiframe_builder.cc b/src/components/protocol_handler/src/multiframe_builder.cc index c34e2ec640..d7cfc6f90e 100644 --- a/src/components/protocol_handler/src/multiframe_builder.cc +++ b/src/components/protocol_handler/src/multiframe_builder.cc @@ -36,8 +36,8 @@ #include "utils/logger.h" -#include "utils/lock.h" #include "utils/date_time.h" +#include "utils/lock.h" namespace protocol_handler { diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc index 944d80d5d9..e0768b3adf 100644 --- a/src/components/protocol_handler/src/protocol_handler_impl.cc +++ b/src/components/protocol_handler/src/protocol_handler_impl.cc @@ -32,20 +32,20 @@ #include "protocol_handler/protocol_handler_impl.h" #include // for INET6_ADDRSTRLEN -#include -#include // std::find #include +#include #include +#include // std::find #include "connection_handler/connection_handler_impl.h" +#include "protocol/common.h" #include "protocol_handler/session_observer.h" #include "utils/byte_order.h" #include "utils/helpers.h" -#include "protocol/common.h" #ifdef ENABLE_SECURITY -#include "security_manager/ssl_context.h" #include "security_manager/security_manager.h" +#include "security_manager/ssl_context.h" #endif // ENABLE_SECURITY namespace protocol_handler { @@ -975,9 +975,9 @@ void ProtocolHandlerImpl::OnTMMessageReceived(const RawMessagePtr tm_message) { LOG4CXX_DEBUG(logger_, "Proccessed " << protocol_frames.size() << " frames"); if (result != RESULT_OK) { if (result == RESULT_MALFORMED_OCCURS) { - LOG4CXX_WARN(logger_, - "Malformed message occurs, connection id " - << connection_key); + LOG4CXX_WARN( + logger_, + "Malformed message occurs, connection id " << connection_key); if (!get_settings().malformed_message_filtering()) { LOG4CXX_DEBUG(logger_, "Malformed message filterign disabled"); session_observer_.OnMalformedMessageCallback(connection_key); @@ -1285,9 +1285,9 @@ RESULT_CODE ProtocolHandlerImpl::SendMultiFrameMessage( const bool is_final_message) { LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, - " data size " << data_size << " max_frame_size " - << max_frame_size); + LOG4CXX_DEBUG( + logger_, + " data size " << data_size << " max_frame_size " << max_frame_size); // remainder of last frame const size_t lastframe_remainder = data_size % max_frame_size; @@ -1880,9 +1880,9 @@ void ProtocolHandlerImpl::NotifySessionStarted( RESULT_CODE ProtocolHandlerImpl::HandleControlMessageHeartBeat( const ProtocolPacket& packet) { const ConnectionID connection_id = packet.connection_id(); - LOG4CXX_DEBUG(logger_, - "Sending heart beat acknowledgment for connection " - << connection_id); + LOG4CXX_DEBUG( + logger_, + "Sending heart beat acknowledgment for connection " << connection_id); uint8_t protocol_version; if (session_observer_.ProtocolVersionUsed( connection_id, packet.session_id(), protocol_version)) { @@ -1918,9 +1918,9 @@ void ProtocolHandlerImpl::PopValideAndExpirateMultiframes() { const uint32_t connection_key = session_observer_.KeyFromPair( frame->connection_id(), frame->session_id()); - LOG4CXX_DEBUG(logger_, - "Result frame" << frame << "for connection " - << connection_key); + LOG4CXX_DEBUG( + logger_, + "Result frame" << frame << "for connection " << connection_key); const RawMessagePtr rawMessage(new RawMessage(connection_key, frame->protocol_version(), frame->data(), @@ -1947,9 +1947,9 @@ bool ProtocolHandlerImpl::TrackMessage(const uint32_t& connection_key) { if (frequency_time > 0u && frequency_count > 0u) { const size_t message_frequency = message_meter_.TrackMessage(connection_key); - LOG4CXX_DEBUG(logger_, - "Frequency of " << connection_key << " is " - << message_frequency); + LOG4CXX_DEBUG( + logger_, + "Frequency of " << connection_key << " is " << message_frequency); if (message_frequency > frequency_count) { LOG4CXX_WARN(logger_, "Frequency of " << connection_key << " is marked as high."); @@ -1975,9 +1975,9 @@ bool ProtocolHandlerImpl::TrackMalformedMessage(const uint32_t& connection_key, << malformed_message_frequency); if (!get_settings().malformed_message_filtering() || malformed_message_frequency > malformed_frequency_count) { - LOG4CXX_WARN(logger_, - "Malformed frequency of " << connection_key - << " is marked as high."); + LOG4CXX_WARN( + logger_, + "Malformed frequency of " << connection_key << " is marked as high."); session_observer_.OnMalformedMessageCallback(connection_key); malformed_message_meter_.RemoveIdentifier(connection_key); return true; @@ -2027,7 +2027,8 @@ void ProtocolHandlerImpl::Handle(const impl::RawFordMessageToMobile message) { "Message to mobile app: connection id " << static_cast(message->connection_id()) << ";" - " dataSize: " << message->data_size() + " dataSize: " + << message->data_size() << " ;" " protocolVersion " << static_cast(message->protocol_version())); @@ -2432,9 +2433,9 @@ void ProtocolHandlerImpl::GenerateServiceTransportsForStartSessionAck( std::vector::const_iterator it = service_transports.begin(); for (; it != service_transports.end(); it++) { const utils::custom_string::CustomString transport(*it); - LOG4CXX_TRACE(logger_, - "Service Allowed to run on " << transport.c_str() - << " transport"); + LOG4CXX_TRACE( + logger_, + "Service Allowed to run on " << transport.c_str() << " transport"); if (!fPrimaryAdded && (transport.CompareIgnoreCase(primary_connection_type.c_str()) || diff --git a/src/components/protocol_handler/src/protocol_packet.cc b/src/components/protocol_handler/src/protocol_packet.cc index d5422e11bc..3473b8e5c5 100644 --- a/src/components/protocol_handler/src/protocol_packet.cc +++ b/src/components/protocol_handler/src/protocol_packet.cc @@ -30,17 +30,17 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include -#include -#include +#include #include #include +#include +#include #include "protocol/common.h" #include "protocol_handler/protocol_packet.h" -#include "utils/macro.h" #include "utils/byte_order.h" +#include "utils/macro.h" #include "utils/semantic_version.h" namespace protocol_handler { @@ -118,9 +118,9 @@ void ProtocolPacket::ProtocolHeader::deserialize(const uint8_t* message, case PROTOCOL_VERSION_4: case PROTOCOL_VERSION_5: { if (messageSize < PROTOCOL_HEADER_V2_SIZE) { - LOG4CXX_DEBUG(logger_, - "Message size less " << PROTOCOL_HEADER_V2_SIZE - << " bytes"); + LOG4CXX_DEBUG( + logger_, + "Message size less " << PROTOCOL_HEADER_V2_SIZE << " bytes"); return; } messageId = read_be_uint32(message + 8); @@ -255,9 +255,9 @@ RESULT_CODE ProtocolPacket::ProtocolHeaderValidator::validate( // ServiceType shall be equal 0x0 (Control), 0x07 (RPC), 0x0A (PCM), 0x0B // (Video), 0x0F (Bulk) if (ServiceTypeFromByte(header.serviceType) == kInvalidServiceType) { - LOG4CXX_WARN(logger_, - "Invalide service type" - << static_cast(header.serviceType)); + LOG4CXX_WARN( + logger_, + "Invalide service type" << static_cast(header.serviceType)); return RESULT_FAIL; } // Check frame info for each frame type diff --git a/src/components/protocol_handler/src/protocol_payload.cc b/src/components/protocol_handler/src/protocol_payload.cc index aa011bdf0f..8916fe91b0 100644 --- a/src/components/protocol_handler/src/protocol_payload.cc +++ b/src/components/protocol_handler/src/protocol_payload.cc @@ -44,7 +44,7 @@ static const size_t kCorrelationIdBits = 32; static const size_t kJsonSizeBits = 32; static const size_t PayloadHeaderBits = kRpcTypeBits + kRpcFunctionIdBits + kCorrelationIdBits + kJsonSizeBits; -} +} // namespace namespace protocol_handler { diff --git a/src/components/protocol_handler/test/include/protocol_handler/control_message_matcher.h b/src/components/protocol_handler/test/include/protocol_handler/control_message_matcher.h index 8f68003ada..a099cff225 100644 --- a/src/components/protocol_handler/test/include/protocol_handler/control_message_matcher.h +++ b/src/components/protocol_handler/test/include/protocol_handler/control_message_matcher.h @@ -32,10 +32,10 @@ #ifndef SRC_COMPONENTS_PROTOCOL_HANDLER_TEST_INCLUDE_PROTOCOL_HANDLER_CONTROL_MESSAGE_MATCHER_H_ #define SRC_COMPONENTS_PROTOCOL_HANDLER_TEST_INCLUDE_PROTOCOL_HANDLER_CONTROL_MESSAGE_MATCHER_H_ -#include "gmock/gmock.h" #include #include #include +#include "gmock/gmock.h" #include "protocol/raw_message.h" #include "protocol_handler/protocol_packet.h" @@ -43,11 +43,11 @@ namespace test { namespace components { namespace protocol_handler_test { +using protocol_handler::FRAME_DATA_START_SERVICE_NACK; +using protocol_handler::FRAME_TYPE_CONTROL; using protocol_handler::ProtocolPacket; using protocol_handler::RawMessagePtr; using protocol_handler::RESULT_CODE; -using protocol_handler::FRAME_TYPE_CONTROL; -using protocol_handler::FRAME_DATA_START_SERVICE_NACK; bool CheckRegularMatches(const ProtocolPacket& packet, RESULT_CODE result, diff --git a/src/components/protocol_handler/test/incoming_data_handler_test.cc b/src/components/protocol_handler/test/incoming_data_handler_test.cc index 9abf5d69af..fff102dde9 100644 --- a/src/components/protocol_handler/test/incoming_data_handler_test.cc +++ b/src/components/protocol_handler/test/incoming_data_handler_test.cc @@ -30,11 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -#include #include +#include -#include "utils/macro.h" #include "protocol_handler/incoming_data_handler.h" +#include "utils/macro.h" namespace test { namespace components { @@ -91,7 +91,7 @@ class IncomingDataHandlerTest : public ::testing::Test { FrameList actual_frames; RESULT_CODE result_code; size_t malformed_occurs; - uint8_t* some_data, *some_data2; + uint8_t *some_data, *some_data2; size_t some_data_size, some_data2_size; uint32_t protov1_message_id; uint32_t some_message_id; @@ -251,8 +251,8 @@ TEST_F(IncomingDataHandlerTest, MixedPayloadData_TwoConnections) { it != actual_frames.end(); ++it, ++it_exp) { // TODO(EZamakhov): investigate valgrind warning (unitialized value) - EXPECT_EQ(**it, **it_exp) << "Element number " - << std::distance(mobile_packets.begin(), it_exp); + EXPECT_EQ(**it, **it_exp) + << "Element number " << std::distance(mobile_packets.begin(), it_exp); } } @@ -654,8 +654,8 @@ TEST_F(IncomingDataHandlerTest, MalformedPacket_AdditionalByte) { it != actual_frames.end(); ++it, ++it_exp) { // TODO(EZamakhov): investigate valgrind warning (unitialized value) - EXPECT_EQ(**it, **it_exp) << "Element number " - << std::distance(mobile_packets.begin(), it_exp); + EXPECT_EQ(**it, **it_exp) + << "Element number " << std::distance(mobile_packets.begin(), it_exp); } } @@ -754,8 +754,8 @@ TEST_F(IncomingDataHandlerTest, MalformedPacket_Mix) { it != actual_frames.end(); ++it, ++it_exp) { // TODO(EZamakhov): investigate valgrind warning (unitialized value) - EXPECT_EQ(**it, **it_exp) << "Element number " - << std::distance(mobile_packets.begin(), it_exp); + EXPECT_EQ(**it, **it_exp) + << "Element number " << std::distance(mobile_packets.begin(), it_exp); } } diff --git a/src/components/protocol_handler/test/multiframe_builder_test.cc b/src/components/protocol_handler/test/multiframe_builder_test.cc index f919ec92af..2859aeb8ae 100644 --- a/src/components/protocol_handler/test/multiframe_builder_test.cc +++ b/src/components/protocol_handler/test/multiframe_builder_test.cc @@ -29,12 +29,12 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" -#include -#include #include -#include #include +#include +#include +#include +#include "gtest/gtest.h" #include "protocol_handler/multiframe_builder.h" diff --git a/src/components/protocol_handler/test/protocol_handler_tm_test.cc b/src/components/protocol_handler/test/protocol_handler_tm_test.cc index e1149fefb2..e23223c2c8 100644 --- a/src/components/protocol_handler/test/protocol_handler_tm_test.cc +++ b/src/components/protocol_handler/test/protocol_handler_tm_test.cc @@ -214,9 +214,11 @@ class ProtocolHandlerImplTest : public ::testing::Test { void TearDown() OVERRIDE { const_cast( - protocol_handler_impl->get_from_mobile_queue()).WaitDumpQueue(); + protocol_handler_impl->get_from_mobile_queue()) + .WaitDumpQueue(); const_cast( - protocol_handler_impl->get_to_mobile_queue()).WaitDumpQueue(); + protocol_handler_impl->get_to_mobile_queue()) + .WaitDumpQueue(); } // Emulate connection establish @@ -3638,7 +3640,8 @@ TEST_F(ProtocolHandlerImplTest, SendMessageToDevice(ExpectedMessage(FRAME_TYPE_CONTROL, FRAME_DATA_HEART_BEAT_ACK, PROTECTION_OFF, - kControl))).Times(0); + kControl))) + .Times(0); // Act SendControlMessage( PROTECTION_OFF, kControl, session_id, FRAME_DATA_HEART_BEAT); @@ -3828,7 +3831,8 @@ TEST_F(ProtocolHandlerImplTest, SendServiceDataAck_AfterVersion5) { SendMessageToDevice(ExpectedMessage(FRAME_TYPE_CONTROL, FRAME_DATA_SERVICE_DATA_ACK, PROTECTION_OFF, - kMobileNav))).Times(0); + kMobileNav))) + .Times(0); protocol_handler_impl->SendFramesNumber(connection_key, 0); diff --git a/src/components/protocol_handler/test/protocol_header_validator_test.cc b/src/components/protocol_handler/test/protocol_header_validator_test.cc index 5554bfd280..e69e44dbac 100644 --- a/src/components/protocol_handler/test/protocol_header_validator_test.cc +++ b/src/components/protocol_handler/test/protocol_header_validator_test.cc @@ -31,11 +31,11 @@ */ #include -#include #include +#include -#include "utils/macro.h" #include "protocol_handler/protocol_packet.h" +#include "utils/macro.h" namespace { const size_t MAXIMUM_FRAME_DATA_V3_SIZE = 131072; diff --git a/src/components/protocol_handler/test/protocol_packet_test.cc b/src/components/protocol_handler/test/protocol_packet_test.cc index 71c7726243..e4ea4be61f 100644 --- a/src/components/protocol_handler/test/protocol_packet_test.cc +++ b/src/components/protocol_handler/test/protocol_packet_test.cc @@ -30,42 +30,42 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include +#include "gtest/gtest.h" -#include "utils/macro.h" -#include "protocol_handler/protocol_packet.h" #include "protocol/common.h" +#include "protocol_handler/protocol_packet.h" +#include "utils/macro.h" namespace test { namespace components { namespace protocol_handler_test { -using protocol_handler::RawMessagePtr; -using protocol_handler::ProtocolPacket; using protocol_handler::ConnectionID; -using protocol_handler::FRAME_TYPE_MAX_VALUE; using protocol_handler::FRAME_DATA_FIRST; -using protocol_handler::FRAME_TYPE_FIRST; -using protocol_handler::PROTOCOL_VERSION_1; -using protocol_handler::PROTOCOL_VERSION_3; -using protocol_handler::PROTECTION_OFF; -using protocol_handler::RESULT_CODE; -using protocol_handler::RESULT_OK; -using protocol_handler::RESULT_FAIL; +using protocol_handler::FRAME_DATA_HEART_BEAT; +using protocol_handler::FRAME_DATA_LAST_CONSECUTIVE; +using protocol_handler::FRAME_DATA_START_SERVICE_ACK; using protocol_handler::FRAME_TYPE_CONTROL; -using protocol_handler::kControl; -using protocol_handler::kRpc; +using protocol_handler::FRAME_TYPE_FIRST; +using protocol_handler::FRAME_TYPE_MAX_VALUE; using protocol_handler::kAudio; -using protocol_handler::kMobileNav; using protocol_handler::kBulk; +using protocol_handler::kControl; using protocol_handler::kInvalidServiceType; -using protocol_handler::FRAME_DATA_HEART_BEAT; -using protocol_handler::FRAME_DATA_START_SERVICE_ACK; -using protocol_handler::FRAME_DATA_LAST_CONSECUTIVE; +using protocol_handler::kMobileNav; +using protocol_handler::kRpc; +using protocol_handler::PROTECTION_OFF; using protocol_handler::PROTOCOL_HEADER_V1_SIZE; using protocol_handler::PROTOCOL_HEADER_V2_SIZE; +using protocol_handler::PROTOCOL_VERSION_1; +using protocol_handler::PROTOCOL_VERSION_3; using protocol_handler::PROTOCOL_VERSION_MAX; +using protocol_handler::ProtocolPacket; +using protocol_handler::RawMessagePtr; +using protocol_handler::RESULT_CODE; +using protocol_handler::RESULT_FAIL; +using protocol_handler::RESULT_OK; class ProtocolPacketTest : public ::testing::Test { protected: diff --git a/src/components/protocol_handler/test/protocol_payload_test.cc b/src/components/protocol_handler/test/protocol_payload_test.cc index e56f8aadff..e89e6c7395 100644 --- a/src/components/protocol_handler/test/protocol_payload_test.cc +++ b/src/components/protocol_handler/test/protocol_payload_test.cc @@ -33,10 +33,10 @@ #include #include -#include "utils/macro.h" -#include "utils/bitstream.h" -#include "protocol_handler/protocol_payload.h" #include "protocol/common.h" +#include "protocol_handler/protocol_payload.h" +#include "utils/bitstream.h" +#include "utils/macro.h" namespace test { namespace components { diff --git a/src/components/resumption/src/last_state_impl.cc b/src/components/resumption/src/last_state_impl.cc index 4d3fd1526c..564266e19c 100644 --- a/src/components/resumption/src/last_state_impl.cc +++ b/src/components/resumption/src/last_state_impl.cc @@ -78,4 +78,4 @@ void LastStateImpl::LoadStateFromFileSystem() { LOG4CXX_WARN(logger_, "No valid last state was found."); } -} // resumption +} // namespace resumption diff --git a/src/components/rpc_base/include/rpc_base/rpc_base.h b/src/components/rpc_base/include/rpc_base/rpc_base.h index 10b494465c..611c333e4d 100644 --- a/src/components/rpc_base/include/rpc_base/rpc_base.h +++ b/src/components/rpc_base/include/rpc_base/rpc_base.h @@ -57,7 +57,7 @@ const std::string omitted_validation_info = "should be omitted in "; const std::string required_validation_info = "is required in "; std::string PolicyTableTypeToString(const PolicyTableType pt_type); -} +} // namespace policy_table_interface_base template class Range; diff --git a/src/components/rpc_base/include/rpc_base/rpc_base_inl.h b/src/components/rpc_base/include/rpc_base/rpc_base_inl.h index b6b47c2ed8..07a85eaa22 100644 --- a/src/components/rpc_base/include/rpc_base/rpc_base_inl.h +++ b/src/components/rpc_base/include/rpc_base/rpc_base_inl.h @@ -46,8 +46,7 @@ namespace rpc { * Range helper class */ template -Range::Range(T min, T max) - : min_(min), max_(max) {} +Range::Range(T min, T max) : min_(min), max_(max) {} template T Range::min() const { @@ -236,8 +235,7 @@ template const Range String::length_range_(minlen, maxlen); template -String::String() - : PrimitiveType(kUninitialized) {} +String::String() : PrimitiveType(kUninitialized) {} template String::String(const std::string& value) @@ -288,8 +286,7 @@ String::operator const std::string&() const { * Enum class */ template -Enum::Enum() - : PrimitiveType(kUninitialized), value_(EnumType()) {} +Enum::Enum() : PrimitiveType(kUninitialized), value_(EnumType()) {} template Enum::Enum(EnumType value) @@ -311,8 +308,7 @@ Enum::operator EnumType() const { * Array class */ template -Array::Array() - : CompositeType(kUninitialized) {} +Array::Array() : CompositeType(kUninitialized) {} template template @@ -401,13 +397,11 @@ void Array::SetPolicyTableType( * Map class */ template -Map::Map() - : CompositeType(kUninitialized) {} +Map::Map() : CompositeType(kUninitialized) {} template template -Map::Map(const U& value) - : CompositeType(kUninitialized) { +Map::Map(const U& value) : CompositeType(kUninitialized) { for (typename U::const_iterator i = value.begin(), e = value.end(); i != e; ++i) { // Explicitly convert that value to T because all rpc_types have explicit @@ -499,13 +493,11 @@ void Map::SetPolicyTableType( * Nullable class */ template -Nullable::Nullable() - : marked_null_(false) {} +Nullable::Nullable() : marked_null_(false) {} template template -Nullable::Nullable(const U& value) - : T(value), marked_null_(false) {} +Nullable::Nullable(const U& value) : T(value), marked_null_(false) {} template template @@ -623,8 +615,7 @@ void rpc::Optional::SetPolicyTableType( * Stringifyable class */ template -Stringifyable::Stringifyable() - : predefined_string_("") {} +Stringifyable::Stringifyable() : predefined_string_("") {} template template diff --git a/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h b/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h index 960ca10e21..871778b29a 100644 --- a/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h +++ b/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_RPC_BASE_INCLUDE_RPC_BASE_RPC_BASE_JSON_INL_H_ #define SRC_COMPONENTS_RPC_BASE_INCLUDE_RPC_BASE_RPC_BASE_JSON_INL_H_ -#include "rpc_base/rpc_base.h" #include "json/value.h" +#include "rpc_base/rpc_base.h" namespace rpc { diff --git a/src/components/rpc_base/test/rpc_base_test.cc b/src/components/rpc_base/test/rpc_base_test.cc index d81e01db6c..dc0a1df128 100644 --- a/src/components/rpc_base/test/rpc_base_test.cc +++ b/src/components/rpc_base/test/rpc_base_test.cc @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "rpc_base/rpc_base.h" #include "gtest/gtest.h" #include "json/writer.h" #include "rpc_base/gtest_support.h" -#include "rpc_base/rpc_base.h" namespace test { namespace components { diff --git a/src/components/rpc_base/test/validation_report_test.cc b/src/components/rpc_base/test/validation_report_test.cc index 10effe7dd2..5d3785d6cb 100644 --- a/src/components/rpc_base/test/validation_report_test.cc +++ b/src/components/rpc_base/test/validation_report_test.cc @@ -30,9 +30,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "rpc_base/validation_report.h" #include #include "gtest/gtest.h" -#include "rpc_base/validation_report.h" namespace test { namespace components { diff --git a/src/components/security_manager/include/security_manager/crypto_manager_impl.h b/src/components/security_manager/include/security_manager/crypto_manager_impl.h index 5fd7a95155..46fd1a5995 100644 --- a/src/components/security_manager/include/security_manager/crypto_manager_impl.h +++ b/src/components/security_manager/include/security_manager/crypto_manager_impl.h @@ -33,19 +33,19 @@ #ifndef SRC_COMPONENTS_SECURITY_MANAGER_INCLUDE_SECURITY_MANAGER_CRYPTO_MANAGER_IMPL_H_ #define SRC_COMPONENTS_SECURITY_MANAGER_INCLUDE_SECURITY_MANAGER_CRYPTO_MANAGER_IMPL_H_ -#include #include -#include #include -#include +#include +#include #include +#include #include "security_manager/crypto_manager.h" -#include "security_manager/ssl_context.h" #include "security_manager/security_manager_settings.h" +#include "security_manager/ssl_context.h" -#include "utils/macro.h" #include "utils/lock.h" +#include "utils/macro.h" namespace security_manager { class CryptoManagerImpl : public CryptoManager { diff --git a/src/components/security_manager/include/security_manager/crypto_manager_settings_impl.h b/src/components/security_manager/include/security_manager/crypto_manager_settings_impl.h index f20d3e4034..47cc557976 100644 --- a/src/components/security_manager/include/security_manager/crypto_manager_settings_impl.h +++ b/src/components/security_manager/include/security_manager/crypto_manager_settings_impl.h @@ -1,8 +1,8 @@ #ifndef SRC_COMPONENTS_SECURITY_MANAGER_INCLUDE_SECURITY_MANAGER_CRYPTO_MANAGER_SETTINGS_IMPL_H_ #define SRC_COMPONENTS_SECURITY_MANAGER_INCLUDE_SECURITY_MANAGER_CRYPTO_MANAGER_SETTINGS_IMPL_H_ -#include "security_manager/security_manager_settings.h" #include "config_profile/profile.h" +#include "security_manager/security_manager_settings.h" namespace security_manager { diff --git a/src/components/security_manager/include/security_manager/security_manager_impl.h b/src/components/security_manager/include/security_manager/security_manager_impl.h index c53d39ba87..f2a417a43d 100644 --- a/src/components/security_manager/include/security_manager/security_manager_impl.h +++ b/src/components/security_manager/include/security_manager/security_manager_impl.h @@ -34,18 +34,18 @@ #define SRC_COMPONENTS_SECURITY_MANAGER_INCLUDE_SECURITY_MANAGER_SECURITY_MANAGER_IMPL_H_ #include -#include -#include #include +#include +#include #include "utils/macro.h" #include "utils/message_queue.h" #include "utils/threads/message_loop_thread.h" +#include "protocol/common.h" +#include "protocol_handler/protocol_handler.h" #include "security_manager/security_manager.h" #include "security_manager/security_query.h" -#include "protocol_handler/protocol_handler.h" -#include "protocol/common.h" #include "utils/system_time_handler.h" namespace security_manager { diff --git a/src/components/security_manager/src/crypto_manager_impl.cc b/src/components/security_manager/src/crypto_manager_impl.cc index 90ae0177ec..cb42d5b46c 100644 --- a/src/components/security_manager/src/crypto_manager_impl.cc +++ b/src/components/security_manager/src/crypto_manager_impl.cc @@ -33,22 +33,22 @@ #include "security_manager/crypto_manager_impl.h" #include -#include #include #include +#include -#include -#include #include -#include #include +#include +#include +#include #include "security_manager/security_manager.h" -#include "utils/logger.h" #include "utils/atomic.h" +#include "utils/date_time.h" +#include "utils/logger.h" #include "utils/macro.h" #include "utils/scope_guard.h" -#include "utils/date_time.h" #define TLS1_1_MINIMAL_VERSION 0x1000103fL #define CONST_SSL_METHOD_MINIMAL_VERSION 0x00909000L @@ -84,7 +84,7 @@ void free_ctx(SSL_CTX** ctx) { *ctx = NULL; } } -} +} // namespace CryptoManagerImpl::CryptoManagerImpl( const std::shared_ptr set) @@ -156,9 +156,9 @@ bool CryptoManagerImpl::Init() { LOG4CXX_DEBUG(logger_, "Peer verification " << (get_settings().verify_peer() ? "enabled" : "disabled")); - LOG4CXX_DEBUG(logger_, - "CA certificate file is \"" << get_settings().ca_cert_path() - << '"'); + LOG4CXX_DEBUG( + logger_, + "CA certificate file is \"" << get_settings().ca_cert_path() << '"'); #if OPENSSL_VERSION_NUMBER < CONST_SSL_METHOD_MINIMAL_VERSION SSL_METHOD* method; @@ -387,9 +387,9 @@ bool CryptoManagerImpl::SaveCertificateData( UNUSED(cert_guard); if (1 != BIO_reset(bio_cert)) { - LOG4CXX_WARN(logger_, - "Unabled to reset BIO in order to read private key, " - << LastError()); + LOG4CXX_WARN( + logger_, + "Unabled to reset BIO in order to read private key, " << LastError()); } EVP_PKEY* pkey = NULL; diff --git a/src/components/security_manager/src/security_manager_impl.cc b/src/components/security_manager/src/security_manager_impl.cc index 70f835fb93..dd71828d73 100644 --- a/src/components/security_manager/src/security_manager_impl.cc +++ b/src/components/security_manager/src/security_manager_impl.cc @@ -32,12 +32,12 @@ #include "security_manager/security_manager_impl.h" #include -#include "security_manager/crypto_manager_impl.h" +#include "json/json.h" #include "protocol_handler/protocol_packet.h" -#include "utils/logger.h" +#include "security_manager/crypto_manager_impl.h" #include "utils/byte_order.h" -#include "json/json.h" #include "utils/helpers.h" +#include "utils/logger.h" namespace security_manager { @@ -448,9 +448,9 @@ bool SecurityManagerImpl::ProccessHandshakeData( const uint32_t seqNumber = inMessage->get_header().seq_number; const uint32_t connection_key = inMessage->get_connection_key(); - LOG4CXX_DEBUG(logger_, - "Received " << inMessage->get_data_size() - << " bytes handshake data "); + LOG4CXX_DEBUG( + logger_, + "Received " << inMessage->get_data_size() << " bytes handshake data "); if (!inMessage->get_data_size()) { const std::string error_text("SendHandshakeData: null arguments size."); diff --git a/src/components/security_manager/src/security_query.cc b/src/components/security_manager/src/security_query.cc index 60233dde5e..fecfc4d723 100644 --- a/src/components/security_manager/src/security_query.cc +++ b/src/components/security_manager/src/security_query.cc @@ -32,8 +32,8 @@ #include "security_manager/security_query.h" #include -#include "utils/macro.h" #include "utils/byte_order.h" +#include "utils/macro.h" namespace security_manager { diff --git a/src/components/security_manager/src/ssl_context_impl.cc b/src/components/security_manager/src/ssl_context_impl.cc index 67be17db63..357d9556fb 100644 --- a/src/components/security_manager/src/ssl_context_impl.cc +++ b/src/components/security_manager/src/ssl_context_impl.cc @@ -33,14 +33,14 @@ #include #include -#include +#include #include +#include #include -#include #include -#include #include +#include #include "utils/macro.h" @@ -249,9 +249,9 @@ CryptoManagerImpl::SSLContextImpl::CheckCertContext() { << start_seconds << " seconds"); return Handshake_Result_NotYetValid; } else { - LOG4CXX_DEBUG(logger_, - "Time since certificate validity " << start_seconds - << "seconds"); + LOG4CXX_DEBUG( + logger_, + "Time since certificate validity " << start_seconds << "seconds"); } if (end_seconds < 0) { diff --git a/src/components/security_manager/test/crypto_manager_impl_test.cc b/src/components/security_manager/test/crypto_manager_impl_test.cc index 5e096194f3..d30fa5ef23 100644 --- a/src/components/security_manager/test/crypto_manager_impl_test.cc +++ b/src/components/security_manager/test/crypto_manager_impl_test.cc @@ -35,17 +35,17 @@ #else #include #endif //__QNXNTO__ -#include #include +#include #include #include "gtest/gtest.h" #include "security_manager/crypto_manager_impl.h" #include "security_manager/mock_security_manager_settings.h" +using ::testing::NiceMock; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::NiceMock; namespace { const size_t kUpdatesBeforeHour = 24; @@ -62,7 +62,7 @@ const std::string kFordCipher = SSL3_TXT_RSA_DES_192_CBC3_SHA; // Used cipher from ford protocol requirement const std::string kFordCipher = TLS1_TXT_RSA_WITH_AES_256_GCM_SHA384; #endif -} +} // namespace namespace test { namespace components { diff --git a/src/components/security_manager/test/security_manager_test.cc b/src/components/security_manager/test/security_manager_test.cc index aff7cbca2d..21af54f67b 100644 --- a/src/components/security_manager/test/security_manager_test.cc +++ b/src/components/security_manager/test/security_manager_test.cc @@ -30,20 +30,20 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include #include "gtest/gtest.h" -#include "utils/byte_order.h" #include "protocol/common.h" #include "security_manager/security_manager_impl.h" +#include "utils/byte_order.h" #include "protocol_handler/mock_protocol_handler.h" #include "protocol_handler/mock_session_observer.h" -#include "security_manager/mock_security_manager.h" -#include "security_manager/mock_ssl_context.h" #include "security_manager/mock_crypto_manager.h" +#include "security_manager/mock_security_manager.h" #include "security_manager/mock_security_manager_listener.h" +#include "security_manager/mock_ssl_context.h" #include "utils/mock_system_time_handler.h" #include "utils/test_async_waiter.h" @@ -52,28 +52,28 @@ namespace test { namespace components { namespace security_manager_test { -using protocol_handler::PROTOCOL_VERSION_2; -using protocol_handler::ServiceType; -using protocol_handler::kControl; -using protocol_handler::kRpc; using protocol_handler::kAudio; -using protocol_handler::kMobileNav; using protocol_handler::kBulk; +using protocol_handler::kControl; using protocol_handler::kInvalidServiceType; -using protocol_handler::RawMessagePtr; +using protocol_handler::kMobileNav; +using protocol_handler::kRpc; +using protocol_handler::PROTOCOL_VERSION_2; using protocol_handler::RawMessage; +using protocol_handler::RawMessagePtr; +using protocol_handler::ServiceType; -using security_manager::SecurityQuery; -using security_manager::SSLContext; using security_manager::SecurityManager; using security_manager::SecurityManagerImpl; +using security_manager::SecurityQuery; +using security_manager::SSLContext; using security_manager_test::InternalErrorWithErrId; +using ::testing::_; +using ::testing::DoAll; using ::testing::Return; using ::testing::ReturnNull; -using ::testing::DoAll; using ::testing::SetArgPointee; -using ::testing::_; namespace { // Sample data for handshake data emulation @@ -92,7 +92,7 @@ uint8_t* handshake_data_out_pointer = handshake_data_out; const size_t handshake_data_out_size = sizeof(handshake_data_out) / sizeof(handshake_data_out[0]); const uint32_t kAsyncExpectationsTimeout = 10000u; -} +} // namespace class SecurityManagerTest : public ::testing::Test { protected: @@ -104,8 +104,9 @@ class SecurityManagerTest : public ::testing::Test { void SetUp() OVERRIDE { security_manager_->set_session_observer(&mock_session_observer); security_manager_->set_protocol_handler(&mock_protocol_handler); - mock_sm_listener.reset(new testing::StrictMock< - security_manager_test::MockSecurityManagerListener>()); + mock_sm_listener.reset( + new testing::StrictMock< + security_manager_test::MockSecurityManagerListener>()); security_manager_->AddListener(mock_sm_listener.get()); } @@ -170,8 +171,9 @@ class SecurityManagerTest : public ::testing::Test { mock_ssl_context_new; testing::StrictMock mock_ssl_context_exists; - std::unique_ptr > mock_sm_listener; + std::unique_ptr< + testing::StrictMock > + mock_sm_listener; std::unique_ptr mock_system_time_handler; std::shared_ptr security_manager_; }; @@ -290,7 +292,8 @@ TEST_F(SecurityManagerTest, SecurityManager_NULLCryptoManager) { EXPECT_CALL(mock_protocol_handler, SendMessageToMobileApp( InternalErrorWithErrId(SecurityManager::ERROR_NOT_SUPPORTED), - kIsFinal)).WillOnce(NotifyTestAsyncWaiter(&waiter)); + kIsFinal)) + .WillOnce(NotifyTestAsyncWaiter(&waiter)); const SecurityQuery::QueryHeader header(SecurityQuery::REQUEST, // It could be any query id SecurityQuery::INVALID_QUERY_ID); @@ -385,7 +388,8 @@ TEST_F(SecurityManagerTest, GetInvalidQueryId) { mock_protocol_handler, SendMessageToMobileApp( InternalErrorWithErrId(SecurityManager::ERROR_INVALID_QUERY_ID), - kIsFinal)).WillOnce(NotifyTestAsyncWaiter(&waiter)); + kIsFinal)) + .WillOnce(NotifyTestAsyncWaiter(&waiter)); times++; const SecurityQuery::QueryHeader header(SecurityQuery::REQUEST, SecurityQuery::INVALID_QUERY_ID); @@ -575,7 +579,8 @@ TEST_F(SecurityManagerTest, ProccessHandshakeData_WrongDataSize) { mock_protocol_handler, SendMessageToMobileApp( InternalErrorWithErrId(SecurityManager::ERROR_INVALID_QUERY_SIZE), - kIsFinal)).WillOnce(NotifyTestAsyncWaiter(&waiter)); + kIsFinal)) + .WillOnce(NotifyTestAsyncWaiter(&waiter)); EmulateMobileMessageHandshake(NULL, 0); @@ -606,7 +611,8 @@ TEST_F(SecurityManagerTest, mock_protocol_handler, SendMessageToMobileApp( InternalErrorWithErrId(SecurityManager::ERROR_SERVICE_NOT_PROTECTED), - kIsFinal)).WillOnce(NotifyTestAsyncWaiter(&waiter)); + kIsFinal)) + .WillOnce(NotifyTestAsyncWaiter(&waiter)); times++; // Expect notifying listeners (unsuccess) diff --git a/src/components/security_manager/test/security_query_matcher.cc b/src/components/security_manager/test/security_query_matcher.cc index 3b7f4dd298..1bf22bf8cd 100644 --- a/src/components/security_manager/test/security_query_matcher.cc +++ b/src/components/security_manager/test/security_query_matcher.cc @@ -33,8 +33,8 @@ #include #include "gmock/gmock.h" -#include "utils/byte_order.h" #include "security_manager/security_query.h" +#include "utils/byte_order.h" namespace test { namespace components { diff --git a/src/components/security_manager/test/security_query_test.cc b/src/components/security_manager/test/security_query_test.cc index 80da10ea72..6becddaaf9 100644 --- a/src/components/security_manager/test/security_query_test.cc +++ b/src/components/security_manager/test/security_query_test.cc @@ -30,14 +30,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include #include "gtest/gtest.h" -#include "security_manager/security_query.h" #include "protocol_handler/protocol_payload.h" -#include "utils/byte_order.h" #include "security_manager/mock_security_manager.h" +#include "security_manager/security_query.h" +#include "utils/byte_order.h" // Test values for compare after serialization and byteorder conversion #define SEQ_NUMBER 0x12345678u diff --git a/src/components/security_manager/test/ssl_context_test.cc b/src/components/security_manager/test/ssl_context_test.cc index 05eeb802ad..e4d6c308bb 100644 --- a/src/components/security_manager/test/ssl_context_test.cc +++ b/src/components/security_manager/test/ssl_context_test.cc @@ -30,21 +30,21 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" +#include #include #include #include -#include +#include "gtest/gtest.h" #include "security_manager/crypto_manager.h" #include "security_manager/crypto_manager_impl.h" +#include "security_manager/mock_security_manager_settings.h" #include "security_manager/ssl_context.h" #include "utils/custom_string.h" -#include "security_manager/mock_security_manager_settings.h" +using ::testing::NiceMock; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::NiceMock; namespace { const std::string kCaPath = ""; @@ -98,14 +98,14 @@ class SSLTest : public testing::Test { static void SetCertificate(const std::string& file_name, std::string& out_certificate_data) { std::ifstream certificate_file(file_name.c_str()); - ASSERT_TRUE(certificate_file.is_open()) << "Could not open " << file_name - << "certificate data file"; + ASSERT_TRUE(certificate_file.is_open()) + << "Could not open " << file_name << "certificate data file"; std::stringstream certificate; certificate << certificate_file.rdbuf(); certificate_file.close(); out_certificate_data = certificate.str(); - ASSERT_FALSE(out_certificate_data.empty()) << file_name - << " data file is empty"; + ASSERT_FALSE(out_certificate_data.empty()) + << file_name << " data file is empty"; } virtual void SetUp() OVERRIDE { diff --git a/src/components/smart_objects/include/smart_objects/array_schema_item.h b/src/components/smart_objects/include/smart_objects/array_schema_item.h index 7706b6e091..0e19d2237e 100644 --- a/src/components/smart_objects/include/smart_objects/array_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/array_schema_item.h @@ -34,8 +34,8 @@ #include -#include "smart_objects/schema_item.h" #include "smart_objects/always_true_schema_item.h" +#include "smart_objects/schema_item.h" #include "smart_objects/schema_item_parameter.h" #include "utils/semantic_version.h" diff --git a/src/components/smart_objects/include/smart_objects/default_shema_item.h b/src/components/smart_objects/include/smart_objects/default_shema_item.h index beeeaac81f..16dbad4426 100644 --- a/src/components/smart_objects/include/smart_objects/default_shema_item.h +++ b/src/components/smart_objects/include/smart_objects/default_shema_item.h @@ -113,10 +113,10 @@ errors::eType CDefaultSchemaItem::validate( const utils::SemanticVersion& MessageVersion, const bool allow_unknown_enums) { if (getSmartType() != Object.getType()) { - std::string validation_info = "Incorrect type, expected: " + - SmartObject::typeToString(getSmartType()) + - ", got: " + - SmartObject::typeToString(Object.getType()); + std::string validation_info = + "Incorrect type, expected: " + + SmartObject::typeToString(getSmartType()) + + ", got: " + SmartObject::typeToString(Object.getType()); report__->set_validation_info(validation_info); return errors::INVALID_VALUE; } else { diff --git a/src/components/smart_objects/include/smart_objects/enum_schema_item.h b/src/components/smart_objects/include/smart_objects/enum_schema_item.h index 2a27f765d2..053ad98395 100644 --- a/src/components/smart_objects/include/smart_objects/enum_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/enum_schema_item.h @@ -41,8 +41,8 @@ #include "smart_objects/default_shema_item.h" -#include "utils/semantic_version.h" #include +#include "utils/semantic_version.h" namespace ns_smart_device_link { namespace ns_smart_objects { @@ -325,10 +325,10 @@ errors::eType TEnumSchemaItem::validate( } validation_info = "Invalid enum value: " + Object.asString(); } else { - validation_info = "Incorrect type, expected: " + - SmartObject::typeToString(SmartType_Integer) + - " (enum), got: " + - SmartObject::typeToString(Object.getType()); + validation_info = + "Incorrect type, expected: " + + SmartObject::typeToString(SmartType_Integer) + + " (enum), got: " + SmartObject::typeToString(Object.getType()); } report__->set_validation_info(validation_info); return errors::INVALID_VALUE; diff --git a/src/components/smart_objects/include/smart_objects/number_schema_item.h b/src/components/smart_objects/include/smart_objects/number_schema_item.h index b3e227e0f1..c3767e8e48 100644 --- a/src/components/smart_objects/include/smart_objects/number_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/number_schema_item.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_NUMBER_SCHEMA_ITEM_H_ #define SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_NUMBER_SCHEMA_ITEM_H_ -#include #include +#include #include "smart_objects/default_shema_item.h" #include "smart_objects/schema_item_parameter.h" @@ -113,10 +113,11 @@ class TNumberSchemaItem : public CDefaultSchemaItem { }; template -std::shared_ptr > TNumberSchemaItem< - NumberType>::create(const TSchemaItemParameter& MinValue, - const TSchemaItemParameter& MaxValue, - const TSchemaItemParameter& DefaultValue) { +std::shared_ptr > +TNumberSchemaItem::create( + const TSchemaItemParameter& MinValue, + const TSchemaItemParameter& MaxValue, + const TSchemaItemParameter& DefaultValue) { return std::shared_ptr >( new TNumberSchemaItem(MinValue, MaxValue, DefaultValue)); } diff --git a/src/components/smart_objects/include/smart_objects/object_schema_item.h b/src/components/smart_objects/include/smart_objects/object_schema_item.h index 7b57792c1e..7f51ae5678 100644 --- a/src/components/smart_objects/include/smart_objects/object_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/object_schema_item.h @@ -33,12 +33,12 @@ #define SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_OBJECT_SCHEMA_ITEM_H_ #include -#include #include +#include +#include #include "utils/macro.h" #include "utils/semantic_version.h" -#include #include "smart_objects/schema_item.h" #include "smart_objects/schema_item_parameter.h" diff --git a/src/components/smart_objects/include/smart_objects/smart_object.h b/src/components/smart_objects/include/smart_objects/smart_object.h index b862d25a17..f3aab0fc1e 100644 --- a/src/components/smart_objects/include/smart_objects/smart_object.h +++ b/src/components/smart_objects/include/smart_objects/smart_object.h @@ -33,15 +33,15 @@ #ifndef SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_SMART_OBJECT_H_ #define SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_SMART_OBJECT_H_ +#include #include -#include #include +#include #include -#include +#include "rpc_base/validation_report.h" #include "smart_objects/smart_schema.h" #include "utils/custom_string.h" -#include "rpc_base/validation_report.h" namespace ns_smart_device_link { namespace ns_smart_objects { @@ -299,8 +299,8 @@ class SmartObject FINAL { bool operator==(const int64_t Value) const; /** - * @name Support of type: uint64_t - * @{ + * @name Support of type: uint64_t + * @{ **/ /** diff --git a/src/components/smart_objects/include/smart_objects/smart_schema.h b/src/components/smart_objects/include/smart_objects/smart_schema.h index ece2696539..936f49c11e 100644 --- a/src/components/smart_objects/include/smart_objects/smart_schema.h +++ b/src/components/smart_objects/include/smart_objects/smart_schema.h @@ -32,8 +32,8 @@ #ifndef SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_SMART_SCHEMA_H_ #define SRC_COMPONENTS_SMART_OBJECTS_INCLUDE_SMART_OBJECTS_SMART_SCHEMA_H_ -#include "utils/macro.h" #include "smart_objects/schema_item.h" +#include "utils/macro.h" namespace ns_smart_device_link { namespace ns_smart_objects { diff --git a/src/components/smart_objects/src/array_schema_item.cc b/src/components/smart_objects/src/array_schema_item.cc index 1671a97644..9420fe020f 100644 --- a/src/components/smart_objects/src/array_schema_item.cc +++ b/src/components/smart_objects/src/array_schema_item.cc @@ -48,10 +48,10 @@ errors::eType CArraySchemaItem::validate( const utils::SemanticVersion& MessageVersion, const bool allow_unknown_enums) { if (SmartType_Array != Object.getType()) { - std::string validation_info = "Incorrect type, expected: " + - SmartObject::typeToString(SmartType_Array) + - ", got: " + - SmartObject::typeToString(Object.getType()); + std::string validation_info = + "Incorrect type, expected: " + + SmartObject::typeToString(SmartType_Array) + + ", got: " + SmartObject::typeToString(Object.getType()); report__->set_validation_info(validation_info); return errors::INVALID_VALUE; } diff --git a/src/components/smart_objects/src/object_schema_item.cc b/src/components/smart_objects/src/object_schema_item.cc index 21d2316e48..be1c73fb85 100644 --- a/src/components/smart_objects/src/object_schema_item.cc +++ b/src/components/smart_objects/src/object_schema_item.cc @@ -40,7 +40,7 @@ namespace { const char connection_key[] = "connection_key"; const char binary_data[] = "binary_data"; const char app_id[] = "appID"; -} +} // namespace namespace ns_smart_device_link { namespace ns_smart_objects { @@ -113,10 +113,10 @@ errors::eType CObjectSchemaItem::validate( const utils::SemanticVersion& MessageVersion, const bool allow_unknown_enums) { if (SmartType_Map != object.getType()) { - std::string validation_info = "Incorrect type, expected: " + - SmartObject::typeToString(SmartType_Map) + - ", got: " + - SmartObject::typeToString(object.getType()); + std::string validation_info = + "Incorrect type, expected: " + + SmartObject::typeToString(SmartType_Map) + + ", got: " + SmartObject::typeToString(object.getType()); report__->set_validation_info(validation_info); return errors::INVALID_VALUE; } @@ -244,8 +244,7 @@ void CObjectSchemaItem::RemoveFakeParams( mMembers.find(key); if (mMembers.end() == members_it // FIXME(EZamakhov): Remove illegal usage of filed in AM - && - key.compare(connection_key) != 0 && key.compare(binary_data) != 0 && + && key.compare(connection_key) != 0 && key.compare(binary_data) != 0 && key.compare(app_id) != 0) { ++it; Object.erase(key); diff --git a/src/components/smart_objects/src/smart_object.cc b/src/components/smart_objects/src/smart_object.cc index ef5dc787be..eb1c737aff 100644 --- a/src/components/smart_objects/src/smart_object.cc +++ b/src/components/smart_objects/src/smart_object.cc @@ -34,13 +34,12 @@ #include #include -#include #include #include -#include #include #include #include +#include namespace ns_smart_device_link { namespace ns_smart_objects { diff --git a/src/components/smart_objects/src/string_schema_item.cc b/src/components/smart_objects/src/string_schema_item.cc index e2ebde1861..c4382174d0 100644 --- a/src/components/smart_objects/src/string_schema_item.cc +++ b/src/components/smart_objects/src/string_schema_item.cc @@ -29,8 +29,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "smart_objects/smart_object.h" #include "smart_objects/string_schema_item.h" +#include "smart_objects/smart_object.h" #include "utils/custom_string.h" namespace ns_smart_device_link { @@ -52,10 +52,10 @@ errors::eType CStringSchemaItem::validate( const utils::SemanticVersion& MessageVersion, const bool allow_unknown_enums) { if (SmartType_String != Object.getType()) { - std::string validation_info = "Incorrect type, expected: " + - SmartObject::typeToString(SmartType_String) + - ", got: " + - SmartObject::typeToString(Object.getType()); + std::string validation_info = + "Incorrect type, expected: " + + SmartObject::typeToString(SmartType_String) + + ", got: " + SmartObject::typeToString(Object.getType()); report__->set_validation_info(validation_info); return errors::INVALID_VALUE; } diff --git a/src/components/smart_objects/test/AlwaysFalseSchemaItem_test.cc b/src/components/smart_objects/test/AlwaysFalseSchemaItem_test.cc index 1f514672fd..cded041bcc 100644 --- a/src/components/smart_objects/test/AlwaysFalseSchemaItem_test.cc +++ b/src/components/smart_objects/test/AlwaysFalseSchemaItem_test.cc @@ -34,8 +34,8 @@ #include "gmock/gmock.h" -#include "smart_objects/smart_object.h" #include "smart_objects/always_false_schema_item.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { diff --git a/src/components/smart_objects/test/AlwaysTrueSchemaItem_test.cc b/src/components/smart_objects/test/AlwaysTrueSchemaItem_test.cc index 7f26a4968a..54a9c8684f 100644 --- a/src/components/smart_objects/test/AlwaysTrueSchemaItem_test.cc +++ b/src/components/smart_objects/test/AlwaysTrueSchemaItem_test.cc @@ -34,8 +34,8 @@ #include "gmock/gmock.h" -#include "smart_objects/smart_object.h" #include "smart_objects/always_true_schema_item.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { diff --git a/src/components/smart_objects/test/ArraySchemaItem_test.cc b/src/components/smart_objects/test/ArraySchemaItem_test.cc index 28f435ee43..a22a27399d 100644 --- a/src/components/smart_objects/test/ArraySchemaItem_test.cc +++ b/src/components/smart_objects/test/ArraySchemaItem_test.cc @@ -34,8 +34,8 @@ #include "gmock/gmock.h" -#include "smart_objects/smart_object.h" #include "smart_objects/array_schema_item.h" +#include "smart_objects/smart_object.h" #include "smart_objects/string_schema_item.h" namespace test { diff --git a/src/components/smart_objects/test/BoolSchemaItem_test.cc b/src/components/smart_objects/test/BoolSchemaItem_test.cc index ed0043925b..7400729116 100644 --- a/src/components/smart_objects/test/BoolSchemaItem_test.cc +++ b/src/components/smart_objects/test/BoolSchemaItem_test.cc @@ -34,8 +34,8 @@ #include "gmock/gmock.h" -#include "smart_objects/smart_object.h" #include "smart_objects/bool_schema_item.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { diff --git a/src/components/smart_objects/test/CObjectSchemaItem_test.cc b/src/components/smart_objects/test/CObjectSchemaItem_test.cc index 646e60bf61..51085040c5 100644 --- a/src/components/smart_objects/test/CObjectSchemaItem_test.cc +++ b/src/components/smart_objects/test/CObjectSchemaItem_test.cc @@ -32,18 +32,18 @@ #include +#include "formatters/CSmartFactory.h" +#include "formatters/generic_json_formatter.h" #include "gmock/gmock.h" -#include "smart_objects/smart_object.h" -#include "smart_objects/smart_schema.h" #include "smart_objects/array_schema_item.h" #include "smart_objects/bool_schema_item.h" -#include "smart_objects/string_schema_item.h" #include "smart_objects/enum_schema_item.h" #include "smart_objects/number_schema_item.h" -#include "smart_objects/schema_item_parameter.h" #include "smart_objects/object_schema_item.h" -#include "formatters/generic_json_formatter.h" -#include "formatters/CSmartFactory.h" +#include "smart_objects/schema_item_parameter.h" +#include "smart_objects/smart_object.h" +#include "smart_objects/smart_schema.h" +#include "smart_objects/string_schema_item.h" #include "utils/semantic_version.h" namespace formatters = ns_smart_device_link::ns_json_handler::formatters; @@ -89,7 +89,7 @@ namespace Keys { const char RESULT_CODE[] = "resultCode"; const char INFO[] = "info"; const char SUCCESS[] = "success"; -} +} // namespace Keys class ObjectSchemaItemTest : public ::testing::Test { protected: diff --git a/src/components/smart_objects/test/EnumSchemaItem_test.cc b/src/components/smart_objects/test/EnumSchemaItem_test.cc index edfa563336..4f675ab181 100644 --- a/src/components/smart_objects/test/EnumSchemaItem_test.cc +++ b/src/components/smart_objects/test/EnumSchemaItem_test.cc @@ -32,8 +32,8 @@ #include "gmock/gmock.h" -#include "smart_objects/smart_object.h" #include "smart_objects/enum_schema_item.h" +#include "smart_objects/smart_object.h" #include "smart_objects/string_schema_item.h" #include @@ -278,5 +278,5 @@ const test::components::SmartObjects::SchemaItem::TestType::eType test::components::SmartObjects::SchemaItem::TestType::MASTER_RESET, test::components::SmartObjects::SchemaItem::TestType::FACTORY_DEFAULTS, test::components::SmartObjects::SchemaItem::TestType::APP_UNAUTHORIZED}; -} -} +} // namespace ns_smart_objects +} // namespace ns_smart_device_link diff --git a/src/components/smart_objects/test/NumberSchemaItem_test.cc b/src/components/smart_objects/test/NumberSchemaItem_test.cc index eb227e4e9b..04010be3f3 100644 --- a/src/components/smart_objects/test/NumberSchemaItem_test.cc +++ b/src/components/smart_objects/test/NumberSchemaItem_test.cc @@ -33,8 +33,8 @@ #include #include "gmock/gmock.h" -#include "smart_objects/smart_object.h" #include "smart_objects/number_schema_item.h" +#include "smart_objects/smart_object.h" namespace test { namespace components { diff --git a/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc b/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc index 7d95a40b26..edcb09c604 100644 --- a/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc +++ b/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc @@ -36,21 +36,21 @@ #include "gmock/gmock.h" -#include "smart_objects/smart_object.h" -#include "smart_objects/smart_schema.h" -#include "smart_objects/schema_item.h" -#include "formatters/CFormatterJsonSDLRPCv2.h" #include "formatters/CFormatterJsonSDLRPCv1.h" +#include "formatters/CFormatterJsonSDLRPCv2.h" #include "smart_objects/array_schema_item.h" #include "smart_objects/bool_schema_item.h" -#include "smart_objects/object_schema_item.h" -#include "smart_objects/string_schema_item.h" #include "smart_objects/enum_schema_item.h" #include "smart_objects/number_schema_item.h" +#include "smart_objects/object_schema_item.h" +#include "smart_objects/schema_item.h" #include "smart_objects/schema_item_parameter.h" +#include "smart_objects/smart_object.h" +#include "smart_objects/smart_schema.h" +#include "smart_objects/string_schema_item.h" -#include #include +#include namespace test { namespace components { @@ -783,5 +783,5 @@ const test::components::SmartObjects::SmartObjectConvertionTimeTest:: MessageTypeTest::response, test::components::SmartObjects::SmartObjectConvertionTimeTest:: MessageTypeTest::notification}; -} -} +} // namespace ns_smart_objects +} // namespace ns_smart_device_link diff --git a/src/components/smart_objects/test/SmartObjectDraft_test.cc b/src/components/smart_objects/test/SmartObjectDraft_test.cc index cfb6785db7..d2382be51d 100644 --- a/src/components/smart_objects/test/SmartObjectDraft_test.cc +++ b/src/components/smart_objects/test/SmartObjectDraft_test.cc @@ -37,8 +37,8 @@ #include "smart_objects/smart_object.h" -using ::testing::ElementsAre; using ::testing::ContainerEq; +using ::testing::ElementsAre; namespace test { namespace components { diff --git a/src/components/smart_objects/test/map_performance_test.cc b/src/components/smart_objects/test/map_performance_test.cc index b0544a94d4..be29a93553 100644 --- a/src/components/smart_objects/test/map_performance_test.cc +++ b/src/components/smart_objects/test/map_performance_test.cc @@ -30,9 +30,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include -#include #include "gmock/gmock.h" @@ -59,7 +59,7 @@ void MakeMapObject(Map& obj, const int size) { obj[i_key] = array; } } -} +} // namespace TEST(SmartObjectPerformanceTest, SmartObjectMapPerformance) { Map object; diff --git a/src/components/smart_objects/test/smart_object_performance_test.cc b/src/components/smart_objects/test/smart_object_performance_test.cc index 11273e332f..ebf39e6b5c 100644 --- a/src/components/smart_objects/test/smart_object_performance_test.cc +++ b/src/components/smart_objects/test/smart_object_performance_test.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include #include "gmock/gmock.h" @@ -58,7 +58,7 @@ void MakeMapObject(SmartObject& obj, const int size) { obj[i_key] = array; } } -} +} // namespace TEST(SmartObjectPerformanceTest, SmartObjectPerformance) { SmartObject object; diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_metric_wrapper.h b/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_metric_wrapper.h index eabaf0a5e4..7ee5729c9b 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_metric_wrapper.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_metric_wrapper.h @@ -35,8 +35,8 @@ #include -#include "telemetry_monitor/metric_wrapper.h" #include "telemetry_monitor/application_manager_observer.h" +#include "telemetry_monitor/metric_wrapper.h" namespace telemetry_monitor { @@ -48,5 +48,5 @@ class ApplicationManagerMetricWrapper : public MetricWrapper { message_metric; virtual Json::Value GetJsonMetric(); }; -} +} // namespace telemetry_monitor #endif // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_APPLICATION_MANAGER_METRIC_WRAPPER_H_ diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_observer.h b/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_observer.h index 31a3ceea12..826bc66c7f 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_observer.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_observer.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_APPLICATION_MANAGER_OBSERVER_H_ #define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_APPLICATION_MANAGER_OBSERVER_H_ -#include "utils/message_queue.h" #include "application_manager/telemetry_observer.h" #include "telemetry_monitor/application_manager_metric_wrapper.h" +#include "utils/message_queue.h" namespace telemetry_monitor { @@ -50,5 +50,5 @@ class ApplicationManagerObserver private: TelemetryMonitor* telemetry_monitor_; }; -} +} // namespace telemetry_monitor #endif // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_APPLICATION_MANAGER_OBSERVER_H_ diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/json_keys.h b/src/components/telemetry_monitor/include/telemetry_monitor/json_keys.h index 899c76b2e8..94911bcaef 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/json_keys.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/json_keys.h @@ -47,6 +47,6 @@ const char connection_key[] = "connection_key"; const char stime[] = "stime"; const char utime[] = "utime"; const char memory[] = "RAM"; -} -} +} // namespace strings +} // namespace telemetry_monitor #endif // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_JSON_KEYS_H_ diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/metric_wrapper.h b/src/components/telemetry_monitor/include/telemetry_monitor/metric_wrapper.h index 431e255c7b..f69efada82 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/metric_wrapper.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/metric_wrapper.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_METRIC_WRAPPER_H_ #include -#include "utils/resource_usage.h" #include "json/json.h" +#include "utils/resource_usage.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric_wrapper.h b/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric_wrapper.h index dfe7f4b964..a3af8e7048 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric_wrapper.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric_wrapper.h @@ -35,8 +35,8 @@ #include -#include "telemetry_monitor/metric_wrapper.h" #include "protocol_handler_observer.h" +#include "telemetry_monitor/metric_wrapper.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h b/src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h index 0d31573d8e..b7d8f6da2b 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h @@ -35,16 +35,16 @@ #include -#include "utils/message_queue.h" -#include "utils/threads/thread.h" -#include "utils/threads/thread_delegate.h" -#include "telemetry_monitor/metric_wrapper.h" -#include "telemetry_monitor/application_manager_observer.h" #include "application_manager/application_manager.h" +#include "protocol_handler/protocol_handler_impl.h" +#include "protocol_handler_observer.h" +#include "telemetry_monitor/application_manager_observer.h" +#include "telemetry_monitor/metric_wrapper.h" #include "telemetry_monitor/transport_manager_observer.h" #include "transport_manager/transport_manager_impl.h" -#include "protocol_handler_observer.h" -#include "protocol_handler/protocol_handler_impl.h" +#include "utils/message_queue.h" +#include "utils/threads/thread.h" +#include "utils/threads/thread_delegate.h" namespace telemetry_monitor { @@ -78,12 +78,13 @@ class TelemetryMonitor { public: TelemetryMonitor(const std::string& server_address, uint16_t port); virtual ~TelemetryMonitor(); - virtual void Init(TelemetryObservable* - protocol_handler, - TelemetryObservable< - application_manager::AMTelemetryObserver>* app_manager, - TelemetryObservable* - transport_manager); + virtual void Init( + TelemetryObservable* + protocol_handler, + TelemetryObservable* + app_manager, + TelemetryObservable* + transport_manager); virtual void Stop(); virtual void Start(); virtual void SendMetric(std::shared_ptr metric); diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_observer.h b/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_observer.h index d0bf4ba5bb..f79e27d2a0 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_observer.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_observer.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_TRANSPORT_MANAGER_OBSERVER_H_ #include "transport_manager/telemetry_observer.h" -#include "utils/message_queue.h" #include "utils/date_time.h" +#include "utils/message_queue.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc b/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc index 006aac196f..90c5ffb87e 100644 --- a/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc +++ b/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc @@ -31,8 +31,8 @@ */ #include "telemetry_monitor/application_manager_metric_wrapper.h" -#include "telemetry_monitor/json_keys.h" #include "application_manager/smart_object_keys.h" +#include "telemetry_monitor/json_keys.h" #include "utils/convert_utils.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/src/application_manager_observer.cc b/src/components/telemetry_monitor/src/application_manager_observer.cc index 1e621c8a6e..1a18d87ad8 100644 --- a/src/components/telemetry_monitor/src/application_manager_observer.cc +++ b/src/components/telemetry_monitor/src/application_manager_observer.cc @@ -31,8 +31,8 @@ */ #include "telemetry_monitor/application_manager_observer.h" -#include "telemetry_monitor/telemetry_monitor.h" #include "telemetry_monitor/application_manager_metric_wrapper.h" +#include "telemetry_monitor/telemetry_monitor.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/src/metric_wrapper.cc b/src/components/telemetry_monitor/src/metric_wrapper.cc index 10b694c5e6..8b2ba6f220 100644 --- a/src/components/telemetry_monitor/src/metric_wrapper.cc +++ b/src/components/telemetry_monitor/src/metric_wrapper.cc @@ -71,4 +71,4 @@ void MetricWrapper::Clear() { MetricWrapper::~MetricWrapper() { Clear(); } -} +} // namespace telemetry_monitor diff --git a/src/components/telemetry_monitor/src/protocol_handler_observer.cc b/src/components/telemetry_monitor/src/protocol_handler_observer.cc index 19b04da392..e696e58506 100644 --- a/src/components/telemetry_monitor/src/protocol_handler_observer.cc +++ b/src/components/telemetry_monitor/src/protocol_handler_observer.cc @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "utils/date_time.h" #include "telemetry_monitor/protocol_handler_observer.h" #include "telemetry_monitor/protocol_handler_metric_wrapper.h" #include "telemetry_monitor/telemetry_monitor.h" +#include "utils/date_time.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/src/telemetry_monitor.cc b/src/components/telemetry_monitor/src/telemetry_monitor.cc index d62724a479..e2f45b7576 100644 --- a/src/components/telemetry_monitor/src/telemetry_monitor.cc +++ b/src/components/telemetry_monitor/src/telemetry_monitor.cc @@ -32,12 +32,12 @@ #include "telemetry_monitor/telemetry_monitor.h" -#include -#include +#include +#include #include +#include #include -#include -#include +#include #include #include "transport_manager/transport_manager_default.h" diff --git a/src/components/telemetry_monitor/src/transport_manager_metric_wrapper.cc b/src/components/telemetry_monitor/src/transport_manager_metric_wrapper.cc index 789da92eaf..3a89c9245a 100644 --- a/src/components/telemetry_monitor/src/transport_manager_metric_wrapper.cc +++ b/src/components/telemetry_monitor/src/transport_manager_metric_wrapper.cc @@ -31,9 +31,9 @@ */ #include "telemetry_monitor/transport_manager_metric_wrapper.h" +#include "application_manager/smart_object_keys.h" #include "json/json.h" #include "telemetry_monitor/json_keys.h" -#include "application_manager/smart_object_keys.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/src/transport_manager_observer.cc b/src/components/telemetry_monitor/src/transport_manager_observer.cc index 25817d6c73..15338eddff 100644 --- a/src/components/telemetry_monitor/src/transport_manager_observer.cc +++ b/src/components/telemetry_monitor/src/transport_manager_observer.cc @@ -33,8 +33,8 @@ #include -#include "telemetry_monitor/transport_manager_metric_wrapper.h" #include "telemetry_monitor/telemetry_monitor.h" +#include "telemetry_monitor/transport_manager_metric_wrapper.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/test/application_manager_metric_test.cc b/src/components/telemetry_monitor/test/application_manager_metric_test.cc index 2e6eaad9d8..4af5ba82b5 100644 --- a/src/components/telemetry_monitor/test/application_manager_metric_test.cc +++ b/src/components/telemetry_monitor/test/application_manager_metric_test.cc @@ -30,11 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "application_manager/smart_object_keys.h" #include "gtest/gtest.h" +#include "telemetry_monitor/application_manager_metric_wrapper.h" #include "telemetry_monitor/json_keys.h" #include "utils/resource_usage.h" -#include "application_manager/smart_object_keys.h" -#include "telemetry_monitor/application_manager_metric_wrapper.h" namespace test { namespace components { diff --git a/src/components/telemetry_monitor/test/application_manager_observer_test.cc b/src/components/telemetry_monitor/test/application_manager_observer_test.cc index deecfa57b7..daf3890485 100644 --- a/src/components/telemetry_monitor/test/application_manager_observer_test.cc +++ b/src/components/telemetry_monitor/test/application_manager_observer_test.cc @@ -30,11 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" -#include "telemetry_monitor/mock_telemetry_monitor.h" +#include "telemetry_monitor/application_manager_observer.h" #include "application_manager/telemetry_observer.h" +#include "gtest/gtest.h" #include "telemetry_monitor/application_manager_metric_wrapper.h" -#include "telemetry_monitor/application_manager_observer.h" +#include "telemetry_monitor/mock_telemetry_monitor.h" #include "telemetry_monitor/telemetry_monitor.h" diff --git a/src/components/telemetry_monitor/test/include/telemetry_monitor/mock_telemetry_monitor.h b/src/components/telemetry_monitor/test/include/telemetry_monitor/mock_telemetry_monitor.h index c2aebe72b3..9b41d5a9ac 100644 --- a/src/components/telemetry_monitor/test/include/telemetry_monitor/mock_telemetry_monitor.h +++ b/src/components/telemetry_monitor/test/include/telemetry_monitor/mock_telemetry_monitor.h @@ -35,8 +35,8 @@ #include #include "gmock/gmock.h" -#include "telemetry_monitor/telemetry_monitor.h" #include "telemetry_monitor/metric_wrapper.h" +#include "telemetry_monitor/telemetry_monitor.h" namespace test { namespace components { @@ -51,7 +51,7 @@ class MockTelemetryMonitor : public telemetry_monitor::TelemetryMonitor { MOCK_METHOD1(SendMetric, void(std::shared_ptr metric)); }; -} // namespace transport_manager_test +} // namespace telemetry_monitor_test } // namespace components } // namespace test #endif // SRC_COMPONENTS_TELEMETRY_MONITOR_TEST_INCLUDE_TELEMETRY_MONITOR_MOCK_TELEMETRY_MONITOR_H_ diff --git a/src/components/telemetry_monitor/test/metric_wrapper_test.cc b/src/components/telemetry_monitor/test/metric_wrapper_test.cc index f1e3c77db4..5501877ec8 100644 --- a/src/components/telemetry_monitor/test/metric_wrapper_test.cc +++ b/src/components/telemetry_monitor/test/metric_wrapper_test.cc @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "telemetry_monitor/metric_wrapper.h" -#include "telemetry_monitor/json_keys.h" +#include "gtest/gtest.h" #include "json/json.h" +#include "telemetry_monitor/json_keys.h" #include "utils/resource_usage.h" namespace test { diff --git a/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc b/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc index c9130411e7..8662321be3 100644 --- a/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc +++ b/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc @@ -31,11 +31,11 @@ */ #include "gtest/gtest.h" -#include "telemetry_monitor/json_keys.h" #include "json/json.h" -#include "utils/resource_usage.h" -#include "telemetry_monitor/protocol_handler_metric_wrapper.h" #include "protocol_handler/telemetry_observer.h" +#include "telemetry_monitor/json_keys.h" +#include "telemetry_monitor/protocol_handler_metric_wrapper.h" +#include "utils/resource_usage.h" namespace test { namespace components { diff --git a/src/components/telemetry_monitor/test/protocol_handler_observer_test.cc b/src/components/telemetry_monitor/test/protocol_handler_observer_test.cc index 587bf21ce6..b74434da3c 100644 --- a/src/components/telemetry_monitor/test/protocol_handler_observer_test.cc +++ b/src/components/telemetry_monitor/test/protocol_handler_observer_test.cc @@ -31,9 +31,9 @@ */ #include "gtest/gtest.h" -#include "telemetry_monitor/telemetry_monitor.h" -#include "telemetry_monitor/mock_telemetry_monitor.h" #include "protocol_handler/telemetry_observer.h" +#include "telemetry_monitor/mock_telemetry_monitor.h" +#include "telemetry_monitor/telemetry_monitor.h" namespace test { namespace components { diff --git a/src/components/telemetry_monitor/test/telemetry_monitor_test.cc b/src/components/telemetry_monitor/test/telemetry_monitor_test.cc index b8d3f9063f..f7b74ac278 100644 --- a/src/components/telemetry_monitor/test/telemetry_monitor_test.cc +++ b/src/components/telemetry_monitor/test/telemetry_monitor_test.cc @@ -30,19 +30,19 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "telemetry_monitor/telemetry_monitor.h" -#include "protocol_handler/telemetry_observer.h" -#include "protocol_handler/protocol_handler.h" +#include "connection_handler/mock_connection_handler.h" +#include "gtest/gtest.h" #include "protocol_handler//mock_protocol_handler.h" -#include "protocol_handler/mock_session_observer.h" #include "protocol_handler/mock_protocol_handler_settings.h" -#include "connection_handler/mock_connection_handler.h" -#include "transport_manager/mock_transport_manager.h" +#include "protocol_handler/mock_session_observer.h" +#include "protocol_handler/protocol_handler.h" +#include "protocol_handler/telemetry_observer.h" #include "telemetry_monitor/mock_telemetry_observable.h" +#include "transport_manager/mock_transport_manager.h" -using testing::Return; using testing::_; +using testing::Return; namespace test { namespace components { diff --git a/src/components/telemetry_monitor/test/transport_manager_metric_test.cc b/src/components/telemetry_monitor/test/transport_manager_metric_test.cc index 40caa6e0d6..3b3ac07577 100644 --- a/src/components/telemetry_monitor/test/transport_manager_metric_test.cc +++ b/src/components/telemetry_monitor/test/transport_manager_metric_test.cc @@ -31,11 +31,11 @@ */ #include "gtest/gtest.h" -#include "telemetry_monitor/json_keys.h" #include "json/json.h" -#include "utils/resource_usage.h" -#include "telemetry_monitor/transport_manager_metric_wrapper.h" #include "protocol_handler/telemetry_observer.h" +#include "telemetry_monitor/json_keys.h" +#include "telemetry_monitor/transport_manager_metric_wrapper.h" +#include "utils/resource_usage.h" namespace test { namespace components { diff --git a/src/components/telemetry_monitor/test/transport_manager_observer_test.cc b/src/components/telemetry_monitor/test/transport_manager_observer_test.cc index adc857d6cc..57834339d6 100644 --- a/src/components/telemetry_monitor/test/transport_manager_observer_test.cc +++ b/src/components/telemetry_monitor/test/transport_manager_observer_test.cc @@ -30,11 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "telemetry_monitor/transport_manager_observer.h" #include "gtest/gtest.h" -#include "telemetry_monitor/mock_telemetry_monitor.h" #include "protocol_handler/telemetry_observer.h" +#include "telemetry_monitor/mock_telemetry_monitor.h" #include "telemetry_monitor/transport_manager_metric_wrapper.h" -#include "telemetry_monitor/transport_manager_observer.h" namespace test { namespace components { diff --git a/src/components/test_main.cc b/src/components/test_main.cc index 61606756fe..8912ed9bd2 100644 --- a/src/components/test_main.cc +++ b/src/components/test_main.cc @@ -1,7 +1,7 @@ +#include #include "gmock/gmock.h" -#include "utils/logger.h" #include "utils/custom_string.h" -#include +#include "utils/logger.h" CREATE_LOGGERPTR_GLOBAL(logger_, "SDLMain") int main(int argc, char** argv) { diff --git a/src/components/transport_manager/include/transport_manager/bluetooth/bluetooth_device_scanner.h b/src/components/transport_manager/include/transport_manager/bluetooth/bluetooth_device_scanner.h index dc38a971f5..13fef1d017 100644 --- a/src/components/transport_manager/include/transport_manager/bluetooth/bluetooth_device_scanner.h +++ b/src/components/transport_manager/include/transport_manager/bluetooth/bluetooth_device_scanner.h @@ -39,9 +39,9 @@ #include #include #include +#include #include #include -#include #include "transport_manager/transport_adapter/device_scanner.h" #include "utils/conditional_variable.h" diff --git a/src/components/transport_manager/include/transport_manager/cloud/websocket_client_connection.h b/src/components/transport_manager/include/transport_manager/cloud/websocket_client_connection.h index a726524af2..76c8ca73cd 100644 --- a/src/components/transport_manager/include/transport_manager/cloud/websocket_client_connection.h +++ b/src/components/transport_manager/include/transport_manager/cloud/websocket_client_connection.h @@ -36,11 +36,11 @@ #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_CLOUD_WEBSOCKET_CLIENT_CONNECTION_H_ #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_CLOUD_WEBSOCKET_CLIENT_CONNECTION_H_ -#include -#include #include #include #include +#include +#include #ifdef ENABLE_SECURITY #include #include @@ -51,11 +51,11 @@ #include #include #include -#include "transport_manager/transport_adapter/connection.h" #include "transport_manager/cloud/cloud_websocket_transport_adapter.h" -#include "utils/threads/thread.h" -#include "utils/threads/message_loop_thread.h" +#include "transport_manager/transport_adapter/connection.h" #include "utils/message_queue.h" +#include "utils/threads/message_loop_thread.h" +#include "utils/threads/thread.h" namespace websocket = boost::beast::websocket; // from diff --git a/src/components/transport_manager/include/transport_manager/iap2_emulation/iap2_transport_adapter.h b/src/components/transport_manager/include/transport_manager/iap2_emulation/iap2_transport_adapter.h index e53a472bcb..a802a64afa 100644 --- a/src/components/transport_manager/include/transport_manager/iap2_emulation/iap2_transport_adapter.h +++ b/src/components/transport_manager/include/transport_manager/iap2_emulation/iap2_transport_adapter.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_IAP2_EMULATION_IAP2_TRANSPORT_ADAPTER_H_ #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_IAP2_EMULATION_IAP2_TRANSPORT_ADAPTER_H_ +#include "resumption/last_state.h" #include "transport_manager/tcp/tcp_transport_adapter.h" #include "transport_manager/transport_manager_settings.h" -#include "resumption/last_state.h" #include "utils/macro.h" #include "utils/threads/thread_delegate.h" @@ -108,8 +108,8 @@ class IAP2USBEmulationTransportAdapter : public TcpTransportAdapter { const TransportManagerSettings& settings); /** - * Destructor - */ + * Destructor + */ ~IAP2USBEmulationTransportAdapter(); /** diff --git a/src/components/transport_manager/include/transport_manager/tcp/network_interface_listener_impl.h b/src/components/transport_manager/include/transport_manager/tcp/network_interface_listener_impl.h index 159b5ff21d..272b28b6b2 100644 --- a/src/components/transport_manager/include/transport_manager/tcp/network_interface_listener_impl.h +++ b/src/components/transport_manager/include/transport_manager/tcp/network_interface_listener_impl.h @@ -1,11 +1,11 @@ #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TCP_NETWORK_INTERFACE_LISTENER_IMPL_H_ #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TCP_NETWORK_INTERFACE_LISTENER_IMPL_H_ -#include #include +#include -#include "utils/macro.h" #include "transport_manager/tcp/network_interface_listener.h" +#include "utils/macro.h" namespace transport_manager { namespace transport_adapter { diff --git a/src/components/transport_manager/include/transport_manager/tcp/tcp_client_listener.h b/src/components/transport_manager/include/transport_manager/tcp/tcp_client_listener.h index 0f9529d8d8..28784fe3c7 100644 --- a/src/components/transport_manager/include/transport_manager/tcp/tcp_client_listener.h +++ b/src/components/transport_manager/include/transport_manager/tcp/tcp_client_listener.h @@ -36,9 +36,9 @@ #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TCP_TCP_CLIENT_LISTENER_H_ #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TCP_TCP_CLIENT_LISTENER_H_ +#include "transport_manager/transport_adapter/client_connection_listener.h" #include "utils/lock.h" #include "utils/threads/thread_delegate.h" -#include "transport_manager/transport_adapter/client_connection_listener.h" class Thread; struct in_addr; diff --git a/src/components/transport_manager/include/transport_manager/tcp/tcp_device.h b/src/components/transport_manager/include/transport_manager/tcp/tcp_device.h index 7aa0b72687..6e7a306879 100644 --- a/src/components/transport_manager/include/transport_manager/tcp/tcp_device.h +++ b/src/components/transport_manager/include/transport_manager/tcp/tcp_device.h @@ -36,19 +36,19 @@ #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TCP_TCP_DEVICE_H_ #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TCP_TCP_DEVICE_H_ -#include -#include -#include #include +#include +#include #include -#include +#include #include +#include #include #include -#include "utils/lock.h" #include "transport_manager/transport_adapter/device.h" +#include "utils/lock.h" namespace transport_manager { namespace transport_adapter { diff --git a/src/components/transport_manager/include/transport_manager/telemetry_observer.h b/src/components/transport_manager/include/transport_manager/telemetry_observer.h index a38255966b..b4f321d23f 100644 --- a/src/components/transport_manager/include/transport_manager/telemetry_observer.h +++ b/src/components/transport_manager/include/transport_manager/telemetry_observer.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TELEMETRY_OBSERVER_H_ #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TELEMETRY_OBSERVER_H_ -#include "transport_manager/common.h" #include "protocol/raw_message.h" +#include "transport_manager/common.h" #include "utils/date_time.h" namespace transport_manager { @@ -51,5 +51,5 @@ class TMTelemetryObserver { virtual ~TMTelemetryObserver() {} }; -} // transport_manager +} // namespace transport_manager #endif // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TELEMETRY_OBSERVER_H_ diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/threaded_socket_connection.h b/src/components/transport_manager/include/transport_manager/transport_adapter/threaded_socket_connection.h index f1c679c123..11123ceb1c 100644 --- a/src/components/transport_manager/include/transport_manager/transport_adapter/threaded_socket_connection.h +++ b/src/components/transport_manager/include/transport_manager/transport_adapter/threaded_socket_connection.h @@ -38,11 +38,11 @@ #include #include -#include "transport_manager/transport_adapter/connection.h" -#include "protocol/common.h" #include -#include "utils/threads/thread_delegate.h" +#include "protocol/common.h" +#include "transport_manager/transport_adapter/connection.h" #include "utils/lock.h" +#include "utils/threads/thread_delegate.h" using ::transport_manager::transport_adapter::Connection; diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_controller.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_controller.h index 7a0a37758c..72a67a3087 100644 --- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_controller.h +++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_controller.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_TRANSPORT_ADAPTER_CONTROLLER_H_ #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_TRANSPORT_ADAPTER_CONTROLLER_H_ -#include "transport_manager/transport_adapter/device.h" -#include "transport_manager/transport_adapter/connection.h" #include "protocol/common.h" +#include "transport_manager/transport_adapter/connection.h" +#include "transport_manager/transport_adapter/device.h" namespace transport_manager { namespace transport_adapter { @@ -174,12 +174,12 @@ class TransportAdapterController { const ApplicationHandle& app_handle) = 0; /** - * @brief Launch OnDataReceiveDone event in the device adapter listener. - * - * @param device_handle Device unique identifier. - * @param app_handle Handle of application. - * @param message Smart pointer to the raw message. - */ + * @brief Launch OnDataReceiveDone event in the device adapter listener. + * + * @param device_handle Device unique identifier. + * @param app_handle Handle of application. + * @param message Smart pointer to the raw message. + */ virtual void DataReceiveDone(const DeviceUID& device_handle, const ApplicationHandle& app_handle, ::protocol_handler::RawMessagePtr message) = 0; diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h index b30f1e35b2..84b80e956f 100644 --- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h +++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h @@ -33,21 +33,21 @@ #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_TRANSPORT_ADAPTER_IMPL_H_ #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_TRANSPORT_ADAPTER_IMPL_H_ -#include -#include #include #include +#include +#include #include #include "utils/lock.h" #include "utils/rwlock.h" #include "utils/timer.h" +#include "resumption/last_state.h" +#include "transport_manager/transport_adapter/connection.h" #include "transport_manager/transport_adapter/transport_adapter.h" #include "transport_manager/transport_adapter/transport_adapter_controller.h" -#include "transport_manager/transport_adapter/connection.h" #include "transport_manager/transport_manager_settings.h" -#include "resumption/last_state.h" #ifdef TELEMETRY_MONITOR #include "transport_manager/telemetry_observer.h" diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h index a0e0a51c1e..4db9a3b710 100644 --- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h +++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_TRANSPORT_ADAPTER_LISTENER_H_ #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_TRANSPORT_ADAPTER_LISTENER_H_ +#include "protocol/common.h" #include "transport_manager/common.h" #include "transport_manager/error.h" -#include "protocol/common.h" namespace transport_manager { namespace transport_adapter { @@ -307,6 +307,6 @@ class TransportAdapterListener { const TransportAdapter* transport_adapter) = 0; }; -} // transport_adapter namespace -} // transport_manager namespace +} // namespace transport_adapter +} // namespace transport_manager #endif // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_TRANSPORT_ADAPTER_LISTENER_H_ diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener_impl.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener_impl.h index 0c9c6ef6a2..d00ae1c498 100644 --- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener_impl.h +++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_listener_impl.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_TRANSPORT_ADAPTER_LISTENER_IMPL_H_ #include "transport_manager/common.h" -#include "transport_manager/transport_adapter/transport_adapter_listener.h" #include "transport_manager/transport_adapter/transport_adapter.h" +#include "transport_manager/transport_adapter/transport_adapter_listener.h" #include "transport_manager/transport_manager.h" namespace transport_manager { diff --git a/src/components/transport_manager/include/transport_manager/transport_manager_default.h b/src/components/transport_manager/include/transport_manager/transport_manager_default.h index 8039f9c985..7fb0904fdf 100644 --- a/src/components/transport_manager/include/transport_manager/transport_manager_default.h +++ b/src/components/transport_manager/include/transport_manager/transport_manager_default.h @@ -65,6 +65,6 @@ class TransportManagerDefault : public TransportManagerImpl { DISALLOW_COPY_AND_ASSIGN(TransportManagerDefault); }; -} +} // namespace transport_manager #endif // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_DEFAULT_H_ diff --git a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h index 60303c1bca..d576db7500 100644 --- a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h +++ b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h @@ -33,29 +33,29 @@ #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_IMPL_H_ #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_IMPL_H_ -#include -#include -#include -#include -#include #include -#include #include +#include +#include +#include +#include +#include +#include -#include "utils/timer.h" #include "utils/rwlock.h" +#include "utils/timer.h" +#include "protocol/common.h" +#include "transport_manager/transport_adapter/transport_adapter_listener_impl.h" #include "transport_manager/transport_manager.h" #include "transport_manager/transport_manager_listener.h" -#include "transport_manager/transport_adapter/transport_adapter_listener_impl.h" -#include "protocol/common.h" #ifdef TELEMETRY_MONITOR -#include "transport_manager/telemetry_observer.h" #include "telemetry_monitor/telemetry_observable.h" +#include "transport_manager/telemetry_observer.h" #endif // TELEMETRY_MONITOR -#include "utils/threads/message_loop_thread.h" #include "transport_manager/transport_adapter/transport_adapter_event.h" #include "transport_manager/transport_manager_settings.h" +#include "utils/threads/message_loop_thread.h" namespace transport_manager { @@ -74,10 +74,10 @@ class TransportManagerImpl public RawMessageLoopThread::Handler, public TransportAdapterEventLoopThread::Handler #ifdef TELEMETRY_MONITOR - , + , public telemetry_monitor::TelemetryObservable #endif // TELEMETRY_MONITOR - { +{ public: struct Connection { ConnectionUID id; @@ -327,9 +327,9 @@ class TransportManagerImpl private: /** - * @brief Structure that contains conversion functions (Device ID -> Device - * Handle; Device Handle -> Device ID) - */ + * @brief Structure that contains conversion functions (Device ID -> Device + * Handle; Device Handle -> Device ID) + */ struct Handle2GUIDConverter { /** * @brief ConversionTable Records uid/connection type/handle @@ -421,18 +421,18 @@ class TransportManagerImpl void AddConnection(const ConnectionInternal& c); /** - * @brief Removes connection from connections list - * @param id Identifier of connection to be removed - * @param transport_adapter Pointer to transport adapter - * that holds connection - */ + * @brief Removes connection from connections list + * @param id Identifier of connection to be removed + * @param transport_adapter Pointer to transport adapter + * that holds connection + */ void RemoveConnection(const uint32_t id, transport_adapter::TransportAdapter* transport_adapter); /** - * @brief Deactivates all connections related to certain device - * @param device_uid Device unique identifier - */ + * @brief Deactivates all connections related to certain device + * @param device_uid Device unique identifier + */ void DeactivateDeviceConnections(const DeviceUID& device_uid); /** * @brief Returns connection from connections list by connection identifier @@ -452,14 +452,14 @@ class TransportManagerImpl const ApplicationHandle& application); /** - * @brief Returns active connection from connections list by device unique + * @brief Returns active connection from connections list by device unique * id - * and application handle - * (this method returns only active connections as opposed to previous one) - * @param device Device unique identifier - * @param application Application handle - * @return Pointer to connection or NULL if connection could not be found - */ + * and application handle + * (this method returns only active connections as opposed to previous one) + * @param device Device unique identifier + * @param application Application handle + * @return Pointer to connection or NULL if connection could not be found + */ ConnectionInternal* GetActiveConnection(const DeviceUID& device, const ApplicationHandle& application); diff --git a/src/components/transport_manager/include/transport_manager/usb/common.h b/src/components/transport_manager/include/transport_manager/usb/common.h index 1db1a83a3a..d15e1fdd96 100644 --- a/src/components/transport_manager/include/transport_manager/usb/common.h +++ b/src/components/transport_manager/include/transport_manager/usb/common.h @@ -110,7 +110,7 @@ inline bool IsAppleDevice(const PlatformUsbDevice* device) { return IsAppleIAPDevice(device) || IsAppleIAP2Device(device); } -} // namespace -} // namespace +} // namespace transport_adapter +} // namespace transport_manager #endif // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_USB_COMMON_H_ diff --git a/src/components/transport_manager/include/transport_manager/usb/libusb/platform_usb_device.h b/src/components/transport_manager/include/transport_manager/usb/libusb/platform_usb_device.h index baec1938b1..201f3787e0 100644 --- a/src/components/transport_manager/include/transport_manager/usb/libusb/platform_usb_device.h +++ b/src/components/transport_manager/include/transport_manager/usb/libusb/platform_usb_device.h @@ -36,8 +36,8 @@ #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_USB_LIBUSB_PLATFORM_USB_DEVICE_H_ #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_USB_LIBUSB_PLATFORM_USB_DEVICE_H_ -#include #include +#include namespace transport_manager { diff --git a/src/components/transport_manager/include/transport_manager/usb/libusb/usb_connection.h b/src/components/transport_manager/include/transport_manager/usb/libusb/usb_connection.h index 5f6bd40957..2b7f6e4189 100644 --- a/src/components/transport_manager/include/transport_manager/usb/libusb/usb_connection.h +++ b/src/components/transport_manager/include/transport_manager/usb/libusb/usb_connection.h @@ -37,8 +37,8 @@ #include "utils/lock.h" -#include "transport_manager/transport_adapter/transport_adapter_controller.h" #include "transport_manager/transport_adapter/connection.h" +#include "transport_manager/transport_adapter/transport_adapter_controller.h" #include "transport_manager/usb/common.h" namespace transport_manager { diff --git a/src/components/transport_manager/include/transport_manager/usb/libusb/usb_handler.h b/src/components/transport_manager/include/transport_manager/usb/libusb/usb_handler.h index bed631ea2e..6b15229522 100644 --- a/src/components/transport_manager/include/transport_manager/usb/libusb/usb_handler.h +++ b/src/components/transport_manager/include/transport_manager/usb/libusb/usb_handler.h @@ -39,8 +39,8 @@ #include #include "transport_manager/transport_adapter/transport_adapter.h" -#include "transport_manager/usb/usb_control_transfer.h" #include "transport_manager/usb/libusb/platform_usb_device.h" +#include "transport_manager/usb/usb_control_transfer.h" #include "utils/threads/thread.h" diff --git a/src/components/transport_manager/include/transport_manager/usb/qnx/platform_usb_device.h b/src/components/transport_manager/include/transport_manager/usb/qnx/platform_usb_device.h index 9755a5eacd..738675754d 100644 --- a/src/components/transport_manager/include/transport_manager/usb/qnx/platform_usb_device.h +++ b/src/components/transport_manager/include/transport_manager/usb/qnx/platform_usb_device.h @@ -36,8 +36,8 @@ #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_USB_QNX_PLATFORM_USB_DEVICE_H_ #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_USB_QNX_PLATFORM_USB_DEVICE_H_ -#include #include +#include namespace transport_manager { diff --git a/src/components/transport_manager/include/transport_manager/usb/qnx/usb_connection.h b/src/components/transport_manager/include/transport_manager/usb/qnx/usb_connection.h index e9f7344ee2..ba7e263b4c 100644 --- a/src/components/transport_manager/include/transport_manager/usb/qnx/usb_connection.h +++ b/src/components/transport_manager/include/transport_manager/usb/qnx/usb_connection.h @@ -38,8 +38,8 @@ #include "utils/lock.h" -#include "transport_manager/transport_adapter/transport_adapter_controller.h" #include "transport_manager/transport_adapter/connection.h" +#include "transport_manager/transport_adapter/transport_adapter_controller.h" #include "transport_manager/usb/common.h" namespace transport_manager { diff --git a/src/components/transport_manager/include/transport_manager/usb/qnx/usb_handler.h b/src/components/transport_manager/include/transport_manager/usb/qnx/usb_handler.h index c33e0f2361..53600309ec 100644 --- a/src/components/transport_manager/include/transport_manager/usb/qnx/usb_handler.h +++ b/src/components/transport_manager/include/transport_manager/usb/qnx/usb_handler.h @@ -39,8 +39,8 @@ #include #include "transport_manager/transport_adapter/transport_adapter.h" -#include "transport_manager/usb/usb_control_transfer.h" #include "transport_manager/usb/qnx/platform_usb_device.h" +#include "transport_manager/usb/usb_control_transfer.h" namespace transport_manager { diff --git a/src/components/transport_manager/include/transport_manager/usb/usb_control_transfer.h b/src/components/transport_manager/include/transport_manager/usb/usb_control_transfer.h index 850902bea3..a47574353e 100644 --- a/src/components/transport_manager/include/transport_manager/usb/usb_control_transfer.h +++ b/src/components/transport_manager/include/transport_manager/usb/usb_control_transfer.h @@ -100,7 +100,7 @@ class UsbControlTransferSequence { Transfers transfers_; }; -} // namespace -} // namespace +} // namespace transport_adapter +} // namespace transport_manager #endif // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_USB_USB_CONTROL_TRANSFER_H_ diff --git a/src/components/transport_manager/include/transport_manager/usb/usb_device_scanner.h b/src/components/transport_manager/include/transport_manager/usb/usb_device_scanner.h index a6065de2b2..2cc482297b 100644 --- a/src/components/transport_manager/include/transport_manager/usb/usb_device_scanner.h +++ b/src/components/transport_manager/include/transport_manager/usb/usb_device_scanner.h @@ -38,9 +38,9 @@ #include -#include "utils/lock.h" #include "transport_manager/transport_adapter/device_scanner.h" #include "transport_manager/usb/common.h" +#include "utils/lock.h" namespace transport_manager { @@ -71,7 +71,7 @@ class UsbDeviceScanner : public DeviceScanner, public UsbDeviceListener { sync_primitives::Lock devices_mutex_; }; -} // namespace -} // namespace +} // namespace transport_adapter +} // namespace transport_manager #endif // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_USB_USB_DEVICE_SCANNER_H_ diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_connection_factory.cc b/src/components/transport_manager/src/bluetooth/bluetooth_connection_factory.cc index 62615cb30f..19f4078443 100644 --- a/src/components/transport_manager/src/bluetooth/bluetooth_connection_factory.cc +++ b/src/components/transport_manager/src/bluetooth/bluetooth_connection_factory.cc @@ -33,9 +33,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "transport_manager/transport_adapter/transport_adapter_controller.h" #include "transport_manager/bluetooth/bluetooth_connection_factory.h" #include "transport_manager/bluetooth/bluetooth_socket_connection.h" +#include "transport_manager/transport_adapter/transport_adapter_controller.h" #include "utils/logger.h" namespace transport_manager { diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_device.cc b/src/components/transport_manager/src/bluetooth/bluetooth_device.cc index e7cc3d4f34..734d8fe1e9 100644 --- a/src/components/transport_manager/src/bluetooth/bluetooth_device.cc +++ b/src/components/transport_manager/src/bluetooth/bluetooth_device.cc @@ -36,13 +36,13 @@ #include #include #include +#include #include #include -#include #include -#include #include +#include #include #include diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc b/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc index 75ea799ce8..7e9b4c1332 100644 --- a/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc +++ b/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc @@ -38,18 +38,18 @@ #include #include #include +#include #include #include -#include #include -#include #include #include +#include #include -#include #include -#include "transport_manager/bluetooth/bluetooth_transport_adapter.h" +#include #include "transport_manager/bluetooth/bluetooth_device.h" +#include "transport_manager/bluetooth/bluetooth_transport_adapter.h" #include "utils/logger.h" #include "utils/threads/thread.h" diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_socket_connection.cc b/src/components/transport_manager/src/bluetooth/bluetooth_socket_connection.cc index b4370e4b12..78597ac2ad 100644 --- a/src/components/transport_manager/src/bluetooth/bluetooth_socket_connection.cc +++ b/src/components/transport_manager/src/bluetooth/bluetooth_socket_connection.cc @@ -33,13 +33,13 @@ #include "transport_manager/bluetooth/bluetooth_socket_connection.h" -#include #include #include #include +#include #include #include -#include +#include #include "transport_manager/bluetooth/bluetooth_device.h" #include "transport_manager/transport_adapter/transport_adapter_controller.h" @@ -93,9 +93,9 @@ bool BluetoothSocketConnection::Establish(ConnectError** error) { do { rfcomm_socket = socket(AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM); if (-1 == rfcomm_socket) { - LOG4CXX_ERROR_WITH_ERRNO(logger_, - "Failed to create RFCOMM socket for device " - << device_handle()); + LOG4CXX_ERROR_WITH_ERRNO( + logger_, + "Failed to create RFCOMM socket for device " << device_handle()); *error = new ConnectError(); LOG4CXX_TRACE(logger_, "exit with FALSE"); return false; diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_transport_adapter.cc b/src/components/transport_manager/src/bluetooth/bluetooth_transport_adapter.cc index b373744f79..95265cad2e 100644 --- a/src/components/transport_manager/src/bluetooth/bluetooth_transport_adapter.cc +++ b/src/components/transport_manager/src/bluetooth/bluetooth_transport_adapter.cc @@ -34,18 +34,18 @@ */ #include -#include #include +#include #include +#include #include #include -#include -#include "transport_manager/bluetooth/bluetooth_transport_adapter.h" -#include "transport_manager/bluetooth/bluetooth_device_scanner.h" #include "transport_manager/bluetooth/bluetooth_connection_factory.h" #include "transport_manager/bluetooth/bluetooth_device.h" +#include "transport_manager/bluetooth/bluetooth_device_scanner.h" +#include "transport_manager/bluetooth/bluetooth_transport_adapter.h" #include "utils/logger.h" diff --git a/src/components/transport_manager/src/cloud/cloud_websocket_connection_factory.cc b/src/components/transport_manager/src/cloud/cloud_websocket_connection_factory.cc index 0d9fda6fe5..d072685eef 100644 --- a/src/components/transport_manager/src/cloud/cloud_websocket_connection_factory.cc +++ b/src/components/transport_manager/src/cloud/cloud_websocket_connection_factory.cc @@ -33,9 +33,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "transport_manager/transport_adapter/transport_adapter_controller.h" #include "transport_manager/cloud/cloud_websocket_connection_factory.h" #include "transport_manager/cloud/websocket_client_connection.h" +#include "transport_manager/transport_adapter/transport_adapter_controller.h" #include "utils/logger.h" #include "transport_manager/cloud/cloud_device.h" diff --git a/src/components/transport_manager/src/cloud/cloud_websocket_transport_adapter.cc b/src/components/transport_manager/src/cloud/cloud_websocket_transport_adapter.cc index 8298042d41..c8d9dc3811 100644 --- a/src/components/transport_manager/src/cloud/cloud_websocket_transport_adapter.cc +++ b/src/components/transport_manager/src/cloud/cloud_websocket_transport_adapter.cc @@ -105,9 +105,9 @@ void CloudWebsocketTransportAdapter::CreateDevice(const std::string& uid) { << results[4] << " " << results[5] << " "); std::string device_id = uid; - LOG4CXX_DEBUG(logger_, - "Creating Cloud Device For Host: " << host - << " and Port: " << port); + LOG4CXX_DEBUG( + logger_, + "Creating Cloud Device For Host: " << host << " and Port: " << port); auto cloud_device = std::make_shared(host, port, device_id); @@ -124,5 +124,5 @@ void CloudWebsocketTransportAdapter::CreateDevice(const std::string& uid) { return; } -} -} +} // namespace transport_adapter +} // namespace transport_manager diff --git a/src/components/transport_manager/src/cloud/websocket_client_connection.cc b/src/components/transport_manager/src/cloud/websocket_client_connection.cc index bb654822c3..a93a27ba40 100644 --- a/src/components/transport_manager/src/cloud/websocket_client_connection.cc +++ b/src/components/transport_manager/src/cloud/websocket_client_connection.cc @@ -169,9 +169,9 @@ TransportAdapter::Error WebsocketClientConnection::Start() { #endif // ENABLE_SECURITY if (ec) { std::string str_err = "ErrorMessage: " + ec.message(); - LOG4CXX_ERROR(logger_, - "Could not complete handshake with host/port: " << host << ":" - << port); + LOG4CXX_ERROR( + logger_, + "Could not complete handshake with host/port: " << host << ":" << port); LOG4CXX_ERROR(logger_, str_err); return TransportAdapter::FAIL; } @@ -208,9 +208,9 @@ TransportAdapter::Error WebsocketClientConnection::Start() { boost::asio::post(io_pool_, [&]() { ioc_.run(); }); - LOG4CXX_DEBUG(logger_, - "Successfully started websocket connection @: " << host << ":" - << port); + LOG4CXX_DEBUG( + logger_, + "Successfully started websocket connection @: " << host << ":" << port); return TransportAdapter::OK; } diff --git a/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc b/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc index 31e997f3ba..2e37f76bc9 100644 --- a/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc +++ b/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc @@ -32,14 +32,14 @@ #include "transport_manager/iap2_emulation/iap2_transport_adapter.h" -#include -#include #include -#include #include +#include +#include +#include -#include "utils/threads/thread.h" #include "utils/file_system.h" +#include "utils/threads/thread.h" namespace { static const mode_t mode = 0666; @@ -182,5 +182,5 @@ void IAP2USBEmulationTransportAdapter::IAPSignalHandlerDelegate:: run_flag_ = false; ThreadDelegate::exitThreadMain(); } -} -} // namespace transport_manager::transport_adapter +} // namespace transport_adapter +} // namespace transport_manager diff --git a/src/components/transport_manager/src/tcp/platform_specific/linux/platform_specific_network_interface_listener.cc b/src/components/transport_manager/src/tcp/platform_specific/linux/platform_specific_network_interface_listener.cc index 047d43b7bf..e0bda61e4d 100644 --- a/src/components/transport_manager/src/tcp/platform_specific/linux/platform_specific_network_interface_listener.cc +++ b/src/components/transport_manager/src/tcp/platform_specific/linux/platform_specific_network_interface_listener.cc @@ -5,11 +5,11 @@ #include #include #include -#include #include -#include #include #include +#include +#include #include #include @@ -356,7 +356,7 @@ bool PlatformSpecificNetworkInterfaceListener::InitializeStatus() { } #endif // BUILD_TESTS - struct ifaddrs* if_list, *interface; + struct ifaddrs *if_list, *interface; if (getifaddrs(&if_list) != 0) { LOG4CXX_WARN(logger_, "getifaddr failed, interface status won't be available until " @@ -421,9 +421,9 @@ bool PlatformSpecificNetworkInterfaceListener::UpdateStatus( switch (type) { case RTM_NEWLINK: { - LOG4CXX_DEBUG(logger_, - "netlink event: interface " << ifname - << " created or updated"); + LOG4CXX_DEBUG( + logger_, + "netlink event: interface " << ifname << " created or updated"); status.SetFlags(it->flags); break; } diff --git a/src/components/transport_manager/src/tcp/tcp_client_listener.cc b/src/components/transport_manager/src/tcp/tcp_client_listener.cc index 9f2597f0a7..66be810a9b 100644 --- a/src/components/transport_manager/src/tcp/tcp_client_listener.cc +++ b/src/components/transport_manager/src/tcp/tcp_client_listener.cc @@ -33,35 +33,35 @@ #include "transport_manager/tcp/tcp_client_listener.h" -#include -#include +#include #include #include -#include -#include -#include +#include +#include +#include #include -#include #include -#include +#include +#include +#include #ifdef __linux__ #include #else // __linux__ -#include #include #include #include +#include #endif // __linux__ #include #include "utils/logger.h" -#include "utils/threads/thread.h" -#include "transport_manager/transport_adapter/transport_adapter_controller.h" #include "transport_manager/tcp/network_interface_listener_impl.h" #include "transport_manager/tcp/tcp_device.h" #include "transport_manager/tcp/tcp_socket_connection.h" +#include "transport_manager/transport_adapter/transport_adapter_controller.h" +#include "utils/threads/thread.h" namespace transport_manager { namespace transport_adapter { @@ -455,9 +455,9 @@ void TcpClientListener::OnIPAddressUpdated(const std::string ipv4_addr, if (IsListeningOnSpecificInterface()) { if (!current_ip_address_.empty()) { // the server socket is running, terminate it - LOG4CXX_DEBUG(logger_, - "Stopping current TCP server socket on " - << designated_interface_); + LOG4CXX_DEBUG( + logger_, + "Stopping current TCP server socket on " << designated_interface_); StopOnNetworkInterface(); } if (!ipv4_addr.empty()) { @@ -525,9 +525,9 @@ bool TcpClientListener::StopOnNetworkInterface() { socket_ = -1; } - LOG4CXX_INFO(logger_, - "TCP server socket on " << designated_interface_ - << " stopped"); + LOG4CXX_INFO( + logger_, + "TCP server socket on " << designated_interface_ << " stopped"); } return true; } diff --git a/src/components/transport_manager/src/tcp/tcp_connection_factory.cc b/src/components/transport_manager/src/tcp/tcp_connection_factory.cc index e202554f8f..50d1c74fa7 100644 --- a/src/components/transport_manager/src/tcp/tcp_connection_factory.cc +++ b/src/components/transport_manager/src/tcp/tcp_connection_factory.cc @@ -30,9 +30,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "transport_manager/transport_adapter/transport_adapter_controller.h" #include "transport_manager/tcp/tcp_connection_factory.h" #include "transport_manager/tcp/tcp_server_originated_socket_connection.h" +#include "transport_manager/transport_adapter/transport_adapter_controller.h" #include "utils/logger.h" @@ -52,9 +52,9 @@ TransportAdapter::Error TcpConnectionFactory::Init() { TransportAdapter::Error TcpConnectionFactory::CreateConnection( const DeviceUID& device_uid, const ApplicationHandle& app_handle) { LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, - "DeviceUID: " << &device_uid - << ", ApplicationHandle: " << &app_handle); + LOG4CXX_DEBUG( + logger_, + "DeviceUID: " << &device_uid << ", ApplicationHandle: " << &app_handle); std::shared_ptr connection = std::make_shared( device_uid, app_handle, controller_); diff --git a/src/components/transport_manager/src/tcp/tcp_device.cc b/src/components/transport_manager/src/tcp/tcp_device.cc index dbcb5d38cb..4542f76c1d 100644 --- a/src/components/transport_manager/src/tcp/tcp_device.cc +++ b/src/components/transport_manager/src/tcp/tcp_device.cc @@ -30,8 +30,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "utils/logger.h" #include "transport_manager/tcp/tcp_device.h" +#include "utils/logger.h" namespace transport_manager { namespace transport_adapter { @@ -57,9 +57,9 @@ TcpDevice::TcpDevice(const in_addr_t& in_addr, LOG4CXX_AUTO_TRACE(logger_); LOG4CXX_DEBUG(logger_, "Device created with transport switch emulation support."); - LOG4CXX_DEBUG(logger_, - "Device parameters: " << device_uid << " / " - << transport_switch_id); + LOG4CXX_DEBUG( + logger_, + "Device parameters: " << device_uid << " / " << transport_switch_id); } #endif // BUILD_TESTS diff --git a/src/components/transport_manager/src/tcp/tcp_server_originated_socket_connection.cc b/src/components/transport_manager/src/tcp/tcp_server_originated_socket_connection.cc index 2f10bd9454..690b2d25b3 100644 --- a/src/components/transport_manager/src/tcp/tcp_server_originated_socket_connection.cc +++ b/src/components/transport_manager/src/tcp/tcp_server_originated_socket_connection.cc @@ -65,9 +65,9 @@ bool TcpServerOriginatedSocketConnection::Establish(ConnectError** error) { const int port = tcp_device->GetApplicationPort(application_handle()); if (-1 == port) { - LOG4CXX_ERROR(logger_, - "Application port for " << application_handle() - << " not found"); + LOG4CXX_ERROR( + logger_, + "Application port for " << application_handle() << " not found"); *error = new ConnectError(); return false; } diff --git a/src/components/transport_manager/src/tcp/tcp_transport_adapter.cc b/src/components/transport_manager/src/tcp/tcp_transport_adapter.cc index b3dbf49628..aeb50f3830 100644 --- a/src/components/transport_manager/src/tcp/tcp_transport_adapter.cc +++ b/src/components/transport_manager/src/tcp/tcp_transport_adapter.cc @@ -32,19 +32,19 @@ #include "transport_manager/tcp/tcp_transport_adapter.h" +#include #include #include -#include #include #include #include -#include "utils/logger.h" -#include "utils/threads/thread_delegate.h" #include "transport_manager/tcp/tcp_client_listener.h" #include "transport_manager/tcp/tcp_connection_factory.h" #include "transport_manager/tcp/tcp_device.h" +#include "utils/logger.h" +#include "utils/threads/thread_delegate.h" namespace transport_manager { namespace transport_adapter { diff --git a/src/components/transport_manager/src/transport_adapter/threaded_socket_connection.cc b/src/components/transport_manager/src/transport_adapter/threaded_socket_connection.cc index 9d594affe4..8f8c004594 100644 --- a/src/components/transport_manager/src/transport_adapter/threaded_socket_connection.cc +++ b/src/components/transport_manager/src/transport_adapter/threaded_socket_connection.cc @@ -30,13 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include -#include -#include #include +#include +#include +#include #include "utils/logger.h" #include "utils/threads/thread.h" @@ -300,9 +300,9 @@ bool ThreadedSocketConnection::Receive() { bytes_read = recv(socket_, buffer, sizeof(buffer), MSG_DONTWAIT); if (bytes_read > 0) { - LOG4CXX_DEBUG(logger_, - "Received " << bytes_read << " bytes for connection " - << this); + LOG4CXX_DEBUG( + logger_, + "Received " << bytes_read << " bytes for connection " << this); ::protocol_handler::RawMessagePtr frame( new protocol_handler::RawMessage(0, 0, buffer, bytes_read)); controller_->DataReceiveDone( diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc index 865e8d6aa8..fc43cfc63e 100644 --- a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc +++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc @@ -35,11 +35,11 @@ #include "utils/logger.h" #include "utils/timer_task_impl.h" -#include "transport_manager/transport_adapter/transport_adapter_impl.h" -#include "transport_manager/transport_adapter/transport_adapter_listener.h" +#include "transport_manager/transport_adapter/client_connection_listener.h" #include "transport_manager/transport_adapter/device_scanner.h" #include "transport_manager/transport_adapter/server_connection_factory.h" -#include "transport_manager/transport_adapter/client_connection_listener.h" +#include "transport_manager/transport_adapter/transport_adapter_impl.h" +#include "transport_manager/transport_adapter/transport_adapter_listener.h" namespace transport_manager { namespace transport_adapter { @@ -100,16 +100,16 @@ TransportAdapterImpl::~TransportAdapterImpl() { LOG4CXX_DEBUG(logger_, "device_scanner_ deleted."); } if (server_connection_factory_) { - LOG4CXX_DEBUG(logger_, - "Deleting server_connection_factory " - << server_connection_factory_); + LOG4CXX_DEBUG( + logger_, + "Deleting server_connection_factory " << server_connection_factory_); delete server_connection_factory_; LOG4CXX_DEBUG(logger_, "server_connection_factory deleted."); } if (client_connection_listener_) { - LOG4CXX_DEBUG(logger_, - "Deleting client_connection_listener_ " - << client_connection_listener_); + LOG4CXX_DEBUG( + logger_, + "Deleting client_connection_listener_ " << client_connection_listener_); delete client_connection_listener_; LOG4CXX_DEBUG(logger_, "client_connection_listener_ deleted."); } @@ -193,9 +193,9 @@ TransportAdapter::Error TransportAdapterImpl::SearchDevices() { TransportAdapter::Error TransportAdapterImpl::Connect( const DeviceUID& device_id, const ApplicationHandle& app_handle) { - LOG4CXX_TRACE(logger_, - "enter. DeviceUID " << device_id << " ApplicationHandle " - << app_handle); + LOG4CXX_TRACE( + logger_, + "enter. DeviceUID " << device_id << " ApplicationHandle " << app_handle); if (server_connection_factory_ == 0) { LOG4CXX_TRACE(logger_, "exit with NOT_SUPPORTED"); return NOT_SUPPORTED; @@ -339,9 +339,9 @@ void TransportAdapterImpl::ConnectionStatusUpdated(DeviceSptr device, TransportAdapter::Error TransportAdapterImpl::Disconnect( const DeviceUID& device_id, const ApplicationHandle& app_handle) { - LOG4CXX_TRACE(logger_, - "enter. device_id: " << &device_id - << ", device_id: " << &device_id); + LOG4CXX_TRACE( + logger_, + "enter. device_id: " << &device_id << ", device_id: " << &device_id); if (!initialised_) { LOG4CXX_TRACE(logger_, "exit with BAD_STATE"); return BAD_STATE; @@ -638,9 +638,9 @@ void TransportAdapterImpl::ConnectionCreated( void TransportAdapterImpl::DeviceDisconnected( const DeviceUID& device_handle, const DisconnectDeviceError& error) { const DeviceUID device_uid = device_handle; - LOG4CXX_TRACE(logger_, - "enter. device_handle: " << &device_uid - << ", error: " << &error); + LOG4CXX_TRACE( + logger_, + "enter. device_handle: " << &device_uid << ", error: " << &error); ApplicationList app_list = GetApplicationList(device_uid); for (ApplicationList::const_iterator i = app_list.begin(); i != app_list.end(); @@ -698,9 +698,9 @@ void TransportAdapterImpl::DisconnectDone(const DeviceUID& device_handle, const ApplicationHandle& app_handle) { const DeviceUID device_uid = device_handle; const ApplicationHandle app_uid = app_handle; - LOG4CXX_TRACE(logger_, - "enter. device_id: " << &device_uid - << ", app_handle: " << &app_uid); + LOG4CXX_TRACE( + logger_, + "enter. device_id: " << &device_uid << ", app_handle: " << &app_uid); DeviceSptr device = FindDevice(device_handle); if (!device) { LOG4CXX_WARN(logger_, "Device: uid " << &device_uid << " not found"); @@ -823,9 +823,9 @@ void TransportAdapterImpl::DeviceSwitched(const DeviceUID& device_handle) { ConnectionSPtr TransportAdapterImpl::FindPendingConnection( const DeviceUID& device_id, const ApplicationHandle& app_handle) const { - LOG4CXX_TRACE(logger_, - "enter. device_id: " << &device_id - << ", app_handle: " << &app_handle); + LOG4CXX_TRACE( + logger_, + "enter. device_id: " << &device_id << ", app_handle: " << &app_handle); ConnectionSPtr connection; connections_lock_.AcquireForReading(); ConnectionMap::const_iterator it = @@ -886,9 +886,9 @@ void TransportAdapterImpl::ConnectPending(const DeviceUID& device_id, void TransportAdapterImpl::ConnectDone(const DeviceUID& device_id, const ApplicationHandle& app_handle) { - LOG4CXX_TRACE(logger_, - "enter. device_id: " << &device_id - << ", app_handle: " << &app_handle); + LOG4CXX_TRACE( + logger_, + "enter. device_id: " << &device_id << ", app_handle: " << &app_handle); connections_lock_.AcquireForReading(); ConnectionMap::iterator it_conn = connections_.find(std::make_pair(device_id, app_handle)); @@ -975,9 +975,9 @@ ApplicationList TransportAdapterImpl::GetApplicationList( void TransportAdapterImpl::ConnectionFinished( const DeviceUID& device_id, const ApplicationHandle& app_handle) { - LOG4CXX_TRACE(logger_, - "enter. device_id: " << &device_id - << ", app_handle: " << &app_handle); + LOG4CXX_TRACE( + logger_, + "enter. device_id: " << &device_id << ", app_handle: " << &app_handle); connections_lock_.AcquireForReading(); ConnectionMap::iterator it = connections_.find(std::make_pair(device_id, app_handle)); @@ -1101,9 +1101,9 @@ bool TransportAdapterImpl::ToBeAutoDisconnected(DeviceSptr device) const { ConnectionSPtr TransportAdapterImpl::FindEstablishedConnection( const DeviceUID& device_id, const ApplicationHandle& app_handle) const { - LOG4CXX_TRACE(logger_, - "enter. device_id: " << &device_id - << ", app_handle: " << &app_handle); + LOG4CXX_TRACE( + logger_, + "enter. device_id: " << &device_id << ", app_handle: " << &app_handle); ConnectionSPtr connection; connections_lock_.AcquireForReading(); ConnectionMap::const_iterator it = diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_listener_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_listener_impl.cc index 4ef685adbc..bf2d3dbdf4 100644 --- a/src/components/transport_manager/src/transport_adapter/transport_adapter_listener_impl.cc +++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_listener_impl.cc @@ -34,9 +34,9 @@ #include "utils/logger.h" +#include "transport_manager/transport_adapter/transport_adapter_event.h" #include "transport_manager/transport_adapter/transport_adapter_listener_impl.h" #include "transport_manager/transport_manager_impl.h" -#include "transport_manager/transport_adapter/transport_adapter_event.h" namespace transport_manager { CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager") diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc index 2d93b898b4..32c572157f 100644 --- a/src/components/transport_manager/src/transport_manager_impl.cc +++ b/src/components/transport_manager/src/transport_manager_impl.cc @@ -33,26 +33,26 @@ #include "transport_manager/transport_manager_impl.h" #include +#include #include +#include +#include +#include #include #include -#include -#include -#include #include -#include -#include "utils/macro.h" #include "utils/logger.h" +#include "utils/macro.h" -#include "utils/timer_task_impl.h" +#include "config_profile/profile.h" +#include "transport_manager/cloud/cloud_websocket_transport_adapter.h" #include "transport_manager/common.h" -#include "transport_manager/transport_manager_listener.h" -#include "transport_manager/transport_manager_listener_empty.h" #include "transport_manager/transport_adapter/transport_adapter.h" -#include "transport_manager/cloud/cloud_websocket_transport_adapter.h" #include "transport_manager/transport_adapter/transport_adapter_event.h" -#include "config_profile/profile.h" +#include "transport_manager/transport_manager_listener.h" +#include "transport_manager/transport_manager_listener_empty.h" +#include "utils/timer_task_impl.h" using ::transport_manager::transport_adapter::TransportAdapter; @@ -369,9 +369,9 @@ int TransportManagerImpl::Stop() { int TransportManagerImpl::SendMessageToDevice( const ::protocol_handler::RawMessagePtr message) { LOG4CXX_TRACE(logger_, "enter. RawMessageSptr: " << message); - LOG4CXX_INFO(logger_, - "Send message to device called with arguments " - << message.get()); + LOG4CXX_INFO( + logger_, + "Send message to device called with arguments " << message.get()); if (false == this->is_initialized_) { LOG4CXX_ERROR(logger_, "TM is not initialized."); LOG4CXX_TRACE(logger_, @@ -771,9 +771,9 @@ TransportManagerImpl::ConnectionInternal* TransportManagerImpl::GetActiveConnection( const DeviceUID& device, const ApplicationHandle& application) { LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, - "DeviceUID: " << device - << " ApplicationHandle: " << application); + LOG4CXX_DEBUG( + logger_, + "DeviceUID: " << device << " ApplicationHandle: " << application); for (std::vector::iterator it = connections_.begin(); it != connections_.end(); ++it) { @@ -922,9 +922,9 @@ bool TransportManagerImpl::UpdateDeviceMapping( item = device_to_adapter_map_.begin(); } - LOG4CXX_DEBUG(logger_, - "After cleanup. Device map size is " - << device_to_adapter_map_.size()); + LOG4CXX_DEBUG( + logger_, + "After cleanup. Device map size is " << device_to_adapter_map_.size()); for (DeviceList::const_iterator it = adapter_device_list.begin(); it != adapter_device_list.end(); @@ -934,10 +934,10 @@ bool TransportManagerImpl::UpdateDeviceMapping( device_to_adapter_map_.insert(std::make_pair(device_uid, ta)); if (!result.second) { LOG4CXX_WARN(logger_, - "Device UID " - << device_uid - << " is known already. Processing skipped." - "Connection type is: " << ta->GetConnectionType()); + "Device UID " << device_uid + << " is known already. Processing skipped." + "Connection type is: " + << ta->GetConnectionType()); continue; } DeviceHandle device_handle = @@ -949,9 +949,9 @@ bool TransportManagerImpl::UpdateDeviceMapping( RaiseEvent(&TransportManagerListener::OnDeviceFound, info); } - LOG4CXX_DEBUG(logger_, - "After update. Device map size is " - << device_to_adapter_map_.size()); + LOG4CXX_DEBUG( + logger_, + "After update. Device map size is " << device_to_adapter_map_.size()); return true; } diff --git a/src/components/transport_manager/src/usb/libusb/platform_usb_device.cc b/src/components/transport_manager/src/usb/libusb/platform_usb_device.cc index 33709cf0f6..7d7fb49e6e 100644 --- a/src/components/transport_manager/src/usb/libusb/platform_usb_device.cc +++ b/src/components/transport_manager/src/usb/libusb/platform_usb_device.cc @@ -83,5 +83,5 @@ std::string PlatformUsbDevice::GetSerialNumber() const { return GetDescString(device_descriptor_.iSerialNumber); } -} // namespace -} // namespace +} // namespace transport_adapter +} // namespace transport_manager diff --git a/src/components/transport_manager/src/usb/libusb/usb_connection.cc b/src/components/transport_manager/src/usb/libusb/usb_connection.cc index 212e6e0ec3..d60c409a96 100644 --- a/src/components/transport_manager/src/usb/libusb/usb_connection.cc +++ b/src/components/transport_manager/src/usb/libusb/usb_connection.cc @@ -38,8 +38,8 @@ #include -#include "transport_manager/usb/libusb/usb_connection.h" #include "transport_manager/transport_adapter/transport_adapter_impl.h" +#include "transport_manager/usb/libusb/usb_connection.h" #include "utils/logger.h" diff --git a/src/components/transport_manager/src/usb/libusb/usb_handler.cc b/src/components/transport_manager/src/usb/libusb/usb_handler.cc index c62e80d1be..df3b7e128e 100644 --- a/src/components/transport_manager/src/usb/libusb/usb_handler.cc +++ b/src/components/transport_manager/src/usb/libusb/usb_handler.cc @@ -33,14 +33,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include -#include "transport_manager/usb/common.h" #include "transport_manager/transport_adapter/transport_adapter_impl.h" +#include "transport_manager/usb/common.h" -#include "utils/macro.h" #include "utils/logger.h" +#include "utils/macro.h" #include "utils/threads/thread.h" namespace transport_manager { diff --git a/src/components/transport_manager/src/usb/qnx/platform_usb_device.cc b/src/components/transport_manager/src/usb/qnx/platform_usb_device.cc index e85ab12b10..bb6e341659 100644 --- a/src/components/transport_manager/src/usb/qnx/platform_usb_device.cc +++ b/src/components/transport_manager/src/usb/qnx/platform_usb_device.cc @@ -76,5 +76,5 @@ std::string PlatformUsbDevice::GetSerialNumber() const { return GetDescString(device_descriptor_.iSerialNumber); } -} // namespace -} // namespace +} // namespace transport_adapter +} // namespace transport_manager diff --git a/src/components/transport_manager/src/usb/qnx/usb_connection.cc b/src/components/transport_manager/src/usb/qnx/usb_connection.cc index b9386c5d9f..c514162eb0 100644 --- a/src/components/transport_manager/src/usb/qnx/usb_connection.cc +++ b/src/components/transport_manager/src/usb/qnx/usb_connection.cc @@ -37,8 +37,8 @@ #include #include -#include "transport_manager/usb/qnx/usb_connection.h" #include "transport_manager/transport_adapter/transport_adapter_impl.h" +#include "transport_manager/usb/qnx/usb_connection.h" #include "utils/logger.h" diff --git a/src/components/transport_manager/src/usb/qnx/usb_handler.cc b/src/components/transport_manager/src/usb/qnx/usb_handler.cc index 2336a05f16..9ac4a40d92 100644 --- a/src/components/transport_manager/src/usb/qnx/usb_handler.cc +++ b/src/components/transport_manager/src/usb/qnx/usb_handler.cc @@ -35,11 +35,11 @@ #include -#include #include +#include -#include "transport_manager/usb/common.h" #include "transport_manager/transport_adapter/transport_adapter_impl.h" +#include "transport_manager/usb/common.h" #include "utils/logger.h" @@ -321,5 +321,5 @@ TransportAdapter::Error UsbHandler::Init() { return TransportAdapter::OK; } -} // namespace -} // namespace +} // namespace transport_adapter +} // namespace transport_manager diff --git a/src/components/transport_manager/src/usb/usb_aoa_adapter.cc b/src/components/transport_manager/src/usb/usb_aoa_adapter.cc index b7faf1ef6b..3ecc1e22f3 100644 --- a/src/components/transport_manager/src/usb/usb_aoa_adapter.cc +++ b/src/components/transport_manager/src/usb/usb_aoa_adapter.cc @@ -34,9 +34,9 @@ */ #include "transport_manager/usb/usb_aoa_adapter.h" -#include "transport_manager/usb/usb_device_scanner.h" -#include "transport_manager/usb/usb_connection_factory.h" #include "transport_manager/usb/common.h" +#include "transport_manager/usb/usb_connection_factory.h" +#include "transport_manager/usb/usb_device_scanner.h" #include "utils/logger.h" namespace transport_manager { diff --git a/src/components/transport_manager/src/usb/usb_connection_factory.cc b/src/components/transport_manager/src/usb/usb_connection_factory.cc index 528855cd50..401dde2534 100644 --- a/src/components/transport_manager/src/usb/usb_connection_factory.cc +++ b/src/components/transport_manager/src/usb/usb_connection_factory.cc @@ -31,8 +31,8 @@ */ #include "transport_manager/usb/usb_connection_factory.h" -#include "transport_manager/usb/usb_device.h" #include "transport_manager/transport_adapter/transport_adapter_impl.h" +#include "transport_manager/usb/usb_device.h" #include "utils/logger.h" #if defined(__QNXNTO__) diff --git a/src/components/transport_manager/src/usb/usb_device_scanner.cc b/src/components/transport_manager/src/usb/usb_device_scanner.cc index 092fd29f1a..3a17203307 100644 --- a/src/components/transport_manager/src/usb/usb_device_scanner.cc +++ b/src/components/transport_manager/src/usb/usb_device_scanner.cc @@ -33,9 +33,9 @@ #include #include "transport_manager/transport_adapter/transport_adapter_impl.h" -#include "transport_manager/usb/usb_device_scanner.h" -#include "transport_manager/usb/usb_device.h" #include "transport_manager/usb/common.h" +#include "transport_manager/usb/usb_device.h" +#include "transport_manager/usb/usb_device_scanner.h" #include "utils/logger.h" @@ -247,5 +247,5 @@ bool UsbDeviceScanner::IsInitialised() const { return true; } -} // namespace -} // namespace +} // namespace transport_adapter +} // namespace transport_manager diff --git a/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_impl.h b/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_impl.h index e94586a856..758d22dae2 100644 --- a/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_impl.h +++ b/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_impl.h @@ -33,10 +33,10 @@ #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_IMPL_H_ #define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_IMPL_H_ -#include "gmock/gmock.h" #include "config_profile/profile.h" -#include "transport_manager/transport_manager_impl.h" +#include "gmock/gmock.h" #include "transport_manager/mock_transport_manager_settings.h" +#include "transport_manager/transport_manager_impl.h" #include "transport_manager/transport_manager_settings.h" namespace test { diff --git a/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_listener.h b/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_listener.h index 4eaf34d041..0c9ca959e9 100644 --- a/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_listener.h +++ b/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_listener.h @@ -33,10 +33,10 @@ #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_LISTENER_H_ #define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_LISTENER_H_ -#include #include -#include "transport_manager/transport_manager_listener.h" +#include #include "protocol/raw_message.h" +#include "transport_manager/transport_manager_listener.h" namespace test { namespace components { diff --git a/src/components/transport_manager/test/include/transport_manager/raw_message_matcher.h b/src/components/transport_manager/test/include/transport_manager/raw_message_matcher.h index 9c7327e6fb..2ee699096f 100644 --- a/src/components/transport_manager/test/include/transport_manager/raw_message_matcher.h +++ b/src/components/transport_manager/test/include/transport_manager/raw_message_matcher.h @@ -38,8 +38,8 @@ #include -#include "transport_manager/common.h" #include "protocol/common.h" +#include "transport_manager/common.h" using ::testing::Matcher; using ::testing::MatcherInterface; diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h index 3a1422cee1..592ed855cc 100644 --- a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h +++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h @@ -34,19 +34,19 @@ #define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_TRANSPORT_ADAPTER_IMPL_H_ #include "gmock/gmock.h" -#include "transport_manager/transport_manager_settings.h" -#include "transport_manager/transport_adapter/transport_adapter_impl.h" -#include "transport_manager/transport_adapter/device.h" #include "transport_manager/common.h" +#include "transport_manager/transport_adapter/device.h" +#include "transport_manager/transport_adapter/transport_adapter_impl.h" +#include "transport_manager/transport_manager_settings.h" -using ::transport_manager::transport_adapter::TransportAdapterImpl; -using ::transport_manager::transport_adapter::DeviceScanner; -using ::transport_manager::transport_adapter::ServerConnectionFactory; +using ::transport_manager::ApplicationHandle; +using ::transport_manager::DeviceUID; using ::transport_manager::transport_adapter::ClientConnectionListener; -using ::transport_manager::transport_adapter::DeviceType; using ::transport_manager::transport_adapter::ConnectionSPtr; -using ::transport_manager::DeviceUID; -using ::transport_manager::ApplicationHandle; +using ::transport_manager::transport_adapter::DeviceScanner; +using ::transport_manager::transport_adapter::DeviceType; +using ::transport_manager::transport_adapter::ServerConnectionFactory; +using ::transport_manager::transport_adapter::TransportAdapterImpl; namespace test { namespace components { diff --git a/src/components/transport_manager/test/network_interface_listener_test.cc b/src/components/transport_manager/test/network_interface_listener_test.cc index 55a35fb4ea..c6e007b62a 100644 --- a/src/components/transport_manager/test/network_interface_listener_test.cc +++ b/src/components/transport_manager/test/network_interface_listener_test.cc @@ -3,8 +3,8 @@ #include #include "gtest/gtest.h" -#include "transport_manager/tcp/network_interface_listener_impl.h" #include "transport_manager/tcp/mock_tcp_client_listener.h" +#include "transport_manager/tcp/network_interface_listener_impl.h" #include "utils/test_async_waiter.h" #include "utils/threads/thread.h" @@ -15,7 +15,7 @@ namespace transport_manager_test { namespace { const long kThreadStartWaitMsec = 10; const uint32_t kStartNotificationTimeoutMsec = 500; -} +} // namespace using ::testing::_; using ::testing::AtLeast; diff --git a/src/components/transport_manager/test/platform_specific/linux/linux_network_interface_listener_test.cc b/src/components/transport_manager/test/platform_specific/linux/linux_network_interface_listener_test.cc index da58466c29..97c8fac9c9 100644 --- a/src/components/transport_manager/test/platform_specific/linux/linux_network_interface_listener_test.cc +++ b/src/components/transport_manager/test/platform_specific/linux/linux_network_interface_listener_test.cc @@ -15,7 +15,7 @@ namespace transport_manager_test { namespace { const long kThreadStartWaitMsec = 10; const uint32_t kStartNotificationTimeoutMsec = 500; -} +} // namespace using ::testing::_; using ::testing::AtLeast; @@ -207,7 +207,8 @@ TEST_F(NetworkInterfaceListenerTest, DesignatedInterface_IPAddressChanged) { SetDummyInterfaceTable(entries1); EXPECT_CALL(mock_tcp_client_listener_, - OnIPAddressUpdated(entries1[0].ipv4_address, "")).Times(1); + OnIPAddressUpdated(entries1[0].ipv4_address, "")) + .Times(1); // this test case doesn't call Start() - we only check the behavior of // NotifyIPAddresses() @@ -216,7 +217,8 @@ TEST_F(NetworkInterfaceListenerTest, DesignatedInterface_IPAddressChanged) { SetDummyInterfaceTable(entries2); EXPECT_CALL(mock_tcp_client_listener_, - OnIPAddressUpdated(entries2[0].ipv4_address, "")).Times(1); + OnIPAddressUpdated(entries2[0].ipv4_address, "")) + .Times(1); interface_listener_impl_->testCallNotifyIPAddresses(); @@ -239,7 +241,8 @@ TEST_F(NetworkInterfaceListenerTest, DesignatedInterface_IPAddressNotChanged) { SetDummyInterfaceTable(entries1); EXPECT_CALL(mock_tcp_client_listener_, - OnIPAddressUpdated(entries1[0].ipv4_address, "")).Times(1); + OnIPAddressUpdated(entries1[0].ipv4_address, "")) + .Times(1); interface_listener_impl_->testCallNotifyIPAddresses(); @@ -268,9 +271,10 @@ TEST_F(NetworkInterfaceListenerTest, DesignatedInterface_GoesUnavailable) { SetDummyInterfaceTable(entries1); - EXPECT_CALL(mock_tcp_client_listener_, - OnIPAddressUpdated(entries1[0].ipv4_address, - entries1[0].ipv6_address)).Times(1); + EXPECT_CALL( + mock_tcp_client_listener_, + OnIPAddressUpdated(entries1[0].ipv4_address, entries1[0].ipv6_address)) + .Times(1); interface_listener_impl_->testCallNotifyIPAddresses(); @@ -297,9 +301,10 @@ TEST_F(NetworkInterfaceListenerTest, DesignatedInterface_Removed) { SetDummyInterfaceTable(entries1); - EXPECT_CALL(mock_tcp_client_listener_, - OnIPAddressUpdated(entries1[0].ipv4_address, - entries1[0].ipv6_address)).Times(1); + EXPECT_CALL( + mock_tcp_client_listener_, + OnIPAddressUpdated(entries1[0].ipv4_address, entries1[0].ipv6_address)) + .Times(1); interface_listener_impl_->testCallNotifyIPAddresses(); @@ -331,7 +336,8 @@ TEST_F(NetworkInterfaceListenerTest, DesignatedInterface_Added) { SetDummyInterfaceTable(entries2); EXPECT_CALL(mock_tcp_client_listener_, - OnIPAddressUpdated(entries2[1].ipv4_address, "")).Times(1); + OnIPAddressUpdated(entries2[1].ipv4_address, "")) + .Times(1); interface_listener_impl_->testCallNotifyIPAddresses(); @@ -386,9 +392,10 @@ TEST_F(NetworkInterfaceListenerTest, // dummy_int1 should not be selected struct InterfaceEntry* expected = &entries[1]; - EXPECT_CALL(mock_tcp_client_listener_, - OnIPAddressUpdated(expected->ipv4_address, - expected->ipv6_address)).Times(1); + EXPECT_CALL( + mock_tcp_client_listener_, + OnIPAddressUpdated(expected->ipv4_address, expected->ipv6_address)) + .Times(1); interface_listener_impl_->testCallNotifyIPAddresses(); @@ -412,7 +419,8 @@ TEST_F(NetworkInterfaceListenerTest, AutoSelectInterface_SkipEmptyInterface) { // net_dummy2 should not be selected struct InterfaceEntry* expected = &entries[0]; EXPECT_CALL(mock_tcp_client_listener_, - OnIPAddressUpdated(expected->ipv4_address, "")).Times(1); + OnIPAddressUpdated(expected->ipv4_address, "")) + .Times(1); interface_listener_impl_->testCallNotifyIPAddresses(); @@ -434,9 +442,10 @@ TEST_F(NetworkInterfaceListenerTest, // dummy_int1 should not be selected struct InterfaceEntry* expected = &entries[1]; - EXPECT_CALL(mock_tcp_client_listener_, - OnIPAddressUpdated(expected->ipv4_address, - expected->ipv6_address)).Times(1); + EXPECT_CALL( + mock_tcp_client_listener_, + OnIPAddressUpdated(expected->ipv4_address, expected->ipv6_address)) + .Times(1); SetDummyInterfaceTable(entries); @@ -499,9 +508,10 @@ TEST_F(NetworkInterfaceListenerTest, AutoSelectInterface_EnableInterface) { entries[0].flags |= IFF_RUNNING; SetDummyInterfaceTable(entries); - EXPECT_CALL(mock_tcp_client_listener_, - OnIPAddressUpdated(entries[0].ipv4_address, - entries[0].ipv6_address)).Times(1); + EXPECT_CALL( + mock_tcp_client_listener_, + OnIPAddressUpdated(entries[0].ipv4_address, entries[0].ipv6_address)) + .Times(1); interface_listener_impl_->testCallNotifyIPAddresses(); @@ -550,9 +560,10 @@ TEST_F(NetworkInterfaceListenerTest, AutoSelectInterface_SwitchInterface) { switched = &entries[0]; } - EXPECT_CALL(mock_tcp_client_listener_, - OnIPAddressUpdated(switched->ipv4_address, - switched->ipv6_address)).Times(1); + EXPECT_CALL( + mock_tcp_client_listener_, + OnIPAddressUpdated(switched->ipv4_address, switched->ipv6_address)) + .Times(1); interface_listener_impl_->testCallNotifyIPAddresses(); diff --git a/src/components/transport_manager/test/tcp_client_listener_test.cc b/src/components/transport_manager/test/tcp_client_listener_test.cc index 1f4a17cf6c..d524b3eb6a 100644 --- a/src/components/transport_manager/test/tcp_client_listener_test.cc +++ b/src/components/transport_manager/test/tcp_client_listener_test.cc @@ -33,16 +33,16 @@ #include #include #include -#include #include +#include #include "gtest/gtest.h" -#include "transport_manager/transport_adapter/mock_transport_adapter.h" -#include "transport_manager/tcp/tcp_client_listener.h" -#include "transport_manager/tcp/network_interface_listener.h" #include "transport_manager/mock_transport_manager.h" -#include "transport_manager/transport_adapter/transport_adapter_controller.h" +#include "transport_manager/tcp/network_interface_listener.h" +#include "transport_manager/tcp/tcp_client_listener.h" #include "transport_manager/transport_adapter/mock_device.h" +#include "transport_manager/transport_adapter/mock_transport_adapter.h" +#include "transport_manager/transport_adapter/transport_adapter_controller.h" #include "utils/test_async_waiter.h" #include "utils/threads/thread.h" @@ -60,7 +60,7 @@ using namespace ::transport_manager::transport_adapter; namespace { const long kThreadStartWaitMsec = 10; const uint32_t kConnectionCreatedTimeoutMsec = 200; -} +} // namespace class MockTransportAdapterController : public TransportAdapterController { public: @@ -395,7 +395,8 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_changed) { expected_config_1.insert(std::make_pair(tc_tcp_port, test_port)); EXPECT_CALL(adapter_controller_mock_, - TransportConfigUpdated(expected_config_1)).Times(1); + TransportConfigUpdated(expected_config_1)) + .Times(1); tcp_client_listener_->OnIPAddressUpdated(test_ipv4_addr_1, test_ipv6_addr); @@ -406,7 +407,8 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_changed) { expected_config_2.insert(std::make_pair(tc_tcp_port, test_port)); EXPECT_CALL(adapter_controller_mock_, - TransportConfigUpdated(expected_config_2)).Times(1); + TransportConfigUpdated(expected_config_2)) + .Times(1); tcp_client_listener_->OnIPAddressUpdated(test_ipv4_addr_2, test_ipv6_addr); @@ -440,7 +442,8 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_same) { expected_config_1.insert(std::make_pair(tc_tcp_port, test_port)); EXPECT_CALL(adapter_controller_mock_, - TransportConfigUpdated(expected_config_1)).Times(1); + TransportConfigUpdated(expected_config_1)) + .Times(1); tcp_client_listener_->OnIPAddressUpdated(test_ipv4_addr_1, test_ipv6_addr); @@ -485,7 +488,8 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_disabled) { expected_config_1.insert(std::make_pair(tc_tcp_port, test_port)); EXPECT_CALL(adapter_controller_mock_, - TransportConfigUpdated(expected_config_1)).Times(1); + TransportConfigUpdated(expected_config_1)) + .Times(1); tcp_client_listener_->OnIPAddressUpdated(test_ipv4_addr_1, test_ipv6_addr); @@ -496,7 +500,8 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_disabled) { expected_config_2.insert(std::make_pair(tc_tcp_port, test_port)); EXPECT_CALL(adapter_controller_mock_, - TransportConfigUpdated(expected_config_2)).Times(1); + TransportConfigUpdated(expected_config_2)) + .Times(1); tcp_client_listener_->OnIPAddressUpdated(test_ipv4_addr_2, test_ipv6_addr); @@ -530,7 +535,8 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_reenabled) { expected_config_1.insert(std::make_pair(tc_tcp_port, test_port)); EXPECT_CALL(adapter_controller_mock_, - TransportConfigUpdated(expected_config_1)).Times(1); + TransportConfigUpdated(expected_config_1)) + .Times(1); tcp_client_listener_->OnIPAddressUpdated(test_ipv4_addr_1, test_ipv6_addr); @@ -541,7 +547,8 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_reenabled) { expected_config_2.insert(std::make_pair(tc_tcp_port, test_port)); EXPECT_CALL(adapter_controller_mock_, - TransportConfigUpdated(expected_config_2)).Times(1); + TransportConfigUpdated(expected_config_2)) + .Times(1); tcp_client_listener_->OnIPAddressUpdated(test_ipv4_addr_2, test_ipv6_addr); @@ -552,7 +559,8 @@ TEST_P(TcpClientListenerTest, OnIPAddressUpdated_IPv4Address_reenabled) { expected_config_3.insert(std::make_pair(tc_tcp_port, test_port)); EXPECT_CALL(adapter_controller_mock_, - TransportConfigUpdated(expected_config_3)).Times(1); + TransportConfigUpdated(expected_config_3)) + .Times(1); tcp_client_listener_->OnIPAddressUpdated(test_ipv4_addr_3, test_ipv6_addr); diff --git a/src/components/transport_manager/test/tcp_device_test.cc b/src/components/transport_manager/test/tcp_device_test.cc index 55fa5ac5d3..f52270d1ee 100644 --- a/src/components/transport_manager/test/tcp_device_test.cc +++ b/src/components/transport_manager/test/tcp_device_test.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "transport_manager/tcp/tcp_device.h" +#include "gtest/gtest.h" #include "transport_manager/transport_adapter/device.h" namespace test { diff --git a/src/components/transport_manager/test/tcp_transport_adapter_test.cc b/src/components/transport_manager/test/tcp_transport_adapter_test.cc index 959180948a..f5f6cc38c8 100644 --- a/src/components/transport_manager/test/tcp_transport_adapter_test.cc +++ b/src/components/transport_manager/test/tcp_transport_adapter_test.cc @@ -30,24 +30,24 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "transport_manager/tcp/tcp_transport_adapter.h" -#include "resumption/last_state_impl.h" +#include "gtest/gtest.h" #include "protocol/raw_message.h" +#include "resumption/last_state_impl.h" +#include "transport_manager/mock_transport_manager_settings.h" +#include "transport_manager/tcp/mock_tcp_transport_adapter.h" #include "transport_manager/transport_adapter/connection.h" -#include "transport_manager/transport_adapter/mock_transport_adapter_listener.h" -#include "transport_manager/transport_adapter/mock_device.h" #include "transport_manager/transport_adapter/mock_connection.h" -#include "transport_manager/tcp/mock_tcp_transport_adapter.h" -#include "transport_manager/mock_transport_manager_settings.h" +#include "transport_manager/transport_adapter/mock_device.h" +#include "transport_manager/transport_adapter/mock_transport_adapter_listener.h" namespace test { namespace components { namespace transport_manager_test { +using ::testing::_; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::_; using namespace ::protocol_handler; using namespace ::transport_manager; diff --git a/src/components/transport_manager/test/transport_adapter_listener_test.cc b/src/components/transport_manager/test/transport_adapter_listener_test.cc index a5d08035ae..0813448e91 100644 --- a/src/components/transport_manager/test/transport_adapter_listener_test.cc +++ b/src/components/transport_manager/test/transport_adapter_listener_test.cc @@ -76,7 +76,8 @@ TEST_F(TransportAdapterListenerTest, OnCommunicationError) { ReceiveEventFromDevice(IsEvent(EventTypeEnum::ON_COMMUNICATION_ERROR, &adapter_mock, dev_id, - app_handle))).WillOnce(Return(E_SUCCESS)); + app_handle))) + .WillOnce(Return(E_SUCCESS)); transport_listener.OnCommunicationError(&adapter_mock, dev_id, app_handle); } @@ -195,7 +196,8 @@ TEST_F(TransportAdapterListenerTest, OnFindNewApplicationsRequest) { IsEvent(EventTypeEnum::ON_FIND_NEW_APPLICATIONS_REQUEST, &adapter_mock, "", - 0))).WillOnce(Return(E_SUCCESS)); + 0))) + .WillOnce(Return(E_SUCCESS)); transport_listener.OnFindNewApplicationsRequest(&adapter_mock); } @@ -225,7 +227,8 @@ TEST_F(TransportAdapterListenerTest, OnUnexpectedDisconnect) { ReceiveEventFromDevice(IsEvent(EventTypeEnum::ON_UNEXPECTED_DISCONNECT, &adapter_mock, dev_id, - app_handle))).WillOnce(Return(E_SUCCESS)); + app_handle))) + .WillOnce(Return(E_SUCCESS)); transport_listener.OnUnexpectedDisconnect( &adapter_mock, dev_id, app_handle, err); } diff --git a/src/components/transport_manager/test/transport_adapter_test.cc b/src/components/transport_manager/test/transport_adapter_test.cc index 5abfa4dfdd..b325449e08 100644 --- a/src/components/transport_manager/test/transport_adapter_test.cc +++ b/src/components/transport_manager/test/transport_adapter_test.cc @@ -41,23 +41,23 @@ #include "transport_manager/transport_adapter/mock_transport_adapter_listener.h" #include "utils/test_async_waiter.h" +#include "protocol/raw_message.h" +#include "transport_manager/transport_adapter/connection.h" +#include "transport_manager/transport_adapter/transport_adapter_controller.h" #include "transport_manager/transport_adapter/transport_adapter_impl.h" #include "transport_manager/transport_adapter/transport_adapter_listener.h" -#include "transport_manager/transport_adapter/transport_adapter_controller.h" -#include "transport_manager/transport_adapter/connection.h" -#include "protocol/raw_message.h" -#include "resumption/last_state_impl.h" #include "config_profile/profile.h" +#include "resumption/last_state_impl.h" namespace test { namespace components { namespace transport_manager_test { -using ::testing::Return; -using ::testing::ReturnRef; using ::testing::_; using ::testing::NiceMock; +using ::testing::Return; +using ::testing::ReturnRef; using namespace ::transport_manager; using namespace ::protocol_handler; diff --git a/src/components/transport_manager/test/transport_manager_default_test.cc b/src/components/transport_manager/test/transport_manager_default_test.cc index 8e8a964228..d8bf51ef88 100644 --- a/src/components/transport_manager/test/transport_manager_default_test.cc +++ b/src/components/transport_manager/test/transport_manager_default_test.cc @@ -30,20 +30,20 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" -#include "transport_manager/transport_manager.h" #include "transport_manager/transport_manager_default.h" -#include "transport_manager/mock_transport_manager_settings.h" +#include "gtest/gtest.h" #include "resumption/mock_last_state.h" +#include "transport_manager/mock_transport_manager_settings.h" +#include "transport_manager/transport_manager.h" namespace test { namespace components { namespace transport_manager_test { using resumption_test::MockLastState; +using ::testing::NiceMock; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::NiceMock; namespace { const std::string kDeviceName = "name"; diff --git a/src/components/transport_manager/test/transport_manager_impl_test.cc b/src/components/transport_manager/test/transport_manager_impl_test.cc index dbf0899a1b..3073ff689b 100644 --- a/src/components/transport_manager/test/transport_manager_impl_test.cc +++ b/src/components/transport_manager/test/transport_manager_impl_test.cc @@ -30,26 +30,25 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "transport_manager/transport_manager_impl.h" #include #include "gtest/gtest.h" #include "protocol/raw_message.h" +#include "resumption/last_state_impl.h" #include "transport_manager/common.h" -#include "transport_manager/transport_manager_impl.h" #include "transport_manager/mock_telemetry_observer.h" -#include "transport_manager/mock_transport_manager_listener.h" -#include "transport_manager/mock_telemetry_observer.h" -#include "transport_manager/transport_adapter/mock_transport_adapter.h" #include "transport_manager/mock_transport_manager_impl.h" +#include "transport_manager/mock_transport_manager_listener.h" #include "transport_manager/mock_transport_manager_settings.h" -#include "resumption/last_state_impl.h" +#include "transport_manager/transport_adapter/mock_transport_adapter.h" #include "utils/test_async_waiter.h" using ::testing::_; using ::testing::AtLeast; +using ::testing::DoAll; using ::testing::Return; using ::testing::ReturnRef; -using ::testing::DoAll; using ::protocol_handler::RawMessage; using ::protocol_handler::RawMessagePtr; @@ -64,7 +63,7 @@ namespace { const std::string kAppStorageFolder = "app_storage_folder"; const std::string kAppInfoFolder = "app_info_folder"; const uint32_t kAsyncExpectationsTimeout = 10000u; -} +} // namespace class TransportManagerImplTest : public ::testing::Test { protected: @@ -947,7 +946,8 @@ TEST_F(TransportManagerImplTest, Visibility_TMIsNotInitialized) { TEST_F(TransportManagerImplTest, HandleMessage_ConnectionNotExist) { EXPECT_CALL(*mock_adapter_, - SendData(mac_address_, application_id_, test_message_)).Times(0); + SendData(mac_address_, application_id_, test_message_)) + .Times(0); TestAsyncWaiter waiter; EXPECT_CALL(*tm_listener_, OnTMMessageSendFailed(_, test_message_)) @@ -1228,7 +1228,8 @@ TEST_F(TransportManagerImplTest, EXPECT_CALL(mock_transport_manager_settings_, app_transport_change_timer()) .WillOnce(Return(timeout)); EXPECT_CALL(mock_transport_manager_settings_, - app_transport_change_timer_addition()).WillOnce(Return(0)); + app_transport_change_timer_addition()) + .WillOnce(Return(0)); EXPECT_CALL(*tm_listener_, OnDeviceSwitchingStart(mac_address_, usb_serial)); diff --git a/src/components/utils/include/utils/back_trace.h b/src/components/utils/include/utils/back_trace.h index 180714e5a6..f23f87e60c 100644 --- a/src/components/utils/include/utils/back_trace.h +++ b/src/components/utils/include/utils/back_trace.h @@ -33,8 +33,8 @@ #define SRC_COMPONENTS_UTILS_INCLUDE_UTILS_BACK_TRACE_H_ #include -#include #include +#include #include "utils/threads/thread.h" namespace utils { diff --git a/src/components/utils/include/utils/file_system.h b/src/components/utils/include/utils/file_system.h index e6e5fdc0d4..f62858417d 100644 --- a/src/components/utils/include/utils/file_system.h +++ b/src/components/utils/include/utils/file_system.h @@ -35,11 +35,11 @@ #include #include +#include #include #include #include #include -#include namespace file_system { diff --git a/src/components/utils/include/utils/helpers.h b/src/components/utils/include/utils/helpers.h index f13d69aa83..1ef336dadd 100644 --- a/src/components/utils/include/utils/helpers.h +++ b/src/components/utils/include/utils/helpers.h @@ -132,6 +132,6 @@ bool in_range(const Container& container, return std::find(container.begin(), container.end(), value) != container.end(); } -} +} // namespace helpers #endif // SRC_COMPONENTS_UTILS_INCLUDE_UTILS_HELPERS_H_ diff --git a/src/components/utils/include/utils/log_message_loop_thread.h b/src/components/utils/include/utils/log_message_loop_thread.h index b20b43c251..b0cac75c71 100644 --- a/src/components/utils/include/utils/log_message_loop_thread.h +++ b/src/components/utils/include/utils/log_message_loop_thread.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_UTILS_INCLUDE_UTILS_LOG_MESSAGE_LOOP_THREAD_H_ #define SRC_COMPONENTS_UTILS_INCLUDE_UTILS_LOG_MESSAGE_LOOP_THREAD_H_ -#include -#include #include +#include +#include #include "utils/macro.h" #include "utils/threads/message_loop_thread.h" diff --git a/src/components/utils/include/utils/optional.h b/src/components/utils/include/utils/optional.h index 0395945de0..626c166a02 100644 --- a/src/components/utils/include/utils/optional.h +++ b/src/components/utils/include/utils/optional.h @@ -79,5 +79,5 @@ class Optional { bool is_initialized_; }; -} // utils utils +} // namespace utils #endif // ERROR_OR_H diff --git a/src/components/utils/include/utils/qdb_wrapper/sql_query.h b/src/components/utils/include/utils/qdb_wrapper/sql_query.h index bc3e7a592b..b324fd5d40 100644 --- a/src/components/utils/include/utils/qdb_wrapper/sql_query.h +++ b/src/components/utils/include/utils/qdb_wrapper/sql_query.h @@ -33,11 +33,11 @@ #ifndef SRC_COMPONENTS_UTILS_INCLUDE_UTILS_QDB_WRAPPER_SQL_QUERY_H_ #define SRC_COMPONENTS_UTILS_INCLUDE_UTILS_QDB_WRAPPER_SQL_QUERY_H_ -#include #include +#include #include -#include #include +#include #include "qdb_wrapper/sql_error.h" #include "utils/lock.h" diff --git a/src/components/utils/include/utils/resource_usage.h b/src/components/utils/include/utils/resource_usage.h index d358c49225..d34897eded 100644 --- a/src/components/utils/include/utils/resource_usage.h +++ b/src/components/utils/include/utils/resource_usage.h @@ -38,9 +38,9 @@ #include #endif -#include "utils/macro.h" -#include #include +#include +#include "utils/macro.h" #include "utils/logger.h" @@ -171,6 +171,6 @@ class Resources { */ static const char* proc; }; -} +} // namespace utils #endif // SRC_COMPONENTS_UTILS_INCLUDE_UTILS_RESOURCE_USAGE_H_ diff --git a/src/components/utils/include/utils/singleton.h b/src/components/utils/include/utils/singleton.h index b73780ee1d..54fc113aba 100644 --- a/src/components/utils/include/utils/singleton.h +++ b/src/components/utils/include/utils/singleton.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_UTILS_INCLUDE_UTILS_SINGLETON_H_ #define SRC_COMPONENTS_UTILS_INCLUDE_UTILS_SINGLETON_H_ +#include "utils/atomic.h" #include "utils/lock.h" #include "utils/memory_barrier.h" -#include "utils/atomic.h" namespace utils { diff --git a/src/components/utils/include/utils/sqlite_wrapper/sql_database.h b/src/components/utils/include/utils/sqlite_wrapper/sql_database.h index f68c5e215e..1bedbea01e 100644 --- a/src/components/utils/include/utils/sqlite_wrapper/sql_database.h +++ b/src/components/utils/include/utils/sqlite_wrapper/sql_database.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_UTILS_INCLUDE_UTILS_SQLITE_WRAPPER_SQL_DATABASE_H_ #include -#include "utils/sqlite_wrapper/sql_error.h" #include "utils/lock.h" +#include "utils/sqlite_wrapper/sql_error.h" struct sqlite3; diff --git a/src/components/utils/include/utils/sqlite_wrapper/sql_query.h b/src/components/utils/include/utils/sqlite_wrapper/sql_query.h index dc45be7ed1..e7fe75f9c9 100644 --- a/src/components/utils/include/utils/sqlite_wrapper/sql_query.h +++ b/src/components/utils/include/utils/sqlite_wrapper/sql_query.h @@ -35,8 +35,8 @@ #include #include -#include "utils/sqlite_wrapper/sql_error.h" #include "utils/lock.h" +#include "utils/sqlite_wrapper/sql_error.h" struct sqlite3_stmt; diff --git a/src/components/utils/include/utils/system.h b/src/components/utils/include/utils/system.h index 3b34d78526..f975f74510 100644 --- a/src/components/utils/include/utils/system.h +++ b/src/components/utils/include/utils/system.h @@ -91,6 +91,6 @@ class System { std::vector argv_; }; -} // utils +} // namespace utils #endif // SRC_COMPONENTS_UTILS_INCLUDE_UTILS_SYSTEM_H_ diff --git a/src/components/utils/include/utils/threads/pulse_thread_delegate.h b/src/components/utils/include/utils/threads/pulse_thread_delegate.h index 623e12b261..ad6df6fca7 100644 --- a/src/components/utils/include/utils/threads/pulse_thread_delegate.h +++ b/src/components/utils/include/utils/threads/pulse_thread_delegate.h @@ -55,23 +55,23 @@ namespace threads { class PulseThreadDelegate : public ThreadDelegate { public: /** - * @brief default constructor - */ + * @brief default constructor + */ PulseThreadDelegate(); virtual void threadMain(); virtual void exitThreadMain(); protected: /** - * @brief This method is to be implemented to arm events of interest - * @param event pointer to structure sigevent - * @return If this method returns true, thread is blocked on + * @brief This method is to be implemented to arm events of interest + * @param event pointer to structure sigevent + * @return If this method returns true, thread is blocked on * MsgReceivePulse() waiting for Pulse - */ + */ virtual bool ArmEvent(struct sigevent* event) = 0; /** - * @brief This method is invoked from threadMain() when Pulse comes - */ + * @brief This method is invoked from threadMain() when Pulse comes + */ virtual void OnPulse() = 0; /** @@ -83,9 +83,9 @@ class PulseThreadDelegate : public ThreadDelegate { } /** - * Finalizes thread - * Can free resources - */ + * Finalizes thread + * Can free resources + */ virtual void Finalize() {} private: diff --git a/src/components/utils/include/utils/threads/thread_manager.h b/src/components/utils/include/utils/threads/thread_manager.h index 3f53c902c4..4f28d0cb15 100644 --- a/src/components/utils/include/utils/threads/thread_manager.h +++ b/src/components/utils/include/utils/threads/thread_manager.h @@ -37,16 +37,16 @@ #include +#include #include -#include #include -#include +#include -#include "utils/macro.h" -#include "utils/singleton.h" -#include "utils/lock.h" #include "utils/conditional_variable.h" +#include "utils/lock.h" +#include "utils/macro.h" #include "utils/message_queue.h" +#include "utils/singleton.h" #include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" diff --git a/src/components/utils/include/utils/timer.h b/src/components/utils/include/utils/timer.h index b012b97e6a..a47b52a030 100644 --- a/src/components/utils/include/utils/timer.h +++ b/src/components/utils/include/utils/timer.h @@ -32,15 +32,15 @@ #ifndef SRC_COMPONENTS_UTILS_INCLUDE_UTILS_TIMER_H_ #define SRC_COMPONENTS_UTILS_INCLUDE_UTILS_TIMER_H_ -#include #include #include +#include -#include "utils/macro.h" #include "utils/lock.h" -#include "utils/timer_task.h" +#include "utils/macro.h" #include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" +#include "utils/timer_task.h" namespace timer { diff --git a/src/components/utils/include/utils/timer_task_impl.h b/src/components/utils/include/utils/timer_task_impl.h index 28618551ec..9ed6dd702d 100644 --- a/src/components/utils/include/utils/timer_task_impl.h +++ b/src/components/utils/include/utils/timer_task_impl.h @@ -33,8 +33,8 @@ #ifndef SRC_COMPONENTS_UTILS_INCLUDE_UTILS_TIMER_TASK_IMPL_H_ #define SRC_COMPONENTS_UTILS_INCLUDE_UTILS_TIMER_TASK_IMPL_H_ -#include "utils/timer_task.h" #include "utils/macro.h" +#include "utils/timer_task.h" namespace timer { diff --git a/src/components/utils/src/back_trace.cc b/src/components/utils/src/back_trace.cc index c587643cc6..65f9e72070 100644 --- a/src/components/utils/src/back_trace.cc +++ b/src/components/utils/src/back_trace.cc @@ -33,8 +33,8 @@ #include "utils/back_trace.h" #include -#include #include +#include #include #include @@ -63,7 +63,7 @@ string demangle(const char* symbol) { } return symbol; } -} +} // namespace Backtrace::Backtrace(int32_t count, int32_t skip_top) : thread_id_(threads::Thread::CurrentId()) { diff --git a/src/components/utils/src/conditional_variable_boost.cc b/src/components/utils/src/conditional_variable_boost.cc index a74aa3eaa6..c70b727d66 100644 --- a/src/components/utils/src/conditional_variable_boost.cc +++ b/src/components/utils/src/conditional_variable_boost.cc @@ -34,9 +34,9 @@ #include #include +#include #include "utils/lock.h" #include "utils/logger.h" -#include namespace { const long kNanosecondsPerSecond = 1000000000; diff --git a/src/components/utils/src/convert_utils.cc b/src/components/utils/src/convert_utils.cc index 319b231a96..9d90318731 100644 --- a/src/components/utils/src/convert_utils.cc +++ b/src/components/utils/src/convert_utils.cc @@ -32,8 +32,8 @@ #include "utils/convert_utils.h" #include -#include #include +#include #include "utils/macro.h" long long int utils::ConvertInt64ToLongLongInt(const int64_t value) { diff --git a/src/components/utils/src/custom_string.cc b/src/components/utils/src/custom_string.cc index 8254a98180..7bbe5f2da8 100644 --- a/src/components/utils/src/custom_string.cc +++ b/src/components/utils/src/custom_string.cc @@ -31,14 +31,14 @@ */ #include "utils/custom_string.h" -#include -#include +#include +#include #include +#include +#include #include #include -#include #include -#include #include "utils/logger.h" #include "utils/macro.h" @@ -76,7 +76,7 @@ void ConvertWStringToLowerCase(std::wstring& str) { std::transform(str.begin(), str.end(), str.begin(), towlower); setlocale(LC_ALL, current_locale.c_str()); } -} +} // namespace namespace utils { namespace custom_string { diff --git a/src/components/utils/src/gen_hash.cc b/src/components/utils/src/gen_hash.cc index a43b8feb03..0b85798b00 100644 --- a/src/components/utils/src/gen_hash.cc +++ b/src/components/utils/src/gen_hash.cc @@ -32,8 +32,8 @@ #include "utils/gen_hash.h" #include -#include #include +#include #include "utils/custom_string.h" namespace utils { diff --git a/src/components/utils/src/logger.cc b/src/components/utils/src/logger.cc index af21aeac77..2a4b8eb108 100644 --- a/src/components/utils/src/logger.cc +++ b/src/components/utils/src/logger.cc @@ -31,9 +31,9 @@ */ #include "utils/logger.h" +#include #include "utils/log_message_loop_thread.h" #include "utils/logger_status.h" -#include void deinit_logger() { CREATE_LOGGERPTR_LOCAL(logger_, "Utils") diff --git a/src/components/utils/src/qdb_wrapper/sql_database.cc b/src/components/utils/src/qdb_wrapper/sql_database.cc index b95fe17845..e2a51753b2 100644 --- a/src/components/utils/src/qdb_wrapper/sql_database.cc +++ b/src/components/utils/src/qdb_wrapper/sql_database.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include "qdb_wrapper/sql_database.h" +#include #include "utils/logger.h" namespace utils { diff --git a/src/components/utils/src/qdb_wrapper/sql_query.cc b/src/components/utils/src/qdb_wrapper/sql_query.cc index e5facb5853..d101e80718 100644 --- a/src/components/utils/src/qdb_wrapper/sql_query.cc +++ b/src/components/utils/src/qdb_wrapper/sql_query.cc @@ -31,12 +31,12 @@ */ #include "qdb_wrapper/sql_query.h" +#include #include -#include #include +#include #include "qdb_wrapper/sql_database.h" #include "utils/logger.h" -#include namespace utils { namespace dbms { diff --git a/src/components/utils/src/resource_usage.cc b/src/components/utils/src/resource_usage.cc index 385c2bfa2e..15a8c71e70 100644 --- a/src/components/utils/src/resource_usage.cc +++ b/src/components/utils/src/resource_usage.cc @@ -10,11 +10,11 @@ #include #include #endif -#include #include +#include +#include #include #include -#include #include #include "utils/file_system.h" diff --git a/src/components/utils/src/rwlock_posix.cc b/src/components/utils/src/rwlock_posix.cc index 08edb8cb0c..81bf5feee1 100644 --- a/src/components/utils/src/rwlock_posix.cc +++ b/src/components/utils/src/rwlock_posix.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "utils/rwlock.h" #include "utils/logger.h" +#include "utils/rwlock.h" namespace sync_primitives { diff --git a/src/components/utils/src/signals_posix.cc b/src/components/utils/src/signals_posix.cc index e13dc04f40..8d1134576f 100644 --- a/src/components/utils/src/signals_posix.cc +++ b/src/components/utils/src/signals_posix.cc @@ -29,10 +29,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include #include -#include #include #include "utils/signals.h" diff --git a/src/components/utils/src/system.cc b/src/components/utils/src/system.cc index 6c3cf56133..2acc7acf92 100644 --- a/src/components/utils/src/system.cc +++ b/src/components/utils/src/system.cc @@ -32,16 +32,16 @@ #ifdef __QNX__ #include #else // __QNX__ +#include +#include #include #include -#include -#include #include #endif // __QNX__ #include -#include #include +#include #include #include "utils/logger.h" @@ -87,7 +87,7 @@ bool System::Execute() { bool System::Execute(bool wait) { size_t size = argv_.size(); - char** argv = new char* [size + 1]; + char** argv = new char*[size + 1]; std::transform(argv_.begin(), argv_.end(), argv, GetCString()); argv[size] = NULL; @@ -137,7 +137,7 @@ bool System::Execute(bool wait) { dup2(fd_dev0, STDERR_FILENO); size_t size = argv_.size(); - char** argv = new char* [size + 1]; + char** argv = new char*[size + 1]; std::transform(argv_.begin(), argv_.end(), argv, GetCString()); argv[size] = NULL; @@ -173,4 +173,4 @@ bool System::Execute(bool wait) { #endif // __QNX__ -} // utils +} // namespace utils diff --git a/src/components/utils/src/threads/async_runner.cc b/src/components/utils/src/threads/async_runner.cc index 131aaa3f78..740db016be 100644 --- a/src/components/utils/src/threads/async_runner.cc +++ b/src/components/utils/src/threads/async_runner.cc @@ -110,4 +110,4 @@ void AsyncRunner::AsyncRunnerDelegate::runDelegate(ThreadDelegate* delegate) { delegate_notifier_.NotifyOne(); } -} // namespace policy. +} // namespace threads diff --git a/src/components/utils/src/threads/pulse_thread_delegate.cc b/src/components/utils/src/threads/pulse_thread_delegate.cc index 37e6c670d1..a76b17368a 100644 --- a/src/components/utils/src/threads/pulse_thread_delegate.cc +++ b/src/components/utils/src/threads/pulse_thread_delegate.cc @@ -32,8 +32,8 @@ #include -#include "utils/threads/pulse_thread_delegate.h" #include "utils/logger.h" +#include "utils/threads/pulse_thread_delegate.h" namespace threads { diff --git a/src/components/utils/src/threads/thread_delegate.cc b/src/components/utils/src/threads/thread_delegate.cc index 917603f92c..e071959522 100644 --- a/src/components/utils/src/threads/thread_delegate.cc +++ b/src/components/utils/src/threads/thread_delegate.cc @@ -34,8 +34,8 @@ #include -#include "utils/threads/thread.h" #include "utils/lock.h" +#include "utils/threads/thread.h" namespace threads { diff --git a/src/components/utils/src/threads/thread_manager.cc b/src/components/utils/src/threads/thread_manager.cc index 2959a86cb7..8825510d74 100644 --- a/src/components/utils/src/threads/thread_manager.cc +++ b/src/components/utils/src/threads/thread_manager.cc @@ -31,16 +31,16 @@ */ #include "utils/threads/thread_manager.h" -#include "utils/threads/thread_delegate.h" -#include "utils/lock.h" #include "utils/conditional_variable.h" -#include "utils/threads/thread.h" +#include "utils/lock.h" #include "utils/logger.h" +#include "utils/threads/thread.h" +#include "utils/threads/thread_delegate.h" #include -#include #include +#include #if defined(OS_LINUX) #include diff --git a/src/components/utils/src/threads/thread_posix.cc b/src/components/utils/src/threads/thread_posix.cc index 51e59fa108..35c1cd7084 100644 --- a/src/components/utils/src/threads/thread_posix.cc +++ b/src/components/utils/src/threads/thread_posix.cc @@ -32,16 +32,16 @@ #include #include -#include -#include #include +#include +#include #include #include -#include "utils/threads/thread.h" #include "utils/atomic.h" -#include "utils/threads/thread_delegate.h" #include "utils/logger.h" +#include "utils/threads/thread.h" +#include "utils/threads/thread_delegate.h" #ifndef __QNXNTO__ const int EOK = 0; @@ -172,9 +172,9 @@ bool Thread::start(const ThreadOptions& options) { } if (isThreadRunning_) { - LOG4CXX_TRACE(logger_, - "EXIT thread " << name_ << " #" << handle_ - << " is already running"); + LOG4CXX_TRACE( + logger_, + "EXIT thread " << name_ << " #" << handle_ << " is already running"); return true; } diff --git a/src/components/utils/src/threads/thread_validator.cc b/src/components/utils/src/threads/thread_validator.cc index 4024522ae4..3b753e79b5 100644 --- a/src/components/utils/src/threads/thread_validator.cc +++ b/src/components/utils/src/threads/thread_validator.cc @@ -31,8 +31,8 @@ */ #include "utils/threads/thread_validator.h" -#include "utils/logger.h" #include "utils/back_trace.h" +#include "utils/logger.h" namespace threads { @@ -46,14 +46,15 @@ SingleThreadSimpleValidator::~SingleThreadSimpleValidator() {} void SingleThreadSimpleValidator::AssertRunningOnCreationThread() const { PlatformThreadHandle current_id = Thread::CurrentId(); if (creation_thread_id_ != current_id) { - LOG4CXX_ERROR(logger_, - "Single-threaded object created at thread " - << creation_thread_id_ << " is accessed from thread " - << current_id + LOG4CXX_ERROR( + logger_, + "Single-threaded object created at thread " + << creation_thread_id_ << " is accessed from thread " << current_id #ifdef BACKTRACE_SUPPORT - << "\n" << utils::Backtrace() + << "\n" + << utils::Backtrace() #endif - ); + ); } } @@ -80,7 +81,7 @@ void SingleThreadValidator::AssertRunningOnValidThread() const { #ifdef BACKTRACE_SUPPORT << utils::Backtrace() #endif - ); + ); } } diff --git a/src/components/utils/src/timer.cc b/src/components/utils/src/timer.cc index 68693dfc55..8e854654de 100644 --- a/src/components/utils/src/timer.cc +++ b/src/components/utils/src/timer.cc @@ -33,13 +33,13 @@ #include -#include "utils/macro.h" -#include "utils/logger.h" -#include "utils/lock.h" -#include "utils/timer_task.h" #include "utils/conditional_variable.h" +#include "utils/lock.h" +#include "utils/logger.h" +#include "utils/macro.h" #include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" +#include "utils/timer_task.h" CREATE_LOGGERPTR_GLOBAL(logger_, "Utils") diff --git a/src/components/utils/test/async_runner_test.cc b/src/components/utils/test/async_runner_test.cc index f01dad8d58..e26f80d954 100644 --- a/src/components/utils/test/async_runner_test.cc +++ b/src/components/utils/test/async_runner_test.cc @@ -30,15 +30,15 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "utils/threads/async_runner.h" #include #include #include -#include "utils/lock.h" -#include "utils/threads/async_runner.h" #include "utils/conditional_variable.h" +#include "utils/lock.h" -#include "gtest/gtest.h" #include "gmock/gmock.h" +#include "gtest/gtest.h" namespace test { namespace components { @@ -49,7 +49,7 @@ using namespace threads; namespace { size_t kCheckValue = 0u; const size_t kDelegatesAmount = 4u; -} +} // namespace // ThreadDelegate successor class TestThreadDelegate : public ThreadDelegate { @@ -93,7 +93,7 @@ class AsyncRunnerTest : public ::testing::Test { std::shared_ptr async_runner_; void CreateThreadsArray() { - delegates_ = new ThreadDelegate* [kDelegatesAmount]; + delegates_ = new ThreadDelegate*[kDelegatesAmount]; } void DeleteThreadsArray() { diff --git a/src/components/utils/test/auto_trace_test.cc b/src/components/utils/test/auto_trace_test.cc index 1290ce7e96..41dc90cae4 100644 --- a/src/components/utils/test/auto_trace_test.cc +++ b/src/components/utils/test/auto_trace_test.cc @@ -30,19 +30,19 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include #include "gtest/gtest.h" #include "utils/auto_trace.h" -#include "utils/logger.h" +#include "utils/date_time.h" +#include "utils/file_system.h" +#include "utils/helpers.h" #include "utils/log_message_loop_thread.h" +#include "utils/logger.h" +#include "utils/logger_status.h" #include "utils/threads/message_loop_thread.h" -#include "utils/file_system.h" #include "utils/threads/thread.h" -#include "utils/date_time.h" -#include "utils/logger_status.h" -#include "utils/helpers.h" namespace test { namespace components { @@ -115,7 +115,7 @@ bool CheckAutoTraceDebugInFile(const std::string& debug_message) { bool trace_exit = false; for (std::string line; Compare(false, debug_found, trace_enter, trace_exit) && - getline(file_log, line);) { + getline(file_log, line);) { debug_found = debug_found ? debug_found : IsLogLineContains(line, debug_log_level, debug_message); diff --git a/src/components/utils/test/back_trace_test.cc b/src/components/utils/test/back_trace_test.cc index dcb2a79baa..2c8c61439b 100644 --- a/src/components/utils/test/back_trace_test.cc +++ b/src/components/utils/test/back_trace_test.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "utils/back_trace.h" +#include "gtest/gtest.h" namespace test { namespace components { diff --git a/src/components/utils/test/bitstream_test.cc b/src/components/utils/test/bitstream_test.cc index caec4b3970..3d20845dc4 100644 --- a/src/components/utils/test/bitstream_test.cc +++ b/src/components/utils/test/bitstream_test.cc @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "utils/bitstream.h" #include #include "gtest/gtest.h" #include "utils/macro.h" -#include "utils/bitstream.h" namespace test { namespace components { diff --git a/src/components/utils/test/custom_string_test.cc b/src/components/utils/test/custom_string_test.cc index bca332be5a..cf03f6099f 100644 --- a/src/components/utils/test/custom_string_test.cc +++ b/src/components/utils/test/custom_string_test.cc @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "utils/custom_string.h" #include #include #include "gtest/gtest.h" -#include "utils/custom_string.h" namespace custom_str = utils::custom_string; diff --git a/src/components/utils/test/data_accessor_test.cc b/src/components/utils/test/data_accessor_test.cc index 24b7bab282..b9d8f3b4f9 100644 --- a/src/components/utils/test/data_accessor_test.cc +++ b/src/components/utils/test/data_accessor_test.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "utils/data_accessor.h" +#include "gtest/gtest.h" #include "utils/lock.h" namespace test { diff --git a/src/components/utils/test/date_time_test.cc b/src/components/utils/test/date_time_test.cc index 00085813aa..4cde9a4fc4 100644 --- a/src/components/utils/test/date_time_test.cc +++ b/src/components/utils/test/date_time_test.cc @@ -30,9 +30,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "utils/date_time.h" #include #include "gtest/gtest.h" -#include "utils/date_time.h" namespace test { namespace components { diff --git a/src/components/utils/test/file_system_test.cc b/src/components/utils/test/file_system_test.cc index eb35773fc9..3d518e599f 100644 --- a/src/components/utils/test/file_system_test.cc +++ b/src/components/utils/test/file_system_test.cc @@ -32,8 +32,8 @@ #include #include -#include #include +#include #include "gtest/gtest.h" #include "utils/file_system.h" @@ -57,7 +57,7 @@ StringArray MergeStringsToArray(const std::string& first, return array_of_strings; } -} +} // namespace TEST(FileSystemTest, CreateDeleteDirectory) { ASSERT_FALSE(DirectoryExists("./Test directory")); diff --git a/src/components/utils/test/generated_code_with_sqlite_test.cc b/src/components/utils/test/generated_code_with_sqlite_test.cc index 1c829c838c..b75ec5c58f 100644 --- a/src/components/utils/test/generated_code_with_sqlite_test.cc +++ b/src/components/utils/test/generated_code_with_sqlite_test.cc @@ -29,9 +29,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "utils/generated_code_with_sqlite_test.h" #include #include "gtest/gtest.h" -#include "utils/generated_code_with_sqlite_test.h" namespace test { namespace components { diff --git a/src/components/utils/test/include/utils/generated_code_with_sqlite_test.h b/src/components/utils/test/include/utils/generated_code_with_sqlite_test.h index e21fd75f87..0e75b8ba87 100644 --- a/src/components/utils/test/include/utils/generated_code_with_sqlite_test.h +++ b/src/components/utils/test/include/utils/generated_code_with_sqlite_test.h @@ -35,8 +35,8 @@ #include #include "policy/policy_table/types.h" #include "rpc_base/rpc_base.h" -#include "utils/sqlite_wrapper/sql_query.h" #include "utils/sqlite_wrapper/sql_database.h" +#include "utils/sqlite_wrapper/sql_query.h" namespace test { namespace components { diff --git a/src/components/utils/test/include/utils/mock_signals_posix.h b/src/components/utils/test/include/utils/mock_signals_posix.h index 1aad2d5873..363708a668 100644 --- a/src/components/utils/test/include/utils/mock_signals_posix.h +++ b/src/components/utils/test/include/utils/mock_signals_posix.h @@ -33,10 +33,10 @@ #ifndef SRC_COMPONENTS_UTILS_TEST_INCLUDE_UTILS_MOCK_SIGNALS_POSIX_H_ #define SRC_COMPONENTS_UTILS_TEST_INCLUDE_UTILS_MOCK_SIGNALS_POSIX_H_ -#include "gmock/gmock.h" -#include "utils/signals.h" #include #include "appMain/low_voltage_signals_handler.h" +#include "gmock/gmock.h" +#include "utils/signals.h" namespace utils { diff --git a/src/components/utils/test/log_message_loop_thread_test.cc b/src/components/utils/test/log_message_loop_thread_test.cc index 92287fb45b..74b1f5094f 100644 --- a/src/components/utils/test/log_message_loop_thread_test.cc +++ b/src/components/utils/test/log_message_loop_thread_test.cc @@ -30,9 +30,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" -#include "gmock/gmock.h" #include "utils/log_message_loop_thread.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "utils/logger_status.h" namespace test { diff --git a/src/components/utils/test/message_queue_test.cc b/src/components/utils/test/message_queue_test.cc index 9aa70933d6..b3c654420a 100644 --- a/src/components/utils/test/message_queue_test.cc +++ b/src/components/utils/test/message_queue_test.cc @@ -30,9 +30,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "utils/message_queue.h" #include #include "gtest/gtest.h" -#include "utils/message_queue.h" namespace test { namespace components { diff --git a/src/components/utils/test/messagemeter_test.cc b/src/components/utils/test/messagemeter_test.cc index d45e600034..fdfca113a8 100644 --- a/src/components/utils/test/messagemeter_test.cc +++ b/src/components/utils/test/messagemeter_test.cc @@ -1,44 +1,44 @@ /* -* Copyright (c) 2015, 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. -*/ + * Copyright (c) 2015, 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 -#include "gtest/gtest.h" #include "gmock/gmock.h" +#include "gtest/gtest.h" #include "utils/macro.h" -#include "utils/messagemeter.h" #include "utils/date_time.h" +#include "utils/messagemeter.h" namespace test { namespace components { diff --git a/src/components/utils/test/mock_signals_posix.cc b/src/components/utils/test/mock_signals_posix.cc index 47531b4a9f..93c08a690d 100644 --- a/src/components/utils/test/mock_signals_posix.cc +++ b/src/components/utils/test/mock_signals_posix.cc @@ -30,9 +30,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" -#include "gmock/gmock.h" #include "utils/mock_signals_posix.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "utils/signals.h" namespace utils { diff --git a/src/components/utils/test/posix_thread_test.cc b/src/components/utils/test/posix_thread_test.cc index a44e1b9b89..4bf0c8c092 100644 --- a/src/components/utils/test/posix_thread_test.cc +++ b/src/components/utils/test/posix_thread_test.cc @@ -52,7 +52,7 @@ const char* threadName("test thread"); const std::string test_thread_name("THREAD"); sync_primitives::ConditionalVariable cond_var_; sync_primitives::Lock test_mutex_; -}; +}; // namespace // ThreadDelegate successor class TestThreadDelegate : public threads::ThreadDelegate { diff --git a/src/components/utils/test/prioritized_queue_test.cc b/src/components/utils/test/prioritized_queue_test.cc index 082ff56713..ed22c2db48 100644 --- a/src/components/utils/test/prioritized_queue_test.cc +++ b/src/components/utils/test/prioritized_queue_test.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "utils/prioritized_queue.h" +#include "gtest/gtest.h" namespace test { namespace components { diff --git a/src/components/utils/test/qdb_wrapper/sql_database_test.cc b/src/components/utils/test/qdb_wrapper/sql_database_test.cc index 4e1a822b57..33dfe69119 100644 --- a/src/components/utils/test/qdb_wrapper/sql_database_test.cc +++ b/src/components/utils/test/qdb_wrapper/sql_database_test.cc @@ -33,11 +33,11 @@ #include "gtest/gtest.h" -#include "qdb_wrapper/sql_error.h" #include "qdb_wrapper/sql_database.h" +#include "qdb_wrapper/sql_error.h" -using ::utils::dbms::SQLError; using ::utils::dbms::SQLDatabase; +using ::utils::dbms::SQLError; namespace test { namespace components { diff --git a/src/components/utils/test/qdb_wrapper/sql_query_test.cc b/src/components/utils/test/qdb_wrapper/sql_query_test.cc index e575e4f575..6279f4d8a1 100644 --- a/src/components/utils/test/qdb_wrapper/sql_query_test.cc +++ b/src/components/utils/test/qdb_wrapper/sql_query_test.cc @@ -34,12 +34,12 @@ #include "gtest/gtest.h" -#include "qdb_wrapper/sql_error.h" #include "qdb_wrapper/sql_database.h" +#include "qdb_wrapper/sql_error.h" #include "qdb_wrapper/sql_query.h" -using ::utils::dbms::SQLError; using ::utils::dbms::SQLDatabase; +using ::utils::dbms::SQLError; using ::utils::dbms::SQLQuery; namespace test { diff --git a/src/components/utils/test/resource_usage_test.cc b/src/components/utils/test/resource_usage_test.cc index 96b4fe4b49..ac8825c841 100644 --- a/src/components/utils/test/resource_usage_test.cc +++ b/src/components/utils/test/resource_usage_test.cc @@ -34,8 +34,8 @@ #include "gtest/gtest.h" #include "utils/macro.h" -#include "utils/resource_usage.h" #include "utils/file_system.h" +#include "utils/resource_usage.h" namespace utils { @@ -80,7 +80,7 @@ TEST_F(ResourceUsagePrivateTest, GetProcPathTest) { // assert EXPECT_EQ(filename, fd + "/stat"); } -} +} // namespace utils namespace test { namespace components { diff --git a/src/components/utils/test/scope_guard_test.cc b/src/components/utils/test/scope_guard_test.cc index 5e685d6aba..1f9224effa 100644 --- a/src/components/utils/test/scope_guard_test.cc +++ b/src/components/utils/test/scope_guard_test.cc @@ -30,18 +30,18 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gmock/gmock.h" #include "utils/scope_guard.h" +#include "gmock/gmock.h" #include "utils/macro.h" namespace test { namespace components { namespace utils_test { -using ::utils::ScopeGuard; +using ::testing::Mock; using ::utils::MakeGuard; using ::utils::MakeObjGuard; -using ::testing::Mock; +using ::utils::ScopeGuard; class TestCalleeObject { public: @@ -55,7 +55,7 @@ void dealloc(char* ptr) { delete ptr; ++call_with_param_count; } -} +} // namespace TEST(ScopeGuardTest, CallFreeFunctionWithParam) { { @@ -118,4 +118,4 @@ TEST(ScopeGuardTest, DismissCallObjectFunctionWithParam) { } // namespace utils_test } // namespace components -} // namesapce test +} // namespace test diff --git a/src/components/utils/test/singleton_test.cc b/src/components/utils/test/singleton_test.cc index ae05b6cbab..a38f51726c 100644 --- a/src/components/utils/test/singleton_test.cc +++ b/src/components/utils/test/singleton_test.cc @@ -30,9 +30,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "utils/singleton.h" #include +#include "gtest/gtest.h" namespace test { namespace components { diff --git a/src/components/utils/test/sqlite_wrapper/sql_database_test.cc b/src/components/utils/test/sqlite_wrapper/sql_database_test.cc index 9732fbe078..0195e02121 100644 --- a/src/components/utils/test/sqlite_wrapper/sql_database_test.cc +++ b/src/components/utils/test/sqlite_wrapper/sql_database_test.cc @@ -1,40 +1,40 @@ /* 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. -*/ + * 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 "utils/sqlite_wrapper/sql_database.h" #include "gtest/gtest.h" #include "utils/sqlite_wrapper/sql_error.h" -#include "utils/sqlite_wrapper/sql_database.h" -using ::utils::dbms::SQLError; using ::utils::dbms::SQLDatabase; +using ::utils::dbms::SQLError; namespace test { namespace components { diff --git a/src/components/utils/test/sqlite_wrapper/sql_query_test.cc b/src/components/utils/test/sqlite_wrapper/sql_query_test.cc index c10c26a2c7..b2d3c747cd 100644 --- a/src/components/utils/test/sqlite_wrapper/sql_query_test.cc +++ b/src/components/utils/test/sqlite_wrapper/sql_query_test.cc @@ -29,17 +29,17 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include +#include #include "gtest/gtest.h" -#include "utils/sqlite_wrapper/sql_error.h" #include "utils/sqlite_wrapper/sql_database.h" +#include "utils/sqlite_wrapper/sql_error.h" #include "utils/sqlite_wrapper/sql_query.h" -using ::utils::dbms::SQLError; using ::utils::dbms::SQLDatabase; +using ::utils::dbms::SQLError; using ::utils::dbms::SQLQuery; namespace test { diff --git a/src/components/utils/test/stl_utils_test.cc b/src/components/utils/test/stl_utils_test.cc index 5250a7a514..c2701c1558 100644 --- a/src/components/utils/test/stl_utils_test.cc +++ b/src/components/utils/test/stl_utils_test.cc @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "utils/stl_utils.h" #include +#include #include "gtest/gtest.h" -#include "utils/stl_utils.h" namespace test { namespace components { diff --git a/src/components/utils/test/system_test.cc b/src/components/utils/test/system_test.cc index b479823aa5..b9daa575ba 100644 --- a/src/components/utils/test/system_test.cc +++ b/src/components/utils/test/system_test.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gmock/gmock.h" #include "utils/system.h" +#include "gmock/gmock.h" namespace test { namespace components { diff --git a/src/components/utils/test/test_generator/generated_msg_version_test.cc b/src/components/utils/test/test_generator/generated_msg_version_test.cc index c9647dcad0..4d1d70a5d6 100644 --- a/src/components/utils/test/test_generator/generated_msg_version_test.cc +++ b/src/components/utils/test/test_generator/generated_msg_version_test.cc @@ -30,11 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "generated_msg_version.h" #include +#include #include #include "gtest/gtest.h" -#include "generated_msg_version.h" #include "utils/file_system.h" using namespace std; diff --git a/src/components/utils/test/timer_test.cc b/src/components/utils/test/timer_test.cc index ea5c9f0b84..d7b196876d 100644 --- a/src/components/utils/test/timer_test.cc +++ b/src/components/utils/test/timer_test.cc @@ -30,12 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "utils/timer.h" -#include "utils/mock_timer_task.h" +#include "gtest/gtest.h" #include "utils/conditional_variable.h" #include "utils/lock.h" #include "utils/macro.h" +#include "utils/mock_timer_task.h" #include "utils/timer_task_impl.h" namespace test { -- cgit v1.2.1 From 945d9a4e06bf74f257898671c9b63598d8b0a3bf Mon Sep 17 00:00:00 2001 From: jacobkeeler Date: Tue, 30 Apr 2019 13:13:02 -0400 Subject: Fix build failures from rearranged includes --- .../include/application_manager/app_extension.h | 2 ++ .../include/application_manager/command_factory.h | 1 + .../include/application_manager/mock_event_dispatcher.h | 1 + .../include/application_manager/application_manager.h | 1 - .../media_manager/audio/from_mic_recorder_listener.h | 1 + .../transport_manager/tcp/mock_tcp_transport_adapter.h | 16 ++++++++++------ tools/InterfaceGenerator/MsgVersionGenerate.py | 1 + 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/components/application_manager/include/application_manager/app_extension.h b/src/components/application_manager/include/application_manager/app_extension.h index d6d5cbba64..5167aa88c0 100644 --- a/src/components/application_manager/include/application_manager/app_extension.h +++ b/src/components/application_manager/include/application_manager/app_extension.h @@ -33,6 +33,8 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_EXTENSION_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_EXTENSION_H_ +#include + namespace ns_smart_device_link { namespace ns_smart_objects { class SmartObject; diff --git a/src/components/application_manager/include/application_manager/command_factory.h b/src/components/application_manager/include/application_manager/command_factory.h index 261d0e1e10..f479ee7f37 100644 --- a/src/components/application_manager/include/application_manager/command_factory.h +++ b/src/components/application_manager/include/application_manager/command_factory.h @@ -35,6 +35,7 @@ #include "application_manager/application_manager.h" #include "application_manager/commands/command.h" +#include "application_manager/hmi_capabilities.h" #include "application_manager/policies/policy_handler_interface.h" #include "application_manager/rpc_service.h" #include "utils/macro.h" diff --git a/src/components/application_manager/test/include/application_manager/mock_event_dispatcher.h b/src/components/application_manager/test/include/application_manager/mock_event_dispatcher.h index c5aedba029..b345f53c1c 100644 --- a/src/components/application_manager/test/include/application_manager/mock_event_dispatcher.h +++ b/src/components/application_manager/test/include/application_manager/mock_event_dispatcher.h @@ -37,6 +37,7 @@ #include "application_manager/event_engine/event.h" #include "application_manager/event_engine/event_dispatcher.h" #include "application_manager/event_engine/event_observer.h" +#include "gmock/gmock.h" namespace test { namespace components { diff --git a/src/components/include/application_manager/application_manager.h b/src/components/include/application_manager/application_manager.h index 1a12e973b2..521eadf48e 100644 --- a/src/components/include/application_manager/application_manager.h +++ b/src/components/include/application_manager/application_manager.h @@ -40,7 +40,6 @@ #include "application_manager/application.h" #include "application_manager/command_factory.h" #include "application_manager/commands/command.h" -#include "application_manager/hmi_capabilities.h" #include "connection_handler/connection_handler.h" #include "utils/data_accessor.h" diff --git a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h index c615195f94..643657951b 100644 --- a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h +++ b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h @@ -35,6 +35,7 @@ #include #include "media_manager/media_adapter_listener.h" +#include "utils/macro.h" namespace application_manager { class ApplicationManager; diff --git a/src/components/transport_manager/test/include/transport_manager/tcp/mock_tcp_transport_adapter.h b/src/components/transport_manager/test/include/transport_manager/tcp/mock_tcp_transport_adapter.h index 432e4f3fa0..9a8936e58a 100644 --- a/src/components/transport_manager/test/include/transport_manager/tcp/mock_tcp_transport_adapter.h +++ b/src/components/transport_manager/test/include/transport_manager/tcp/mock_tcp_transport_adapter.h @@ -34,6 +34,7 @@ #define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TCP_MOCK_TCP_TRANSPORT_ADAPTER_H_ #include "gmock/gmock.h" +#include "transport_manager/common.h" #include "transport_manager/tcp/tcp_transport_adapter.h" #include "transport_manager/transport_manager_settings.h" @@ -50,14 +51,17 @@ class MockTCPTransportAdapter : public TcpTransportAdapter { resumption::LastState& last_state, const transport_manager::TransportManagerSettings& settings) : TcpTransportAdapter(port, last_state, settings) {} - MOCK_CONST_METHOD2(FindEstablishedConnection, - ConnectionSPtr(const DeviceUID& device_handle, - const ApplicationHandle& app_handle)); + MOCK_CONST_METHOD2( + FindEstablishedConnection, + ConnectionSPtr(const transport_manager::DeviceUID& device_handle, + const transport_manager::ApplicationHandle& app_handle)); - MOCK_CONST_METHOD1(FindDevice, DeviceSptr(const DeviceUID& device_handle)); + MOCK_CONST_METHOD1( + FindDevice, DeviceSptr(const transport_manager::DeviceUID& device_handle)); MOCK_METHOD2(Connect, - TransportAdapter::Error(const DeviceUID& device_handle, - const ApplicationHandle& app_handle)); + TransportAdapter::Error( + const transport_manager::DeviceUID& device_handle, + const transport_manager::ApplicationHandle& app_handle)); void CallStore() { Store(); } diff --git a/tools/InterfaceGenerator/MsgVersionGenerate.py b/tools/InterfaceGenerator/MsgVersionGenerate.py index 4a24a3239f..6ec0c40a68 100644 --- a/tools/InterfaceGenerator/MsgVersionGenerate.py +++ b/tools/InterfaceGenerator/MsgVersionGenerate.py @@ -96,6 +96,7 @@ def prepare_data_for_storage(major_version, minor_version, patch_version, minimu u'''*/\n''' u'''#ifndef GENERATED_MSG_VERSION_H\n''' u'''#define GENERATED_MSG_VERSION_H\n\n''' + u'''#include \n\n''' u'''namespace application_manager {\n\n''' u'''const uint16_t major_version = $m_version;\n''' u'''const uint16_t minor_version = $min_version;\n''' -- cgit v1.2.1