remove trailing space in cpprest, update samples

2017-04-24 22:45:16 +08:00
parent fc2b3d49ea
commit aa85468932
32 changed files with 217 additions and 139 deletions
--- a/modules/swagger-codegen/src/main/resources/cpprest/api-source.mustache
+++ b/modules/swagger-codegen/src/main/resources/cpprest/api-source.mustache
@@ -28,13 +28,13 @@ using namespace {{modelNamespace}};
 {{#operation}}
 pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {{classname}}::{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{^required}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
 {
-    {{#allParams}}{{#required}}{{^isPrimitiveType}}{{^isContainer}}
+{{#allParams}}{{#required}}{{^isPrimitiveType}}{{^isContainer}}
    // verify the required parameter '{{paramName}}' is set
    if ({{paramName}} == nullptr)
    {
        throw ApiException(400, U("Missing required parameter '{{paramName}}' when calling {{classname}}->{{operationId}}"));
    }
-    {{/isContainer}}{{/isPrimitiveType}}{{/required}}{{/allParams}}
+{{/isContainer}}{{/isPrimitiveType}}{{/required}}{{/allParams}}

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("{{{path}}}");
--- a/samples/client/petstore/cpprest/ApiClient.cpp
+++ b/samples/client/petstore/cpprest/ApiClient.cpp
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
@@ -56,6 +56,11 @@ utility::string_t ApiClient::parameterToString(int32_t value)
    return utility::conversions::to_string_t(valueAsStringStream.str());
 }

+utility::string_t ApiClient::parameterToString(float value)
+{
+    return utility::conversions::to_string_t(std::to_string(value));
+}
+
 utility::string_t ApiClient::parameterToString(const utility::datetime &value)
 {
    return utility::conversions::to_string_t(value.to_string(utility::datetime::ISO_8601));
@@ -124,12 +129,24 @@ pplx::task<web::http::http_response> ApiClient::callApi(
        }
        else
        {
-            web::http::uri_builder formData;
-            for (auto& kvp : formParams)
+            if (contentType == U("application/json"))
            {
-                formData.append_query(kvp.first, kvp.second);
+                web::json::value body_data = web::json::value::object();
+                for (auto& kvp : formParams)
+                {
+                    body_data[U(kvp.first)] = ModelBase::toJson(kvp.second);
+                }
+                request.set_body(body_data);
+            }
+            else
+            {
+                web::http::uri_builder formData;
+                for (auto& kvp : formParams)
+                {
+                    formData.append_query(kvp.first, kvp.second);
+                }
+                request.set_body(formData.query(), U("application/x-www-form-urlencoded"));
            }
-            request.set_body(formData.query(), U("application/x-www-form-urlencoded"));
        }
    }

--- a/samples/client/petstore/cpprest/ApiClient.h
+++ b/samples/client/petstore/cpprest/ApiClient.h
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
@@ -50,6 +50,7 @@ public:
    static utility::string_t parameterToString(utility::string_t value);
    static utility::string_t parameterToString(int32_t value);
    static utility::string_t parameterToString(int64_t value);
+    static utility::string_t parameterToString(float value);
    static utility::string_t parameterToString(const utility::datetime &value);

    template<class T>
--- a/samples/client/petstore/cpprest/ApiConfiguration.cpp
+++ b/samples/client/petstore/cpprest/ApiConfiguration.cpp
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/client/petstore/cpprest/ApiConfiguration.h
+++ b/samples/client/petstore/cpprest/ApiConfiguration.h
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/client/petstore/cpprest/ApiException.cpp
+++ b/samples/client/petstore/cpprest/ApiException.cpp
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/client/petstore/cpprest/ApiException.h
+++ b/samples/client/petstore/cpprest/ApiException.h
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/client/petstore/cpprest/HttpContent.cpp
+++ b/samples/client/petstore/cpprest/HttpContent.cpp
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/client/petstore/cpprest/HttpContent.h
+++ b/samples/client/petstore/cpprest/HttpContent.h
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/client/petstore/cpprest/IHttpBody.h
+++ b/samples/client/petstore/cpprest/IHttpBody.h
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/client/petstore/cpprest/JsonBody.cpp
+++ b/samples/client/petstore/cpprest/JsonBody.cpp
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/client/petstore/cpprest/JsonBody.h
+++ b/samples/client/petstore/cpprest/JsonBody.h
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/client/petstore/cpprest/ModelBase.cpp
+++ b/samples/client/petstore/cpprest/ModelBase.cpp
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
@@ -283,6 +283,10 @@ int32_t ModelBase::int32_tFromJson(web::json::value& val)
 {
    return val.as_integer();
 }
+float ModelBase::floatFromJson(web::json::value& val)
+{
+    return val.as_double();
+}
 utility::string_t ModelBase::stringFromJson(web::json::value& val)
 {
    return val.is_string() ? val.as_string() : U("");
@@ -319,6 +323,15 @@ int32_t ModelBase::int32_tFromHttpContent(std::shared_ptr<HttpContent> val)
    ss >> result;
    return result;
 }
+float ModelBase::floatFromHttpContent(std::shared_ptr<HttpContent> val)
+{
+    utility::string_t str = ModelBase::stringFromHttpContent(val);
+
+    utility::stringstream_t ss(str);
+    float result = 0;
+    ss >> result;
+    return result;
+}
 utility::string_t ModelBase::stringFromHttpContent(std::shared_ptr<HttpContent> val)
 {
    std::shared_ptr<std::istream> data = val->getData();
--- a/samples/client/petstore/cpprest/ModelBase.h
+++ b/samples/client/petstore/cpprest/ModelBase.h
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
@@ -56,6 +56,7 @@ public:

    static int64_t int64_tFromJson(web::json::value& val);
    static int32_t int32_tFromJson(web::json::value& val);
+    static float floatFromJson(web::json::value& val);
    static utility::string_t stringFromJson(web::json::value& val);
    static utility::datetime dateFromJson(web::json::value& val);
    static double doubleFromJson(web::json::value& val);
@@ -72,6 +73,7 @@ public:

    static int64_t int64_tFromHttpContent(std::shared_ptr<HttpContent> val);
    static int32_t int32_tFromHttpContent(std::shared_ptr<HttpContent> val);
+    static float floatFromHttpContent(std::shared_ptr<HttpContent> val);
    static utility::string_t stringFromHttpContent(std::shared_ptr<HttpContent> val);
    static utility::datetime dateFromHttpContent(std::shared_ptr<HttpContent> val);
    static bool boolFromHttpContent(std::shared_ptr<HttpContent> val);
--- a/samples/client/petstore/cpprest/MultipartFormData.cpp
+++ b/samples/client/petstore/cpprest/MultipartFormData.cpp
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/client/petstore/cpprest/MultipartFormData.h
+++ b/samples/client/petstore/cpprest/MultipartFormData.h
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/client/petstore/cpprest/api/PetApi.cpp
+++ b/samples/client/petstore/cpprest/api/PetApi.cpp
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
@@ -38,7 +38,13 @@ PetApi::~PetApi()

 pplx::task<void> PetApi::addPet(std::shared_ptr<Pet> body)
 {
-    
+
+    // verify the required parameter 'body' is set
+    if (body == nullptr)
+    {
+        throw ApiException(400, U("Missing required parameter 'body' when calling PetApi->addPet"));
+    }
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/pet");
@@ -49,8 +55,8 @@ pplx::task<void> PetApi::addPet(std::shared_ptr<Pet> body)
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

@@ -154,7 +160,7 @@ pplx::task<void> PetApi::addPet(std::shared_ptr<Pet> body)
 }
 pplx::task<void> PetApi::deletePet(int64_t petId, utility::string_t apiKey)
 {
-    
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/pet/{petId}");
@@ -166,8 +172,8 @@ pplx::task<void> PetApi::deletePet(int64_t petId, utility::string_t apiKey)
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

@@ -260,7 +266,7 @@ pplx::task<void> PetApi::deletePet(int64_t petId, utility::string_t apiKey)
 }
 pplx::task<std::vector<std::shared_ptr<Pet>>> PetApi::findPetsByStatus(std::vector<utility::string_t> status)
 {
-    
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/pet/findByStatus");
@@ -271,8 +277,8 @@ pplx::task<std::vector<std::shared_ptr<Pet>>> PetApi::findPetsByStatus(std::vect
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

@@ -390,7 +396,7 @@ pplx::task<std::vector<std::shared_ptr<Pet>>> PetApi::findPetsByStatus(std::vect
 }
 pplx::task<std::vector<std::shared_ptr<Pet>>> PetApi::findPetsByTags(std::vector<utility::string_t> tags)
 {
-    
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/pet/findByTags");
@@ -401,8 +407,8 @@ pplx::task<std::vector<std::shared_ptr<Pet>>> PetApi::findPetsByTags(std::vector
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

@@ -520,7 +526,7 @@ pplx::task<std::vector<std::shared_ptr<Pet>>> PetApi::findPetsByTags(std::vector
 }
 pplx::task<std::shared_ptr<Pet>> PetApi::getPetById(int64_t petId)
 {
-    
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/pet/{petId}");
@@ -532,8 +538,8 @@ pplx::task<std::shared_ptr<Pet>> PetApi::getPetById(int64_t petId)
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

@@ -583,8 +589,6 @@ pplx::task<std::shared_ptr<Pet>> PetApi::getPetById(int64_t petId)
    //Set the request content type in the header.
    headerParams[U("Content-Type")] = requestHttpContentType;

-    // authentication (petstore_auth) required
-    // oauth2 authentication is added automatically as part of the http_client_config
    // authentication (api_key) required
    {
        utility::string_t apiKey = apiConfiguration->getApiKey(U("api_key"));
@@ -648,7 +652,13 @@ pplx::task<std::shared_ptr<Pet>> PetApi::getPetById(int64_t petId)
 }
 pplx::task<void> PetApi::updatePet(std::shared_ptr<Pet> body)
 {
-    
+
+    // verify the required parameter 'body' is set
+    if (body == nullptr)
+    {
+        throw ApiException(400, U("Missing required parameter 'body' when calling PetApi->updatePet"));
+    }
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/pet");
@@ -659,8 +669,8 @@ pplx::task<void> PetApi::updatePet(std::shared_ptr<Pet> body)
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

@@ -762,9 +772,9 @@ pplx::task<void> PetApi::updatePet(std::shared_ptr<Pet> body)
        return void();
    });
 }
-pplx::task<void> PetApi::updatePetWithForm(utility::string_t petId, utility::string_t name, utility::string_t status)
+pplx::task<void> PetApi::updatePetWithForm(int64_t petId, utility::string_t name, utility::string_t status)
 {
-    
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/pet/{petId}");
@@ -776,8 +786,8 @@ pplx::task<void> PetApi::updatePetWithForm(utility::string_t petId, utility::str
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

@@ -873,9 +883,9 @@ pplx::task<void> PetApi::updatePetWithForm(utility::string_t petId, utility::str
        return void();
    });
 }
-pplx::task<void> PetApi::uploadFile(int64_t petId, utility::string_t additionalMetadata, std::shared_ptr<HttpContent> file)
+pplx::task<std::shared_ptr<ApiResponse>> PetApi::uploadFile(int64_t petId, utility::string_t additionalMetadata, std::shared_ptr<HttpContent> file)
 {
-    
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/pet/{petId}/uploadImage");
@@ -888,7 +898,6 @@ pplx::task<void> PetApi::uploadFile(int64_t petId, utility::string_t additionalM

    std::unordered_set<utility::string_t> responseHttpContentTypes;
    responseHttpContentTypes.insert( U("application/json") );
-    responseHttpContentTypes.insert( U("application/xml") );

    utility::string_t responseHttpContentType;

@@ -981,7 +990,25 @@ pplx::task<void> PetApi::uploadFile(int64_t petId, utility::string_t additionalM
    })
    .then([=](utility::string_t response)
    {
-        return void();
+        std::shared_ptr<ApiResponse> result(new ApiResponse());
+
+        if(responseHttpContentType == U("application/json"))
+        {
+            web::json::value json = web::json::value::parse(response);
+
+            result->fromJson(json);
+        }
+        // else if(responseHttpContentType == U("multipart/form-data"))
+        // {
+        // TODO multipart response parsing
+        // }
+        else
+        {
+            throw ApiException(500
+                , U("error calling uploadFile: unsupported response type"));
+        }
+
+        return result;
    });
 }

--- a/samples/client/petstore/cpprest/api/PetApi.h
+++ b/samples/client/petstore/cpprest/api/PetApi.h
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
@@ -22,6 +22,7 @@

 #include "ApiClient.h"

+#include "ApiResponse.h"
 #include "HttpContent.h"
 #include "Pet.h"
 #include <cpprest/details/basic_types.h>
@@ -44,7 +45,7 @@ public:
    /// <remarks>
    /// 
    /// </remarks>
-    /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+    /// <param name="body">Pet object that needs to be added to the store</param>
    pplx::task<void> addPet(std::shared_ptr<Pet> body);
    /// <summary>
    /// Deletes a pet
@@ -60,7 +61,7 @@ public:
    /// <remarks>
    /// Multiple status values can be provided with comma separated strings
    /// </remarks>
-    /// <param name="status">Status values that need to be considered for filter (optional, default to available)</param>
+    /// <param name="status">Status values that need to be considered for filter</param>
    pplx::task<std::vector<std::shared_ptr<Pet>>> findPetsByStatus(std::vector<utility::string_t> status);
    /// <summary>
    /// Finds Pets by tags
@@ -68,15 +69,15 @@ public:
    /// <remarks>
    /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
    /// </remarks>
-    /// <param name="tags">Tags to filter by (optional)</param>
+    /// <param name="tags">Tags to filter by</param>
    pplx::task<std::vector<std::shared_ptr<Pet>>> findPetsByTags(std::vector<utility::string_t> tags);
    /// <summary>
    /// Find pet by ID
    /// </summary>
    /// <remarks>
-    /// Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+    /// Returns a single pet
    /// </remarks>
-    /// <param name="petId">ID of pet that needs to be fetched</param>
+    /// <param name="petId">ID of pet to return</param>
    pplx::task<std::shared_ptr<Pet>> getPetById(int64_t petId);
    /// <summary>
    /// Update an existing pet
@@ -84,7 +85,7 @@ public:
    /// <remarks>
    /// 
    /// </remarks>
-    /// <param name="body">Pet object that needs to be added to the store (optional)</param>
+    /// <param name="body">Pet object that needs to be added to the store</param>
    pplx::task<void> updatePet(std::shared_ptr<Pet> body);
    /// <summary>
    /// Updates a pet in the store with form data
@@ -93,7 +94,7 @@ public:
    /// 
    /// </remarks>
    /// <param name="petId">ID of pet that needs to be updated</param>/// <param name="name">Updated name of the pet (optional)</param>/// <param name="status">Updated status of the pet (optional)</param>
-    pplx::task<void> updatePetWithForm(utility::string_t petId, utility::string_t name, utility::string_t status);
+    pplx::task<void> updatePetWithForm(int64_t petId, utility::string_t name, utility::string_t status);
    /// <summary>
    /// uploads an image
    /// </summary>
@@ -101,7 +102,7 @@ public:
    /// 
    /// </remarks>
    /// <param name="petId">ID of pet to update</param>/// <param name="additionalMetadata">Additional data to pass to server (optional)</param>/// <param name="file">file to upload (optional)</param>
-    pplx::task<void> uploadFile(int64_t petId, utility::string_t additionalMetadata, std::shared_ptr<HttpContent> file);
+    pplx::task<std::shared_ptr<ApiResponse>> uploadFile(int64_t petId, utility::string_t additionalMetadata, std::shared_ptr<HttpContent> file);

 protected:
    std::shared_ptr<ApiClient> m_ApiClient;
--- a/samples/client/petstore/cpprest/api/StoreApi.cpp
+++ b/samples/client/petstore/cpprest/api/StoreApi.cpp
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
@@ -38,7 +38,7 @@ StoreApi::~StoreApi()

 pplx::task<void> StoreApi::deleteOrder(utility::string_t orderId)
 {
-    
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/store/order/{orderId}");
@@ -50,8 +50,8 @@ pplx::task<void> StoreApi::deleteOrder(utility::string_t orderId)
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

@@ -138,7 +138,7 @@ pplx::task<void> StoreApi::deleteOrder(utility::string_t orderId)
 }
 pplx::task<std::map<utility::string_t, int32_t>> StoreApi::getInventory()
 {
-    
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/store/inventory");
@@ -150,7 +150,6 @@ pplx::task<std::map<utility::string_t, int32_t>> StoreApi::getInventory()

    std::unordered_set<utility::string_t> responseHttpContentTypes;
    responseHttpContentTypes.insert( U("application/json") );
-    responseHttpContentTypes.insert( U("application/xml") );

    utility::string_t responseHttpContentType;

@@ -266,9 +265,9 @@ pplx::task<std::map<utility::string_t, int32_t>> StoreApi::getInventory()
        return result;
    });
 }
-pplx::task<std::shared_ptr<Order>> StoreApi::getOrderById(utility::string_t orderId)
+pplx::task<std::shared_ptr<Order>> StoreApi::getOrderById(int64_t orderId)
 {
-    
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/store/order/{orderId}");
@@ -280,8 +279,8 @@ pplx::task<std::shared_ptr<Order>> StoreApi::getOrderById(utility::string_t orde
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

@@ -386,7 +385,13 @@ pplx::task<std::shared_ptr<Order>> StoreApi::getOrderById(utility::string_t orde
 }
 pplx::task<std::shared_ptr<Order>> StoreApi::placeOrder(std::shared_ptr<Order> body)
 {
-    
+
+    // verify the required parameter 'body' is set
+    if (body == nullptr)
+    {
+        throw ApiException(400, U("Missing required parameter 'body' when calling StoreApi->placeOrder"));
+    }
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/store/order");
@@ -397,8 +402,8 @@ pplx::task<std::shared_ptr<Order>> StoreApi::placeOrder(std::shared_ptr<Order> b
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

--- a/samples/client/petstore/cpprest/api/StoreApi.h
+++ b/samples/client/petstore/cpprest/api/StoreApi.h
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
@@ -61,14 +61,14 @@ public:
    /// For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
    /// </remarks>
    /// <param name="orderId">ID of pet that needs to be fetched</param>
-    pplx::task<std::shared_ptr<Order>> getOrderById(utility::string_t orderId);
+    pplx::task<std::shared_ptr<Order>> getOrderById(int64_t orderId);
    /// <summary>
    /// Place an order for a pet
    /// </summary>
    /// <remarks>
    /// 
    /// </remarks>
-    /// <param name="body">order placed for purchasing the pet (optional)</param>
+    /// <param name="body">order placed for purchasing the pet</param>
    pplx::task<std::shared_ptr<Order>> placeOrder(std::shared_ptr<Order> body);

 protected:
--- a/samples/client/petstore/cpprest/api/UserApi.cpp
+++ b/samples/client/petstore/cpprest/api/UserApi.cpp
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
@@ -38,7 +38,13 @@ UserApi::~UserApi()

 pplx::task<void> UserApi::createUser(std::shared_ptr<User> body)
 {
-    
+
+    // verify the required parameter 'body' is set
+    if (body == nullptr)
+    {
+        throw ApiException(400, U("Missing required parameter 'body' when calling UserApi->createUser"));
+    }
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/user");
@@ -49,8 +55,8 @@ pplx::task<void> UserApi::createUser(std::shared_ptr<User> body)
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

@@ -150,7 +156,7 @@ pplx::task<void> UserApi::createUser(std::shared_ptr<User> body)
 }
 pplx::task<void> UserApi::createUsersWithArrayInput(std::vector<std::shared_ptr<User>> body)
 {
-    
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/user/createWithArray");
@@ -161,8 +167,8 @@ pplx::task<void> UserApi::createUsersWithArrayInput(std::vector<std::shared_ptr<
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

@@ -275,7 +281,7 @@ pplx::task<void> UserApi::createUsersWithArrayInput(std::vector<std::shared_ptr<
 }
 pplx::task<void> UserApi::createUsersWithListInput(std::vector<std::shared_ptr<User>> body)
 {
-    
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/user/createWithList");
@@ -286,8 +292,8 @@ pplx::task<void> UserApi::createUsersWithListInput(std::vector<std::shared_ptr<U
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

@@ -400,7 +406,7 @@ pplx::task<void> UserApi::createUsersWithListInput(std::vector<std::shared_ptr<U
 }
 pplx::task<void> UserApi::deleteUser(utility::string_t username)
 {
-    
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/user/{username}");
@@ -412,8 +418,8 @@ pplx::task<void> UserApi::deleteUser(utility::string_t username)
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

@@ -500,7 +506,7 @@ pplx::task<void> UserApi::deleteUser(utility::string_t username)
 }
 pplx::task<std::shared_ptr<User>> UserApi::getUserByName(utility::string_t username)
 {
-    
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/user/{username}");
@@ -512,8 +518,8 @@ pplx::task<std::shared_ptr<User>> UserApi::getUserByName(utility::string_t usern
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

@@ -618,7 +624,7 @@ pplx::task<std::shared_ptr<User>> UserApi::getUserByName(utility::string_t usern
 }
 pplx::task<utility::string_t> UserApi::loginUser(utility::string_t username, utility::string_t password)
 {
-    
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/user/login");
@@ -629,8 +635,8 @@ pplx::task<utility::string_t> UserApi::loginUser(utility::string_t username, uti
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

@@ -753,7 +759,7 @@ pplx::task<utility::string_t> UserApi::loginUser(utility::string_t username, uti
 }
 pplx::task<void> UserApi::logoutUser()
 {
-    
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/user/logout");
@@ -764,8 +770,8 @@ pplx::task<void> UserApi::logoutUser()
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

@@ -852,7 +858,13 @@ pplx::task<void> UserApi::logoutUser()
 }
 pplx::task<void> UserApi::updateUser(utility::string_t username, std::shared_ptr<User> body)
 {
-    
+
+    // verify the required parameter 'body' is set
+    if (body == nullptr)
+    {
+        throw ApiException(400, U("Missing required parameter 'body' when calling UserApi->updateUser"));
+    }
+

    std::shared_ptr<ApiConfiguration> apiConfiguration( m_ApiClient->getConfiguration() );
    utility::string_t path = U("/user/{username}");
@@ -864,8 +876,8 @@ pplx::task<void> UserApi::updateUser(utility::string_t username, std::shared_ptr
    std::map<utility::string_t, std::shared_ptr<HttpContent>> fileParams;

    std::unordered_set<utility::string_t> responseHttpContentTypes;
-    responseHttpContentTypes.insert( U("application/json") );
    responseHttpContentTypes.insert( U("application/xml") );
+    responseHttpContentTypes.insert( U("application/json") );

    utility::string_t responseHttpContentType;

--- a/samples/client/petstore/cpprest/api/UserApi.h
+++ b/samples/client/petstore/cpprest/api/UserApi.h
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
@@ -44,7 +44,7 @@ public:
    /// <remarks>
    /// This can only be done by the logged in user.
    /// </remarks>
-    /// <param name="body">Created user object (optional)</param>
+    /// <param name="body">Created user object</param>
    pplx::task<void> createUser(std::shared_ptr<User> body);
    /// <summary>
    /// Creates list of users with given input array
@@ -52,7 +52,7 @@ public:
    /// <remarks>
    /// 
    /// </remarks>
-    /// <param name="body">List of user object (optional)</param>
+    /// <param name="body">List of user object</param>
    pplx::task<void> createUsersWithArrayInput(std::vector<std::shared_ptr<User>> body);
    /// <summary>
    /// Creates list of users with given input array
@@ -60,7 +60,7 @@ public:
    /// <remarks>
    /// 
    /// </remarks>
-    /// <param name="body">List of user object (optional)</param>
+    /// <param name="body">List of user object</param>
    pplx::task<void> createUsersWithListInput(std::vector<std::shared_ptr<User>> body);
    /// <summary>
    /// Delete user
@@ -84,7 +84,7 @@ public:
    /// <remarks>
    /// 
    /// </remarks>
-    /// <param name="username">The user name for login (optional)</param>/// <param name="password">The password for login in clear text (optional)</param>
+    /// <param name="username">The user name for login</param>/// <param name="password">The password for login in clear text</param>
    pplx::task<utility::string_t> loginUser(utility::string_t username, utility::string_t password);
    /// <summary>
    /// Logs out current logged in user session
@@ -100,7 +100,7 @@ public:
    /// <remarks>
    /// This can only be done by the logged in user.
    /// </remarks>
-    /// <param name="username">name that need to be deleted</param>/// <param name="body">Updated user object (optional)</param>
+    /// <param name="username">name that need to be deleted</param>/// <param name="body">Updated user object</param>
    pplx::task<void> updateUser(utility::string_t username, std::shared_ptr<User> body);

 protected:
--- a/samples/client/petstore/cpprest/model/Category.cpp
+++ b/samples/client/petstore/cpprest/model/Category.cpp
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/client/petstore/cpprest/model/Category.h
+++ b/samples/client/petstore/cpprest/model/Category.h
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
@@ -13,7 +13,7 @@
 /*
 * Category.h
 *
- * 
+ * A category for a pet
 */

 #ifndef Category_H_
@@ -30,7 +30,7 @@ namespace client {
 namespace model {

 /// <summary>
-/// 
+/// A category for a pet
 /// </summary>
 class  Category
    : public ModelBase
--- a/samples/client/petstore/cpprest/model/Order.cpp
+++ b/samples/client/petstore/cpprest/model/Order.cpp
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/client/petstore/cpprest/model/Order.h
+++ b/samples/client/petstore/cpprest/model/Order.h
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
@@ -13,7 +13,7 @@
 /*
 * Order.h
 *
- * 
+ * An order for a pets from the pet store
 */

 #ifndef Order_H_
@@ -30,7 +30,7 @@ namespace client {
 namespace model {

 /// <summary>
-/// 
+/// An order for a pets from the pet store
 /// </summary>
 class  Order
    : public ModelBase
--- a/samples/client/petstore/cpprest/model/Pet.cpp
+++ b/samples/client/petstore/cpprest/model/Pet.cpp
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/client/petstore/cpprest/model/Pet.h
+++ b/samples/client/petstore/cpprest/model/Pet.h
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
@@ -13,7 +13,7 @@
 /*
 * Pet.h
 *
- * 
+ * A pet for sale in the pet store
 */

 #ifndef Pet_H_
@@ -33,7 +33,7 @@ namespace client {
 namespace model {

 /// <summary>
-/// 
+/// A pet for sale in the pet store
 /// </summary>
 class  Pet
    : public ModelBase
--- a/samples/client/petstore/cpprest/model/Tag.cpp
+++ b/samples/client/petstore/cpprest/model/Tag.cpp
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/client/petstore/cpprest/model/Tag.h
+++ b/samples/client/petstore/cpprest/model/Tag.h
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
@@ -13,7 +13,7 @@
 /*
 * Tag.h
 *
- * 
+ * A tag for a pet
 */

 #ifndef Tag_H_
@@ -30,7 +30,7 @@ namespace client {
 namespace model {

 /// <summary>
-/// 
+/// A tag for a pet
 /// </summary>
 class  Tag
    : public ModelBase
--- a/samples/client/petstore/cpprest/model/User.cpp
+++ b/samples/client/petstore/cpprest/model/User.cpp
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
--- a/samples/client/petstore/cpprest/model/User.h
+++ b/samples/client/petstore/cpprest/model/User.h
@@ -1,9 +1,9 @@
 /**
 * Swagger Petstore
- * This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 *
 * OpenAPI spec version: 1.0.0
- * Contact: apiteam@wordnik.com
+ * Contact: apiteam@swagger.io
 *
 * NOTE: This class is auto generated by the swagger code generator program.
 * https://github.com/swagger-api/swagger-codegen.git
@@ -13,7 +13,7 @@
 /*
 * User.h
 *
- * 
+ * A User who is purchasing from the pet store
 */

 #ifndef User_H_
@@ -30,7 +30,7 @@ namespace client {
 namespace model {

 /// <summary>
-/// 
+/// A User who is purchasing from the pet store
 /// </summary>
 class  User
    : public ModelBase