Refactored VSHL into vshl-core and vshl-capabilities.

vshl-core: This API is responsible for request arbitration. Verbs exposed are

1. startListening
2. cancelListening
3. subscribe
4. enumerateVoiceAgents
5. setDefaultVoiceAgent Used by applications to subscribe to dialog, connection and auth states of underlying low level voiceagent bindings. Used by applications to trigger voice recognition routine of the underlying low level voiceagent binding.

vshl-capabilities: This API exposes publish and subscribe methods for all the speech framework domains/capabilities. For eg. navigation, phonecontrol etc. This API is used by apps and low level voice agent binding to subscribe and publish these capability messages whenever applicable. The code for this is agl-service-voice-high-capabilities repository.

This specific commit is for vshl-core API.

Change-Id: I1101db19b57ee918482a178843641b088508ac5d
Signed-off-by: Naveen Bobbili  <nbobbili@amazon.com>

2 files changed, 14 insertions, 16 deletions

diff --git a/src/plugins/utilities/events/EventRouter.cpp b/src/plugins/utilities/events/EventRouter.cpp
index 999c3dd..4564953 100644
--- a/src/plugins/utilities/events/EventRouter.cpp
+++ b/src/plugins/utilities/events/EventRouter.cpp
@@ -14,19 +14,18 @@
  */
 #include "utilities/events/EventRouter.h"
 
-static string TAG = "vshl::utilities::events::EventRouter";
+static string TAG = "vshlcore::utilities::events::EventRouter";
 
-using Level = vshl::common::interfaces::ILogger::Level;
-
-namespace vshl {
+using Level = vshlcore::common::interfaces::ILogger::Level;
+namespace vshlcore {
 namespace utilities {
 namespace events {
 
-unique_ptr<EventRouter> EventRouter::create(shared_ptr<vshl::common::interfaces::ILogger> logger) {
+unique_ptr<EventRouter> EventRouter::create(shared_ptr<vshlcore::common::interfaces::ILogger> logger) {
     return std::unique_ptr<EventRouter>(new EventRouter(logger));
 }
 
-EventRouter::EventRouter(shared_ptr<vshl::common::interfaces::ILogger> logger) : mLogger(logger) {
+EventRouter::EventRouter(shared_ptr<vshlcore::common::interfaces::ILogger> logger) : mLogger(logger) {
 }
 
 EventRouter::~EventRouter() {
@@ -43,7 +42,7 @@ bool EventRouter::handleIncomingEvent(const string eventName, const string voice
     return false;
 }
 
-bool EventRouter::addEventFilter(shared_ptr<vshl::common::interfaces::IEventFilter> filter) {
+bool EventRouter::addEventFilter(shared_ptr<vshlcore::common::interfaces::IEventFilter> filter) {
     if (!filter) {
         mLogger->log(Level::ERROR, TAG, "Failed to add event filter. Invalid arguments.");
         return false;
@@ -53,7 +52,7 @@ bool EventRouter::addEventFilter(shared_ptr<vshl::common::interfaces::IEventFilt
     return true;
 }
 
-bool EventRouter::removeEventFilter(shared_ptr<vshl::common::interfaces::IEventFilter> filter) {
+bool EventRouter::removeEventFilter(shared_ptr<vshlcore::common::interfaces::IEventFilter> filter) {
     if (!filter) {
         mLogger->log(Level::ERROR, TAG, "Failed to add remove filter. Invalid arguments.");
         return false;
diff --git a/src/plugins/utilities/events/EventRouter.h b/src/plugins/utilities/events/EventRouter.h
index fd7f0c2..752973a 100644
--- a/src/plugins/utilities/events/EventRouter.h
+++ b/src/plugins/utilities/events/EventRouter.h
@@ -23,8 +23,7 @@
 #include "interfaces/utilities/logging/ILogger.h"
 
 using namespace std;
-
-namespace vshl {
+namespace vshlcore {
 namespace utilities {
 namespace events {
 /*
@@ -34,29 +33,29 @@ namespace events {
  */
 class EventRouter {
 public:
-    static unique_ptr<EventRouter> create(shared_ptr<vshl::common::interfaces::ILogger> logger);
+    static unique_ptr<EventRouter> create(shared_ptr<vshlcore::common::interfaces::ILogger> logger);
 
     // Destructor
     ~EventRouter();
 
     // Add event filter as listerner.
-    bool addEventFilter(shared_ptr<vshl::common::interfaces::IEventFilter> filter);
+    bool addEventFilter(shared_ptr<vshlcore::common::interfaces::IEventFilter> filter);
 
     // Remove event filter as listerner.
-    bool removeEventFilter(shared_ptr<vshl::common::interfaces::IEventFilter> filter);
+    bool removeEventFilter(shared_ptr<vshlcore::common::interfaces::IEventFilter> filter);
 
     // This method is called by the controller for routing
     // the event to appropriate listener.
     bool handleIncomingEvent(const string eventName, const string voiceAgentId, const string payload);
 
 private:
-    EventRouter(shared_ptr<vshl::common::interfaces::ILogger> logger);
+    EventRouter(shared_ptr<vshlcore::common::interfaces::ILogger> logger);
 
     // set of event filters.
-    unordered_set<shared_ptr<vshl::common::interfaces::IEventFilter>> mEventFilters;
+    unordered_set<shared_ptr<vshlcore::common::interfaces::IEventFilter>> mEventFilters;
 
     // Logger
-    shared_ptr<vshl::common::interfaces::ILogger> mLogger;
+    shared_ptr<vshlcore::common::interfaces::ILogger> mLogger;
 };
 
 }  // namespace events