From 84be5e2ee06f343b937cf57ca18159e277326e98 Mon Sep 17 00:00:00 2001 From: "abitha.s" Date: Mon, 6 Feb 2017 17:36:11 +0530 Subject: [PATCH] [IOT-1793]Exclude Internal header from Interface header files Change-Id: Ia159f481a1a4ddd5e1a7a1134fa2aa4cdd3cc6f3 Signed-off-by: abitha.s Reviewed-on: https://gerrit.iotivity.org/gerrit/17071 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi --- .../cpp-wrapper/consumer/inc/NSConsumerService.h | 6 +++--- .../cpp-wrapper/consumer/src/NSConsumerService.cpp | 24 ++++++++++++---------- .../cpp-wrapper/consumer/src/NSProvider.cpp | 3 ++- .../cpp-wrapper/provider/inc/NSProviderService.h | 13 ++++-------- .../cpp-wrapper/provider/src/NSConsumer.cpp | 3 ++- .../cpp-wrapper/provider/src/NSProviderService.cpp | 21 +++++++++++++------ 6 files changed, 39 insertions(+), 31 deletions(-) diff --git a/service/notification/cpp-wrapper/consumer/inc/NSConsumerService.h b/service/notification/cpp-wrapper/consumer/inc/NSConsumerService.h index fa67f10..0c020f0 100755 --- a/service/notification/cpp-wrapper/consumer/inc/NSConsumerService.h +++ b/service/notification/cpp-wrapper/consumer/inc/NSConsumerService.h @@ -31,13 +31,13 @@ #include #include "NSProvider.h" #include "NSUtils.h" -#include "NSAcceptedProviders.h" namespace OIC { namespace Service { + class NSAcceptedProviders; /** * @class NSConsumerService * @brief This class provides a set of C++APIs for Notification Consumer. @@ -110,11 +110,11 @@ namespace OIC * get handle of providers accepted. * @return m_acceptedProviders -accepted providers */ - NSAcceptedProviders &getAcceptedProviders(); + NSAcceptedProviders *getAcceptedProviders(); private : ProviderDiscoveredCallback m_providerDiscoveredCb; - NSAcceptedProviders m_acceptedProviders; + NSAcceptedProviders *m_acceptedProviders; private : NSConsumerService(); diff --git a/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp b/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp index 8bafdc5..4834eb3 100755 --- 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" #include #include "NSConsumerInterface.h" +#include "NSAcceptedProviders.h" #include "NSMessage.h" #include "NSCommon.h" #include "NSConstants.h" @@ -50,7 +51,7 @@ namespace OIC nsProvider->setProviderState((NSProviderState)state); auto topicLL = NSConsumerGetTopicList(provider->providerId); nsProvider->setTopicList(new NSTopicsList(topicLL)); - NSConsumerService::getInstance()->getAcceptedProviders().addProvider(nsProvider); + NSConsumerService::getInstance()->getAcceptedProviders()->addProvider(nsProvider); if (state == NS_DISCOVERED) { nsProvider->setProviderSubscribedState(NSProviderSubscribedState::DISCOVERED); @@ -103,7 +104,7 @@ namespace OIC else if (state == NS_DENY) { oldProvider->setProviderSubscribedState(NSProviderSubscribedState::DENY); - NSConsumerService::getInstance()->getAcceptedProviders().removeProvider( + NSConsumerService::getInstance()->getAcceptedProviders()->removeProvider( oldProvider->getProviderId()); if (changeCallback != NULL) { @@ -141,7 +142,7 @@ namespace OIC else if (state == NS_STOPPED) { oldProvider->setProviderSubscribedState(NSProviderSubscribedState::DENY); - NSConsumerService::getInstance()->getAcceptedProviders().removeProvider( + NSConsumerService::getInstance()->getAcceptedProviders()->removeProvider( oldProvider->getProviderId()); NS_LOG(DEBUG, "initiating the State callback : NS_STOPPED"); if (changeCallback != NULL) @@ -161,7 +162,7 @@ namespace OIC NSMessage nsMessage(message); - if (NSConsumerService::getInstance()->getAcceptedProviders().isAccepted( + if (NSConsumerService::getInstance()->getAcceptedProviders()->isAccepted( nsMessage.getProviderId())) { auto provider = NSConsumerService::getInstance()->getProvider( @@ -187,7 +188,7 @@ namespace OIC NSSyncInfo nsSyncInfo(syncInfo); - if (NSConsumerService::getInstance()->getAcceptedProviders().isAccepted( + if (NSConsumerService::getInstance()->getAcceptedProviders()->isAccepted( nsSyncInfo.getProviderId())) { auto provider = NSConsumerService::getInstance()->getProvider( @@ -209,12 +210,13 @@ namespace OIC NSConsumerService::NSConsumerService() { m_providerDiscoveredCb = NULL; - m_acceptedProviders.removeProviders(); + m_acceptedProviders = new NSAcceptedProviders(); } NSConsumerService::~NSConsumerService() { - m_acceptedProviders.removeProviders(); + m_acceptedProviders->removeProviders(); + delete m_acceptedProviders; } NSConsumerService *NSConsumerService::getInstance() @@ -226,7 +228,7 @@ namespace OIC NSResult NSConsumerService::start(NSConsumerService::ProviderDiscoveredCallback providerDiscovered) { NS_LOG(DEBUG, "start - IN"); - m_acceptedProviders.removeProviders(); + m_acceptedProviders->removeProviders(); m_providerDiscoveredCb = providerDiscovered; NSConsumerConfig nsConfig; @@ -243,7 +245,7 @@ namespace OIC { NS_LOG(DEBUG, "stop - IN"); m_providerDiscoveredCb = NULL; - m_acceptedProviders.removeProviders(); + m_acceptedProviders->removeProviders(); NSResult result = (NSResult) NSStopConsumer(); NS_LOG(DEBUG, "stop - OUT"); @@ -298,10 +300,10 @@ namespace OIC std::shared_ptr NSConsumerService::getProvider(const std::string &id) { - return m_acceptedProviders.getProvider(id); + return m_acceptedProviders->getProvider(id); } - NSAcceptedProviders &NSConsumerService::getAcceptedProviders() + NSAcceptedProviders *NSConsumerService::getAcceptedProviders() { return m_acceptedProviders; } diff --git a/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp b/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp index 1efe2ea..5dd53c1 100755 --- a/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp +++ b/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp @@ -22,6 +22,7 @@ #include #include "NSConsumerService.h" #include "NSConsumerInterface.h" +#include "NSAcceptedProviders.h" #include "NSConstants.h" #include "NSCommon.h" #include "oic_string.h" @@ -315,7 +316,7 @@ namespace OIC bool NSProvider::isValid() const { - if (!NSConsumerService::getInstance()->getAcceptedProviders().isAccepted(getProviderId())) + if (!NSConsumerService::getInstance()->getAcceptedProviders()->isAccepted(getProviderId())) { NS_LOG(DEBUG, "Invalid Operation with stale reference of Provider. Provider ID doesnot exist"); return false; diff --git a/service/notification/cpp-wrapper/provider/inc/NSProviderService.h b/service/notification/cpp-wrapper/provider/inc/NSProviderService.h index 622d99a..86fa446 100755 --- a/service/notification/cpp-wrapper/provider/inc/NSProviderService.h +++ b/service/notification/cpp-wrapper/provider/inc/NSProviderService.h @@ -29,7 +29,6 @@ #include #include "NSConsumer.h" -#include "NSAcceptedConsumers.h" #include "NSSyncInfo.h" #include "NSMessage.h" #include "NSUtils.h" @@ -39,6 +38,7 @@ namespace OIC { namespace Service { + class NSAcceptedConsumers; /** * @class NSProviderService * @brief This class provides a set of C++APIs for Notification Provider. @@ -185,19 +185,14 @@ namespace OIC * get handle of Consumers accepted. * @return m_acceptedConsumers -accepted Consumers */ - NSAcceptedConsumers &getAcceptedConsumers(); + NSAcceptedConsumers *getAcceptedConsumers(); private : ProviderConfig m_config; - NSAcceptedConsumers m_acceptedConsumers; + NSAcceptedConsumers *m_acceptedConsumers; private: - NSProviderService() - { - m_config.m_subscribeRequestCb = NULL; - m_config.m_syncInfoCb = NULL; - m_acceptedConsumers.removeConsumers(); - } + NSProviderService(); ~NSProviderService(); NSProviderService(const NSProviderService &) = delete; NSProviderService &operator=(const NSProviderService &) = delete; diff --git a/service/notification/cpp-wrapper/provider/src/NSConsumer.cpp b/service/notification/cpp-wrapper/provider/src/NSConsumer.cpp index 03afe03..86649e3 100755 --- 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" #include #include "NSProviderService.h" +#include "NSAcceptedConsumers.h" #include "NSProviderInterface.h" #include "NSConstants.h" #include "oic_string.h" @@ -104,7 +105,7 @@ namespace OIC bool NSConsumer::isValid() const { - if (!NSProviderService::getInstance()->getAcceptedConsumers().isAccepted(getConsumerId())) + if (!NSProviderService::getInstance()->getAcceptedConsumers()->isAccepted(getConsumerId())) { NS_LOG(DEBUG, "Invalid Operation with stale reference of Consumer. Consumer ID doesnot exist"); return false; diff --git a/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp b/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp index 43f950a..e349795 100755 --- a/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp +++ b/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp @@ -23,6 +23,7 @@ #include #include "NSCommon.h" #include "NSProviderInterface.h" +#include "NSAcceptedConsumers.h" #include "NSConsumer.h" #include "NSSyncInfo.h" #include "NSConstants.h" @@ -39,7 +40,7 @@ namespace OIC { NS_LOG(DEBUG, "onConsumerSubscribedCallback - IN"); std::shared_ptr nsConsumer = std::make_shared(consumer); - NSProviderService::getInstance()->getAcceptedConsumers().addConsumer(nsConsumer); + NSProviderService::getInstance()->getAcceptedConsumers()->addConsumer(nsConsumer); if (NSProviderService::getInstance()->getProviderConfig().m_subscribeRequestCb != NULL) { NS_LOG(DEBUG, "initiating the callback for consumer subscribed"); @@ -86,11 +87,19 @@ namespace OIC return nsMsg; } + NSProviderService::NSProviderService() + { + m_config.m_subscribeRequestCb = NULL; + m_config.m_syncInfoCb = NULL; + m_acceptedConsumers = new NSAcceptedConsumers(); + } + NSProviderService::~NSProviderService() { m_config.m_subscribeRequestCb = NULL; m_config.m_syncInfoCb = NULL; - getAcceptedConsumers().removeConsumers(); + m_acceptedConsumers->removeConsumers(); + delete m_acceptedConsumers; } NSProviderService *NSProviderService::getInstance() @@ -102,7 +111,7 @@ namespace OIC NSResult NSProviderService::start(NSProviderService::ProviderConfig config) { NS_LOG(DEBUG, "start - IN"); - getAcceptedConsumers().removeConsumers(); + m_acceptedConsumers->removeConsumers(); m_config = config; NSProviderConfig nsConfig; @@ -124,7 +133,7 @@ namespace OIC m_config.m_subscribeRequestCb = NULL; m_config.m_syncInfoCb = NULL; - getAcceptedConsumers().removeConsumers(); + m_acceptedConsumers->removeConsumers(); NSResult result = (NSResult) NSStopProvider(); NS_LOG(DEBUG, "stop - OUT"); @@ -265,10 +274,10 @@ namespace OIC std::shared_ptr NSProviderService::getConsumer(const std::string &id) { - return m_acceptedConsumers.getConsumer(id); + return m_acceptedConsumers->getConsumer(id); } - NSAcceptedConsumers &NSProviderService::getAcceptedConsumers() + NSAcceptedConsumers *NSProviderService::getAcceptedConsumers() { return m_acceptedConsumers; } -- 2.7.4