Adding JsonSchema parser implementation for simulator and Updating Raml Parser.

[platform/upstream/iotivity.git] / service / simulator / ramlparser / raml / model / Action.cpp

diff --git a/service/simulator/ramlparser/raml/model/Action.cpp b/service/simulator/ramlparser/raml/model/Action.cpp
index 346fa9e..15c826a 100755 (executable)
--- a/service/simulator/ramlparser/raml/model/Action.cpp
+++ b/service/simulator/ramlparser/raml/model/Action.cpp
@@ -8,7 +8,7 @@
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *             http://www.apache.org/licenses/LICENSE-2.0\r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r
@@ -38,55 +38,56 @@ namespace RAML
     {\r
         m_description = description;\r
     }\r
-    std::map<std::string, Header> Action::getHeaders() const\r
+    std::map<std::string, HeaderPtr > const &Action::getHeaders() const\r
     {\r
         return m_headers;\r
     }\r
-    void Action::setHeader(const std::string &headerName, const Header &header)\r
+    void Action::setHeader(const std::string &headerName, const HeaderPtr &header)\r
     {\r
         m_headers[headerName] = header;\r
     }\r
-    std::map<std::string, QueryParameter> Action::getQueryParameters()const\r
+    std::map<std::string, QueryParameterPtr > const &Action::getQueryParameters()const\r
     {\r
         return m_queryParameters;\r
     }\r
-    void Action::setQueryParameter(const std::string &paramName, const QueryParameter &queryParameter)\r
+    void Action::setQueryParameter(const std::string &paramName,\r
+                                   const QueryParameterPtr &queryParameter)\r
     {\r
         m_queryParameters[paramName] = queryParameter;\r
     }\r
-    RequestResponseBody &Action::getRequestBody(std::string bodyType)\r
+    RequestResponseBodyPtr Action::getRequestBody(const std::string &bodyType)\r
     {\r
         return m_requestBody[bodyType];\r
     }\r
 \r
-    std::map<std::string, RequestResponseBody> Action::getRequestBody() const\r
+    std::map<std::string, RequestResponseBodyPtr> const &Action::getRequestBody() const\r
     {\r
         return m_requestBody;\r
     }\r
     void Action::setRequestBody(const std::string &typeName)\r
     {\r
-        m_requestBody[typeName] = *(new RequestResponseBody(typeName));\r
+        m_requestBody[typeName] = std::make_shared<RequestResponseBody>(typeName);\r
     }\r
 \r
-    void Action::setRequestBody(const std::string &typeName , const RequestResponseBody &body)\r
+    void Action::setRequestBody(const std::string &typeName , const RequestResponseBodyPtr &body)\r
     {\r
         m_requestBody[typeName] = body;\r
     }\r
-    Response &Action::getResponse(std::string responseCode)\r
+    ResponsePtr Action::getResponse(const std::string &responseCode)\r
     {\r
         return m_responses[responseCode];\r
     }\r
 \r
-    std::map<std::string, Response> Action::getResponses() const\r
+    std::map<std::string, ResponsePtr> const &Action::getResponses() const\r
     {\r
         return m_responses;\r
     }\r
-    void Action::setResponse(const std::string &responseCode, const Response &response)\r
+    void Action::setResponse(const std::string &responseCode, const ResponsePtr &response)\r
     {\r
         m_responses[responseCode] = response;\r
     }\r
 \r
-    std::list<std::string> Action::getProtocols() const\r
+    std::list<std::string> const &Action::getProtocols() const\r
     {\r
         return m_protocols;\r
     }\r
@@ -94,17 +95,17 @@ namespace RAML
     {\r
         m_protocols.push_back(protocol);\r
     }\r
