Add sid getter to PrimitiveResource

Add sid getter requested by broker

Change-Id: Ib00fb700ce25188d800abe637fe35395df25c313
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1484
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/resource-manipulation/modules/common/primitiveResource/include/PrimitiveResource.h b/service/resource-manipulation/modules/common/primitiveResource/include/PrimitiveResource.h
index 9f2b460..ae5f207 100755 (executable)
--- a/service/resource-manipulation/modules/common/primitiveResource/include/PrimitiveResource.h
+++ b/service/resource-manipulation/modules/common/primitiveResource/include/PrimitiveResource.h
@@ -63,6 +63,7 @@ namespace OIC
             virtual void requestObserve(ObserveCallback) = 0;
             virtual void cancelObserve() = 0;
 
+            virtual std::string getSid() const = 0;
             virtual std::string getUri() const = 0;
             virtual std::string getHost() const = 0;
             virtual std::vector< std::string > getTypes() const = 0;
@@ -76,8 +77,8 @@ namespace OIC
             PrimitiveResource(const PrimitiveResource&) = delete;
             PrimitiveResource(PrimitiveResource&&) = delete;
 
-            PrimitiveResource& operator=(const PrimitiveResource&) const = delete;
-            PrimitiveResource& operator=(PrimitiveResource&&) const = delete;
+            PrimitiveResource& operator=(const PrimitiveResource&) = delete;
+            PrimitiveResource& operator=(PrimitiveResource&&) = delete;
         };
 
         using DiscoverCallback = std::function<void(std::shared_ptr<PrimitiveResource>)>;

diff --git a/service/resource-manipulation/modules/common/primitiveResource/include/internal/PrimitiveResourceImpl.h b/service/resource-manipulation/modules/common/primitiveResource/include/internal/PrimitiveResourceImpl.h
index 69262ac..19fb909 100644 (file)
--- a/service/resource-manipulation/modules/common/primitiveResource/include/internal/PrimitiveResourceImpl.h
+++ b/service/resource-manipulation/modules/common/primitiveResource/include/internal/PrimitiveResourceImpl.h
@@ -98,6 +98,11 @@ namespace OIC
                         static_cast< CancelObserveFunc >(&BaseResource::cancelObserve));
             }
 
+            std::string getSid() const override
+            {
+                return invokeOC(m_baseResource, &BaseResource::sid);
+            }
+
             std::string getUri() const override
             {
                 return invokeOC(m_baseResource, &BaseResource::uri);

diff --git a/service/resource-manipulation/modules/common/primitiveResource/unittests/PrimitiveResourceTest.cpp b/service/resource-manipulation/modules/common/primitiveResource/unittests/PrimitiveResourceTest.cpp
index 1c9f17b..a0ec6f3 100644 (file)
--- a/service/resource-manipulation/modules/common/primitiveResource/unittests/PrimitiveResourceTest.cpp
+++ b/service/resource-manipulation/modules/common/primitiveResource/unittests/PrimitiveResourceTest.cpp
@@ -47,10 +47,11 @@ public:
 
     virtual OCStackResult cancelObserve() = 0;
 
+    virtual std::string sid() const = 0;
     virtual std::string uri() const = 0;
     virtual std::string host() const = 0;
     virtual std::vector<std::string> getResourceTypes() const = 0;
-    virtual std::vector<std::string> getResourceInterfaces(void) const = 0;
+    virtual std::vector<std::string> getResourceInterfaces() const = 0;
 
     virtual bool isObservable() const = 0;
 };