Modify RCSRequest to wrap OCResourceRequest

RCSRequest just wraps OCResourceRequest and it exposes OCResourceRequest for users who want to get information from oc request.

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

diff --git a/service/resource-encapsulation/include/RCSRequest.h b/service/resource-encapsulation/include/RCSRequest.h
index 9a78af8..d711778 100644 (file)
--- a/service/resource-encapsulation/include/RCSRequest.h
+++ b/service/resource-encapsulation/include/RCSRequest.h
@@ -26,7 +26,12 @@
 #ifndef SERVERBUILDER_PRIMITIVEREQUEST_H
 #define SERVERBUILDER_PRIMITIVEREQUEST_H
 
-#include <string>
+#include <memory>
+
+namespace OC
+{
+    class OCResourceRequest;
+}
 
 namespace OIC
 {
@@ -44,7 +49,9 @@ namespace OIC
                 *
                 * @param resourceUri URI of the resource for which the request is generated.
                 */
-                explicit RCSRequest(const std::string &resourceUri);
+                explicit RCSRequest(const std::string& resourceUri);
+
+                explicit RCSRequest(const std::shared_ptr< OC::OCResourceRequest >&);
 
                 RCSRequest &operator=(RCSRequest &) = delete;
 
@@ -54,8 +61,10 @@ namespace OIC
                 */
                 std::string getResourceUri() const;
 
+                const std::shared_ptr< OC::OCResourceRequest >& getOCRequest() const;
+
             private:
-                std::string m_resourceUri;
+                const std::shared_ptr< OC::OCResourceRequest > m_ocRequest;
         };
 
     }

diff --git a/service/resource-encapsulation/src/serverBuilder/src/RCSRequest.cpp b/service/resource-encapsulation/src/serverBuilder/src/RCSRequest.cpp
index 378e5ed..a220e71 100644 (file)
--- a/service/resource-encapsulation/src/serverBuilder/src/RCSRequest.cpp
+++ b/service/resource-encapsulation/src/serverBuilder/src/RCSRequest.cpp
@@ -18,22 +18,34 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include <RCSRequest.h>
+#include "RCSRequest.h"
+
+#include "OCResourceRequest.h"
 
 namespace OIC
 {
     namespace Service
     {
 
+        RCSRequest::RCSRequest(const std::shared_ptr< OC::OCResourceRequest >& ocRequest) :
+                m_ocRequest{ ocRequest }
+        {
+        }
+
         RCSRequest::RCSRequest(const std::string& resourceUri) :
-                m_resourceUri{ resourceUri }
+                m_ocRequest{ std::make_shared< OC::OCResourceRequest >() }
         {
+            m_ocRequest->setResourceUri(resourceUri);
         }
 
         std::string RCSRequest::getResourceUri() const
         {
-            return m_resourceUri;
+            return m_ocRequest->getResourceUri();
         }
 
+        const std::shared_ptr< OC::OCResourceRequest >& RCSRequest::getOCRequest() const
+        {
+            return m_ocRequest;
+        }
     }
 }