Merge branch 'master' into scala-gatling-fixes

swagger-api · Dec 13, 2019 · 269e191 · 269e191
2 parents cc03569 + b930bb4
commit 269e191
Show file tree

Hide file tree

Showing 63 changed files with 522 additions and 65 deletions.
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -1705,6 +1705,7 @@ public CodegenProperty fromProperty(String name, Property p) {
         if (p instanceof IntegerProperty) {
             IntegerProperty sp = (IntegerProperty) p;
             property.isInteger = true;
+            property.isNumeric = true;
             if (sp.getEnum() != null) {
                 List<Integer> _enum = sp.getEnum();
                 property._enum = new ArrayList<String>();

diff --git a/...les/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java b/...les/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java
@@ -408,7 +408,7 @@ private void postProcessEnumRefs(final Map<String, Object> models) {
                         // This is different in C# than most other generators, because enums in C# are compiled to integral types,
                         // while enums in many other languages are true objects.
                         CodegenModel refModel = enumRefs.get(var.datatype);
-                        var.allowableValues = refModel.allowableValues;
+                        var.allowableValues = new HashMap<>(refModel.allowableValues);
                         var.isEnum = true;
 
                         updateCodegenPropertyEnum(var);

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Swift4Codegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Swift4Codegen.java
@@ -60,6 +60,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {
     protected static final String LIBRARY_PROMISE_KIT = "PromiseKit";
     protected static final String LIBRARY_RX_SWIFT = "RxSwift";
     protected static final String[] RESPONSE_LIBRARIES = {LIBRARY_PROMISE_KIT, LIBRARY_RX_SWIFT};
+    protected static final String MODEL_CLASSES = "modelClasses";
     protected String projectName = "SwaggerClient";
     protected boolean unwrapRequired;
     protected boolean objcCompatible = false;
@@ -302,6 +303,10 @@ public void processOpts() {
             additionalProperties.put(POD_AUTHORS, DEFAULT_POD_AUTHORS);
         }
 
+        if (additionalProperties.containsKey(MODEL_CLASSES)) {
+            additionalProperties.put("useModelClasses", true);
+        }
+
         setLenientTypeCast(convertPropertyToBooleanAndWriteBack(LENIENT_TYPE_CAST));
 
         supportingFiles.add(new SupportingFile("Podspec.mustache",

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Swift5Codegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Swift5Codegen.java
@@ -47,6 +47,7 @@ public class Swift5Codegen extends DefaultCodegen implements CodegenConfig {
     private static final String LIBRARY_PROMISE_KIT = "PromiseKit";
     private static final String LIBRARY_RX_SWIFT = "RxSwift";
     private static final String[] RESPONSE_LIBRARIES = {LIBRARY_PROMISE_KIT, LIBRARY_RX_SWIFT};
+    protected static final String MODEL_CLASSES = "modelClasses";
     protected String projectName = "SwaggerClient";
     private boolean unwrapRequired;
     private boolean objcCompatible = false;
@@ -289,6 +290,10 @@ public void processOpts() {
             additionalProperties.put(POD_AUTHORS, DEFAULT_POD_AUTHORS);
         }
 
+        if (additionalProperties.containsKey(MODEL_CLASSES)) {
+            additionalProperties.put("useModelClasses", true);
+        }
+
         setLenientTypeCast(convertPropertyToBooleanAndWriteBack(LENIENT_TYPE_CAST));
 
         supportingFiles.add(new SupportingFile("Podspec.mustache",

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
@@ -127,18 +127,18 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
     {{#joda}}
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version",
+    compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
     {{/joda}}
     {{#java8}}
     compile "org.glassfish.jersey.inject:jersey-hk2:$jersey_version"
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version",
+    compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     {{/java8}}
     {{#supportJava6}}
     compile "commons-io:commons-io:$commons_io_version"
     compile "org.apache.commons:commons-lang3:$commons_lang3_version"
     {{/supportJava6}}
     {{#threetenbp}}
-    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version",
+    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version"
     {{/threetenbp}}
     {{^java8}}
     compile "com.brsanthu:migbase64:2.2"

diff --git a/modules/swagger-codegen/src/main/resources/cpprest/apiclient-header.mustache b/modules/swagger-codegen/src/main/resources/cpprest/apiclient-header.mustache
@@ -36,6 +36,7 @@ public:
     void setConfiguration(std::shared_ptr<ApiConfiguration> configuration);
 
     static utility::string_t parameterToString(utility::string_t value);
+    static utility::string_t parameterToString(bool value);
     static utility::string_t parameterToString(int32_t value);
     static utility::string_t parameterToString(int64_t value);
     static utility::string_t parameterToString(float value);

diff --git a/modules/swagger-codegen/src/main/resources/cpprest/apiclient-source.mustache b/modules/swagger-codegen/src/main/resources/cpprest/apiclient-source.mustache
@@ -31,6 +31,14 @@ utility::string_t ApiClient::parameterToString(utility::string_t value)
 {
     return value;
 }
+
+utility::string_t ApiClient::parameterToString(bool value)
+{
+    std::stringstream valueAsStringStream;
+    valueAsStringStream << (value ? "true" : "false");
+    return utility::conversions::to_string_t(valueAsStringStream.str());
+}
+
 utility::string_t ApiClient::parameterToString(int64_t value)
 {
 	std::stringstream valueAsStringStream;
@@ -132,7 +140,20 @@ pplx::task<web::http::http_response> ApiClient::callApi(
                 if (!formParams.empty())
                 {
                     request.set_body(body_data);
-		}
+                }
+            }
+            else if (contentType == utility::conversions::to_string_t("multipart/form-data"))
+            {
+                MultipartFormData uploadData;
+                for (auto& kvp : formParams)
+                {
+                    uploadData.add(ModelBase::toHttpContent(kvp.first, kvp.second));
+                }
+                std::stringstream data;
+                uploadData.writeTo(data);
+                auto bodyString = data.str();
+                auto length = bodyString.size();
+                request.set_body(concurrency::streams::bytestream::open_istream(std::move(bodyString)), length, utility::conversions::to_string_t("multipart/form-data; boundary=") + uploadData.getBoundary());
             }
             else
             {

diff --git a/modules/swagger-codegen/src/main/resources/cpprest/multipart-source.mustache b/modules/swagger-codegen/src/main/resources/cpprest/multipart-source.mustache
@@ -59,7 +59,7 @@ void MultipartFormData::writeTo( std::ostream& target )
         std::shared_ptr<HttpContent> content = m_Contents[i];
 
         // boundary
-        target << "\r\n" << "--" << utility::conversions::to_utf8string( m_Boundary ) << "\r\n";
+        target << (i > 0 ? "\r\n" : "") << "--" << utility::conversions::to_utf8string( m_Boundary ) << "\r\n";
 
         // headers
         target << "Content-Disposition: " << utility::conversions::to_utf8string( content->getContentDisposition() );

diff --git a/modules/swagger-codegen/src/main/resources/go/api.mustache b/modules/swagger-codegen/src/main/resources/go/api.mustache
@@ -148,8 +148,8 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx context.Context{{#hasParams}
 {{#hasFormParams}}
 {{#formParams}}
 {{#isFile}}
-{{^required}}
 	var localVarFile {{dataType}}
+{{^required}}
 	if localVarOptionals != nil && localVarOptionals.{{vendorExtensions.x-exportParamName}}.IsSet() {
 		localVarFileOk := false
 		localVarFile, localVarFileOk = localVarOptionals.{{vendorExtensions.x-exportParamName}}.Value().({{dataType}})

diff --git a/modules/swagger-codegen/src/main/resources/php/api.mustache b/modules/swagger-codegen/src/main/resources/php/api.mustache
@@ -472,6 +472,12 @@ use {{invokerPackage}}\ObjectSerializer;
             $headers['Authorization'] = 'Basic ' . base64_encode($this->config->getUsername() . ":" . $this->config->getPassword());
         }
         {{/isBasic}}
+        {{#isBearer}}
+        // this endpoint requires Bearer token
+        if ($this->config->getAccessToken() !== null) {
+            $headers['Authorization'] = 'Bearer ' . $this->config->getAccessToken();
+        }
+        {{/isBearer}}
         {{#isOAuth}}
         // this endpoint requires OAuth (access token)
         if ($this->config->getAccessToken() !== null) {

diff --git a/modules/swagger-codegen/src/main/resources/swift4/modelObject.mustache b/modules/swagger-codegen/src/main/resources/swift4/modelObject.mustache
@@ -1,5 +1,5 @@
 
-public struct {{classname}}: Codable {
+public {{#useModelClasses}}class{{/useModelClasses}}{{^useModelClasses}}struct{{/useModelClasses}} {{classname}}: Codable {
 
 {{#allVars}}
 {{#isEnum}}

diff --git a/modules/swagger-codegen/src/main/resources/swift5/modelObject.mustache b/modules/swagger-codegen/src/main/resources/swift5/modelObject.mustache
@@ -1,5 +1,5 @@
 
-public struct {{classname}}: Codable {
+public {{#useModelClasses}}class{{/useModelClasses}}{{^useModelClasses}}struct{{/useModelClasses}} {{classname}}: Codable {
 
 {{#allVars}}
 {{#isEnum}}

diff --git a/samples/client/petstore/cpprest/.swagger-codegen/VERSION b/samples/client/petstore/cpprest/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.3-SNAPSHOT
+2.4.11-SNAPSHOT
diff --git a/samples/client/petstore/cpprest/ApiClient.cpp b/samples/client/petstore/cpprest/ApiClient.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
@@ -43,6 +43,14 @@ utility::string_t ApiClient::parameterToString(utility::string_t value)
 {
     return value;
 }
+
+utility::string_t ApiClient::parameterToString(bool value)
+{
+    std::stringstream valueAsStringStream;
+    valueAsStringStream << (value ? "true" : "false");
+    return utility::conversions::to_string_t(valueAsStringStream.str());
+}
+
 utility::string_t ApiClient::parameterToString(int64_t value)
 {
 	std::stringstream valueAsStringStream;
@@ -144,7 +152,20 @@ pplx::task<web::http::http_response> ApiClient::callApi(
                 if (!formParams.empty())
                 {
                     request.set_body(body_data);
-		}
+                }
+            }
+            else if (contentType == utility::conversions::to_string_t("multipart/form-data"))
+            {
+                MultipartFormData uploadData;
+                for (auto& kvp : formParams)
+                {
+                    uploadData.add(ModelBase::toHttpContent(kvp.first, kvp.second));
+                }
+                std::stringstream data;
+                uploadData.writeTo(data);
+                auto bodyString = data.str();
+                auto length = bodyString.size();
+                request.set_body(concurrency::streams::bytestream::open_istream(std::move(bodyString)), length, utility::conversions::to_string_t("multipart/form-data; boundary=") + uploadData.getBoundary());
             }
             else
             {

diff --git a/samples/client/petstore/cpprest/ApiClient.h b/samples/client/petstore/cpprest/ApiClient.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
@@ -48,6 +48,7 @@ class  ApiClient
     void setConfiguration(std::shared_ptr<ApiConfiguration> configuration);
 
     static utility::string_t parameterToString(utility::string_t value);
+    static utility::string_t parameterToString(bool value);
     static utility::string_t parameterToString(int32_t value);
     static utility::string_t parameterToString(int64_t value);
     static utility::string_t parameterToString(float value);

diff --git a/samples/client/petstore/cpprest/ApiConfiguration.cpp b/samples/client/petstore/cpprest/ApiConfiguration.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpprest/ApiConfiguration.h b/samples/client/petstore/cpprest/ApiConfiguration.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpprest/ApiException.cpp b/samples/client/petstore/cpprest/ApiException.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpprest/ApiException.h b/samples/client/petstore/cpprest/ApiException.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpprest/HttpContent.cpp b/samples/client/petstore/cpprest/HttpContent.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpprest/HttpContent.h b/samples/client/petstore/cpprest/HttpContent.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpprest/IHttpBody.h b/samples/client/petstore/cpprest/IHttpBody.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpprest/JsonBody.cpp b/samples/client/petstore/cpprest/JsonBody.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpprest/JsonBody.h b/samples/client/petstore/cpprest/JsonBody.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpprest/ModelBase.cpp b/samples/client/petstore/cpprest/ModelBase.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpprest/ModelBase.h b/samples/client/petstore/cpprest/ModelBase.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpprest/MultipartFormData.cpp b/samples/client/petstore/cpprest/MultipartFormData.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
@@ -71,7 +71,7 @@ void MultipartFormData::writeTo( std::ostream& target )
         std::shared_ptr<HttpContent> content = m_Contents[i];
 
         // boundary
-        target << "\r\n" << "--" << utility::conversions::to_utf8string( m_Boundary ) << "\r\n";
+        target << (i > 0 ? "\r\n" : "") << "--" << utility::conversions::to_utf8string( m_Boundary ) << "\r\n";
 
         // headers
         target << "Content-Disposition: " << utility::conversions::to_utf8string( content->getContentDisposition() );

diff --git a/samples/client/petstore/cpprest/MultipartFormData.h b/samples/client/petstore/cpprest/MultipartFormData.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpprest/Object.cpp b/samples/client/petstore/cpprest/Object.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpprest/Object.h b/samples/client/petstore/cpprest/Object.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpprest/api/PetApi.cpp b/samples/client/petstore/cpprest/api/PetApi.cpp
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/cpprest/api/PetApi.h b/samples/client/petstore/cpprest/api/PetApi.h
@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * Contact: apiteam@swagger.io
  *
- * NOTE: This class is auto generated by the swagger code generator 2.4.3-SNAPSHOT.
+ * NOTE: This class is auto generated by the swagger code generator 2.4.11-SNAPSHOT.
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */