C additional properties fix #4289

README.md

@@ -558,6 +558,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [Angular.Schule](https://angular.schule/)
 - [Australia and New Zealand Banking Group (ANZ)](http://www.anz.com/)
 - [ASKUL](https://www.askul.co.jp)
+- [Arduino](https://www.arduino.cc/)
 - [b<>com](https://b-com.com/en)
 - [Banzai Cloud](https://banzaicloud.com)
 - [BIMData.io](https://bimdata.io)

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java

@@ -436,6 +436,7 @@ public String toEnumValue(String value, String datatype) {
 
     @Override
     public String toEnumVarName(String name, String datatype) {
+        // the name of the elements was decorate with the class name using the templates
         if (name.length() == 0) {
             return "EMPTY";
         }
@@ -463,6 +464,8 @@ public String toEnumVarName(String name, String datatype) {
 
     @Override
     public String toEnumName(CodegenProperty property) {
+        // the name of the enum was decorate with the class name using the templates
+
         String enumName = camelize(toModelName(property.name)).toUpperCase(Locale.ROOT);
         enumName = enumName.replaceFirst("^_", "");
         enumName = enumName.replaceFirst("_$", "");

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java

@@ -78,8 +78,9 @@ public DartDioClientCodegen() {
         typeMapping.put("file", "Uint8List");
         typeMapping.put("binary", "Uint8List");
 
-        importMapping.put("BuiltList", "built_collection/built_collection");
-        importMapping.put("BuiltMap", "built_collection/built_collection");
+        importMapping.put("BuiltList", "package:built_collection/built_collection.dart");
+        importMapping.put("BuiltMap", "package:built_collection/built_collection.dart");
+        importMapping.put("Uint8List", "dart:typed_data");
     }
 
     @Override
@@ -208,7 +209,7 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
                     modelImports.add(importMapping.get(modelImport));
                 } else {
                     if (!modelToIgnore.contains(modelImport.toLowerCase(Locale.ROOT))) {
-                        modelImports.add(pubName + "/model/" + underscore(modelImport));
+                        modelImports.add("package:" + pubName + "/model/" + underscore(modelImport) + ".dart");
                     }
                 }
             }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java

@@ -107,7 +107,6 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("baseApi.mustache", "", "base.ts"));
         supportingFiles.add(new SupportingFile("api.mustache", "", "api.ts"));
         supportingFiles.add(new SupportingFile("configuration.mustache", "", "configuration.ts"));
-        supportingFiles.add(new SupportingFile("custom.d.mustache", "", "custom.d.ts"));
         supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
         supportingFiles.add(new SupportingFile("gitignore", "", ".gitignore"));
 

modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache

@@ -74,12 +74,12 @@ return 0;
     {{^isContainer}}
     {{^isModel}}
     {{#isEnum}}
-    char* {{baseName}}{{classname}}_ToString({{baseName}}_e {{baseName}}){
+    char* {{classname}}_{{baseName}}_ToString({{classname}}_{{baseName}}_e {{baseName}}){
     char *{{baseName}}Array[] =  { {{#allowableValues}}{{#enumVars}}"{{{value}}}"{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}} };
         return {{baseName}}Array[{{baseName}}];
     }
 
-    {{baseName}}_e {{baseName}}{{classname}}_FromString(char* {{baseName}}){
+    {{classname}}_{{baseName}}_e {{classname}}_{{baseName}}_FromString(char* {{baseName}}){
     int stringToReturn = 0;
     char *{{baseName}}Array[] =  { {{#allowableValues}}{{#enumVars}}"{{{value}}}"{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}} };
     size_t sizeofArray = sizeof({{baseName}}Array) / sizeof({{baseName}}Array[0]);
@@ -98,14 +98,14 @@ return 0;
     {{#items}}
     {{^isModel}}
     {{#isEnum}}
-    char* {{baseName}}{{classname}}_ToString({{baseName}}_e {{baseName}}){
+    char* {{classname}}_{{baseName}}_ToString({{classname}}_{{baseName}}_e {{baseName}}){
         char *{{baseName}}Array[] =  { {{#allowableValues}}{{#enumVars}}"{{{value}}}"{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}} };
         return {{baseName}}Array[{{baseName}} - 1];
     }
 
-    {{baseName}}_e {{baseName}}{{classname}}_FromString(char* {{baseName}}){
+    {{classname}}_{{baseName}}_e {{classname}}_{{baseName}}_FromString(char* {{baseName}}){
     int stringToReturn = 0;
-    char *{{baseName}}Array[] =  { {{#allowableValues}}{{#enumVars}}"{{{value}}}"{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}} };
+    char *{{baseName}}Array[] =  { {{#allowableValues}}{{#enumVars}}"{{{value}}} davvero"{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}} };
     size_t sizeofArray = sizeof({{baseName}}Array) / sizeof({{baseName}}Array[0]);
     while(stringToReturn < sizeofArray) {
         if(strcmp({{baseName}}, {{baseName}}Array[stringToReturn]) == 0) {
@@ -127,7 +127,7 @@ return 0;
     {{^isPrimitiveType}}
     {{#isModel}}
     {{#isEnum}}
-    {{datatype}}_e {{baseName}}{{#hasMore}},{{/hasMore}}
+    {{classname}}_{{datatype}}_e {{baseName}}{{#hasMore}},{{/hasMore}}
     {{/isEnum}}
     {{^isEnum}}
     {{datatype}}_t *{{baseName}}{{#hasMore}},{{/hasMore}}
@@ -152,7 +152,7 @@ return 0;
     {{/isBoolean}}
     {{#isEnum}}
     {{#isString}}
-    {{baseName}}_e {{baseName}}{{#hasMore}},{{/hasMore}}
+    {{classname}}_{{baseName}}_e {{baseName}}{{#hasMore}},{{/hasMore}}
     {{/isString}}
     {{/isEnum}}
     {{^isEnum}}
@@ -255,7 +255,7 @@ void {{classname}}_free({{classname}}_t *{{classname}}) {
     {{/isListContainer}}
     {{#isMapContainer}}
 	list_ForEach(listEntry, {{classname}}->{{baseName}}) {
-		keyValuePair_t *localMapKeyPair = (keyValuePair_t*) listEntry->data;
+		keyValuePair_t *localKeyValue = (keyValuePair_t*) listEntry->data;
         free (localKeyValue->key);
         free (localKeyValue->value);
 	}
@@ -293,7 +293,7 @@ cJSON *{{classname}}_convertToJSON({{classname}}_t *{{classname}}) {
     {{/isBoolean}}
     {{#isEnum}}
     {{#isString}}
-    if(cJSON_AddStringToObject(item, "{{{baseName}}}", {{{baseName}}}{{classname}}_ToString({{{classname}}}->{{{baseName}}})) == NULL)
+    if(cJSON_AddStringToObject(item, "{{{baseName}}}", {{classname}}_{{{baseName}}}_ToString({{{classname}}}->{{{baseName}}})) == NULL)
     {
     goto fail; //Enum
     }
@@ -491,13 +491,13 @@ fail:
     {{/isBoolean}}
     {{#isEnum}}
     {{#isString}}
-    {{{baseName}}}_e {{baseName}}Variable;
+    {{classname}}_{{{baseName}}}_e {{baseName}}Variable;
     {{^required}}if ({{{baseName}}}) { {{/required}}
     if(!cJSON_IsString({{{baseName}}}))
     {
     goto end; //Enum
     }
-    {{baseName}}Variable = {{baseName}}{{classname}}_FromString({{{baseName}}}->valuestring);
+    {{baseName}}Variable = {{classname}}_{{baseName}}_FromString({{{baseName}}}->valuestring);
     {{/isString}}
     {{/isEnum}}
     {{^isEnum}}

modules/openapi-generator/src/main/resources/C-libcurl/model-header.mustache

@@ -18,7 +18,7 @@
 {{#isEnum}}
 
 {{#allowableValues}}
-typedef enum  { {{#enumVars}} {{{value}}}{{#first}} = 0{{/first}}{{^-last}},{{/-last}}{{/enumVars}} } {{classname}}_e;
+typedef enum  { {{#enumVars}} {{{name}}}{{#first}} = 0{{/first}}{{^-last}},{{/-last}}{{/enumVars}} } {{classname}}_e;
 {{/allowableValues}}
 
 char* {{classname}}_ToString({{classname}}_e {{classname}});
@@ -36,12 +36,12 @@ cJSON *{{classname}}_convertToJSON({{classname}}_e {{classname}});
     {{^isModel}}
     {{#isEnum}}
         {{#allowableValues}}
-                typedef enum  { {{#enumVars}} {{{value}}}{{#first}} = 0{{/first}}{{^-last}},{{/-last}}{{/enumVars}} } {{baseName}}_e;
+                typedef enum  { {{#enumVars}} {{classname}}_{{{name}}}{{#first}} = 0{{/first}}{{^-last}},{{/-last}}{{/enumVars}} } {{classname}}_{{baseName}}_e;
         {{/allowableValues}}
 
-        char* {{baseName}}_ToString({{baseName}}_e {{baseName}});
+        char* {{classname}}_{{baseName}}_ToString({{classname}}_{{baseName}}_e {{baseName}});
 
-        {{baseName}}_e {{baseName}}_FromString(char* {{baseName}});
+        {{classname}}_{{baseName}}_e {{classname}}_{{baseName}}_FromString(char* {{baseName}});
     {{/isEnum}}
     {{/isModel}}
     {{/isContainer}}
@@ -50,12 +50,12 @@ cJSON *{{classname}}_convertToJSON({{classname}}_e {{classname}});
         {{^isModel}}
         {{#isEnum}}
             {{#allowableValues}}
-                    typedef enum  { {{#enumVars}} {{{value}}}{{^-last}},{{/-last}}{{/enumVars}} } {{baseName}}_e;
+                    typedef enum  { {{#enumVars}} {{classname}}_{{{name}}}{{^-last}},{{/-last}}{{/enumVars}} } {{classname}}_{{baseName}}_e;
             {{/allowableValues}}
 
-            char* {{baseName}}_ToString({{baseName}}_e {{baseName}});
+            char* {{classname}}_{{baseName}}_ToString({{classname}}_{{baseName}}_e {{baseName}});
 
-            {{baseName}}_e {{baseName}}_FromString(char* {{baseName}});
+            {{classname}}_{{baseName}}_e {{classname}}_{{baseName}}_FromString(char* {{baseName}});
         {{/isEnum}}
         {{/isModel}}
         {{/items}}
@@ -69,7 +69,7 @@ typedef struct {{classname}}_t {
     {{^isPrimitiveType}}
     {{#isModel}}
     {{#isEnum}}
-    {{datatype}}_e {{baseName}}; //enum model
+    {{classname}}_{{datatype}}_e {{baseName}}; //enum model
     {{/isEnum}}
     {{^isEnum}}
     {{datatype}}_t *{{baseName}}; //model
@@ -94,7 +94,7 @@ typedef struct {{classname}}_t {
     {{/isBoolean}}
     {{#isEnum}}
     {{#isString}}
-    {{baseName}}_e {{baseName}}; //enum
+    {{classname}}_{{baseName}}_e {{baseName}}; //enum
     {{/isString}}
     {{/isEnum}}
     {{^isEnum}}
@@ -139,7 +139,7 @@ typedef struct {{classname}}_t {
     {{^isPrimitiveType}}
     {{#isModel}}
     {{#isEnum}}
-    {{datatype}}_e {{baseName}}{{#hasMore}},{{/hasMore}}
+    {{classname}}_{{datatype}}_e {{baseName}}{{#hasMore}},{{/hasMore}}
     {{/isEnum}}
     {{^isEnum}}
     {{datatype}}_t *{{baseName}}{{#hasMore}},{{/hasMore}}
@@ -164,7 +164,7 @@ typedef struct {{classname}}_t {
     {{/isBoolean}}
     {{#isEnum}}
     {{#isString}}
-    {{baseName}}_e {{baseName}}{{#hasMore}},{{/hasMore}}
+    {{classname}}_{{baseName}}_e {{baseName}}{{#hasMore}},{{/hasMore}}
     {{/isString}}
     {{/isEnum}}
     {{^isEnum}}

modules/openapi-generator/src/main/resources/Java/pojo_doc.mustache

@@ -1,5 +1,7 @@
 # {{classname}}
 
+{{#description}}{{description}}
+{{/description}}
 ## Properties
 
 Name | Type | Description | Notes

modules/openapi-generator/src/main/resources/csharp-netcore/model_doc.mustache

@@ -1,6 +1,8 @@
 {{#models}}
 {{#model}}
 # {{{packageName}}}.{{modelPackage}}.{{{classname}}}
+{{#description}}{{description}}
+{{/description}}
 ## Properties
 
 Name | Type | Description | Notes

modules/openapi-generator/src/main/resources/dart-dio/model.mustache

@@ -1,7 +1,7 @@
 {{#models}}
     {{#model}}
         {{#imports}}
-            import 'package:{{.}}.dart';
+            import '{{.}}';
         {{/imports}}
         {{#isEnum}}{{>enum}}{{/isEnum}}{{^isEnum}}{{>class}}{{/isEnum}}
     {{/model}}

modules/openapi-generator/src/main/resources/dart-dio/pubspec.mustache

@@ -4,10 +4,10 @@ description: {{pubDescription}}
 environment:
     sdk: ">=2.3.0 <3.0.0"
 dependencies:
-    dio: ^3.0.3
-    built_value: 6.7.0
-    built_collection: 4.2.2
+    dio: ^3.0.4
+    built_value: ^6.8.2
+    built_collection: ^4.2.2
 dev_dependencies:
-    built_value_generator: ^6.7.1
+    built_value_generator: ^6.8.2
     build_runner: ^1.7.1
     test: 1.6.5

modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/ApiAbstractions.kt.mustache

@@ -5,8 +5,8 @@ typealias MultiValueMap = MutableMap<String,List<String>>
 {{#nonPublicApi}}internal {{/nonPublicApi}}fun collectionDelimiter(collectionFormat: String) = when(collectionFormat) {
     "csv" -> ","
     "tsv" -> "\t"
-    "pipes" -> "|"
-    "ssv" -> " "
+    "pipe" -> "|"
+    "space" -> " "
     else -> ""
 }
 

modules/openapi-generator/src/main/resources/python/api_client.mustache

@@ -294,7 +294,7 @@ class ApiClient(object):
         elif klass == datetime.date:
             return self.__deserialize_date(data)
         elif klass == datetime.datetime:
-            return self.__deserialize_datatime(data)
+            return self.__deserialize_datetime(data)
         else:
             return self.__deserialize_model(data, klass)
 
@@ -347,18 +347,19 @@ class ApiClient(object):
                                    response_type, auth_settings,
                                    _return_http_data_only, collection_formats,
                                    _preload_content, _request_timeout, _host)
-        else:
-            thread = self.pool.apply_async(self.__call_api, (resource_path,
-                                           method, path_params, query_params,
-                                           header_params, body,
-                                           post_params, files,
-                                           response_type, auth_settings,
-                                           _return_http_data_only,
-                                           collection_formats,
-                                           _preload_content,
-                                           _request_timeout,
-                                           _host))
-        return thread
+
+        return self.pool.apply_async(self.__call_api, (resource_path,
+                                                       method, path_params,
+                                                       query_params,
+                                                       header_params, body,
+                                                       post_params, files,
+                                                       response_type,
+                                                       auth_settings,
+                                                       _return_http_data_only,
+                                                       collection_formats,
+                                                       _preload_content,
+                                                       _request_timeout,
+                                                       _host))
 
     def request(self, method, url, query_params=None, headers=None,
                 post_params=None, body=None, _preload_content=True,
@@ -594,7 +595,7 @@ class ApiClient(object):
                 reason="Failed to parse `{0}` as date object".format(string)
             )
 
-    def __deserialize_datatime(self, string):
+    def __deserialize_datetime(self, string):
         """Deserializes string to datetime.
 
         The string should be in iso8601 datetime format.

modules/openapi-generator/src/main/resources/python/model_doc.mustache

@@ -1,5 +1,7 @@
 {{#models}}{{#model}}# {{classname}}
 
+{{#description}}{{description}}
+{{/description}}
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------

modules/openapi-generator/src/main/resources/python/python-experimental/model_doc.mustache

@@ -1,5 +1,7 @@
 {{#models}}{{#model}}# {{classname}}
 
+{{#description}}{{description}}
+{{/description}}
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------

modules/openapi-generator/src/main/resources/r/description.mustache

@@ -1,11 +1,11 @@
 Package: {{{packageName}}}
 Title: R Package Client for {{{appName}}}
 Version: {{packageVersion}}
-Authors@R: person("OpenAPI Generator community", email = "team@openapitools.org", role = c("aut", "cre"))
+Authors@R: person("{{#infoName}}{{infoName}}{{/infoName}}{{^infoName}}OpenAPI Generator community{{/infoName}}", email = "{{#infoEmail}}{{infoEmail}}{{/infoEmail}}{{^infoEmail}}team@openapitools.org{{/infoEmail}}", role = c("aut", "cre"))
 Description: {{{appDescription}}}{{^appDescription}}R Package Client for {{{appName}}}{{/appDescription}}
 Depends: R (>= 3.3.3)
 Encoding: UTF-8
-License: Unlicense
+License: {{#licenseInfo}}{{licenseInfo}}{{/licenseInfo}}{{^licenseInfo}}Unlicense{{/licenseInfo}}
 LazyData: true
 Suggests: testthat
 Imports: jsonlite, httr, R6, caTools{{#useRlangExceptionHandling}}, rlang{{/useRlangExceptionHandling}}

modules/openapi-generator/src/main/resources/r/model_doc.mustache

@@ -1,5 +1,7 @@
 {{#models}}{{#model}}# {{packageName}}::{{classname}}
 
+{{#description}}{{description}}
+{{/description}}
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------

modules/openapi-generator/src/main/resources/typescript-axios/api.mustache

@@ -1,5 +1,4 @@
 // tslint:disable
-/// <reference path="./custom.d.ts" />
 {{>licenseInfo}}
 
 {{^withSeparateModelsAndApi}}

modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache

@@ -1,6 +1,5 @@
 {{#withSeparateModelsAndApi}}
 // tslint:disable
-/// <reference path="{{apiRelativeToRoot}}custom.d.ts" />
 {{>licenseInfo}}
 
 import * as globalImportUrl from 'url';

modules/openapi-generator/src/main/resources/typescript-axios/baseApi.mustache

@@ -1,5 +1,4 @@
 // tslint:disable
-/// <reference path="./custom.d.ts" />
 {{>licenseInfo}}
 
 import { Configuration } from "./configuration";

modules/openapi-generator/src/main/resources/typescript-axios/model.mustache

@@ -1,5 +1,4 @@
 // tslint:disable
-/// <reference path="{{modelRelativeToRoot}}custom.d.ts" />
 {{>licenseInfo}}
 {{#withSeparateModelsAndApi}}{{#imports}}
 import { {{class}} } from './{{filename}}';{{/imports}}{{/withSeparateModelsAndApi}}

modules/openapi-generator/src/main/resources/typescript-axios/package.mustache

@@ -21,8 +21,8 @@
     "axios": "^0.18.0"
   },
   "devDependencies": {
-    "@types/node": "^8.0.9",
-    "typescript": "^2.4"
+    "@types/node": "^12.11.5",
+    "typescript": "^3.6.4"
   }{{#npmRepository}},{{/npmRepository}}
 {{#npmRepository}}
   "publishConfig": {