[IOT-1793]Exclude Internal header from Interface header files

Change-Id: Ia159f481a1a4ddd5e1a7a1134fa2aa4cdd3cc6f3
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17071
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/cpp-wrapper/consumer/inc/NSConsumerService.h b/service/notification/cpp-wrapper/consumer/inc/NSConsumerService.h
index fa67f10..0c020f0 100755 (executable)
--- a/service/notification/cpp-wrapper/consumer/inc/NSConsumerService.h
+++ b/service/notification/cpp-wrapper/consumer/inc/NSConsumerService.h
@@ -31,13 +31,13 @@
 #include <algorithm>\r
 #include "NSProvider.h"\r
 #include "NSUtils.h"\r
-#include "NSAcceptedProviders.h"\r
 \r
 \r
 namespace OIC\r
 {\r
     namespace Service\r
     {\r
+        class NSAcceptedProviders;\r
         /**\r
          * @class   NSConsumerService\r
          * @brief   This class provides a set of C++APIs for Notification Consumer.\r
@@ -110,11 +110,11 @@ namespace OIC
                       *  get handle of providers accepted.\r
                       * @return m_acceptedProviders -accepted providers\r
                       */\r
-                NSAcceptedProviders &getAcceptedProviders();\r
+                NSAcceptedProviders *getAcceptedProviders();\r
 \r
             private :\r
                 ProviderDiscoveredCallback m_providerDiscoveredCb;\r
-                NSAcceptedProviders m_acceptedProviders;\r
+                NSAcceptedProviders *m_acceptedProviders;\r
 \r
             private :\r
                 NSConsumerService();\r

diff --git a/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp b/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp
index 8bafdc5..4834eb3 100755 (executable)
--- a/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp
+++ b/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp
@@ -21,6 +21,7 @@
 #include "NSConsumerService.h"\r
 #include <cstring>\r
 #include "NSConsumerInterface.h"\r
+#include "NSAcceptedProviders.h"\r
 #include "NSMessage.h"\r
 #include "NSCommon.h"\r
 #include "NSConstants.h"\r
@@ -50,7 +51,7 @@ namespace OIC
                 nsProvider->setProviderState((NSProviderState)state);\r
                 auto topicLL = NSConsumerGetTopicList(provider->providerId);\r
                 nsProvider->setTopicList(new NSTopicsList(topicLL));\r
-                NSConsumerService::getInstance()->getAcceptedProviders().addProvider(nsProvider);\r
+                NSConsumerService::getInstance()->getAcceptedProviders()->addProvider(nsProvider);\r
                 if (state == NS_DISCOVERED)\r
                 {\r
                     nsProvider->setProviderSubscribedState(NSProviderSubscribedState::DISCOVERED);\r
@@ -103,7 +104,7 @@ namespace OIC
                 else if (state == NS_DENY)\r
                 {\r
                     oldProvider->setProviderSubscribedState(NSProviderSubscribedState::DENY);\r
-                    NSConsumerService::getInstance()->getAcceptedProviders().removeProvider(\r
+                    NSConsumerService::getInstance()->getAcceptedProviders()->removeProvider(\r
                         oldProvider->getProviderId());\r
                     if (changeCallback != NULL)\r
                     {\r
@@ -141,7 +142,7 @@ namespace OIC
                 else if (state == NS_STOPPED)\r
                 {\r
                     oldProvider->setProviderSubscribedState(NSProviderSubscribedState::DENY);\r
-                    NSConsumerService::getInstance()->getAcceptedProviders().removeProvider(\r
+                    NSConsumerService::getInstance()->getAcceptedProviders()->removeProvider(\r
                         oldProvider->getProviderId());\r
                     NS_LOG(DEBUG, "initiating the State callback : NS_STOPPED");\r
                     if (changeCallback != NULL)\r
@@ -161,7 +162,7 @@ namespace OIC
 \r
             NSMessage nsMessage(message);\r
 \r
-            if (NSConsumerService::getInstance()->getAcceptedProviders().isAccepted(\r
+            if (NSConsumerService::getInstance()->getAcceptedProviders()->isAccepted(\r
                     nsMessage.getProviderId()))\r
             {\r
                 auto provider = NSConsumerService::getInstance()->getProvider(\r
@@ -187,7 +188,7 @@ namespace OIC
 \r
             NSSyncInfo nsSyncInfo(syncInfo);\r
 \r
-            if (NSConsumerService::getInstance()->getAcceptedProviders().isAccepted(\r
+            if (NSConsumerService::getInstance()->getAcceptedProviders()->isAccepted(\r
                     nsSyncInfo.getProviderId()))\r
             {\r
                 auto provider = NSConsumerService::getInstance()->getProvider(\r
@@ -209,12 +210,13 @@ namespace OIC
         NSConsumerService::NSConsumerService()\r
         {\r
             m_providerDiscoveredCb = NULL;\r
-            m_acceptedProviders.removeProviders();\r
+            m_acceptedProviders = new NSAcceptedProviders();\r
         }\r
 \r
         NSConsumerService::~NSConsumerService()\r
         {\r
-            m_acceptedProviders.removeProviders();\r
+            m_acceptedProviders->removeProviders();\r
+            delete m_acceptedProviders;\r
         }\r
 \r
         NSConsumerService *NSConsumerService::getInstance()\r
@@ -226,7 +228,7 @@ namespace OIC
         NSResult NSConsumerService::start(NSConsumerService::ProviderDiscoveredCallback providerDiscovered)\r
         {\r
             NS_LOG(DEBUG, "start - IN");\r
-            m_acceptedProviders.removeProviders();\r
+            m_acceptedProviders->removeProviders();\r
 \r
             m_providerDiscoveredCb = providerDiscovered;\r
             NSConsumerConfig nsConfig;\r
@@ -243,7 +245,7 @@ namespace OIC
         {\r
             NS_LOG(DEBUG, "stop - IN");\r
             m_providerDiscoveredCb = NULL;\r
-            m_acceptedProviders.removeProviders();\r
+            m_acceptedProviders->removeProviders();\r
 \r
             NSResult result = (NSResult) NSStopConsumer();\r
             NS_LOG(DEBUG, "stop - OUT");\r
@@ -298,10 +300,10 @@ namespace OIC
 \r
         std::shared_ptr<NSProvider> NSConsumerService::getProvider(const std::string &id)\r
         {\r
-            return m_acceptedProviders.getProvider(id);\r
+            return m_acceptedProviders->getProvider(id);\r
         }\r
 \r
-        NSAcceptedProviders &NSConsumerService::getAcceptedProviders()\r
+        NSAcceptedProviders *NSConsumerService::getAcceptedProviders()\r
         {\r
             return m_acceptedProviders;\r
         }\r

diff --git a/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp b/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp
index 1efe2ea..5dd53c1 100755 (executable)
--- a/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp
+++ b/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp
@@ -22,6 +22,7 @@
 #include <cstring>\r
 #include "NSConsumerService.h"\r
 #include "NSConsumerInterface.h"\r
+#include "NSAcceptedProviders.h"\r
 #include "NSConstants.h"\r
 #include "NSCommon.h"\r
 #include "oic_string.h"\r
@@ -315,7 +316,7 @@ namespace OIC
 \r
         bool NSProvider::isValid() const\r
         {\r
-            if (!NSConsumerService::getInstance()->getAcceptedProviders().isAccepted(getProviderId()))\r
+            if (!NSConsumerService::getInstance()->getAcceptedProviders()->isAccepted(getProviderId()))\r
             {\r
                 NS_LOG(DEBUG, "Invalid Operation with stale reference of Provider. Provider ID doesnot exist");\r
                 return false;\r

diff --git a/service/notification/cpp-wrapper/provider/inc/NSProviderService.h b/service/notification/cpp-wrapper/provider/inc/NSProviderService.h
index 622d99a..86fa446 100755 (executable)
--- a/service/notification/cpp-wrapper/provider/inc/NSProviderService.h
+++ b/service/notification/cpp-wrapper/provider/inc/NSProviderService.h
@@ -29,7 +29,6 @@
 \r
 #include <string>\r
 #include "NSConsumer.h"\r
-#include "NSAcceptedConsumers.h"\r
 #include "NSSyncInfo.h"\r
 #include "NSMessage.h"\r
 #include "NSUtils.h"\r
@@ -39,6 +38,7 @@ namespace OIC
 {\r
     namespace Service\r
     {\r
+        class NSAcceptedConsumers;\r
         /**\r
          * @class   NSProviderService\r
          * @brief   This class provides a set of C++APIs for Notification Provider.\r
@@ -185,19 +185,14 @@ namespace OIC
                       *  get handle of Consumers accepted.\r
                       * @return m_acceptedConsumers -accepted Consumers\r
                       */\r
-                NSAcceptedConsumers &getAcceptedConsumers();\r
+                NSAcceptedConsumers *getAcceptedConsumers();\r
 \r
             private :\r
                 ProviderConfig m_config;\r
-                NSAcceptedConsumers m_acceptedConsumers;\r
+                NSAcceptedConsumers *m_acceptedConsumers;\r
 \r
             private:\r
-                NSProviderService()\r
-                {\r
-                    m_config.m_subscribeRequestCb = NULL;\r
-                    m_config.m_syncInfoCb = NULL;\r
-                    m_acceptedConsumers.removeConsumers();\r
-                }\r
+                NSProviderService();\r
                 ~NSProviderService();\r
                 NSProviderService(const NSProviderService &) = delete;\r
                 NSProviderService &operator=(const NSProviderService &) = delete;\r

diff --git a/service/notification/cpp-wrapper/provider/src/NSConsumer.cpp b/service/notification/cpp-wrapper/provider/src/NSConsumer.cpp
index 03afe03..86649e3 100755 (executable)
--- a/service/notification/cpp-wrapper/provider/src/NSConsumer.cpp
+++ b/service/notification/cpp-wrapper/provider/src/NSConsumer.cpp
@@ -21,6 +21,7 @@
 #include "NSConsumer.h"\r
 #include <cstring>\r
 #include "NSProviderService.h"\r
+#include "NSAcceptedConsumers.h"\r
 #include "NSProviderInterface.h"\r
 #include "NSConstants.h"\r
 #include "oic_string.h"\r
@@ -104,7 +105,7 @@ namespace OIC
 \r
         bool NSConsumer::isValid() const\r
         {\r
-            if (!NSProviderService::getInstance()->getAcceptedConsumers().isAccepted(getConsumerId()))\r
+            if (!NSProviderService::getInstance()->getAcceptedConsumers()->isAccepted(getConsumerId()))\r
             {\r
                 NS_LOG(DEBUG, "Invalid Operation with stale reference of Consumer. Consumer ID doesnot exist");\r
                 return false;\r

diff --git a/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp b/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp
index 43f950a..e349795 100755 (executable)
--- a/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp
+++ b/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp
@@ -23,6 +23,7 @@
 #include <cstring>\r
 #include "NSCommon.h"\r
 #include "NSProviderInterface.h"\r
+#include "NSAcceptedConsumers.h"\r
 #include "NSConsumer.h"\r
 #include "NSSyncInfo.h"\r
 #include "NSConstants.h"\r
@@ -39,7 +40,7 @@ namespace OIC
         {\r
             NS_LOG(DEBUG, "onConsumerSubscribedCallback - IN");\r
             std::shared_ptr<NSConsumer> nsConsumer = std::make_shared<NSConsumer>(consumer);\r
-            NSProviderService::getInstance()->getAcceptedConsumers().addConsumer(nsConsumer);\r
+            NSProviderService::getInstance()->getAcceptedConsumers()->addConsumer(nsConsumer);\r
             if (NSProviderService::getInstance()->getProviderConfig().m_subscribeRequestCb != NULL)\r
             {\r
                 NS_LOG(DEBUG, "initiating the callback for consumer subscribed");\r
@@ -86,11 +87,19 @@ namespace OIC
             return nsMsg;\r
         }\r
 \r
+        NSProviderService::NSProviderService()\r
+        {\r
+            m_config.m_subscribeRequestCb = NULL;\r
+            m_config.m_syncInfoCb = NULL;\r
+            m_acceptedConsumers = new NSAcceptedConsumers();\r
+        }\r
+\r
         NSProviderService::~NSProviderService()\r
         {\r
             m_config.m_subscribeRequestCb = NULL;\r
             m_config.m_syncInfoCb = NULL;\r
-            getAcceptedConsumers().removeConsumers();\r
+            m_acceptedConsumers->removeConsumers();\r
+            delete m_acceptedConsumers;\r
         }\r
 \r
         NSProviderService *NSProviderService::getInstance()\r
@@ -102,7 +111,7 @@ namespace OIC
         NSResult NSProviderService::start(NSProviderService::ProviderConfig config)\r
         {\r
             NS_LOG(DEBUG, "start - IN");\r
-            getAcceptedConsumers().removeConsumers();\r
+            m_acceptedConsumers->removeConsumers();\r
 \r
             m_config = config;\r
             NSProviderConfig nsConfig;\r
@@ -124,7 +133,7 @@ namespace OIC
 \r
             m_config.m_subscribeRequestCb = NULL;\r
             m_config.m_syncInfoCb = NULL;\r
-            getAcceptedConsumers().removeConsumers();\r
+            m_acceptedConsumers->removeConsumers();\r
 \r
             NSResult result = (NSResult) NSStopProvider();\r
             NS_LOG(DEBUG, "stop - OUT");\r
@@ -265,10 +274,10 @@ namespace OIC
 \r
         std::shared_ptr<NSConsumer> NSProviderService::getConsumer(const std::string &id)\r
         {\r
-            return m_acceptedConsumers.getConsumer(id);\r
+            return m_acceptedConsumers->getConsumer(id);\r
         }\r
 \r
-        NSAcceptedConsumers &NSProviderService::getAcceptedConsumers()\r
+        NSAcceptedConsumers *NSProviderService::getAcceptedConsumers()\r
         {\r
             return m_acceptedConsumers;\r
         }\r