-    std::map<std::string, UriParameter > Action::getBaseUriParameters() const\r
+    std::map<std::string, UriParameterPtr > const &Action::getBaseUriParameters() const\r
     {\r
         return m_baseUriParameters;\r
     }\r
     void Action::setBaseUriParameter(const std::string &paramName ,\r
-                                     const UriParameter  &baseUriParameter)\r
+                                     const UriParameterPtr &baseUriParameter)\r
     {\r
         m_baseUriParameters[paramName] = baseUriParameter;\r
     }\r
 \r
-    std::list<std::string> Action::getTraits() const\r
+    std::list<std::string> const &Action::getTraits() const\r
     {\r
         return m_trait;\r
     }\r
@@ -112,10 +113,8 @@ namespace RAML
     {\r
         m_trait.push_back(trait);\r
     }\r
-    void Action::readAction(const ActionType actionType, const YAML::Node &yamlNode,\r
-                            IncludeResolver *includeResolver)\r
+    void Action::readAction(const ActionType actionType, const YAML::Node &yamlNode)\r
     {\r
-        m_includeResolver = includeResolver;\r
         m_type = actionType;\r
         for ( YAML::const_iterator it = yamlNode.begin(); it != yamlNode.end(); ++it )\r
         {\r
@@ -129,7 +128,7 @@ namespace RAML
                 for ( YAML::const_iterator tt = responseNode.begin(); tt != responseNode.end(); ++tt )\r
                 {\r
                     std::string responseCode = READ_NODE_AS_STRING(tt->first);\r
-                    setResponse(responseCode, *(new Response(tt->second, m_includeResolver)));\r
+                    setResponse(responseCode, std::make_shared<Response>(tt->second, m_includeResolver));\r
                 }\r
             }\r
             else if (key == Keys::Headers)\r
@@ -137,8 +136,7 @@ namespace RAML
                 YAML::Node paramNode = it->second;\r
                 for ( YAML::const_iterator tt = paramNode.begin(); tt != paramNode.end(); ++tt )\r
                 {\r
-                    Header *header = new Header(tt->second);\r
-                    setHeader(READ_NODE_AS_STRING(tt->first), *header);\r
+                    setHeader(READ_NODE_AS_STRING(tt->first), std::make_shared<Header>(tt->second));\r
                 }\r
             }\r
             else if (key == Keys::QueryParameters)\r
@@ -146,8 +144,7 @@ namespace RAML
                 YAML::Node paramNode = it->second;\r
                 for ( YAML::const_iterator tt = paramNode.begin(); tt != paramNode.end(); ++tt )\r
                 {\r
-                    QueryParameter *queryParameter = new QueryParameter(tt->second);\r
-                    setQueryParameter(READ_NODE_AS_STRING(tt->first), *queryParameter);\r
+                    setQueryParameter(READ_NODE_AS_STRING(tt->first), std::make_shared<QueryParameter>(tt->second));\r
                 }\r
             }\r
             else if (key == Keys::Protocols)\r
@@ -163,8 +160,7 @@ namespace RAML
                 YAML::Node paramNode = it->second;\r
                 for ( YAML::const_iterator tt = paramNode.begin(); tt != paramNode.end(); ++tt )\r
                 {\r
-                    UriParameter *uriParameter = new UriParameter(tt->second);\r
-                    setBaseUriParameter(READ_NODE_AS_STRING(tt->first), *uriParameter);\r
+                    setBaseUriParameter(READ_NODE_AS_STRING(tt->first), std::make_shared<UriParameter>(tt->second));\r
                 }\r
             }\r
             else if (key == Keys::Body)\r
@@ -174,7 +170,7 @@ namespace RAML
                 for ( YAML::const_iterator tt = responseBody.begin(); tt != responseBody.end(); ++tt )\r
                 {\r
                     std::string type = READ_NODE_AS_STRING(tt->first);\r
-                    setRequestBody(type, *(new RequestResponseBody(type, tt->second, m_includeResolver)));\r
+                    setRequestBody(type, std::make_shared<RequestResponseBody>(type, tt->second, m_includeResolver));\r
                 }\r
             }\r
             else if (key == Keys::IsTrait)\r