[Cpprest C++] Fixing issue #3773

README.md

@@ -753,6 +753,7 @@ Here are some companies/projects using Swagger Codegen in production. To add you
 - [Cachet Financial](http://www.cachetfinancial.com/)
 - [CloudBoost](https://www.CloudBoost.io/)
 - [Conplement](http://www.conplement.de/)
+- [Cummins] (http://www.cummins.com/)
 - [Cupix](http://www.cupix.com)
 - [DBBest Technologies](https://www.dbbest.com)
 - [DecentFoX](http://decentfox.com/)

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CppRestClientCodegen.java

@@ -217,6 +217,10 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
                 if (methodResponse.getSchema() != null) {
                     CodegenProperty cm = fromProperty("response", methodResponse.getSchema());
                     op.vendorExtensions.put("x-codegen-response", cm);
+                    if(cm.datatype == "HttpContent")
+                    {
+                        op.vendorExtensions.put("x-codegen-response-ishttpcontent", true);
+                    }
                 }
             }
         }
@@ -267,7 +271,8 @@ public String getTypeDeclaration(Property p) {
             Property inner = mp.getAdditionalProperties();
             return getSwaggerType(p) + "<utility::string_t, " + getTypeDeclaration(inner) + ">";
         }
-        if (p instanceof StringProperty || p instanceof DateProperty || p instanceof DateTimeProperty
+        if (p instanceof StringProperty || p instanceof DateProperty
+                || p instanceof DateTimeProperty || p instanceof FileProperty
                 || languageSpecificPrimitives.contains(swaggerType)) {
             return toModelName(swaggerType);
         }
@@ -289,7 +294,7 @@ public String toDefaultValue(Property p) {
             return "0.0";
         } else if (p instanceof FloatProperty) {
             return "0.0f";
-        } else if (p instanceof IntegerProperty) {
+        } else if (p instanceof IntegerProperty || p instanceof BaseIntegerProperty) {
             return "0";
         } else if (p instanceof LongProperty) {
             return "0L";

modules/swagger-codegen/src/main/resources/cpprest/api-source.mustache

@@ -62,10 +62,19 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
     {
         responseHttpContentType = U("multipart/form-data");
     }
+    {{#vendorExtensions.x-codegen-response-ishttpcontent}}
+    else
+    {
+        //It's going to be binary, so just use the first one.
+        responseHttpContentType = *responseHttpContentTypes.begin();
+    }
+    {{/vendorExtensions.x-codegen-response-ishttpcontent}}
+    {{^vendorExtensions.x-codegen-response-ishttpcontent}}
     else
     {
         throw ApiException(400, U("{{classname}}->{{operationId}} does not produce any supported media type"));
     }    
+    {{/vendorExtensions.x-codegen-response-ishttpcontent}}
 
     headerParams[U("Accept")] = responseHttpContentType;
 
@@ -189,17 +198,17 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
     return m_ApiClient->callApi(path, U("{{httpMethod}}"), queryParams, httpBody, headerParams, formParams, fileParams, requestHttpContentType)
     .then([=](web::http::http_response response)
     {
-		// 1xx - informational : OK
-		// 2xx - successful	   : OK
-		// 3xx - redirection   : OK 
-		// 4xx - client error  : not OK
-		// 5xx - client error  : not OK
-		if (response.status_code() >= 400)
-		{
-			throw ApiException(response.status_code()
-				, U("error calling {{operationId}}: ") + response.reason_phrase()
-				, std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
-		}
+        // 1xx - informational : OK
+        // 2xx - successful       : OK
+        // 3xx - redirection   : OK 
+        // 4xx - client error  : not OK
+        // 5xx - client error  : not OK
+        if (response.status_code() >= 400)
+        {
+            throw ApiException(response.status_code()
+                , U("error calling {{operationId}}: ") + response.reason_phrase()
+                , std::make_shared<std::stringstream>(response.extract_utf8string(true).get()));
+        }
 
         // check response content type
         if(response.headers().has(U("Content-Type")))
@@ -213,6 +222,17 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
             }
         }
 
+        {{#vendorExtensions.x-codegen-response-ishttpcontent}}
+        return response.extract_vector();
+    })
+    .then([=](std::vector<unsigned char> response)
+    {
+        HttpContent result;
+        std::shared_ptr<std::stringstream> stream = std::make_shared<std::stringstream>(std::string(response.begin(), response.end()));
+        result.setData(stream);
+        return result;
+        {{/vendorExtensions.x-codegen-response-ishttpcontent}}
+        {{^vendorExtensions.x-codegen-response-ishttpcontent}}
         return response.extract_string();
     })
     .then([=](utility::string_t response)
@@ -253,12 +273,13 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
         // }
         else 
         {
-			throw ApiException(500
-				, U("error calling findPetsByStatus: unsupported response type"));
+            throw ApiException(500
+                , U("error calling findPetsByStatus: unsupported response type"));
         }
 
         return result;
         {{/returnType}}
+        {{/vendorExtensions.x-codegen-response-ishttpcontent}}
     });            
 }
 {{/operation}}

modules/swagger-codegen/src/main/resources/cpprest/httpcontent-header.mustache

@@ -40,9 +40,9 @@ public:
     virtual void setData( std::shared_ptr<std::istream> value );
 
     virtual void writeTo( std::ostream& stream );
-       
+
 protected:
-	// NOTE: no utility::string_t here because those strings can only contain ascii
+    // NOTE: no utility::string_t here because those strings can only contain ascii
     utility::string_t m_ContentDisposition;
     utility::string_t m_Name;
     utility::string_t m_FileName;

modules/swagger-codegen/src/main/resources/cpprest/model-source.mustache

@@ -29,12 +29,12 @@ web::json::value {{classname}}::toJson() const
 {
     web::json::value val = web::json::value::object();
 
-	{{#vars}}{{#isPrimitiveType}}{{^required}}if(m_{{name}}IsSet)
+    {{#vars}}{{#isPrimitiveType}}{{^isListContainer}}{{^required}}if(m_{{name}}IsSet)
     {
         val[U("{{baseName}}")] = ModelBase::toJson(m_{{name}});
     }
     {{/required}}{{#required}}val[U("{{baseName}}")] = ModelBase::toJson(m_{{name}});
-    {{/required}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isListContainer}}{
+    {{/required}}{{/isListContainer}}{{/isPrimitiveType}}{{#isListContainer}}{
         std::vector<web::json::value> jsonArray;
         for( auto& item : m_{{name}} )
         {
@@ -48,33 +48,33 @@ web::json::value {{classname}}::toJson() const
         }
         {{/required}}
     }
-    {{/isListContainer}}{{^isListContainer}}{{^required}}if(m_{{name}}IsSet)
+    {{/isListContainer}}{{^isListContainer}}{{^isPrimitiveType}}{{^required}}if(m_{{name}}IsSet)
     {
         val[U("{{baseName}}")] = ModelBase::toJson(m_{{name}});
     }
     {{/required}}{{#required}}val[U("{{baseName}}")] = ModelBase::toJson(m_{{name}});
-    {{/required}}{{/isListContainer}}{{/isPrimitiveType}}{{/vars}}
+    {{/required}}{{/isPrimitiveType}}{{/isListContainer}}{{/vars}}
 
     return val;
 }
 
 void {{classname}}::fromJson(web::json::value& val)
 {
-    {{#vars}}{{#isPrimitiveType}}{{^required}}if(val.has_field(U("{{baseName}}")))
+    {{#vars}}{{#isPrimitiveType}}{{^isListContainer}}{{^required}}if(val.has_field(U("{{baseName}}")))
     {
         {{setter}}(ModelBase::{{baseType}}FromJson(val[U("{{baseName}}")]));
     }
     {{/required}}{{#required}}{{setter}}(ModelBase::{{baseType}}FromJson(val[U("{{baseName}}")]));
-    {{/required}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isListContainer}}{
+    {{/required}}{{/isListContainer}}{{/isPrimitiveType}}{{#isListContainer}}{
         m_{{name}}.clear();
         std::vector<web::json::value> jsonArray;
         {{^required}}if(val.has_field(U("{{baseName}}")))
         {
         {{/required}}
         for( auto& item : val[U("{{baseName}}")].as_array() )
         {
-            {{#items.isPrimitiveType}}m_{{name}}.push_back(ModelBase::{{baseType}}FromJson(item));
-            {{/items.isPrimitiveType}}{{^items.isPrimitiveType}}{{#items.isString}}m_{{name}}.push_back(ModelBase::stringFromJson(item));
+            {{#isPrimitiveType}}m_{{name}}.push_back(ModelBase::{{items.baseType}}FromJson(item));
+            {{/isPrimitiveType}}{{^isPrimitiveType}}{{#items.isString}}m_{{name}}.push_back(ModelBase::stringFromJson(item));
             {{/items.isString}}{{^items.isString}}{{#items.isDateTime}}m_{{name}}.push_back(ModelBase::dateFromJson(item));
             {{/items.isDateTime}}{{^items.isDateTime}}
             if(item.is_null()) 
@@ -87,13 +87,13 @@ void {{classname}}::fromJson(web::json::value& val)
                 newItem->fromJson(item);
                 m_{{name}}.push_back( newItem );
             }
-            {{/items.isDateTime}}{{/items.isString}}{{/items.isPrimitiveType}}
+            {{/items.isDateTime}}{{/items.isString}}{{/isPrimitiveType}}
         }
         {{^required}} 
         }
         {{/required}}
     }
-    {{/isListContainer}}{{^isListContainer}}{{^required}}if(val.has_field(U("{{baseName}}")))
+    {{/isListContainer}}{{^isListContainer}}{{^isPrimitiveType}}{{^required}}if(val.has_field(U("{{baseName}}")))
     {
         {{#isString}}{{setter}}(ModelBase::stringFromJson(val[U("{{baseName}}")]));
         {{/isString}}{{^isString}}{{#isDateTime}}{{setter}}(ModelBase::dateFromJson(val[U("{{baseName}}")]));
@@ -111,23 +111,23 @@ void {{classname}}::fromJson(web::json::value& val)
     {{/vendorExtensions.x-codegen-file}}{{^vendorExtensions.x-codegen-file}}{{{datatype}}} new{{name}}({{{defaultValue}}});
     new{{name}}->fromJson(val[U("{{baseName}}")]);
     {{setter}}( newItem );
-    {{/vendorExtensions.x-codegen-file}}{{/isDateTime}}{{/isString}}{{/required}}{{/isListContainer}}{{/isPrimitiveType}}{{/vars}}
+    {{/vendorExtensions.x-codegen-file}}{{/isDateTime}}{{/isString}}{{/required}}{{/isPrimitiveType}}{{/isListContainer}}{{/vars}}
 }
 
 void {{classname}}::toMultipart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix) const
 {
     utility::string_t namePrefix = prefix;
-	if(namePrefix.size() > 0 && namePrefix[namePrefix.size() - 1] != U('.'))
-	{
-		namePrefix += U(".");
-	}
+    if(namePrefix.size() > 0 && namePrefix[namePrefix.size() - 1] != U('.'))
+    {
+        namePrefix += U(".");
+    }
 
-	{{#vars}}{{#isPrimitiveType}}{{^required}}if(m_{{name}}IsSet)
+    {{#vars}}{{#isPrimitiveType}}{{^isListContainer}}{{^required}}if(m_{{name}}IsSet)
     {
         multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
     }
     {{/required}}{{#required}}multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
-    {{/required}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isListContainer}}{
+    {{/required}}{{/isListContainer}}{{/isPrimitiveType}}{{#isListContainer}}{
         std::vector<web::json::value> jsonArray;
         for( auto& item : m_{{name}} )
         {
@@ -141,7 +141,7 @@ void {{classname}}::toMultipart(std::shared_ptr<MultipartFormData> multipart, co
         }
         {{/required}}
     }
-    {{/isListContainer}}{{^isListContainer}}{{^required}}if(m_{{name}}IsSet)
+    {{/isListContainer}}{{^isListContainer}}{{^isPrimitiveType}}{{^required}}if(m_{{name}}IsSet)
     {
         {{#isString}}multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
         {{/isString}}{{^isString}}{{#isDateTime}}multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
@@ -155,23 +155,23 @@ void {{classname}}::toMultipart(std::shared_ptr<MultipartFormData> multipart, co
     {{/isString}}{{^isString}}{{#isDateTime}}multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
     {{/isDateTime}}{{^isDateTime}}{{#vendorExtensions.x-codegen-file}}multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), m_{{name}}));
     {{/vendorExtensions.x-codegen-file}}{{^vendorExtensions.x-codegen-file}}m_{{name}}->toMultipart(multipart, U("{{baseName}}."));
-    {{/vendorExtensions.x-codegen-file}}{{/isDateTime}}{{/isString}}{{/required}}{{/isListContainer}}{{/isPrimitiveType}}{{/vars}}
+    {{/vendorExtensions.x-codegen-file}}{{/isDateTime}}{{/isString}}{{/required}}{{/isPrimitiveType}}{{/isListContainer}}{{/vars}}
 }
 
 void {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix)
 {
     utility::string_t namePrefix = prefix;
-	if(namePrefix.size() > 0 && namePrefix[namePrefix.size() - 1] != U('.'))
-	{
-		namePrefix += U(".");
-	}
+    if(namePrefix.size() > 0 && namePrefix[namePrefix.size() - 1] != U('.'))
+    {
+        namePrefix += U(".");
+    }
 
-    {{#vars}}{{#isPrimitiveType}}{{^required}}if(multipart->hasContent(U("{{baseName}}")))
+    {{#vars}}{{#isPrimitiveType}}{{^isListContainer}}{{^required}}if(multipart->hasContent(U("{{baseName}}")))
     {
         {{setter}}(ModelBase::{{baseType}}FromHttpContent(multipart->getContent(U("{{baseName}}"))));
     }
     {{/required}}{{#required}}{{setter}}(ModelBase::{{baseType}}FromHttpContent(multipart->getContent(U("{{baseName}}"))));
-    {{/required}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isListContainer}}{
+    {{/required}}{{/isListContainer}}{{/isPrimitiveType}}{{#isListContainer}}{
         m_{{name}}.clear();
         {{^required}}if(multipart->hasContent(U("{{baseName}}")))
         {            
@@ -180,8 +180,8 @@ void {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart,
         web::json::value jsonArray = web::json::value::parse(ModelBase::stringFromHttpContent(multipart->getContent(U("{{baseName}}"))));
         for( auto& item : jsonArray.as_array() )
         {
-            {{#items.isPrimitiveType}}m_{{name}}.push_back(ModelBase::{{baseType}}FromJson(item));
-            {{/items.isPrimitiveType}}{{^items.isPrimitiveType}}{{#items.isString}}m_{{name}}.push_back(ModelBase::stringFromJson(item));
+            {{#isPrimitiveType}}m_{{name}}.push_back(ModelBase::{{items.baseType}}FromJson(item));
+            {{/isPrimitiveType}}{{^isPrimitiveType}}{{#items.isString}}m_{{name}}.push_back(ModelBase::stringFromJson(item));
             {{/items.isString}}{{^items.isString}}{{#items.isDateTime}}m_{{name}}.push_back(ModelBase::dateFromJson(item));
             {{/items.isDateTime}}{{^items.isDateTime}}
             if(item.is_null()) 
@@ -194,13 +194,13 @@ void {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart,
                 newItem->fromJson(item);
                 m_{{name}}.push_back( newItem );
             }
-            {{/items.isDateTime}}{{/items.isString}}{{/items.isPrimitiveType}}
+            {{/items.isDateTime}}{{/items.isString}}{{/isPrimitiveType}}
         }
         {{^required}} 
         }
         {{/required}}
     }
-    {{/isListContainer}}{{^isListContainer}}{{^required}}if(multipart->hasContent(U("{{baseName}}")))
+    {{/isListContainer}}{{^isListContainer}}{{^isPrimitiveType}}{{^required}}if(multipart->hasContent(U("{{baseName}}")))
     {
         {{#isString}}{{setter}}(ModelBase::stringFromHttpContent(multipart->getContent(U("{{baseName}}"))));
         {{/isString}}{{^isString}}{{#isDateTime}}{{setter}}(ModelBase::dateFromHttpContent(multipart->getContent(U("{{baseName}}"))));
@@ -218,21 +218,21 @@ void {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart,
     {{/vendorExtensions.x-codegen-file}}{{^vendorExtensions.x-codegen-file}}{{{datatype}}} new{{name}}({{{defaultValue}}});
     new{{name}}->fromMultiPart(multipart, U("{{baseName}}."));
     {{setter}}( new{{name}} );
-    {{/vendorExtensions.x-codegen-file}}{{/isDateTime}}{{/isString}}{{/required}}{{/isListContainer}}{{/isPrimitiveType}}{{/vars}}
+    {{/vendorExtensions.x-codegen-file}}{{/isDateTime}}{{/isString}}{{/required}}{{/isPrimitiveType}}{{/isListContainer}}{{/vars}}
 }
 
 
 {{#vars}}{{^isNotContainer}}{{{datatype}}}& {{classname}}::{{getter}}()
 {
-	return m_{{name}};
+    return m_{{name}};
 }
 {{/isNotContainer}}{{#isNotContainer}}{{{datatype}}} {{classname}}::{{getter}}() const
 {
-	return m_{{name}};
+    return m_{{name}};
 }
 void {{classname}}::{{setter}}({{{datatype}}} value)
 {
-	m_{{name}} = value;
+    m_{{name}} = value;
     {{^required}}m_{{name}}IsSet = true;{{/required}}
 }
 {{/isNotContainer}} 

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 [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.
+ * 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
  *
  * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
+ * Contact: apiteam@wordnik.com
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git

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 [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.
+ * 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
  *
  * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
+ * Contact: apiteam@wordnik.com
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git

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 [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.
+ * 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
  *
  * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
+ * Contact: apiteam@wordnik.com
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git

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 [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.
+ * 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
  *
  * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
+ * Contact: apiteam@wordnik.com
  *
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git