Rename ResourceObject to RCSResourceObject

Prefix is added for consistency for exposed headers

Change-Id: I8366dba5f404089237ac4b16f19a498a2179356c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1891
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification-manager/NotificationManager/src/HostingObject.cpp b/service/notification-manager/NotificationManager/src/HostingObject.cpp
index 8dcf868..c831e25 100644 (file)
--- a/service/notification-manager/NotificationManager/src/HostingObject.cpp
+++ b/service/notification-manager/NotificationManager/src/HostingObject.cpp
@@ -164,13 +164,13 @@ void HostingObject::dataChangedCB(const ResourceAttributes & attributes, RemoteO
 
     ResourceAttributes rData;
     {
-        ResourceObject::LockGuard guard(mirroredServer);
+        RCSResourceObject::LockGuard guard(mirroredServer);
         rData = mirroredServer->getAttributes();
     }
     if(rData.empty() || rData != attributes)
     {
         {
-            ResourceObject::LockGuard guard(mirroredServer);
+            RCSResourceObject::LockGuard guard(mirroredServer);
             for(auto it = rData.begin(); ; ++it)
             {
                 if(it == rData.end())
@@ -205,11 +205,11 @@ HostingObject::ResourceObjectPtr HostingObject::createMirroredServer(RemoteObjec
         {
             std::string type = types.begin()->c_str();
             std::string interface = interfaces.begin()->c_str();
-            retResource = ResourceObject::Builder(uri, type, interface).
+            retResource = RCSResourceObject::Builder(uri, type, interface).
                     setDiscoverable(true).setObservable(true).build();
 
             // TODO need to bind types and interfaces
-            retResource->setAutoNotifyPolicy(ResourceObject::AutoNotifyPolicy::UPDATED);
+            retResource->setAutoNotifyPolicy(RCSResourceObject::AutoNotifyPolicy::UPDATED);
             retResource->setSetRequestHandler(pSetRequestHandler);
         }catch(...)
         {

diff --git a/service/notification-manager/NotificationManager/src/HostingObject.h b/service/notification-manager/NotificationManager/src/HostingObject.h
index 514eb43..9129c3b 100644 (file)
--- a/service/notification-manager/NotificationManager/src/HostingObject.h
+++ b/service/notification-manager/NotificationManager/src/HostingObject.h
@@ -22,7 +22,7 @@
 #define RH_HOSTINGOBJECT_H_
 
 #include "ResourceClient.h"
-#include "ResourceObject.h"
+#include "RCSResourceObject.h"
 #include "RequestObject.h"
 #include "ResourceBroker.h"
 #include "ResourceCacheManager.h"
@@ -38,7 +38,7 @@ void OIC_HOSTING_LOG(LogLevel level, const char * format, ...);
 class HostingObject
 {
 private:
-    typedef std::shared_ptr<ResourceObject> ResourceObjectPtr;
+    typedef std::shared_ptr<RCSResourceObject> ResourceObjectPtr;
     typedef std::shared_ptr<RemoteResourceObject> RemoteObjectPtr;
     typedef std::shared_ptr<RequestObject> RequestObjectPtr;
     typedef std::shared_ptr<PrimitiveResource> PrimiteveResourcePtr;

diff --git a/service/notification-manager/NotificationManager/src/RequestObject.h b/service/notification-manager/NotificationManager/src/RequestObject.h
index bc78dca..4d716ea 100644 (file)
--- a/service/notification-manager/NotificationManager/src/RequestObject.h
+++ b/service/notification-manager/NotificationManager/src/RequestObject.h
@@ -22,7 +22,7 @@
 #define RH_REQUESTOBJECT_H_
 
 #include "ResourceClient.h"
-#include "ResourceObject.h"
+#include "RCSResourceObject.h"
 
 namespace OIC
 {

diff --git a/service/resource-encapsulation/examples/linux/SampleResourceServer.cpp b/service/resource-encapsulation/examples/linux/SampleResourceServer.cpp
index e1c07b1..cd2f88f 100644 (file)
--- a/service/resource-encapsulation/examples/linux/SampleResourceServer.cpp
+++ b/service/resource-encapsulation/examples/linux/SampleResourceServer.cpp
@@ -19,7 +19,7 @@
  ******************************************************************/
 
 #include "PrimitiveResource.h"
-#include "ResourceObject.h"
+#include "RCSResourceObject.h"
 #include "OCPlatform.h"
 #include "OCApi.h"
 
@@ -32,7 +32,7 @@ std::string resourceUri = "/a/TempSensor";
 std::string resourceType = "core.TemperatureSensor";
 std::string resourceInterface = "oic.if.";
 std::string attributeKey = "Temperature";
-ResourceObject::Ptr server;
+RCSResourceObject::Ptr server;
 
 //display the menu on the screen
 void displayMenu()
@@ -49,7 +49,7 @@ RCSGetResponse RequestHandlerForGet(const RCSRequest &request,
         ResourceAttributes &attrs)
 {
     cout << "Recieved a Get request from Client" << std::endl;
-    ResourceObject::LockGuard lock(*server);
+    RCSResourceObject::LockGuard lock(*server);
     ResourceAttributes attr = server->getAttributes();
     ResourceAttributes::const_iterator iter = attr.begin();
     cout << "\nSending response to Client : " << std::endl;
@@ -109,7 +109,7 @@ int main(void)
                //Creation of Resource & Auto control for all requests from Client
                     {
                         //creation of Resource
-                        server = ResourceObject::Builder(resourceUri, resourceType,
+                        server = RCSResourceObject::Builder(resourceUri, resourceType,
                                                          resourceInterface).setDiscoverable(true).setObservable(false).build();
                         std::cout << "Resource created successfully " << std::endl;
 
@@ -122,7 +122,7 @@ int main(void)
                 case 2:
             //Creation of Resource & setting get and set handler for handling get and set request from client in application
                     {
-                        server = ResourceObject::Builder(resourceUri, resourceType,
+                        server = RCSResourceObject::Builder(resourceUri, resourceType,
                                                          resourceInterface).setDiscoverable(true).setObservable(false).build();
                         std::cout << "Resource created successfully " << std::endl;
 
@@ -169,7 +169,7 @@ int main(void)
             {
                 case 1:
                     {
-                        ResourceObject::LockGuard lock(*server);
+                        RCSResourceObject::LockGuard lock(*server);
                         ResourceAttributes attrs = server->getAttributes();
 
                         attrs[attributeKey] =  (server->getAttribute<int>(attributeKey)  + 10);
@@ -189,7 +189,7 @@ int main(void)
                     }
                 case 2:
                     {
-                        ResourceObject::LockGuard lock(*server);
+                        RCSResourceObject::LockGuard lock(*server);
                         ResourceAttributes attrs = server->getAttributes();
                         attrs[attributeKey] =  (server->getAttribute<int>(attributeKey)  - 10);
                         server->setAttribute(attributeKey, attrs[attributeKey]);

diff --git a/service/resource-encapsulation/include/ResourceObject.h b/service/resource-encapsulation/include/RCSResourceObject.h
old mode 100644 (file)
new mode 100755 (executable)
similarity index 89%
rename from service/resource-encapsulation/include/ResourceObject.h
rename to service/resource-encapsulation/include/RCSResourceObject.h
index d3a3e52..7093441
--- a/service/resource-encapsulation/include/ResourceObject.h
+++ b/service/resource-encapsulation/include/RCSResourceObject.h
@@ -22,10 +22,10 @@
  * @file
  *
  * This file contains the resource object APIs provided to the developers.
- * ResourceObject is a part of the server builder module.
+ * RCSResourceObject is a part of the server builder module.
  */
-#ifndef SERVERBUILDER_RESOURCEOBJECT_H
-#define SERVERBUILDER_RESOURCEOBJECT_H
+#ifndef SERVER_RCSRESOURCEOBJECT_H
+#define SERVER_RCSRESOURCEOBJECT_H
 
 #include <string>
 #include <mutex>
@@ -50,8 +50,8 @@ namespace OIC
         /**
          * @brief Thrown when lock has not been acquired.
          *
-         * @see ResourceObject::LockGuard
-         * @see ResourceObject::getAttributes
+         * @see RCSResourceObject::LockGuard
+         * @see RCSResourceObject::getAttributes
          */
         class NoLockException: public RCSException
         {
@@ -60,7 +60,7 @@ namespace OIC
         };
 
         /**
-         * @brief  ResourceObject represents a resource. ResourceObject handles any requests from
+         * @brief  RCSResourceObject represents a resource. It handles any requests from
          *        clients automatically with attributes.
          *        It also provides an auto notification mechanism that notifies to the observers.
          *        <br/>
@@ -71,21 +71,20 @@ namespace OIC
          *        by a set request. In this case, add an AttributeUpdatedListener
          *        with a key interested in instead of overriding SetRequestHandler.
          */
-        class ResourceObject
+        class RCSResourceObject
         {
             private:
                 class WeakGuard;
 
             public:
-
                 /**
                  * @brief represents the policy of AutoNotify function.
                  *        In accord with this policy, observers are notified of attributes that
                  *        are changed or updated.
                  * @note Attributes are changed or updated according to execution of some functions
                  *       or receipt of 'set-request'.
-                 *       (functions - ResourceObject::setAttribute, ResourceObject::removeAttribute,
-                 *        ResourceObject::getAttributes)
+                 *       (functions - RCSResourceObject::setAttribute,
+                 *       RCSResourceObject::removeAttribute, RCSResourceObject::getAttributes)
                  */
                 enum class AutoNotifyPolicy
                 {
@@ -107,15 +106,15 @@ namespace OIC
                                     set-request of attributes of the new key. */
                 };
 
-                typedef std::shared_ptr< ResourceObject > Ptr;
-                typedef std::shared_ptr< const ResourceObject > ConstPtr;
+                typedef std::shared_ptr< RCSResourceObject > Ptr;
+                typedef std::shared_ptr< const RCSResourceObject > ConstPtr;
 
                 /**
                  * @class   Builder
                  * @brief   This class provides APIs for resource creation, setting properties &
                  *          attributes for the constructed resource.
-                 *          It is a subclass of ResourceObject. It provides the build() API
-                 *          which builds a resource and return pointer to ResourceObject class.
+                 *          It provides the build() API
+                 *          which builds a resource and return pointer to RCSResourceObject class.
                  *
                  *@see build()
                  */
@@ -178,16 +177,16 @@ namespace OIC
                         Builder &setAttributes(ResourceAttributes &&attributes);
 
                         /**
-                         * API for constructing a new ResourceObject.
+                         * API for constructing a new RCSResourceObject.
                          *
-                         * @return Pointer to ResourceObject instance created.
+                         * @return Pointer to RCSResourceObject instance created.
                          *
                          * @throw PlatformException
                          *       It catches exception from registerResource API of OCPlatform and
                          *       throws it to developer.
                          *
                          */
-                        ResourceObject::Ptr build();
+                        RCSResourceObject::Ptr build();
 
                     private:
                         std::string m_uri;
@@ -208,13 +207,13 @@ namespace OIC
                                      const ResourceAttributes::Value &) > AttributeUpdatedListener;
 
             public:
-                ResourceObject(ResourceObject&&) = delete;
-                ResourceObject(const ResourceObject &) = delete;
+                RCSResourceObject(RCSResourceObject&&) = delete;
+                RCSResourceObject(const RCSResourceObject &) = delete;
 
-                ResourceObject &operator=(ResourceObject && ) = delete;
-                ResourceObject &operator=(const ResourceObject &) = delete;
+                RCSResourceObject &operator=(RCSResourceObject && ) = delete;
+                RCSResourceObject &operator=(const RCSResourceObject &) = delete;
 
-                virtual ~ResourceObject();
+                virtual ~RCSResourceObject();
 
                 /**
                  * API for setting a particular attribute value.
@@ -294,12 +293,12 @@ namespace OIC
                 bool containsAttribute(const std::string &key) const;
 
                 /**
-                 * API for getting all the attributes of the ResourceObject.
+                 * API for getting all the attributes of the RCSResourceObject.
                  * It invokes the expectOwnLock() API to check the owner of the lock using the
                  * thread id.
                  * If it is not the owner then it throws exception.
                  *
-                 * @return reference of the attributes of this ResourceObject.
+                 * @return reference of the attributes of this RCSResourceObject.
                  *
                  * @see expectOwnLock()
                  *
@@ -377,7 +376,7 @@ namespace OIC
                 virtual bool removeAttributeUpdatedListener(const std::string &key);
 
                 /**
-                 * API for notifying all observers of the ResourceObject
+                 * API for notifying all observers of the RCSResourceObject
                  * with the updated attributes value
                  */
                 virtual void notify() const;
@@ -423,7 +422,7 @@ namespace OIC
                 SetRequestHandlerPolicy getSetRequestHandlerPolicy() const;
 
         private:
-            ResourceObject(uint8_t, ResourceAttributes&&);
+            RCSResourceObject(uint8_t, ResourceAttributes&&);
 
             OCEntityHandlerResult entityHandler(std::shared_ptr< OC::OCResourceRequest >);
 
@@ -457,13 +456,13 @@ namespace OIC
 
         };
 
-        class ResourceObject::LockGuard
+        class RCSResourceObject::LockGuard
         {
         public:
-            LockGuard(const ResourceObject&);
-            LockGuard(const ResourceObject::Ptr);
-            LockGuard(const ResourceObject&, AutoNotifyPolicy);
-            LockGuard(const ResourceObject::Ptr, AutoNotifyPolicy);
+            LockGuard(const RCSResourceObject&);
+            LockGuard(const RCSResourceObject::Ptr);
+            LockGuard(const RCSResourceObject&, AutoNotifyPolicy);
+            LockGuard(const RCSResourceObject::Ptr, AutoNotifyPolicy);
             ~LockGuard();
 
             LockGuard(const LockGuard&) = delete;
@@ -476,7 +475,7 @@ namespace OIC
             void init();
 
         private:
-            const ResourceObject& m_resourceObject;
+            const RCSResourceObject& m_resourceObject;
 
             AutoNotifyPolicy m_autoNotifyPolicy;
 
@@ -485,10 +484,10 @@ namespace OIC
             std::function<void()> m_autoNotifyFunc;
         };
 
-        class ResourceObject::WeakGuard
+        class RCSResourceObject::WeakGuard
         {
         public:
-            WeakGuard(const ResourceObject&);
+            WeakGuard(const RCSResourceObject&);
             ~WeakGuard();
 
             WeakGuard(const WeakGuard&) = delete;
@@ -501,9 +500,9 @@ namespace OIC
 
         private:
             bool m_isOwningLock;
-            const ResourceObject& m_resourceObject;
+            const RCSResourceObject& m_resourceObject;
         };
     }
 }
 
-#endif // SERVERBUILDER_RESOURCEOBJECT_H
+#endif // SERVER_RCSRESOURCEOBJECT_H

diff --git a/service/resource-encapsulation/include/ResourceAttributes.h b/service/resource-encapsulation/include/ResourceAttributes.h
index 8f406e5..99d1181 100644 (file)
--- a/service/resource-encapsulation/include/ResourceAttributes.h
+++ b/service/resource-encapsulation/include/ResourceAttributes.h
@@ -86,7 +86,7 @@ namespace OIC
         * @see const_iterator
         * @see DiscoveryManager
         * @see RemoteResourceObject
-        * @see ResourceObject
+        * @see RCSResourceObject
         */
         class ResourceAttributes
         {

diff --git a/service/resource-encapsulation/src/common/primitiveResource/include/ResourceAttributesUtils.h b/service/resource-encapsulation/src/common/primitiveResource/include/ResourceAttributesUtils.h
index defbe96..7768df8 100644 (file)
--- a/service/resource-encapsulation/src/common/primitiveResource/include/ResourceAttributesUtils.h
+++ b/service/resource-encapsulation/src/common/primitiveResource/include/ResourceAttributesUtils.h
@@ -18,12 +18,14 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#ifndef COMMON_INTERNAL_RESOURCEATTRIBUTESUTILS_H
-#define COMMON_INTERNAL_RESOURCEATTRIBUTESUTILS_H
+#ifndef COMMON_RESOURCEATTRIBUTESUTILS_H
+#define COMMON_RESOURCEATTRIBUTESUTILS_H
 
 #include <vector>
 #include <string>
 
+#include <ResourceAttributes.h>
+
 namespace OIC
 {
     namespace Service
@@ -41,4 +43,4 @@ namespace OIC
     }
 }
 
-#endif // COMMON_INTERNAL_RESOURCEATTRIBUTESUTILS_H
+#endif // COMMON_RESOURCEATTRIBUTESUTILS_H

diff --git a/service/resource-encapsulation/src/resourceContainer/include/ResourceContainerImpl.h b/service/resource-encapsulation/src/resourceContainer/include/ResourceContainerImpl.h
index 1e04067..a7166c2 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/include/ResourceContainerImpl.h
+++ b/service/resource-encapsulation/src/resourceContainer/include/ResourceContainerImpl.h
@@ -29,7 +29,7 @@
 
 #include "RCSRequest.h"
 #include "RCSResponse.h"
-#include "ResourceObject.h"
+#include "RCSResourceObject.h"
 
 #if(JAVA_SUPPORT)
     #include <jni.h>
@@ -78,7 +78,7 @@ namespace OIC
                 void onNotificationReceived(const std::string &strResourceUri);
 
                 static ResourceContainerImpl *getImplInstance();
-                static ResourceObject::Ptr buildResourceObject(const std::string &strUri, const std::string &strResourceType);
+                static RCSResourceObject::Ptr buildResourceObject(const std::string &strUri, const std::string &strResourceType);
 
                 void startBundle(const std::string &bundleId);
                 void stopBundle(const std::string &bundleId);
@@ -102,7 +102,7 @@ namespace OIC
 
             private:
                 map< std::string, BundleInfoInternal * > m_bundles; // <bundleID, bundleInfo>
-                map< std::string, ResourceObject::Ptr > m_mapServers; //<uri, serverPtr>
+                map< std::string, RCSResourceObject::Ptr > m_mapServers; //<uri, serverPtr>
                 map< std::string, BundleResource * > m_mapResources; //<uri, resourcePtr>
                 map< std::string, list<string> > m_mapBundleResources; //<bundleID, vector<uri>>
                 string m_configFile;

diff --git a/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp b/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp
index 16ce833..48d97fb 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp
+++ b/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp
@@ -135,7 +135,7 @@ namespace OIC
 
             if (!m_mapServers.empty())
             {
-                map< std::string, ResourceObject::Ptr >::iterator itor = m_mapServers.begin();
+                map< std::string, RCSResourceObject::Ptr >::iterator itor = m_mapServers.begin();
 
                 while (itor != m_mapServers.end())
                 {
@@ -261,7 +261,7 @@ namespace OIC
         {
             string strUri = resource->m_uri;
             string strResourceType = resource->m_resourceType;
-            ResourceObject::Ptr server = nullptr;
+            RCSResourceObject::Ptr server = nullptr;
 
             info_logger() << "Registration of resource " << strUri << "," << strResourceType << endl;
 
@@ -386,10 +386,10 @@ namespace OIC
             return &m_instance;
         }
 
-        ResourceObject::Ptr ResourceContainerImpl::buildResourceObject(const std::string & strUri,
+        RCSResourceObject::Ptr ResourceContainerImpl::buildResourceObject(const std::string & strUri,
                 const std::string & strResourceType)
         {
-            return ResourceObject::Builder(strUri, strResourceType, "DEFAULT_INTERFACE").setObservable(
+            return RCSResourceObject::Builder(strUri, strResourceType, "DEFAULT_INTERFACE").setObservable(
                        true).setDiscoverable(true).build();
         }
 

diff --git a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp
index 237d936..741c744 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp
+++ b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp
@@ -34,7 +34,7 @@
 #include "ResourceContainerBundleAPI.h"
 #include "ResourceContainerImpl.h"
 
-#include "ResourceObject.h"
+#include "RCSResourceObject.h"
 
 using namespace std;
 using namespace testing;
@@ -237,7 +237,7 @@ class ResourceContainerBundleAPITest: public TestWithMock
 
     public:
         MockRepository mocks;
-        ResourceObject *m_pResourceObject;
+        RCSResourceObject *m_pResourceObject;
         ResourceContainerBundleAPI *m_pResourceContainer;
         TestBundleResource *m_pBundleResource;
 
@@ -245,7 +245,7 @@ class ResourceContainerBundleAPITest: public TestWithMock
         void SetUp()
         {
             TestWithMock::SetUp();
-            m_pResourceObject = mocks.Mock<ResourceObject>();
+            m_pResourceObject = mocks.Mock<RCSResourceObject>();
             m_pResourceContainer = ResourceContainerBundleAPI::getInstance();
 
             m_pBundleResource = new TestBundleResource();
@@ -271,11 +271,11 @@ TEST_F(ResourceContainerBundleAPITest, ResourceServerCreatedWhenRegisterResource
 TEST_F(ResourceContainerBundleAPITest, RequestHandlerForResourceServerSetWhenRegisterResourceCalled)
 {
     mocks.OnCallFunc(ResourceContainerImpl::buildResourceObject).Return(
-        ResourceObject::Ptr(m_pResourceObject, [](ResourceObject *)
+        RCSResourceObject::Ptr(m_pResourceObject, [](RCSResourceObject *)
     {}));
 
-    mocks.ExpectCall(m_pResourceObject, ResourceObject::setGetRequestHandler);
-    mocks.ExpectCall(m_pResourceObject, ResourceObject::setSetRequestHandler);
+    mocks.ExpectCall(m_pResourceObject, RCSResourceObject::setGetRequestHandler);
+    mocks.ExpectCall(m_pResourceObject, RCSResourceObject::setSetRequestHandler);
 
     m_pResourceContainer->registerResource(m_pBundleResource);
 
@@ -285,11 +285,11 @@ TEST_F(ResourceContainerBundleAPITest, RequestHandlerForResourceServerSetWhenReg
 TEST_F(ResourceContainerBundleAPITest, BundleResourceUnregisteredWhenUnregisterResourceCalled)
 {
     mocks.OnCallFunc(ResourceContainerImpl::buildResourceObject).Return(
-        ResourceObject::Ptr(m_pResourceObject, [](ResourceObject *)
+        RCSResourceObject::Ptr(m_pResourceObject, [](RCSResourceObject *)
     {}));
 
-    mocks.ExpectCall(m_pResourceObject, ResourceObject::setGetRequestHandler);
-    mocks.ExpectCall(m_pResourceObject, ResourceObject::setSetRequestHandler);
+    mocks.ExpectCall(m_pResourceObject, RCSResourceObject::setGetRequestHandler);
+    mocks.ExpectCall(m_pResourceObject, RCSResourceObject::setSetRequestHandler);
 
     m_pResourceContainer->registerResource(m_pBundleResource);
     m_pResourceContainer->unregisterResource(m_pBundleResource);
@@ -303,15 +303,15 @@ TEST_F(ResourceContainerBundleAPITest,
        ServerNotifiesToObserversWhenNotificationReceivedFromResource)
 {
     mocks.OnCallFunc(ResourceContainerImpl::buildResourceObject).Return(
-        ResourceObject::Ptr(m_pResourceObject, [](ResourceObject *)
+        RCSResourceObject::Ptr(m_pResourceObject, [](RCSResourceObject *)
     {}));
 
-    mocks.ExpectCall(m_pResourceObject, ResourceObject::setGetRequestHandler);
-    mocks.ExpectCall(m_pResourceObject, ResourceObject::setSetRequestHandler);
+    mocks.ExpectCall(m_pResourceObject, RCSResourceObject::setGetRequestHandler);
+    mocks.ExpectCall(m_pResourceObject, RCSResourceObject::setSetRequestHandler);
 
     m_pResourceContainer->registerResource(m_pBundleResource);
 
-    mocks.ExpectCall(m_pResourceObject, ResourceObject::notify);
+    mocks.ExpectCall(m_pResourceObject, RCSResourceObject::notify);
 
     m_pResourceContainer->onNotificationReceived(m_pBundleResource->m_uri);
 

diff --git a/service/resource-encapsulation/src/serverBuilder/include/RequestHandler.h b/service/resource-encapsulation/src/serverBuilder/include/RequestHandler.h
index eeeb24f..1755b58 100644 (file)
--- a/service/resource-encapsulation/src/serverBuilder/include/RequestHandler.h
+++ b/service/resource-encapsulation/src/serverBuilder/include/RequestHandler.h
@@ -21,7 +21,6 @@
 #ifndef SERVERBUILDER_REQUESTHANDLER_H
 #define SERVERBUILDER_REQUESTHANDLER_H
 
-#include <ResourceObject.h>
 #include <RCSResponse.h>
 #include <ResourceAttributesUtils.h>
 
@@ -36,10 +35,12 @@ namespace OIC
     namespace Service
     {
 
+        class RCSResourceObject;
+
         class RequestHandler
         {
         private:
-            typedef std::function< std::shared_ptr< OC::OCResourceResponse >(ResourceObject&) >
+            typedef std::function< std::shared_ptr< OC::OCResourceResponse >(RCSResourceObject&) >
                         BuildResponseHolder;
 
         public:
@@ -66,7 +67,7 @@ namespace OIC
 
             virtual ~RequestHandler() { };
 
-            std::shared_ptr< OC::OCResourceResponse > buildResponse(ResourceObject&);
+            std::shared_ptr< OC::OCResourceResponse > buildResponse(RCSResourceObject&);
 
         private:
             const BuildResponseHolder m_holder;
@@ -93,7 +94,7 @@ namespace OIC
                     int errorCode = DEFAULT_ERROR_CODE);
 
             AttrKeyValuePairs applyAcceptanceMethod(RCSSetResponse::AcceptanceMethod,
-                    ResourceObject&, const ResourceAttributes&) const;
+                    RCSResourceObject&, const ResourceAttributes&) const;
         };
 
     }

diff --git a/service/resource-encapsulation/src/serverBuilder/src/ResourceObject.cpp b/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp
old mode 100644 (file)
new mode 100755 (executable)
similarity index 76%
rename from service/resource-encapsulation/src/serverBuilder/src/ResourceObject.cpp
rename to service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp
index 61116ae..88c36a1
--- a/service/resource-encapsulation/src/serverBuilder/src/ResourceObject.cpp
+++ b/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp
@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include <ResourceObject.h>
+#include <RCSResourceObject.h>
 
 #include <string>
 #include <functional>
@@ -35,7 +35,7 @@ namespace
 {
     using namespace OIC::Service;
 
-    constexpr char LOG_TAG[]{ "ResourceObject" };
+    constexpr char LOG_TAG[]{ "RCSResourceObject" };
 
     inline bool hasProperty(uint8_t base, uint8_t target)
     {
@@ -53,7 +53,7 @@ namespace
     }
 
     template <typename RESPONSE>
-    OCEntityHandlerResult sendResponse(ResourceObject& resource,
+    OCEntityHandlerResult sendResponse(RCSResourceObject& resource,
             std::shared_ptr< OC::OCResourceRequest > ocRequest, RESPONSE&& response)
     {
         auto ocResponse = response.getHandler()->buildResponse(resource);
@@ -93,13 +93,13 @@ namespace
         return RESPONSE::defaultAction();
     }
 
-    typedef void (ResourceObject::* AutoNotifyFunc)(bool, ResourceObject::AutoNotifyPolicy) const;
+    typedef void (RCSResourceObject::* AutoNotifyFunc)(bool, RCSResourceObject::AutoNotifyPolicy) const;
 
     std::function <void ()> createAutoNotifyInvoker(AutoNotifyFunc autoNotifyFunc,
-            const ResourceObject& resourceObject, const ResourceAttributes& resourceAttributes,
-            ResourceObject::AutoNotifyPolicy autoNotifyPolicy)
+            const RCSResourceObject& resourceObject, const ResourceAttributes& resourceAttributes,
+            RCSResourceObject::AutoNotifyPolicy autoNotifyPolicy)
     {
-        if(autoNotifyPolicy == ResourceObject::AutoNotifyPolicy::UPDATED)
+        if(autoNotifyPolicy == RCSResourceObject::AutoNotifyPolicy::UPDATED)
         {
             auto&& compareAttributesFunc =
                     std::bind(std::not_equal_to<ResourceAttributes>(),
@@ -108,7 +108,7 @@ namespace
             return std::bind(autoNotifyFunc,
                     &resourceObject, std::move(compareAttributesFunc), autoNotifyPolicy);
         }
-        else if(autoNotifyPolicy == ResourceObject::AutoNotifyPolicy::ALWAYS)
+        else if(autoNotifyPolicy == RCSResourceObject::AutoNotifyPolicy::ALWAYS)
         {
             return std::bind(autoNotifyFunc,
                     &resourceObject, true, autoNotifyPolicy);
@@ -123,7 +123,7 @@ namespace OIC
     namespace Service
     {
 
-        ResourceObject::Builder::Builder(const std::string& uri, const std::string& type,
+        RCSResourceObject::Builder::Builder(const std::string& uri, const std::string& type,
                 const std::string& interface) :
                 m_uri{ uri },
                 m_type{ type },
@@ -133,42 +133,42 @@ namespace OIC
         {
         }
 
-        ResourceObject::Builder& ResourceObject::Builder::setDiscoverable(
+        RCSResourceObject::Builder& RCSResourceObject::Builder::setDiscoverable(
                 bool discoverable)
         {
             m_properties = ::makePropertyFlags(m_properties, OC_DISCOVERABLE, discoverable);
             return *this;
         }
 
-        ResourceObject::Builder& ResourceObject::Builder::setObservable(
+        RCSResourceObject::Builder& RCSResourceObject::Builder::setObservable(
                 bool observable)
         {
             m_properties = ::makePropertyFlags(m_properties, OC_OBSERVABLE, observable);
             return *this;
         }
 
-        ResourceObject::Builder& ResourceObject::Builder::setAttributes(
+        RCSResourceObject::Builder& RCSResourceObject::Builder::setAttributes(
                 const ResourceAttributes& attrs)
         {
             m_resourceAttributes = attrs;
             return *this;
         }
 
-        ResourceObject::Builder& ResourceObject::Builder::setAttributes(
+        RCSResourceObject::Builder& RCSResourceObject::Builder::setAttributes(
                 ResourceAttributes&& attrs)
         {
             m_resourceAttributes = std::move(attrs);
             return *this;
         }
 
-        ResourceObject::Ptr ResourceObject::Builder::build()
+        RCSResourceObject::Ptr RCSResourceObject::Builder::build()
         {
             OCResourceHandle handle{ nullptr };
 
-            ResourceObject::Ptr server {
-                new ResourceObject{ m_properties, std::move(m_resourceAttributes) } };
+            RCSResourceObject::Ptr server {
+                new RCSResourceObject{ m_properties, std::move(m_resourceAttributes) } };
 
-            OC::EntityHandler entityHandler{ std::bind(&ResourceObject::entityHandler,
+            OC::EntityHandler entityHandler{ std::bind(&RCSResourceObject::entityHandler,
                     server.get(), std::placeholders::_1) };
 
             try
@@ -190,7 +190,7 @@ namespace OIC
         }
 
 
-        ResourceObject::ResourceObject(uint8_t properties, ResourceAttributes&& attrs) :
+        RCSResourceObject::RCSResourceObject(uint8_t properties, ResourceAttributes&& attrs) :
                 m_properties { properties },
                 m_resourceHandle{ },
                 m_resourceAttributes{ std::move(attrs) },
@@ -205,7 +205,7 @@ namespace OIC
         {
         }
 
-        ResourceObject::~ResourceObject()
+        RCSResourceObject::~RCSResourceObject()
         {
             if (m_resourceHandle)
             {
@@ -220,7 +220,7 @@ namespace OIC
             }
         }
 
-        void ResourceObject::setAttribute(const std::string& key,
+        void RCSResourceObject::setAttribute(const std::string& key,
                 const ResourceAttributes::Value& value)
         {
             WeakGuard lock(*this);
@@ -233,7 +233,7 @@ namespace OIC
             m_resourceAttributes[key] = value;
         }
 
-        void ResourceObject::setAttribute(const std::string& key, ResourceAttributes::Value&& value)
+        void RCSResourceObject::setAttribute(const std::string& key, ResourceAttributes::Value&& value)
         {
             WeakGuard lock(*this);
 
@@ -245,7 +245,7 @@ namespace OIC
             m_resourceAttributes[key] = std::move(value);
         }
 
-        void ResourceObject::setAttribute(std::string&& key, const ResourceAttributes::Value& value)
+        void RCSResourceObject::setAttribute(std::string&& key, const ResourceAttributes::Value& value)
         {
             WeakGuard lock(*this);
 
@@ -257,7 +257,7 @@ namespace OIC
             m_resourceAttributes[std::move(key)] = value;
         }
 
-        void ResourceObject::setAttribute(std::string&& key, ResourceAttributes::Value&& value)
+        void RCSResourceObject::setAttribute(std::string&& key, ResourceAttributes::Value&& value)
         {
             WeakGuard lock(*this);
 
@@ -269,13 +269,13 @@ namespace OIC
             m_resourceAttributes[std::move(key)] = std::move(value);
         }
 
-        ResourceAttributes::Value ResourceObject::getAttributeValue(const std::string& key) const
+        ResourceAttributes::Value RCSResourceObject::getAttributeValue(const std::string& key) const
         {
             WeakGuard lock(*this);
             return m_resourceAttributes.at(key);
         }
 
-        bool ResourceObject::removeAttribute(const std::string& key)
+        bool RCSResourceObject::removeAttribute(const std::string& key)
         {
             WeakGuard lock(*this);
             if (m_resourceAttributes.erase(key))
@@ -286,25 +286,25 @@ namespace OIC
             return false;
         }
 
-        bool ResourceObject::containsAttribute(const std::string& key) const
+        bool RCSResourceObject::containsAttribute(const std::string& key) const
         {
             WeakGuard lock(*this);
             return m_resourceAttributes.contains(key);
         }
 
-        ResourceAttributes& ResourceObject::getAttributes()
+        ResourceAttributes& RCSResourceObject::getAttributes()
         {
             expectOwnLock();
             return m_resourceAttributes;
         }
 
-        const ResourceAttributes& ResourceObject::getAttributes() const
+        const ResourceAttributes& RCSResourceObject::getAttributes() const
         {
             expectOwnLock();
             return m_resourceAttributes;
         }
 
-        void ResourceObject::expectOwnLock() const
+        void RCSResourceObject::expectOwnLock() const
         {
             if (m_lockOwner != std::this_thread::get_id())
             {
@@ -312,27 +312,27 @@ namespace OIC
             }
         }
 
-        bool ResourceObject::isObservable() const
+        bool RCSResourceObject::isObservable() const
         {
             return ::hasProperty(m_properties, OC_OBSERVABLE);
         }
 
-        bool ResourceObject::isDiscoverable() const
+        bool RCSResourceObject::isDiscoverable() const
         {
             return ::hasProperty(m_properties, OC_DISCOVERABLE);
         }
 
-        void ResourceObject::setGetRequestHandler(GetRequestHandler h)
+        void RCSResourceObject::setGetRequestHandler(GetRequestHandler h)
         {
             m_getRequestHandler = std::move(h);
         }
 
-        void ResourceObject::setSetRequestHandler(SetRequestHandler h)
+        void RCSResourceObject::setSetRequestHandler(SetRequestHandler h)
         {
             m_setRequestHandler = std::move(h);
         }
 
-        void ResourceObject::notify() const
+        void RCSResourceObject::notify() const
         {
             typedef OCStackResult (*NotifyAllObservers)(OCResourceHandle);
 
@@ -342,27 +342,27 @@ namespace OIC
                     m_resourceHandle);
         }
 
-        void ResourceObject::addAttributeUpdatedListener(const std::string& key,
+        void RCSResourceObject::addAttributeUpdatedListener(const std::string& key,
                 AttributeUpdatedListener h)
         {
             std::lock_guard<std::mutex> lock(m_mutexKeyAttributeUpdate);
             m_keyAttributesUpdatedListeners[key] = std::move(h);
         }
 
-        void ResourceObject::addAttributeUpdatedListener(std::string&& key,
+        void RCSResourceObject::addAttributeUpdatedListener(std::string&& key,
                 AttributeUpdatedListener h)
         {
            std::lock_guard<std::mutex> lock(m_mutexKeyAttributeUpdate);
            m_keyAttributesUpdatedListeners[std::move(key)] = std::move(h);
         }
 
-        bool ResourceObject::removeAttributeUpdatedListener(const std::string& key)
+        bool RCSResourceObject::removeAttributeUpdatedListener(const std::string& key)
         {
            std::lock_guard<std::mutex> lock(m_mutexKeyAttributeUpdate);
            return (bool) m_keyAttributesUpdatedListeners.erase(key);
         }
 
-        void ResourceObject::autoNotifyIfNeeded(const std::string& key,
+        void RCSResourceObject::autoNotifyIfNeeded(const std::string& key,
                                                 const ResourceAttributes::Value& value)
         {
             autoNotify( m_resourceAttributes.contains(key) == false
@@ -370,27 +370,27 @@ namespace OIC
                         , m_autoNotifyPolicy);
         }
 
-        void ResourceObject::setAutoNotifyPolicy(AutoNotifyPolicy policy)
+        void RCSResourceObject::setAutoNotifyPolicy(AutoNotifyPolicy policy)
         {
             m_autoNotifyPolicy = policy;
         }
 
-        ResourceObject::AutoNotifyPolicy ResourceObject::getAutoNotifyPolicy() const
+        RCSResourceObject::AutoNotifyPolicy RCSResourceObject::getAutoNotifyPolicy() const
         {
             return m_autoNotifyPolicy;
         }
 
-        void ResourceObject::setSetRequestHandlerPolicy(SetRequestHandlerPolicy policy)
+        void RCSResourceObject::setSetRequestHandlerPolicy(SetRequestHandlerPolicy policy)
         {
             m_setRequestHandlerPolicy = policy;
         }
 
-        ResourceObject::SetRequestHandlerPolicy ResourceObject::getSetRequestHandlerPolicy() const
+        RCSResourceObject::SetRequestHandlerPolicy RCSResourceObject::getSetRequestHandlerPolicy() const
         {
             return m_setRequestHandlerPolicy;
         }
 
-        void ResourceObject::autoNotify(
+        void RCSResourceObject::autoNotify(
                         bool isAttributesChanged, AutoNotifyPolicy autoNotifyPolicy) const
         {
             if(autoNotifyPolicy == AutoNotifyPolicy::NEVER) return;
@@ -398,7 +398,7 @@ namespace OIC
             notify();
         }
 
-        OCEntityHandlerResult ResourceObject::entityHandler(
+        OCEntityHandlerResult RCSResourceObject::entityHandler(
                 std::shared_ptr< OC::OCResourceRequest > request)
         {
             if (!request)
@@ -432,7 +432,7 @@ namespace OIC
             return OC_EH_ERROR;
         }
 
-        OCEntityHandlerResult ResourceObject::handleRequest(
+        OCEntityHandlerResult RCSResourceObject::handleRequest(
                 std::shared_ptr< OC::OCResourceRequest > request)
         {
             assert(request != nullptr);
@@ -450,7 +450,7 @@ namespace OIC
             return OC_EH_ERROR;
         }
 
-        OCEntityHandlerResult ResourceObject::handleRequestGet(
+        OCEntityHandlerResult RCSResourceObject::handleRequestGet(
                 std::shared_ptr< OC::OCResourceRequest > request)
         {
             assert(request != nullptr);
@@ -460,7 +460,7 @@ namespace OIC
             return sendResponse(*this, request, invokeHandler(attrs, request, m_getRequestHandler));
         }
 
-        OCEntityHandlerResult ResourceObject::handleRequestSet(
+        OCEntityHandlerResult RCSResourceObject::handleRequestSet(
                 std::shared_ptr< OC::OCResourceRequest > request)
         {
             assert(request != nullptr);
@@ -489,7 +489,7 @@ namespace OIC
             return sendResponse(*this, request, response);
         }
 
-        OCEntityHandlerResult ResourceObject::handleObserve(
+        OCEntityHandlerResult RCSResourceObject::handleObserve(
                 std::shared_ptr< OC::OCResourceRequest > request)
         {
             assert(request != nullptr);
@@ -502,7 +502,7 @@ namespace OIC
             return OC_EH_OK;
         }
 
-        ResourceObject::LockGuard::LockGuard(const ResourceObject::Ptr ptr) :
+        RCSResourceObject::LockGuard::LockGuard(const RCSResourceObject::Ptr ptr) :
                 m_resourceObject(*ptr),
                 m_autoNotifyPolicy{ ptr->getAutoNotifyPolicy() },
                 m_isOwningLock{ false }
@@ -510,8 +510,8 @@ namespace OIC
             init();
         }
 
-        ResourceObject::LockGuard::LockGuard(
-                const ResourceObject& serverResource) :
+        RCSResourceObject::LockGuard::LockGuard(
+                const RCSResourceObject& serverResource) :
                 m_resourceObject(serverResource),
                 m_autoNotifyPolicy{ serverResource.getAutoNotifyPolicy() },
                 m_isOwningLock{ false }
@@ -519,8 +519,8 @@ namespace OIC
             init();
         }
 
-        ResourceObject::LockGuard::LockGuard(
-                const ResourceObject::Ptr ptr, AutoNotifyPolicy autoNotifyPolicy) :
+        RCSResourceObject::LockGuard::LockGuard(
+                const RCSResourceObject::Ptr ptr, AutoNotifyPolicy autoNotifyPolicy) :
                 m_resourceObject(*ptr),
                 m_autoNotifyPolicy { autoNotifyPolicy },
                 m_isOwningLock{ false }
@@ -528,8 +528,8 @@ namespace OIC
             init();
         }
 
-        ResourceObject::LockGuard::LockGuard(
-                const ResourceObject& resourceObject, AutoNotifyPolicy autoNotifyPolicy) :
+        RCSResourceObject::LockGuard::LockGuard(
+                const RCSResourceObject& resourceObject, AutoNotifyPolicy autoNotifyPolicy) :
                         m_resourceObject(resourceObject),
                         m_autoNotifyPolicy { autoNotifyPolicy },
                         m_isOwningLock{ false }
@@ -537,7 +537,7 @@ namespace OIC
             init();
         }
 
-        ResourceObject::LockGuard::~LockGuard()
+        RCSResourceObject::LockGuard::~LockGuard()
         {
             if (m_autoNotifyFunc) m_autoNotifyFunc();
 
@@ -548,7 +548,7 @@ namespace OIC
             }
         }
 
-        void ResourceObject::LockGuard::init()
+        void RCSResourceObject::LockGuard::init()
         {
             if (m_resourceObject.m_lockOwner != std::this_thread::get_id())
             {
@@ -556,12 +556,12 @@ namespace OIC
                 m_resourceObject.m_lockOwner = std::this_thread::get_id();
                 m_isOwningLock = true;
             }
-            m_autoNotifyFunc = ::createAutoNotifyInvoker(&ResourceObject::autoNotify,
+            m_autoNotifyFunc = ::createAutoNotifyInvoker(&RCSResourceObject::autoNotify,
                     m_resourceObject, m_resourceObject.m_resourceAttributes, m_autoNotifyPolicy);
         }
 
-        ResourceObject::WeakGuard::WeakGuard(
-                const ResourceObject& resourceObject) :
+        RCSResourceObject::WeakGuard::WeakGuard(
+                const RCSResourceObject& resourceObject) :
                 m_isOwningLock{ false },
                 m_resourceObject(resourceObject)
         {
@@ -572,7 +572,7 @@ namespace OIC
             }
         }
 
-        ResourceObject::WeakGuard::~WeakGuard()
+        RCSResourceObject::WeakGuard::~WeakGuard()
         {
             if (m_isOwningLock)
             {
@@ -580,7 +580,7 @@ namespace OIC
             }
         }
 
-        bool ResourceObject::WeakGuard::hasLocked() const
+        bool RCSResourceObject::WeakGuard::hasLocked() const
         {
             return m_isOwningLock;
         }

diff --git a/service/resource-encapsulation/src/serverBuilder/src/RCSResponse.cpp b/service/resource-encapsulation/src/serverBuilder/src/RCSResponse.cpp
index 83baf30..f5a6b29 100644 (file)
--- a/service/resource-encapsulation/src/serverBuilder/src/RCSResponse.cpp
+++ b/service/resource-encapsulation/src/serverBuilder/src/RCSResponse.cpp
@@ -22,6 +22,8 @@
 
 #include <RequestHandler.h>
 
+#include <cassert>
+
 namespace OIC
 {
     namespace Service

diff --git a/service/resource-encapsulation/src/serverBuilder/src/RequestHandler.cpp b/service/resource-encapsulation/src/serverBuilder/src/RequestHandler.cpp
index 20d9964..62764e3 100644 (file)
--- a/service/resource-encapsulation/src/serverBuilder/src/RequestHandler.cpp
+++ b/service/resource-encapsulation/src/serverBuilder/src/RequestHandler.cpp
@@ -22,16 +22,17 @@
 
 #include <OCResourceResponse.h>
 #include <ResourceAttributesConverter.h>
+#include <RCSResourceObject.h>
 
 namespace
 {
     using namespace OIC::Service;
 
-    typedef std::function< OC::OCRepresentation(ResourceObject&) > OCRepresentationGetter;
+    typedef std::function< OC::OCRepresentation(RCSResourceObject&) > OCRepresentationGetter;
 
-    OC::OCRepresentation getOCRepresentationFromResource(ResourceObject& resource)
+    OC::OCRepresentation getOCRepresentationFromResource(RCSResourceObject& resource)
     {
-        ResourceObject::LockGuard lock{ resource, ResourceObject::AutoNotifyPolicy::NEVER };
+        RCSResourceObject::LockGuard lock{ resource, RCSResourceObject::AutoNotifyPolicy::NEVER };
         return ResourceAttributesConverter::toOCRepresentation(resource.getAttributes());
     }
 
@@ -46,7 +47,7 @@ namespace
         return std::bind(getOCRepresentation, std::forward<T>(attrs));
     }
 
-    std::shared_ptr< OC::OCResourceResponse > doBuildResponse(ResourceObject& resource,
+    std::shared_ptr< OC::OCResourceResponse > doBuildResponse(RCSResourceObject& resource,
             const OCEntityHandlerResult result, int errorCode, OCRepresentationGetter ocRepGetter)
     {
         auto response = std::make_shared< OC::OCResourceResponse >();
@@ -58,21 +59,21 @@ namespace
         return response;
     }
 
-    AttrKeyValuePairs applyAcceptMethod(ResourceObject& resource,
+    AttrKeyValuePairs applyAcceptMethod(RCSResourceObject& resource,
             const ResourceAttributes& requestAttrs)
     {
-        ResourceObject::LockGuard lock(resource, ResourceObject::AutoNotifyPolicy::NEVER);
+        RCSResourceObject::LockGuard lock(resource, RCSResourceObject::AutoNotifyPolicy::NEVER);
 
         return replaceAttributes(resource.getAttributes(), requestAttrs);
     }
 
-    AttrKeyValuePairs applyDefaultMethod(ResourceObject& resource,
+    AttrKeyValuePairs applyDefaultMethod(RCSResourceObject& resource,
             const ResourceAttributes& requestAttrs)
     {
-        ResourceObject::LockGuard lock(resource, ResourceObject::AutoNotifyPolicy::NEVER);
+        RCSResourceObject::LockGuard lock(resource, RCSResourceObject::AutoNotifyPolicy::NEVER);
 
         if (resource.getSetRequestHandlerPolicy()
-            != ResourceObject::SetRequestHandlerPolicy::ACCEPTANCE
+            != RCSResourceObject::SetRequestHandlerPolicy::ACCEPTANCE
             && !acceptableAttributes(resource.getAttributes(), requestAttrs))
         {
             return AttrKeyValuePairs{ };
@@ -81,13 +82,13 @@ namespace
         return replaceAttributes(resource.getAttributes(), requestAttrs);
     }
 
-    AttrKeyValuePairs applyIgnoreMethod(ResourceObject&, const ResourceAttributes&)
+    AttrKeyValuePairs applyIgnoreMethod(RCSResourceObject&, const ResourceAttributes&)
     {
         return AttrKeyValuePairs();
     }
 
     auto getApplyAcceptanceFunc(RCSSetResponse::AcceptanceMethod method) ->
-            std::function<AttrKeyValuePairs(ResourceObject&, const ResourceAttributes&)>
+            std::function<AttrKeyValuePairs(RCSResourceObject&, const ResourceAttributes&)>
     {
         switch (method)
         {
@@ -140,7 +141,7 @@ namespace OIC
         }
 
         std::shared_ptr< OC::OCResourceResponse > RequestHandler::buildResponse(
-                ResourceObject& resource)
+                RCSResourceObject& resource)
         {
             return m_holder(resource);
         }
@@ -170,7 +171,7 @@ namespace OIC
         }
 
         AttrKeyValuePairs SetRequestHandler::applyAcceptanceMethod(
-                RCSSetResponse::AcceptanceMethod method, ResourceObject& resource,
+                RCSSetResponse::AcceptanceMethod method, RCSResourceObject& resource,
                 const ResourceAttributes& requestAttrs) const
         {
             return getApplyAcceptanceFunc(method)(resource, requestAttrs);

diff --git a/service/resource-encapsulation/src/serverBuilder/unittests/ResourceObjectTest.cpp b/service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp
old mode 100644 (file)
new mode 100755 (executable)
similarity index 85%
rename from service/resource-encapsulation/src/serverBuilder/unittests/ResourceObjectTest.cpp
rename to service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp
index 4560c1f..5fdcf47
--- a/service/resource-encapsulation/src/serverBuilder/unittests/ResourceObjectTest.cpp
+++ b/service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp
@@ -20,7 +20,7 @@
 
 #include <UnitTestHelper.h>
 
-#include <ResourceObject.h>
+#include <RCSResourceObject.h>
 
 #include <OCPlatform.h>
 
@@ -42,7 +42,7 @@ constexpr int value{ 100 };
 
 TEST(ResourceObjectBuilderCreateTest, ThrowIfUriIsInvalid)
 {
-    ASSERT_THROW(ResourceObject::Builder("", "", "").build(), PlatformException);
+    ASSERT_THROW(RCSResourceObject::Builder("", "", "").build(), PlatformException);
 }
 
 class ResourceObjectBuilderTest: public TestWithMock
@@ -62,12 +62,12 @@ TEST_F(ResourceObjectBuilderTest, RegisterResourceWhenCallCreate)
     mocks.ExpectCallFuncOverload(static_cast< registerResource >(OCPlatform::registerResource))
             .Return(OC_STACK_OK);
 
-    ResourceObject::Builder(RESOURCE_URI, RESOURCE_TYPE, "").build();
+    RCSResourceObject::Builder(RESOURCE_URI, RESOURCE_TYPE, "").build();
 }
 
 TEST_F(ResourceObjectBuilderTest, ResourceServerHasPropertiesSetByBuilder)
 {
-    auto serverResource = ResourceObject::Builder(RESOURCE_URI, RESOURCE_TYPE, "").
+    auto serverResource = RCSResourceObject::Builder(RESOURCE_URI, RESOURCE_TYPE, "").
             setDiscoverable(false).setObservable(true).build();
 
     EXPECT_FALSE(serverResource->isDiscoverable());
@@ -79,10 +79,10 @@ TEST_F(ResourceObjectBuilderTest, ResourceServerHasAttrsSetByBuilder)
     ResourceAttributes attrs;
     attrs[KEY] = 100;
 
-    auto serverResource = ResourceObject::Builder(RESOURCE_URI, RESOURCE_TYPE, "").
+    auto serverResource = RCSResourceObject::Builder(RESOURCE_URI, RESOURCE_TYPE, "").
             setAttributes(attrs).build();
 
-    ResourceObject::LockGuard lock{ serverResource, ResourceObject::AutoNotifyPolicy::NEVER };
+    RCSResourceObject::LockGuard lock{ serverResource, RCSResourceObject::AutoNotifyPolicy::NEVER };
     EXPECT_EQ(attrs, serverResource->getAttributes());
 }
 
@@ -90,7 +90,7 @@ TEST_F(ResourceObjectBuilderTest, ResourceServerHasAttrsSetByBuilder)
 class ResourceObjectTest: public TestWithMock
 {
 public:
-    ResourceObject::Ptr server;
+    RCSResourceObject::Ptr server;
 
 protected:
     void SetUp()
@@ -99,7 +99,7 @@ protected:
 
         initMocks();
 
-        server = ResourceObject::Builder(RESOURCE_URI, RESOURCE_TYPE, "").build();
+        server = RCSResourceObject::Builder(RESOURCE_URI, RESOURCE_TYPE, "").build();
 
         initResourceObject();
     }
@@ -113,14 +113,14 @@ protected:
     }
 
     virtual void initResourceObject() {
-        server->setAutoNotifyPolicy(ResourceObject::AutoNotifyPolicy::NEVER);
+        server->setAutoNotifyPolicy(RCSResourceObject::AutoNotifyPolicy::NEVER);
     }
 };
 
 TEST_F(ResourceObjectTest, AccessAttributesWithLock)
 {
     {
-        ResourceObject::LockGuard lock{ server };
+        RCSResourceObject::LockGuard lock{ server };
         auto& attr = server->getAttributes();
         attr[KEY] = value;
     }
@@ -136,7 +136,7 @@ TEST_F(ResourceObjectTest, ThrowIfTryToAccessAttributesWithoutGuard)
 TEST_F(ResourceObjectTest, SettingAttributesWithinGuardDoesntCauseDeadLock)
 {
     {
-        ResourceObject::LockGuard guard{ server };
+        RCSResourceObject::LockGuard guard{ server };
         server->setAttribute(KEY, value);
     }
 
@@ -160,19 +160,19 @@ protected:
 
 TEST_F(AutoNotifyTest, DefalutAutoNotifyPolicyIsUpdated)
 {
-    ASSERT_EQ(ResourceObject::AutoNotifyPolicy::UPDATED, server->getAutoNotifyPolicy());
+    ASSERT_EQ(RCSResourceObject::AutoNotifyPolicy::UPDATED, server->getAutoNotifyPolicy());
 }
 
 TEST_F(AutoNotifyTest, AutoNotifyPolicyCanBeSet)
 {
-    server->setAutoNotifyPolicy(ResourceObject::AutoNotifyPolicy::NEVER);
+    server->setAutoNotifyPolicy(RCSResourceObject::AutoNotifyPolicy::NEVER);
 
-    ASSERT_EQ(ResourceObject::AutoNotifyPolicy::NEVER, server->getAutoNotifyPolicy());
+    ASSERT_EQ(RCSResourceObject::AutoNotifyPolicy::NEVER, server->getAutoNotifyPolicy());
 }
 
 TEST_F(AutoNotifyTest, WithUpdatedPolicy_NeverBeNotifiedIfAttributeIsNotChanged)
 {
-    server->setAutoNotifyPolicy(ResourceObject::AutoNotifyPolicy::UPDATED);
+    server->setAutoNotifyPolicy(RCSResourceObject::AutoNotifyPolicy::UPDATED);
     server->setAttribute(KEY, value);
 
     mocks.NeverCallFuncOverload(static_cast< NotifyAllObservers >(
@@ -183,7 +183,7 @@ TEST_F(AutoNotifyTest, WithUpdatedPolicy_NeverBeNotifiedIfAttributeIsNotChanged)
 
 TEST_F(AutoNotifyTest, WithUpdatedPolicy_WillBeNotifiedIfAttributeIsChanged)
 {
-    server->setAutoNotifyPolicy(ResourceObject::AutoNotifyPolicy::UPDATED);
+    server->setAutoNotifyPolicy(RCSResourceObject::AutoNotifyPolicy::UPDATED);
     server->setAttribute(KEY, value);
 
     mocks.ExpectCallFuncOverload(static_cast< NotifyAllObservers >(
@@ -195,7 +195,7 @@ TEST_F(AutoNotifyTest, WithUpdatedPolicy_WillBeNotifiedIfAttributeIsChanged)
 TEST_F(AutoNotifyTest, WithUpdatedPolicy_WillBeNotifiedIfValueIsAdded)
 {
     constexpr char newKey[]{ "newKey" };
-    server->setAutoNotifyPolicy(ResourceObject::AutoNotifyPolicy::UPDATED);
+    server->setAutoNotifyPolicy(RCSResourceObject::AutoNotifyPolicy::UPDATED);
 
     mocks.ExpectCallFuncOverload(static_cast< NotifyAllObservers >(
             OC::OCPlatform::notifyAllObservers)).Return(OC_STACK_OK);
@@ -205,18 +205,18 @@ TEST_F(AutoNotifyTest, WithUpdatedPolicy_WillBeNotifiedIfValueIsAdded)
 
 TEST_F(AutoNotifyTest, WithNeverPolicy_NeverBeNotifiedEvenIfAttributeIsChanged)
 {
-    server->setAutoNotifyPolicy(ResourceObject::AutoNotifyPolicy::NEVER);
+    server->setAutoNotifyPolicy(RCSResourceObject::AutoNotifyPolicy::NEVER);
 
     mocks.NeverCallFuncOverload(static_cast< NotifyAllObservers >(
             OC::OCPlatform::notifyAllObservers));
 
-    ResourceObject::LockGuard lock{ server };
+    RCSResourceObject::LockGuard lock{ server };
     server->setAttribute(KEY, value);
 }
 
 TEST_F(AutoNotifyTest, WithUpdatePolicy_WillBeNotifiedIfAttributeIsDeleted)
 {
-    server->setAutoNotifyPolicy(ResourceObject::AutoNotifyPolicy::UPDATED);
+    server->setAutoNotifyPolicy(RCSResourceObject::AutoNotifyPolicy::UPDATED);
     server->setAttribute(KEY, value);
 
     mocks.ExpectCallFuncOverload(static_cast< NotifyAllObservers >(
@@ -231,35 +231,35 @@ class AutoNotifyWithGuardTest: public AutoNotifyTest
 
 TEST_F(AutoNotifyWithGuardTest, GuardFollowsServerPolicyByDefault)
 {
-    server->setAutoNotifyPolicy(ResourceObject::AutoNotifyPolicy::UPDATED);
+    server->setAutoNotifyPolicy(RCSResourceObject::AutoNotifyPolicy::UPDATED);
 
     mocks.ExpectCallFuncOverload(static_cast< NotifyAllObservers >(
             OC::OCPlatform::notifyAllObservers)).Return(OC_STACK_OK);
 
-    ResourceObject::LockGuard guard{ server };
+    RCSResourceObject::LockGuard guard{ server };
     server->setAttribute(KEY, value);
 }
 
 TEST_F(AutoNotifyWithGuardTest, GuardCanOverridePolicy)
 {
-    server->setAutoNotifyPolicy(ResourceObject::AutoNotifyPolicy::ALWAYS);
+    server->setAutoNotifyPolicy(RCSResourceObject::AutoNotifyPolicy::ALWAYS);
 
     mocks.NeverCallFuncOverload(static_cast< NotifyAllObservers >(
             OC::OCPlatform::notifyAllObservers));
 
-    ResourceObject::LockGuard guard{ server, ResourceObject::AutoNotifyPolicy::NEVER };
+    RCSResourceObject::LockGuard guard{ server, RCSResourceObject::AutoNotifyPolicy::NEVER };
     server->getAttributes()[KEY] = value;
 }
 
 TEST_F(AutoNotifyWithGuardTest, GuardInvokesNotifyWhenDestroyed)
 {
-    server->setAutoNotifyPolicy(ResourceObject::AutoNotifyPolicy::NEVER);
+    server->setAutoNotifyPolicy(RCSResourceObject::AutoNotifyPolicy::NEVER);
 
     mocks.ExpectCallFuncOverload(static_cast< NotifyAllObservers >(
             OC::OCPlatform::notifyAllObservers)).Return(OC_STACK_OK);
 
     {
-        ResourceObject::LockGuard guard{ server, ResourceObject::AutoNotifyPolicy::ALWAYS };
+        RCSResourceObject::LockGuard guard{ server, RCSResourceObject::AutoNotifyPolicy::ALWAYS };
         server->setAttribute(KEY, value);
     }
 
@@ -427,15 +427,15 @@ public:
 
 TEST_F(SetRequestHandlerPolicyTest, DefalutSetRequestHandlerPolicyIsNever)
 {
-    ASSERT_EQ(ResourceObject::SetRequestHandlerPolicy::NEVER,
+    ASSERT_EQ(RCSResourceObject::SetRequestHandlerPolicy::NEVER,
                 server->getSetRequestHandlerPolicy());
 }
 
 TEST_F(SetRequestHandlerPolicyTest, SetRequestHandlerPolicyCanBeSet)
 {
-    server->setSetRequestHandlerPolicy(ResourceObject::SetRequestHandlerPolicy::ACCEPTANCE);
+    server->setSetRequestHandlerPolicy(RCSResourceObject::SetRequestHandlerPolicy::ACCEPTANCE);
 
-    ASSERT_EQ(ResourceObject::SetRequestHandlerPolicy::ACCEPTANCE,
+    ASSERT_EQ(RCSResourceObject::SetRequestHandlerPolicy::ACCEPTANCE,
                 server->getSetRequestHandlerPolicy());
 }
 
@@ -443,11 +443,11 @@ TEST_F(SetRequestHandlerPolicyTest, WithNeverPolicy_NotAddedIfReceivedNewKeyValu
 {
     OCRepresentation ocRep = createOCRepresentation();
     ocRep.setValue("NewKey", value);
-    server->setSetRequestHandlerPolicy(ResourceObject::SetRequestHandlerPolicy::NEVER);
+    server->setSetRequestHandlerPolicy(RCSResourceObject::SetRequestHandlerPolicy::NEVER);
 
     handler(createRequest(OC_REST_PUT, ocRep));
 
-    ResourceObject::LockGuard guard{ server };
+    RCSResourceObject::LockGuard guard{ server };
     ASSERT_FALSE((server->getAttributes()).contains("NewKey"));
 }
 
@@ -455,11 +455,11 @@ TEST_F(SetRequestHandlerPolicyTest, WithAcceptancePolicy_WillBeAddedIfReceivedNe
 {
     OCRepresentation ocRep = createOCRepresentation();
     ocRep.setValue("NewKey", value);
-    server->setSetRequestHandlerPolicy(ResourceObject::SetRequestHandlerPolicy::ACCEPTANCE);
+    server->setSetRequestHandlerPolicy(RCSResourceObject::SetRequestHandlerPolicy::ACCEPTANCE);
 
     handler(createRequest(OC_REST_PUT, ocRep));
 
-    ResourceObject::LockGuard guard{ server };
+    RCSResourceObject::LockGuard guard{ server };
     ASSERT_TRUE((server->getAttributes()).contains("NewKey"));
 }
 
@@ -468,11 +468,11 @@ class ResourceObjectSynchronizationTest: public ResourceObjectHandlingRequestTes
 {
 public:
 
-    static void withLock(ResourceObject::Ptr serverResource, int count)
+    static void withLock(RCSResourceObject::Ptr serverResource, int count)
     {
         for (int i=0; i<count; ++i)
         {
-            ResourceObject::LockGuard lock{ serverResource };
+            RCSResourceObject::LockGuard lock{ serverResource };
 
             auto& attrs = serverResource->getAttributes();
 
@@ -480,11 +480,11 @@ public:
         }
     }
 
-    static void withSetter(ResourceObject::Ptr serverResource, int count)
+    static void withSetter(RCSResourceObject::Ptr serverResource, int count)
     {
         for (int i=0; i<count; ++i)
         {
-            ResourceObject::LockGuard lock{ serverResource };
+            RCSResourceObject::LockGuard lock{ serverResource };
 
             serverResource->setAttribute(KEY, serverResource->getAttribute<int>(KEY) + 1);
         }

diff --git a/service/resource-encapsulation/src/serverBuilder/unittests/RCSResponseTest.cpp b/service/resource-encapsulation/src/serverBuilder/unittests/RCSResponseTest.cpp
index 801c5d4..5e77ad8 100644 (file)
--- a/service/resource-encapsulation/src/serverBuilder/unittests/RCSResponseTest.cpp
+++ b/service/resource-encapsulation/src/serverBuilder/unittests/RCSResponseTest.cpp
@@ -21,7 +21,7 @@
 #include <UnitTestHelper.h>
 
 #include <RCSResponse.h>
-#include <ResourceObject.h>
+#include <RCSResourceObject.h>
 
 #include <RequestHandler.h>
 #include <ResourceAttributesConverter.h>
@@ -59,8 +59,8 @@ public:
     template< typename T >
     shared_ptr< OCResourceResponse > buildResponse(const T& response)
     {
-        ResourceObject::Ptr server =
-                ResourceObject::Builder("a/test", "", "").build();
+        RCSResourceObject::Ptr server =
+                RCSResourceObject::Builder("a/test", "", "").build();
 
         return response.getHandler()->buildResponse(*server);
     }

diff --git a/service/resource-encapsulation/src/serverBuilder/unittests/RequestHandlerTest.cpp b/service/resource-encapsulation/src/serverBuilder/unittests/RequestHandlerTest.cpp
index b863589..6c3e87f 100644 (file)
--- a/service/resource-encapsulation/src/serverBuilder/unittests/RequestHandlerTest.cpp
+++ b/service/resource-encapsulation/src/serverBuilder/unittests/RequestHandlerTest.cpp
@@ -21,6 +21,7 @@
 #include <UnitTestHelper.h>
 
 #include <RequestHandler.h>
+#include <RCSResourceObject.h>
 
 #include <OCPlatform.h>
 
@@ -39,7 +40,7 @@ typedef OCStackResult (*RegisterResource)(OCResourceHandle&, std::string&,
 class RequestHandlerTest: public TestWithMock
 {
 public:
-    ResourceObject::Ptr server;
+    RCSResourceObject::Ptr server;
 
 protected:
     void SetUp()
@@ -51,9 +52,9 @@ protected:
 
         mocks.OnCallFunc(OC::OCPlatform::unregisterResource).Return(OC_STACK_OK);
 
-        server = ResourceObject::Builder("a/test", "resourceType", "").build();
+        server = RCSResourceObject::Builder("a/test", "resourceType", "").build();
 
-        server->setAutoNotifyPolicy(ResourceObject::AutoNotifyPolicy::NEVER);
+        server->setAutoNotifyPolicy(RCSResourceObject::AutoNotifyPolicy::NEVER);
         server->setAttribute(EXISTING, ORIGIN_VALUE);
     }
 };

diff --git a/service/resource-encapsulation/unittests/ResourceClient_Test.cpp b/service/resource-encapsulation/unittests/ResourceClient_Test.cpp
index 3372ce1..78e86f6 100644 (file)
--- a/service/resource-encapsulation/unittests/ResourceClient_Test.cpp
+++ b/service/resource-encapsulation/unittests/ResourceClient_Test.cpp
@@ -2,7 +2,7 @@
 #include <gtest/gtest.h>
 #include <iostream>
 #include "ResourceClient.h"
-#include "ResourceObject.h"
+#include "RCSResourceObject.h"
 #include "OCPlatform.h"
 
 #define RESOURCEURI "/a/TemperatureSensor"
@@ -18,11 +18,11 @@ std::shared_ptr<RemoteResourceObject> object;
 DiscoveryManager *manager = DiscoveryManager::getInstance();
 ResourceState receivedResourceState;
 ResourceAttributes receivedResourceAttributes;
-ResourceObject::Ptr server;
+RCSResourceObject::Ptr server;
 
 void createResource()
 {
-    server = ResourceObject::Builder(RESOURCEURI, RESOURCETYPE,
+    server = RCSResourceObject::Builder(RESOURCEURI, RESOURCETYPE,
                                      RESOURCEINTERFACE).setDiscoverable(true).setObservable(true).build();
     std::cout << "Resource created successfully " << std::endl;
     server->setAttribute("Temperature", 0);