Merged constructors of the RCSResourceObject::Builder.

Change-Id: I4fd030a951c7d2c655b1a1c7c01e0812328dde78
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6207
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Inga Stotland <inga.stotland@intel.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/resource-encapsulation/include/RCSResourceObject.h b/service/resource-encapsulation/include/RCSResourceObject.h
index abea691..8a58b15 100644 (file)
--- a/service/resource-encapsulation/include/RCSResourceObject.h
+++ b/service/resource-encapsulation/include/RCSResourceObject.h
@@ -144,17 +144,7 @@ namespace OIC
                  * @param interface Resource interface
                  *
                  */
-                Builder(std::string &&uri, std::string &&type, std::string &&interface);
-
-                 /**
-                 * Constructs a Builder.
-                 *
-                 * @param uri Resource uri
-                 * @param type Resource type
-                 * @param interface Resource interface
-                 *
-                 */
-                Builder(const std::string &uri, const std::string &type, const std::string &interface);
+                Builder(std::string uri, std::string type, std::string interface);
 
                 /**
                  * Add an interface for the resource.

diff --git a/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp b/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp
index 80afefb..4d37f6f 100644 (file)
--- a/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp
+++ b/service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp
@@ -138,8 +138,8 @@ namespace OIC
     namespace Service
     {
 
-        RCSResourceObject::Builder::Builder(std::string &&uri, std::string &&type,
-                std::string &&interface) :
+        RCSResourceObject::Builder::Builder(std::string uri, std::string type,
+                std::string interface) :
                 m_uri{ std::move(uri) },
                 m_types{ std::move(type) },
                 m_interfaces{ },
@@ -156,17 +156,6 @@ namespace OIC
             }
         }
 
-        RCSResourceObject::Builder::Builder(const std::string &uri, const std::string &type,
-                const std::string &interface) :
-                m_uri{ uri },
-                m_types{ type },
-                m_interfaces{ interface },
-                m_defaultInterface { BASELINE_INTERFACE },
-                m_properties{ OC_DISCOVERABLE | OC_OBSERVABLE },
-                m_resourceAttributes{ }
-        {
-        }
-
         RCSResourceObject::Builder& RCSResourceObject::Builder::addInterface(std::string interface)
         {
             insertValue(m_interfaces, std::move(interface));