diff options
author | jacobkeeler <jacob.keeler@livioradio.com> | 2019-03-15 09:40:24 -0400 |
---|---|---|
committer | jacobkeeler <jacob.keeler@livioradio.com> | 2019-03-15 09:40:24 -0400 |
commit | 2ff8225f536a1595d6a409ddeb7e46c3ec9ebb95 (patch) | |
tree | afece7b6f3526d2afeb24d1544f61dfbb705a4fb | |
parent | b84c348facd194ec0f94348af1621534549320b0 (diff) | |
download | sdl_core-2ff8225f536a1595d6a409ddeb7e46c3ec9ebb95.tar.gz |
Rearrange includes and make AppServiceManager methods virtual
21 files changed, 71 insertions, 36 deletions
diff --git a/src/components/application_manager/include/application_manager/app_service_manager.h b/src/components/application_manager/include/application_manager/app_service_manager.h index 7f8d305edd..47a60780bc 100644 --- a/src/components/application_manager/include/application_manager/app_service_manager.h +++ b/src/components/application_manager/include/application_manager/app_service_manager.h @@ -34,10 +34,9 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_SERVICE_MANAGER_H_ #include "application_manager/application.h" +#include "application_manager/rpc_passing_handler.h" #include "interfaces/MOBILE_API.h" #include "smart_objects/smart_object.h" -#include "application_manager/application.h" -#include "application_manager/rpc_passing_handler.h" namespace resumption { class LastState; @@ -52,6 +51,7 @@ struct AppService { smart_objects::SmartObject record; }; +class RPCPassingHandler; class ApplicationManager; /** * @brief The AppServiceManager is TODO. @@ -70,13 +70,13 @@ class AppServiceManager { /** * @brief Class destructor */ - ~AppServiceManager(); + virtual ~AppServiceManager(); /** * @brief TODO * @param manifest */ - smart_objects::SmartObject PublishAppService( + virtual smart_objects::SmartObject PublishAppService( const smart_objects::SmartObject& manifest, const bool mobile_service, const uint32_t connection_key); @@ -85,82 +85,83 @@ class AppServiceManager { * @brief TODO * @param service_id */ - bool UnpublishAppService(const std::string service_id); + virtual bool UnpublishAppService(const std::string service_id); - void OnAppActivated(ApplicationConstSharedPtr app); + virtual void OnAppActivated(ApplicationConstSharedPtr app); /** * @brief TODO * @param connection_key */ - void UnpublishServices(const uint32_t connection_key); + virtual void UnpublishServices(const uint32_t connection_key); /** * @brief TODO * @param service_id */ - bool SetDefaultService(const std::string service_id); + virtual bool SetDefaultService(const std::string service_id); /** * @brief TODO * @param service_id */ - bool RemoveDefaultService(const std::string service_id); + virtual bool RemoveDefaultService(const std::string service_id); /** * @brief TODO * @param service_id */ - bool ActivateAppService(const std::string service_id); + virtual bool ActivateAppService(const std::string service_id); /** * @brief TODO * @param service_id */ - bool DeactivateAppService(const std::string service_id); + virtual bool DeactivateAppService(const std::string service_id); /** * @brief TODO * @param manifest */ - std::vector<smart_objects::SmartObject> GetAllServiceRecords(); - std::vector<std::pair<std::string, AppService> > GetActiveServices(); + virtual std::vector<smart_objects::SmartObject> GetAllServiceRecords(); + virtual std::vector<std::pair<std::string, AppService> > GetActiveServices(); - void GetProviderByType(const std::string& service_type, - const bool mobile_consumer, - ApplicationSharedPtr& app, - bool& hmi_service); + virtual void GetProviderByType(const std::string& service_type, + const bool mobile_consumer, + ApplicationSharedPtr& app, + bool& hmi_service); - void GetProviderByID(const std::string& service_id, - const bool mobile_consumer, - ApplicationSharedPtr& app, - bool& hmi_service); + virtual void GetProviderByID(const std::string& service_id, + const bool mobile_consumer, + ApplicationSharedPtr& app, + bool& hmi_service); - AppService* ActiveServiceForType(const std::string service_type); + virtual AppService* ActiveServiceForType(const std::string service_type); - AppService* EmbeddedServiceForType(const std::string service_type); + virtual AppService* EmbeddedServiceForType(const std::string service_type); AppService* FindServiceByName(const std::string name); - AppService* FindServiceByID(const std::string service_id); + virtual AppService* FindServiceByID(const std::string service_id); - std::string DefaultServiceByType(const std::string service_type); + virtual std::string DefaultServiceByType(const std::string service_type); /** * @brief TODO * @param service_id * @param service_published */ - void SetServicePublished(const std::string service_id, - bool service_published); + virtual void SetServicePublished(const std::string service_id, + bool service_published); /** * @brief TODO * @param out_params */ - bool UpdateNavigationCapabilities(smart_objects::SmartObject& out_params); + virtual bool UpdateNavigationCapabilities( + smart_objects::SmartObject& out_params); - RPCPassingHandler& GetRPCPassingHandler(); + virtual RPCPassingHandler& GetRPCPassingHandler(); private: ApplicationManager& app_manager_; 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 2d2eff7bd3..fc40624e4d 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 @@ -42,6 +42,7 @@ #include <memory> #include "application_manager/application_manager.h" +#include "application_manager/app_service_manager.h" #include "application_manager/hmi_capabilities.h" #include "application_manager/message.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/include/application_manager/rpc_passing_handler.h b/src/components/application_manager/include/application_manager/rpc_passing_handler.h index 3ed10ff1e6..ab85b1374f 100644 --- a/src/components/application_manager/include/application_manager/rpc_passing_handler.h +++ b/src/components/application_manager/include/application_manager/rpc_passing_handler.h @@ -33,11 +33,11 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_RPC_PASSING_HANDLER_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_RPC_PASSING_HANDLER_H_ +#include <deque> #include "application_manager/application.h" +#include "application_manager/commands/command.h" #include "interfaces/MOBILE_API.h" #include "smart_objects/smart_object.h" -#include "application_manager/app_service_manager.h" -#include <deque> #include "utils/timer.h" namespace application_manager { diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_app_service_activation_request.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_app_service_activation_request.cc index 7c32d9bbe1..fd7312ca98 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_app_service_activation_request.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_app_service_activation_request.cc @@ -32,6 +32,8 @@ #include "app_service_rpc_plugin/commands/hmi/as_app_service_activation_request.h" +#include "application_manager/app_service_manager.h" + namespace app_service_rpc_plugin { using namespace application_manager; namespace commands { diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_get_app_service_records_request.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_get_app_service_records_request.cc index 6123843704..fa704c1995 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_get_app_service_records_request.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_get_app_service_records_request.cc @@ -32,6 +32,8 @@ #include "app_service_rpc_plugin/commands/hmi/as_get_app_service_records_request.h" +#include "application_manager/app_service_manager.h" + namespace app_service_rpc_plugin { using namespace application_manager; namespace commands { diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_perform_app_service_interaction_request_from_hmi.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_perform_app_service_interaction_request_from_hmi.cc index 2b66993d8f..70a5a10be0 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_perform_app_service_interaction_request_from_hmi.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_perform_app_service_interaction_request_from_hmi.cc @@ -31,6 +31,8 @@ */ #include "app_service_rpc_plugin/commands/hmi/as_perform_app_service_interaction_request_from_hmi.h" + +#include "application_manager/app_service_manager.h" #include "application_manager/message_helper.h" namespace app_service_rpc_plugin { diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_publish_app_service_request.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_publish_app_service_request.cc index b816016fa7..c9466ff52d 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_publish_app_service_request.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/hmi/as_publish_app_service_request.cc @@ -31,6 +31,8 @@ */ #include "app_service_rpc_plugin/commands/hmi/as_publish_app_service_request.h" + +#include "application_manager/app_service_manager.h" #include "application_manager/message_helper.h" namespace app_service_rpc_plugin { 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 2c6ba414e0..fd3891e0e8 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 @@ -31,7 +31,9 @@ */ #include "app_service_rpc_plugin/commands/mobile/on_app_service_data_notification.h" + #include "app_service_rpc_plugin/app_service_app_extension.h" +#include "application_manager/app_service_manager.h" #include "application_manager/application_impl.h" #include "application_manager/helpers/application_helper.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/perform_app_service_interaction_request.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/perform_app_service_interaction_request.cc index 9e262f0ca3..989b57ca12 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/perform_app_service_interaction_request.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/perform_app_service_interaction_request.cc @@ -31,6 +31,8 @@ */ #include "app_service_rpc_plugin/commands/mobile/perform_app_service_interaction_request.h" + +#include "application_manager/app_service_manager.h" #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" #include "interfaces/MOBILE_API.h" 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 22d8e50c3a..171c10913e 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 @@ -31,6 +31,8 @@ */ #include "app_service_rpc_plugin/commands/mobile/publish_app_service_request.h" + +#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" 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 494651379f..0677c97db8 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 @@ -31,6 +31,8 @@ */ #include "sdl_rpc_plugin/commands/hmi/on_bc_system_capability_updated_notification.h" + +#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" 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 2b3611fece..2c92d74b47 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 @@ -31,6 +31,8 @@ */ #include "sdl_rpc_plugin/commands/mobile/get_file_request.h" + +#include "application_manager/app_service_manager.h" #include "application_manager/application_impl.h" #include "application_manager/rpc_service.h" #include "interfaces/MOBILE_API.h" 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 a90c51f48a..2a25928b97 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 @@ -31,7 +31,9 @@ */ #include "sdl_rpc_plugin/commands/mobile/get_system_capability_request.h" + #include "sdl_rpc_plugin/extensions/system_capability_app_extension.h" +#include "application_manager/app_service_manager.h" #include "application_manager/message_helper.h" #include <set> 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 6ab560f56c..a8544ae643 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 @@ -1,4 +1,6 @@ #include "sdl_rpc_plugin/commands/mobile/on_system_capability_updated_notification.h" + +#include "application_manager/app_service_manager.h" #include "application_manager/application_manager.h" #include "application_manager/helpers/application_helper.h" #include "application_manager/message_helper.h" diff --git a/src/components/application_manager/src/app_service_manager.cc b/src/components/application_manager/src/app_service_manager.cc index c2f647f567..83551b1a13 100644 --- a/src/components/application_manager/src/app_service_manager.cc +++ b/src/components/application_manager/src/app_service_manager.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/help_prompt_manager_impl.h" +#include "application_manager/app_service_manager.h" #include <algorithm> #include <iterator> @@ -39,6 +39,7 @@ #include "application_manager/application_manager.h" #include "application_manager/commands/command_impl.h" #include "application_manager/message_helper.h" +#include "application_manager/rpc_passing_handler.h" #include "application_manager/smart_object_keys.h" #include "encryption/hashing.h" #include "resumption/last_state.h" diff --git a/src/components/application_manager/src/commands/command_request_impl.cc b/src/components/application_manager/src/commands/command_request_impl.cc index 344831f882..2d875db387 100644 --- a/src/components/application_manager/src/commands/command_request_impl.cc +++ b/src/components/application_manager/src/commands/command_request_impl.cc @@ -36,9 +36,11 @@ #include "utils/macro.h" #include "application_manager/commands/command_request_impl.h" + +#include "application_manager/app_service_manager.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" #include "smart_objects/smart_object.h" #include "smart_objects/enum_schema_item.h" diff --git a/src/components/application_manager/src/commands/request_from_hmi.cc b/src/components/application_manager/src/commands/request_from_hmi.cc index 0adb389e76..5581f027c0 100644 --- a/src/components/application_manager/src/commands/request_from_hmi.cc +++ b/src/components/application_manager/src/commands/request_from_hmi.cc @@ -31,6 +31,8 @@ */ #include "application_manager/commands/request_from_hmi.h" + +#include "application_manager/app_service_manager.h" #include "application_manager/application_manager.h" #include "application_manager/request_info.h" #include "application_manager/rpc_service.h" diff --git a/src/components/application_manager/src/rpc_handler_impl.cc b/src/components/application_manager/src/rpc_handler_impl.cc index 2574da5fb5..6205e028d0 100644 --- a/src/components/application_manager/src/rpc_handler_impl.cc +++ b/src/components/application_manager/src/rpc_handler_impl.cc @@ -31,6 +31,8 @@ */ #include "application_manager/rpc_handler_impl.h" + +#include "application_manager/app_service_manager.h" #include "application_manager/plugin_manager/plugin_keys.h" 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 8d93659a27..7ff01756f7 100644 --- a/src/components/application_manager/src/rpc_passing_handler.cc +++ b/src/components/application_manager/src/rpc_passing_handler.cc @@ -35,12 +35,13 @@ #include <algorithm> #include <iterator> +#include "application_manager/app_service_manager.h" #include "application_manager/application.h" #include "application_manager/application_manager.h" -#include "application_manager/rpc_passing_handler.h" -#include "application_manager/rpc_handler.h" #include "application_manager/commands/command_impl.h" #include "application_manager/message_helper.h" +#include "application_manager/rpc_handler.h" +#include "application_manager/rpc_passing_handler.h" #include "application_manager/smart_object_keys.h" #include "encryption/hashing.h" #include "resumption/last_state.h" diff --git a/src/components/application_manager/src/rpc_service_impl.cc b/src/components/application_manager/src/rpc_service_impl.cc index dfb5839764..96882d472f 100644 --- a/src/components/application_manager/src/rpc_service_impl.cc +++ b/src/components/application_manager/src/rpc_service_impl.cc @@ -31,6 +31,8 @@ */ #include "application_manager/rpc_service_impl.h" + +#include "application_manager/app_service_manager.h" #include "application_manager/plugin_manager/plugin_keys.h" namespace application_manager { diff --git a/src/components/include/application_manager/application_manager.h b/src/components/include/application_manager/application_manager.h index 97140a18f1..e8f646c1e5 100644 --- a/src/components/include/application_manager/application_manager.h +++ b/src/components/include/application_manager/application_manager.h @@ -51,7 +51,7 @@ #include "application_manager/hmi_interfaces.h" #include "policy/policy_types.h" #include "application_manager/plugin_manager/rpc_plugin_manager.h" -#include "application_manager/app_service_manager.h" + namespace resumption { class LastState; } @@ -90,6 +90,7 @@ class RPCHandler; } class Application; +class AppServiceManager; class StateControllerImpl; struct CommandParametersPermissions; using policy::RPCParams; |