Improve templates for C++ Restbed (#10543)

* Improve templates for C++ Restbed

The templates now generate classes which have virtual functions that can
be overridden to implement handlers.

* Fix missing HTTP methods in generated restbed C++ code

There was a wrong handling of "x-codegen-other-methods".

Change-Id: If6526d2672434beb5ebb0871d84cb80d84c34c38

samples/server/petstore/cpp-restbed/model/Pet.cpp

@@ -5,7 +5,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 5.0.0-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator unset.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -15,7 +15,9 @@
 #include "Pet.h"
 
 #include <string>
+#include <vector>
 #include <sstream>
+#include <stdexcept>
 #include <algorithm>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
@@ -29,26 +31,39 @@ namespace openapitools {
 namespace server {
 namespace model {
 
-Pet::Pet()
+Pet::Pet(boost::property_tree::ptree const& pt)
 {
-	m_Id = 0L;
-	m_Name = "";
-	m_Status = "";
-	m_StatusEnum = { "available", "pending", "sold" };
+        fromPropertyTree(pt);
 }
 
-Pet::~Pet()
+std::string Pet::toJsonString(bool prettyJson /* = false */)
 {
+    return toJsonString_internal(prettyJson);
 }
 
-std::string Pet::toJsonString(bool prettyJson)
+void Pet::fromJsonString(std::string const& jsonString)
+{
+    fromJsonString_internal(jsonString);
+}
+
+boost::property_tree::ptree Pet::toPropertyTree()
+{
+    return toPropertyTree_internal();
+}
+
+void Pet::fromPropertyTree(boost::property_tree::ptree const& pt)
+{
+    fromPropertyTree_internal(pt);
+}
+
+std::string Pet::toJsonString_internal(bool prettyJson)
 {
 	std::stringstream ss;
 	write_json(ss, this->toPropertyTree(), prettyJson);
 	return ss.str();
 }
 
-void Pet::fromJsonString(std::string const& jsonString)
+void Pet::fromJsonString_internal(std::string const& jsonString)
 {
 	std::stringstream ss(jsonString);
 	ptree pt;
@@ -56,7 +71,7 @@ void Pet::fromJsonString(std::string const& jsonString)
 	this->fromPropertyTree(pt);
 }
 
-ptree Pet::toPropertyTree()
+ptree Pet::toPropertyTree_internal()
 {
 	ptree pt;
 	ptree tmp_node;
@@ -68,9 +83,9 @@ ptree Pet::toPropertyTree()
 	// generate tree for PhotoUrls
 	if (!m_PhotoUrls.empty()) {
 		for (const auto &childEntry : m_PhotoUrls) {
-			ptree PhotoUrls_node;
-			PhotoUrls_node.put("", childEntry);
-			tmp_node.push_back(std::make_pair("", PhotoUrls_node));
+            ptree PhotoUrls_node;
+            PhotoUrls_node.put("", childEntry);
+            tmp_node.push_back(std::make_pair("", PhotoUrls_node));
 		}
 		pt.add_child("photoUrls", tmp_node);
 		tmp_node.clear();
@@ -78,9 +93,7 @@ ptree Pet::toPropertyTree()
 	// generate tree for Tags
 	if (!m_Tags.empty()) {
 		for (const auto &childEntry : m_Tags) {
-			ptree Tags_node;
-			Tags_node.put("", childEntry);
-			tmp_node.push_back(std::make_pair("", Tags_node));
+            tmp_node.push_back(std::make_pair("", childEntry->toPropertyTree()));
 		}
 		pt.add_child("tags", tmp_node);
 		tmp_node.clear();
@@ -89,7 +102,7 @@ ptree Pet::toPropertyTree()
 	return pt;
 }
 
-void Pet::fromPropertyTree(ptree const &pt)
+void Pet::fromPropertyTree_internal(ptree const &pt)
 {
 	ptree tmp_node;
 	m_Id = pt.get("id", 0L);
@@ -101,13 +114,17 @@ void Pet::fromPropertyTree(ptree const &pt)
 	// push all items of PhotoUrls into member vector
 	if (pt.get_child_optional("photoUrls")) {
 		for (const auto &childTree : pt.get_child("photoUrls")) {
-			m_PhotoUrls.emplace_back(childTree.second.data());
+            std::string val =
+                childTree.second.data();
+            m_PhotoUrls.emplace_back(std::move(val));
 		}
 	}
 	// push all items of Tags into member vector
 	if (pt.get_child_optional("tags")) {
 		for (const auto &childTree : pt.get_child("tags")) {
-			m_Tags.emplace_back(childTree.second.data());
+            std::shared_ptr<Tag> val =
+                std::make_shared<Tag>(childTree.second);
+            m_Tags.emplace_back(std::move(val));
 		}
 	}
 	setStatus(pt.get("status", ""));
@@ -117,6 +134,7 @@ int64_t Pet::getId() const
 {
     return m_Id;
 }
+
 void Pet::setId(int64_t value)
 {
 	m_Id = value;
@@ -125,6 +143,7 @@ std::shared_ptr<Category> Pet::getCategory() const
 {
     return m_Category;
 }
+
 void Pet::setCategory(std::shared_ptr<Category> value)
 {
 	m_Category = value;
@@ -133,6 +152,7 @@ std::string Pet::getName() const
 {
     return m_Name;
 }
+
 void Pet::setName(std::string value)
 {
 	m_Name = value;
@@ -141,6 +161,7 @@ std::vector<std::string> Pet::getPhotoUrls() const
 {
     return m_PhotoUrls;
 }
+
 void Pet::setPhotoUrls(std::vector<std::string> value)
 {
 	m_PhotoUrls = value;
@@ -149,6 +170,7 @@ std::vector<std::shared_ptr<Tag>> Pet::getTags() const
 {
     return m_Tags;
 }
+
 void Pet::setTags(std::vector<std::shared_ptr<Tag>> value)
 {
 	m_Tags = value;
@@ -157,6 +179,7 @@ std::string Pet::getStatus() const
 {
     return m_Status;
 }
+
 void Pet::setStatus(std::string value)
 {
 	if (std::find(m_StatusEnum.begin(), m_StatusEnum.end(), value) != m_StatusEnum.end()) {
@@ -166,6 +189,20 @@ void Pet::setStatus(std::string value)
 	}
 }
 
+std::vector<Pet> createPetVectorFromJsonString(const std::string& json)
+{
+    std::stringstream sstream(json);
+    boost::property_tree::ptree pt;
+    boost::property_tree::json_parser::read_json(sstream,pt);
+
+    auto vec = std::vector<Pet>();
+    for (const auto& child: pt) {
+        vec.emplace_back(Pet(child.second));
+    }
+
+    return vec;
+}
+
 }
 }
 }