- {{#vars}}
{{name}} {{^required}}(optional){{/required}}
{{^isPrimitiveType}}{{datatype}}{{/isPrimitiveType}} {{unescapedDescription}} {{#dataFormat}}format: {{{dataFormat}}}{{/dataFormat}}
+ {{#vars}}
{{name}} {{^required}}(optional){{/required}}
{{^isPrimitiveType}}{{dataType}}{{/isPrimitiveType}} {{unescapedDescription}} {{#dataFormat}}format: {{{dataFormat}}}{{/dataFormat}}
{{#isEnum}}
{{#_enum}}
{{this}}
{{/_enum}}
diff --git a/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache b/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache
index c50e1ab7b17..6ce9aa2e34c 100644
--- a/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache
+++ b/modules/openapi-generator/src/main/resources/htmlDocs2/index.mustache
@@ -381,7 +381,7 @@
{{#headers}}
| {{#name}}{{name}}{{/name}} |
- {{#datatype}}{{datatype}}{{/datatype}} |
+ {{#datatype}}{{dataType}}{{/datatype}} |
{{#dataFormat}}{{dataFormat}}{{/dataFormat}} |
{{#description}}{{description}}{{/description}} |
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/enumClass.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/enumClass.mustache
index c5c3143cb94..e0520b6e724 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/enumClass.mustache
@@ -20,9 +20,9 @@
{{/allowableValues}}
{{/gson}}
- private {{{datatype}}} value;
+ private {{{dataType}}} value;
- {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{{datatype}}} value) {
+ {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{{dataType}}} value) {
this.value = value;
}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/class_doc.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/class_doc.mustache
index 45e19942734..b363fc5a61f 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/class_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/class_doc.mustache
@@ -3,7 +3,7 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isEnum}}[**inline**](#{{datatypeWithEnum}}){{/isEnum}}{{^isEnum}}{{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}}{{/isEnum}} | {{description}} | {{^required}} [optional]{{/required}}{{#readOnly}} [readonly]{{/readOnly}}
+{{#vars}}**{{name}}** | {{#isEnum}}[**inline**](#{{datatypeWithEnum}}){{/isEnum}}{{^isEnum}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}}{{/isEnum}} | {{description}} | {{^required}} [optional]{{/required}}{{#readOnly}} [readonly]{{/readOnly}}
{{/vars}}
{{#vars}}{{#isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
index 66cc4ac838e..1431de07d13 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
@@ -19,7 +19,7 @@ data class {{classname}} (
* {{{description}}}
* Values: {{#allowableValues}}{{#enumVars}}{{&name}}{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}}
*/
- enum class {{nameInCamelCase}}(val value: {{datatype}}){
+ enum class {{nameInCamelCase}}(val value: {{dataType}}){
{{#allowableValues}}{{#enumVars}}
@Json(name = {{{value}}}) {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
{{/enumVars}}{{/allowableValues}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache
index a88761ea900..8bcc20d0fca 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache
@@ -1,4 +1,4 @@
{{#description}}
/* {{{description}}} */
{{/description}}
- val {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}}
\ No newline at end of file
+ val {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache
index 8a33a15a188..f8ffa6cde82 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache
@@ -1,4 +1,4 @@
{{#description}}
/* {{{description}}} */
{{/description}}
- val {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}}
\ No newline at end of file
+ val {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/class_doc.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/class_doc.mustache
index 45e19942734..b363fc5a61f 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-server/class_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-server/class_doc.mustache
@@ -3,7 +3,7 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isEnum}}[**inline**](#{{datatypeWithEnum}}){{/isEnum}}{{^isEnum}}{{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}}{{/isEnum}} | {{description}} | {{^required}} [optional]{{/required}}{{#readOnly}} [readonly]{{/readOnly}}
+{{#vars}}**{{name}}** | {{#isEnum}}[**inline**](#{{datatypeWithEnum}}){{/isEnum}}{{^isEnum}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}}{{/isEnum}} | {{description}} | {{^required}} [optional]{{/required}}{{#readOnly}} [readonly]{{/readOnly}}
{{/vars}}
{{#vars}}{{#isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/data_class_opt_var.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/data_class_opt_var.mustache
index a88761ea900..8bcc20d0fca 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-server/data_class_opt_var.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-server/data_class_opt_var.mustache
@@ -1,4 +1,4 @@
{{#description}}
/* {{{description}}} */
{{/description}}
- val {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}}
\ No newline at end of file
+ val {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/kotlin-server/data_class_req_var.mustache b/modules/openapi-generator/src/main/resources/kotlin-server/data_class_req_var.mustache
index 8a33a15a188..f8ffa6cde82 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-server/data_class_req_var.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-server/data_class_req_var.mustache
@@ -1,4 +1,4 @@
{{#description}}
/* {{{description}}} */
{{/description}}
- val {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}}
\ No newline at end of file
+ val {{{name}}}: {{#isEnum}}{{classname}}.{{nameInCamelCase}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/lua/model_doc.mustache b/modules/openapi-generator/src/main/resources/lua/model_doc.mustache
index 25537b2c5ed..ccfd3f8d0de 100644
--- a/modules/openapi-generator/src/main/resources/lua/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/lua/model_doc.mustache
@@ -3,7 +3,7 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{{datatype}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{^isContainer}}{{^isDateTime}}*{{/isDateTime}}{{/isContainer}}{{{datatype}}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{^isContainer}}{{^isDateTime}}*{{/isDateTime}}{{/isContainer}}{{{dataType}}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
{{/vars}}
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/modules/openapi-generator/src/main/resources/objc/model_doc.mustache b/modules/openapi-generator/src/main/resources/objc/model_doc.mustache
index 569550df372..0216a3372cd 100644
--- a/modules/openapi-generator/src/main/resources/objc/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/objc/model_doc.mustache
@@ -3,7 +3,7 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
{{/vars}}
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/modules/openapi-generator/src/main/resources/perl/object.mustache b/modules/openapi-generator/src/main/resources/perl/object.mustache
index 0f57d1dc2f0..ee3a6d18008 100644
--- a/modules/openapi-generator/src/main/resources/perl/object.mustache
+++ b/modules/openapi-generator/src/main/resources/perl/object.mustache
@@ -43,7 +43,7 @@ __PACKAGE__->class_documentation({description => '{{description}}',
__PACKAGE__->method_documentation({
{{#vars}}
'{{name}}' => {
- datatype => '{{datatype}}',
+ datatype => '{{dataType}}',
base_name => '{{baseName}}',
description => '{{description}}',
format => '{{format}}',
@@ -53,7 +53,7 @@ __PACKAGE__->method_documentation({
});
__PACKAGE__->openapi_types( {
- {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}},
+ {{#vars}}'{{name}}' => '{{{dataType}}}'{{#hasMore}},
{{/hasMore}}{{/vars}}
} );
diff --git a/modules/openapi-generator/src/main/resources/perl/object_doc.mustache b/modules/openapi-generator/src/main/resources/perl/object_doc.mustache
index b76874f9050..b7300173fcb 100644
--- a/modules/openapi-generator/src/main/resources/perl/object_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/perl/object_doc.mustache
@@ -8,7 +8,7 @@ use {{moduleName}}::Object::{{classname}};
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
{{/vars}}
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache b/modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache
index 491bca6e17c..6da34c82b68 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache
@@ -137,7 +137,7 @@ class {{controllerName}} extends Controller
{{#allParams}}
{{^isFile}}
{{#isBodyParam}}
- ${{paramName}} = $this->deserialize(${{paramName}}, '{{#isContainer}}{{#items}}array<{{datatype}}>{{/items}}{{/isContainer}}{{^isContainer}}{{dataType}}{{/isContainer}}', $inputFormat);
+ ${{paramName}} = $this->deserialize(${{paramName}}, '{{#isContainer}}{{#items}}array<{{dataType}}>{{/items}}{{/isContainer}}{{^isContainer}}{{dataType}}{{/isContainer}}', $inputFormat);
{{/isBodyParam}}
{{^isBodyParam}}
${{paramName}} = $this->deserialize(${{paramName}}, '{{#isContainer}}array<{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}{{^collectionFormat}}csv{{/collectionFormat}},{{dataType}}>{{/isContainer}}{{^isContainer}}{{dataType}}{{/isContainer}}', 'string');
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/api_input_validation.mustache b/modules/openapi-generator/src/main/resources/php-symfony/api_input_validation.mustache
index 99792587651..a3482129b0e 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/api_input_validation.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/api_input_validation.mustache
@@ -18,7 +18,7 @@
{{#isContainer}}
{{#items}}
$asserts[] = new Assert\All([
- new Assert\Type("{{datatype}}")
+ new Assert\Type("{{dataType}}")
]);
{{/items}}
{{/isContainer}}
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/model_doc.mustache b/modules/openapi-generator/src/main/resources/php-symfony/model_doc.mustache
index 569550df372..0216a3372cd 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/model_doc.mustache
@@ -3,7 +3,7 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
{{/vars}}
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/model_variables.mustache b/modules/openapi-generator/src/main/resources/php-symfony/model_variables.mustache
index d05831defa3..d30584290ae 100644
--- a/modules/openapi-generator/src/main/resources/php-symfony/model_variables.mustache
+++ b/modules/openapi-generator/src/main/resources/php-symfony/model_variables.mustache
@@ -23,11 +23,11 @@
{{#isContainer}}
* @Assert\All({
{{#items}}
- * @Assert\Type("{{datatype}}")
+ * @Assert\Type("{{dataType}}")
{{/items}}
* })
{{#items}}
- * @Type("array<{{datatype}}>")
+ * @Type("array<{{dataType}}>")
{{/items}}
{{/isContainer}}
{{^isContainer}}
@@ -41,8 +41,8 @@
{{/isDateTime}}
{{^isDate}}
{{^isDateTime}}
- * @Assert\Type("{{datatype}}")
- * @Type("{{datatype}}")
+ * @Assert\Type("{{dataType}}")
+ * @Type("{{dataType}}")
{{/isDateTime}}
{{/isDate}}
{{/isContainer}}
diff --git a/modules/openapi-generator/src/main/resources/php/model_doc.mustache b/modules/openapi-generator/src/main/resources/php/model_doc.mustache
index 569550df372..0216a3372cd 100644
--- a/modules/openapi-generator/src/main/resources/php/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/php/model_doc.mustache
@@ -3,7 +3,7 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
{{/vars}}
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/modules/openapi-generator/src/main/resources/php/model_generic.mustache b/modules/openapi-generator/src/main/resources/php/model_generic.mustache
index c2d5e0e2f04..c7ff96fb149 100644
--- a/modules/openapi-generator/src/main/resources/php/model_generic.mustache
+++ b/modules/openapi-generator/src/main/resources/php/model_generic.mustache
@@ -15,7 +15,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa
* @var string[]
*/
protected static $openAPITypes = [
- {{#vars}}'{{name}}' => '{{{datatype}}}'{{#hasMore}},
+ {{#vars}}'{{name}}' => '{{{dataType}}}'{{#hasMore}},
{{/hasMore}}{{/vars}}
];
@@ -267,7 +267,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa
/**
* Gets {{name}}
*
- * @return {{datatype}}
+ * @return {{dataType}}
*/
public function {{getter}}()
{
@@ -277,7 +277,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa
/**
* Sets {{name}}
*
- * @param {{datatype}} ${{name}}{{#description}} {{{description}}}{{/description}}{{^description}} {{{name}}}{{/description}}
+ * @param {{dataType}} ${{name}}{{#description}} {{{description}}}{{/description}}{{^description}} {{{name}}}{{/description}}
*
* @return $this
*/
diff --git a/modules/openapi-generator/src/main/resources/pistache-server/model-header.mustache b/modules/openapi-generator/src/main/resources/pistache-server/model-header.mustache
index 6b4ef0077d7..7b095876a38 100644
--- a/modules/openapi-generator/src/main/resources/pistache-server/model-header.mustache
+++ b/modules/openapi-generator/src/main/resources/pistache-server/model-header.mustache
@@ -43,9 +43,9 @@ public:
///
/// {{description}}
///
- {{^isNotContainer}}{{{datatype}}}& {{getter}}();
- {{/isNotContainer}}{{#isNotContainer}}{{{datatype}}} {{getter}}() const;
- void {{setter}}({{{datatype}}} value);
+ {{^isNotContainer}}{{{dataType}}}& {{getter}}();
+ {{/isNotContainer}}{{#isNotContainer}}{{{dataType}}} {{getter}}() const;
+ void {{setter}}({{{dataType}}} value);
{{/isNotContainer}}{{^required}}bool {{nameInCamelCase}}IsSet() const;
void unset{{name}}();
{{/required}}
@@ -53,7 +53,7 @@ public:
protected:
{{#vars}}
- {{{datatype}}} m_{{name}};
+ {{{dataType}}} m_{{name}};
{{^required}}
bool m_{{name}}IsSet;{{/required}}
{{/vars}}
diff --git a/modules/openapi-generator/src/main/resources/pistache-server/model-source.mustache b/modules/openapi-generator/src/main/resources/pistache-server/model-source.mustache
index d21d0c089d4..49f3d1cea59 100644
--- a/modules/openapi-generator/src/main/resources/pistache-server/model-source.mustache
+++ b/modules/openapi-generator/src/main/resources/pistache-server/model-source.mustache
@@ -99,7 +99,7 @@ void {{classname}}::fromJson(nlohmann::json& val)
{{/isString}}{{^isString}}{{#isDateTime}}{{setter}}(val.at("{{baseName}}"));
{{/isDateTime}}{{^isDateTime}}if(!val["{{baseName}}"].is_null())
{
- {{{datatype}}} newItem({{{defaultValue}}});
+ {{{dataType}}} newItem({{{defaultValue}}});
newItem->fromJson(val["{{baseName}}"]);
{{setter}}( newItem );
}
@@ -111,15 +111,15 @@ void {{classname}}::fromJson(nlohmann::json& val)
}
-{{#vars}}{{^isNotContainer}}{{{datatype}}}& {{classname}}::{{getter}}()
+{{#vars}}{{^isNotContainer}}{{{dataType}}}& {{classname}}::{{getter}}()
{
return m_{{name}};
}
-{{/isNotContainer}}{{#isNotContainer}}{{{datatype}}} {{classname}}::{{getter}}() const
+{{/isNotContainer}}{{#isNotContainer}}{{{dataType}}} {{classname}}::{{getter}}() const
{
return m_{{name}};
}
-void {{classname}}::{{setter}}({{{datatype}}} value)
+void {{classname}}::{{setter}}({{{dataType}}} value)
{
m_{{name}} = value;
{{^required}}m_{{name}}IsSet = true;{{/required}}
diff --git a/modules/openapi-generator/src/main/resources/powershell/model.mustache b/modules/openapi-generator/src/main/resources/powershell/model.mustache
index f3580e2a4c4..8d74516b121 100644
--- a/modules/openapi-generator/src/main/resources/powershell/model.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/model.mustache
@@ -5,7 +5,7 @@ function New-{{{classname}}} {
Param (
{{#vars}}
[Parameter(Position = 0, ValueFromPipelineByPropertyName = $true{{#required}}, Mandatory = $true{{/required}})]
- [{{#isString}}{{{datatype}}}{{/isString}}{{^isString}}{{^required}}System.Nullable[{{/required}}{{datatype}}{{^required}}]{{/required}}{{/isString}}]
+ [{{#isString}}{{{dataType}}}{{/isString}}{{^isString}}{{^required}}System.Nullable[{{/required}}{{dataType}}{{^required}}]{{/required}}{{/isString}}]
{{=<% %>=}}
${<%name%>}<%^-last%>,<%/-last%>
<%={{ }}=%>
diff --git a/modules/openapi-generator/src/main/resources/powershell/model_doc.mustache b/modules/openapi-generator/src/main/resources/powershell/model_doc.mustache
index 112d4725495..01028bbaaf3 100644
--- a/modules/openapi-generator/src/main/resources/powershell/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/model_doc.mustache
@@ -5,7 +5,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
{{/vars}}
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/modules/openapi-generator/src/main/resources/python/model.mustache b/modules/openapi-generator/src/main/resources/python/model.mustache
index a2f899eeea0..acac422fd6b 100644
--- a/modules/openapi-generator/src/main/resources/python/model.mustache
+++ b/modules/openapi-generator/src/main/resources/python/model.mustache
@@ -38,7 +38,7 @@ class {{classname}}(object):
"""
openapi_types = {
{{#vars}}
- '{{name}}': '{{{datatype}}}'{{#hasMore}},{{/hasMore}}
+ '{{name}}': '{{{dataType}}}'{{#hasMore}},{{/hasMore}}
{{/vars}}
}
@@ -83,7 +83,7 @@ class {{classname}}(object):
{{/description}}
:return: The {{name}} of this {{classname}}. # noqa: E501
- :rtype: {{datatype}}
+ :rtype: {{dataType}}
"""
return self._{{name}}
@@ -96,7 +96,7 @@ class {{classname}}(object):
{{/description}}
:param {{name}}: The {{name}} of this {{classname}}. # noqa: E501
- :type: {{datatype}}
+ :type: {{dataType}}
"""
{{#required}}
if {{name}} is None:
diff --git a/modules/openapi-generator/src/main/resources/python/model_doc.mustache b/modules/openapi-generator/src/main/resources/python/model_doc.mustache
index 569550df372..0216a3372cd 100644
--- a/modules/openapi-generator/src/main/resources/python/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/python/model_doc.mustache
@@ -3,7 +3,7 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
{{/vars}}
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/modules/openapi-generator/src/main/resources/qt5cpp/model-body.mustache b/modules/openapi-generator/src/main/resources/qt5cpp/model-body.mustache
index 7634ec32ed7..367c0d52693 100644
--- a/modules/openapi-generator/src/main/resources/qt5cpp/model-body.mustache
+++ b/modules/openapi-generator/src/main/resources/qt5cpp/model-body.mustache
@@ -203,12 +203,12 @@ QJsonObject
}
{{#vars}}
-{{{datatype}}}
+{{{dataType}}}
{{classname}}::{{getter}}() {
return {{name}};
}
void
-{{classname}}::{{setter}}({{{datatype}}} {{name}}) {
+{{classname}}::{{setter}}({{{dataType}}} {{name}}) {
this->{{name}} = {{name}};
this->m_{{name}}_isSet = true;
}
diff --git a/modules/openapi-generator/src/main/resources/qt5cpp/model-header.mustache b/modules/openapi-generator/src/main/resources/qt5cpp/model-header.mustache
index 2560c8f5bbc..94ae7e236ef 100644
--- a/modules/openapi-generator/src/main/resources/qt5cpp/model-header.mustache
+++ b/modules/openapi-generator/src/main/resources/qt5cpp/model-header.mustache
@@ -36,8 +36,8 @@ public:
{{classname}}* fromJson(QString jsonString) override;
{{#vars}}
- {{{datatype}}} {{getter}}();
- void {{setter}}({{{datatype}}} {{name}});
+ {{{dataType}}} {{getter}}();
+ void {{setter}}({{{dataType}}} {{name}});
{{/vars}}
@@ -45,7 +45,7 @@ public:
private:
{{#vars}}
- {{{datatype}}} {{name}};
+ {{{dataType}}} {{name}};
bool m_{{name}}_isSet;
{{/vars}}
diff --git a/modules/openapi-generator/src/main/resources/r/model.mustache b/modules/openapi-generator/src/main/resources/r/model.mustache
index af5b5cc9ecc..a1327b91f42 100644
--- a/modules/openapi-generator/src/main/resources/r/model.mustache
+++ b/modules/openapi-generator/src/main/resources/r/model.mustache
@@ -80,13 +80,13 @@
{{^isPrimitiveType}}
{{#isListContainer}}
self$`{{baseName}}` <- lapply({{classname}}Object$`{{baseName}}`, function(x) {
- {{baseName}}Object <- {{datatype}}$new()
+ {{baseName}}Object <- {{dataType}}$new()
{{baseName}}Object$fromJSON(jsonlite::toJSON(x, auto_unbox = TRUE))
{{baseName}}Object
})
{{/isListContainer}}
{{^isListContainer}}
- {{baseName}}Object <- {{datatype}}$new()
+ {{baseName}}Object <- {{dataType}}$new()
{{baseName}}Object$fromJSON(jsonlite::toJSON({{classname}}Object${{baseName}}, auto_unbox = TRUE))
self$`{{baseName}}` <- {{baseName}}Object
{{/isListContainer}}
@@ -124,11 +124,11 @@
{{/isPrimitiveType}}
{{^isPrimitiveType}}
{{#isListContainer}}
- self$`{{baseName}}` <- lapply({{classname}}Object$`{{baseName}}`, function(x) {{datatype}}$new()$fromJSON(jsonlite::toJSON(x, auto_unbox = TRUE)))
+ self$`{{baseName}}` <- lapply({{classname}}Object$`{{baseName}}`, function(x) {{dataType}}$new()$fromJSON(jsonlite::toJSON(x, auto_unbox = TRUE)))
{{/isListContainer}}
{{^isListContainer}}
- {{datatype}}Object <- {{datatype}}$new()
- self$`{{baseName}}` <- {{datatype}}Object$fromJSON(jsonlite::toJSON({{classname}}Object${{baseName}}, auto_unbox = TRUE))
+ {{dataType}}Object <- {{dataType}}$new()
+ self$`{{baseName}}` <- {{dataType}}Object$fromJSON(jsonlite::toJSON({{classname}}Object${{baseName}}, auto_unbox = TRUE))
{{/isListContainer}}
{{/isPrimitiveType}}
{{/vars}}
diff --git a/modules/openapi-generator/src/main/resources/r/model_doc.mustache b/modules/openapi-generator/src/main/resources/r/model_doc.mustache
index 25537b2c5ed..ccfd3f8d0de 100644
--- a/modules/openapi-generator/src/main/resources/r/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/r/model_doc.mustache
@@ -3,7 +3,7 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{{datatype}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{^isContainer}}{{^isDateTime}}*{{/isDateTime}}{{/isContainer}}{{{datatype}}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{^isContainer}}{{^isDateTime}}*{{/isDateTime}}{{/isContainer}}{{{dataType}}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
{{/vars}}
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/modules/openapi-generator/src/main/resources/rails5/migrate.mustache b/modules/openapi-generator/src/main/resources/rails5/migrate.mustache
index d9d5db407be..7109887bde5 100644
--- a/modules/openapi-generator/src/main/resources/rails5/migrate.mustache
+++ b/modules/openapi-generator/src/main/resources/rails5/migrate.mustache
@@ -6,7 +6,7 @@ class InitTables < ActiveRecord::Migration
def change{{#models}}{{#model}}
create_table "{{classFilename}}".pluralize.to_sym, id: false do |t|{{#vars}}{{#isContainer}}
t.string :{{name}}{{/isContainer}}{{^isContainer}}
- t.{{datatype}} :{{{name}}}{{/isContainer}}{{/vars}}
+ t.{{dataType}} :{{{name}}}{{/isContainer}}{{/vars}}
t.timestamps
end
diff --git a/modules/openapi-generator/src/main/resources/restbed/model-header.mustache b/modules/openapi-generator/src/main/resources/restbed/model-header.mustache
index 30f586fb5e8..657c7c9ab7b 100644
--- a/modules/openapi-generator/src/main/resources/restbed/model-header.mustache
+++ b/modules/openapi-generator/src/main/resources/restbed/model-header.mustache
@@ -37,13 +37,13 @@ public:
///
/// {{description}}
///
- {{{datatype}}} {{getter}}() const;
- void {{setter}}({{{datatype}}} value);
+ {{{dataType}}} {{getter}}() const;
+ void {{setter}}({{{dataType}}} value);
{{/vars}}
protected:
{{#vars}}
- {{{datatype}}} m_{{name}};
+ {{{dataType}}} m_{{name}};
{{/vars}}
};
diff --git a/modules/openapi-generator/src/main/resources/restbed/model-source.mustache b/modules/openapi-generator/src/main/resources/restbed/model-source.mustache
index ea2f969c189..2ae2f10484c 100644
--- a/modules/openapi-generator/src/main/resources/restbed/model-source.mustache
+++ b/modules/openapi-generator/src/main/resources/restbed/model-source.mustache
@@ -74,11 +74,11 @@ void {{classname}}::fromJsonString(std::string const& jsonString)
}
{{#vars}}
-{{{datatype}}} {{classname}}::{{getter}}() const
+{{{dataType}}} {{classname}}::{{getter}}() const
{
return m_{{name}};
}
-void {{classname}}::{{setter}}({{{datatype}}} value)
+void {{classname}}::{{setter}}({{{dataType}}} value)
{
m_{{name}} = value;
}
diff --git a/modules/openapi-generator/src/main/resources/ruby/model_doc.mustache b/modules/openapi-generator/src/main/resources/ruby/model_doc.mustache
index 00befadc578..68de5593f65 100644
--- a/modules/openapi-generator/src/main/resources/ruby/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby/model_doc.mustache
@@ -3,7 +3,7 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
{{/vars}}
{{/model}}{{/models}}
diff --git a/modules/openapi-generator/src/main/resources/ruby/model_test.mustache b/modules/openapi-generator/src/main/resources/ruby/model_test.mustache
index c31afc3fab3..f0e6b6c46e6 100644
--- a/modules/openapi-generator/src/main/resources/ruby/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby/model_test.mustache
@@ -31,7 +31,7 @@ describe '{{classname}}' do
it 'should work' do
{{#isEnum}}
# assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
- # validator = Petstore::EnumTest::EnumAttributeValidator.new('{{{datatype}}}', [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}])
+ # validator = Petstore::EnumTest::EnumAttributeValidator.new('{{{dataType}}}', [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}])
# validator.allowable_values.each do |value|
# expect { @instance.{{name}} = value }.not_to raise_error
# end
diff --git a/modules/openapi-generator/src/main/resources/ruby/partial_model_generic.mustache b/modules/openapi-generator/src/main/resources/ruby/partial_model_generic.mustache
index 8332f7c25a7..eb91155ed06 100644
--- a/modules/openapi-generator/src/main/resources/ruby/partial_model_generic.mustache
+++ b/modules/openapi-generator/src/main/resources/ruby/partial_model_generic.mustache
@@ -46,7 +46,7 @@
def self.openapi_types
{
{{#vars}}
- :'{{{name}}}' => :'{{{datatype}}}'{{#hasMore}},{{/hasMore}}
+ :'{{{name}}}' => :'{{{dataType}}}'{{#hasMore}},{{/hasMore}}
{{/vars}}
}
end
@@ -150,7 +150,7 @@
{{/required}}
{{#isEnum}}
{{^isContainer}}
- {{{name}}}_validator = EnumAttributeValidator.new('{{{datatype}}}', [{{#allowableValues}}{{#values}}'{{{this}}}'{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}])
+ {{{name}}}_validator = EnumAttributeValidator.new('{{{dataType}}}', [{{#allowableValues}}{{#values}}'{{{this}}}'{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}])
return false unless {{{name}}}_validator.valid?(@{{{name}}})
{{/isContainer}}
{{/isEnum}}
@@ -187,7 +187,7 @@
# Custom attribute writer method checking allowed values (enum).
# @param [Object] {{{name}}} Object to be assigned
def {{{name}}}=({{{name}}})
- validator = EnumAttributeValidator.new('{{{datatype}}}', [{{#allowableValues}}{{#values}}'{{{this}}}'{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}])
+ validator = EnumAttributeValidator.new('{{{dataType}}}', [{{#allowableValues}}{{#values}}'{{{this}}}'{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}])
unless validator.valid?({{{name}}})
fail ArgumentError, 'invalid value for "{{{name}}}", must be one of #{validator.allowable_values}.'
end
diff --git a/modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache b/modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache
index 12768e25f30..70e5b333a32 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache
@@ -318,7 +318,7 @@ impl
Api for Client where C: Has {{#hasAuthMethods}}+ Has {
-{{#headers}} header! { (Response{{nameInCamelCase}}, "{{baseName}}") => [{{{datatype}}}] }
+{{#headers}} header! { (Response{{nameInCamelCase}}, "{{baseName}}") => [{{{dataType}}}] }
let response_{{name}} = match response.headers().get::() {
Some(response_{{name}}) => response_{{name}}.0.clone(),
None => return Box::new(future::err(ApiError(String::from("Required response header {{baseName}} for response {{code}} was not found.")))) as Box>,
diff --git a/modules/openapi-generator/src/main/resources/rust-server/lib.mustache b/modules/openapi-generator/src/main/resources/rust-server/lib.mustache
index 10cd24f4b3e..2929122ac20 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/lib.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/lib.mustache
@@ -42,7 +42,7 @@ pub const API_VERSION: &'static str = "{{appVersion}}";
pub enum {{operationId}}Response {
{{#responses}}
{{#message}} /// {{message}}{{/message}}
- {{#vendorExtensions}}{{x-responseId}}{{/vendorExtensions}} {{#dataType}}{{^headers}}( {{{dataType}}} ) {{/headers}}{{#headers}}{{#-first}}{ body: {{{dataType}}}{{/-first}}{{/headers}}{{/dataType}}{{#headers}}{{#-first}}{{^dataType}} { {{/dataType}}{{#dataType}}, {{/dataType}}{{/-first}}{{^-first}}, {{/-first}}{{name}}: {{{datatype}}}{{#-last}} } {{/-last}}{{/headers}},
+ {{#vendorExtensions}}{{x-responseId}}{{/vendorExtensions}} {{#dataType}}{{^headers}}( {{{dataType}}} ) {{/headers}}{{#headers}}{{#-first}}{ body: {{{dataType}}}{{/-first}}{{/headers}}{{/dataType}}{{#headers}}{{#-first}}{{^dataType}} { {{/dataType}}{{#dataType}}, {{/dataType}}{{/-first}}{{^-first}}, {{/-first}}{{name}}: {{{dataType}}}{{#-last}} } {{/-last}}{{/headers}},
{{/responses}}
}
{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/rust-server/models.mustache b/modules/openapi-generator/src/main/resources/rust-server/models.mustache
index eae49d6e7cb..213da2e8cdb 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/models.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/models.mustache
@@ -145,19 +145,19 @@ pub struct {{classname}} {
{{/description}}{{#isEnum}} // Note: inline enums are not fully supported by openapi-generator
{{/isEnum}} #[serde(rename = "{{baseName}}")]{{#vendorExtensions}}{{#itemXmlName}}
#[serde(serialize_with = "wrap_in_{{itemXmlName}}")]{{/itemXmlName}}{{/vendorExtensions}}{{#required}}
- pub {{name}}: {{#vendorExtensions}}{{#x-nullable}}swagger::Nullable<{{/x-nullable}}{{/vendorExtensions}}{{{datatype}}}{{#vendorExtensions}}{{#x-nullable}}>{{/x-nullable}}{{/vendorExtensions}},
+ pub {{name}}: {{#vendorExtensions}}{{#x-nullable}}swagger::Nullable<{{/x-nullable}}{{/vendorExtensions}}{{{dataType}}}{{#vendorExtensions}}{{#x-nullable}}>{{/x-nullable}}{{/vendorExtensions}},
{{/required}}{{^required}}{{#vendorExtensions}}{{#x-nullable}} #[serde(deserialize_with = "swagger::nullable_format::deserialize_optional_nullable")]
#[serde(default = "swagger::nullable_format::default_optional_nullable")]
{{/x-nullable}}{{/vendorExtensions}}
#[serde(skip_serializing_if="Option::is_none")]
- pub {{name}}: Option<{{#vendorExtensions}}{{#x-nullable}}swagger::Nullable<{{/x-nullable}}{{/vendorExtensions}}{{#isListContainer}}Vec<{{#items}}{{{datatype}}}{{/items}}>{{/isListContainer}}{{^isListContainer}}{{{datatype}}}{{/isListContainer}}{{#vendorExtensions}}{{#x-nullable}}>{{/x-nullable}}{{/vendorExtensions}}>,
+ pub {{name}}: Option<{{#vendorExtensions}}{{#x-nullable}}swagger::Nullable<{{/x-nullable}}{{/vendorExtensions}}{{#isListContainer}}Vec<{{#items}}{{{dataType}}}{{/items}}>{{/isListContainer}}{{^isListContainer}}{{{dataType}}}{{/isListContainer}}{{#vendorExtensions}}{{#x-nullable}}>{{/x-nullable}}{{/vendorExtensions}}>,
{{/required}}
{{/vars}}
}
impl {{classname}} {
- pub fn new({{#vars}}{{^defaultValue}}{{name}}: {{#vendorExtensions}}{{#x-nullable}}swagger::Nullable<{{/x-nullable}}{{/vendorExtensions}}{{{datatype}}}{{#vendorExtensions}}{{#x-nullable}}>{{/x-nullable}}{{/vendorExtensions}}, {{/defaultValue}}{{/vars}}) -> {{classname}} {
+ pub fn new({{#vars}}{{^defaultValue}}{{name}}: {{#vendorExtensions}}{{#x-nullable}}swagger::Nullable<{{/x-nullable}}{{/vendorExtensions}}{{{dataType}}}{{#vendorExtensions}}{{#x-nullable}}>{{/x-nullable}}{{/vendorExtensions}}, {{/defaultValue}}{{/vars}}) -> {{classname}} {
{{classname}} {
{{#vars}} {{name}}: {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}{{name}}{{/defaultValue}},
{{/vars}}
diff --git a/modules/openapi-generator/src/main/resources/rust-server/server-mod.mustache b/modules/openapi-generator/src/main/resources/rust-server/server-mod.mustache
index de1df20ab85..70c07a2e980 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/server-mod.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/server-mod.mustache
@@ -363,7 +363,7 @@ where
=> {
{{^isFile}} response.set_status(StatusCode::try_from({{code}}).unwrap());
{{#headers}}
- header! { (Response{{nameInCamelCase}}, "{{baseName}}") => [{{{datatype}}}] }
+ header! { (Response{{nameInCamelCase}}, "{{baseName}}") => [{{{dataType}}}] }
response.headers_mut().set(Response{{nameInCamelCase}}({{name}}));
{{/headers}}
{{#produces}}{{#-first}}{{#dataType}}
@@ -395,7 +395,7 @@ where
response.set_status(StatusCode::try_from({{code}}).unwrap());
{{#headers}}
- header! { (Response{{nameInCamelCase}}, "{{baseName}}") => [{{{datatype}}}] }
+ header! { (Response{{nameInCamelCase}}, "{{baseName}}") => [{{{dataType}}}] }
response.headers_mut().set(Response{{nameInCamelCase}}({{name}}));
{{/headers}}{{#produces}}{{#-first}}{{#dataType}}
response.headers_mut().set(ContentType(mimetypes::responses::{{#vendorExtensions}}{{uppercase_operation_id}}_{{x-uppercaseResponseId}}{{/vendorExtensions}}.clone()));
diff --git a/modules/openapi-generator/src/main/resources/rust/model.mustache b/modules/openapi-generator/src/main/resources/rust/model.mustache
index d49cc8dd4dd..afb557c3410 100644
--- a/modules/openapi-generator/src/main/resources/rust/model.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/model.mustache
@@ -15,7 +15,7 @@ pub struct {{classname}} {
/// {{{description}}}
{{/description}}
#[serde(rename = "{{baseName}}")]
- {{name}}: {{^required}}Option<{{/required}}{{{datatype}}}{{^required}}>{{/required}}{{#hasMore}},{{/hasMore}}
+ {{name}}: {{^required}}Option<{{/required}}{{{dataType}}}{{^required}}>{{/required}}{{#hasMore}},{{/hasMore}}
{{/vars}}
}
@@ -23,7 +23,7 @@ impl {{classname}} {
{{#description}}
/// {{{description}}}
{{/description}}
- pub fn new({{#requiredVars}}{{name}}: {{{datatype}}}{{^-last}}, {{/-last}}{{/requiredVars}}) -> {{classname}} {
+ pub fn new({{#requiredVars}}{{name}}: {{{dataType}}}{{^-last}}, {{/-last}}{{/requiredVars}}) -> {{classname}} {
{{classname}} {
{{#vars}}
{{name}}: {{#required}}{{name}}{{/required}}{{^required}}{{#isListContainer}}None{{/isListContainer}}{{#isMapContainer}}None{{/isMapContainer}}{{^isContainer}}None{{/isContainer}}{{/required}}{{#hasMore}},{{/hasMore}}
@@ -32,16 +32,16 @@ impl {{classname}} {
}
{{#vars}}
- pub fn set_{{name}}(&mut self, {{name}}: {{{datatype}}}) {
+ pub fn set_{{name}}(&mut self, {{name}}: {{{dataType}}}) {
self.{{name}} = {{^required}}Some({{name}}){{/required}}{{#required}}{{name}}{{/required}};
}
- pub fn with_{{name}}(mut self, {{name}}: {{{datatype}}}) -> {{classname}} {
+ pub fn with_{{name}}(mut self, {{name}}: {{{dataType}}}) -> {{classname}} {
self.{{name}} = {{^required}}Some({{name}}){{/required}}{{#required}}{{name}}{{/required}};
self
}
- pub fn {{name}}(&self) -> {{^required}}Option<{{/required}}&{{{datatype}}}{{^required}}>{{/required}} {
+ pub fn {{name}}(&self) -> {{^required}}Option<{{/required}}&{{{dataType}}}{{^required}}>{{/required}} {
{{#required}}&{{/required}}self.{{name}}{{^required}}.as_ref(){{/required}}
}
diff --git a/modules/openapi-generator/src/main/resources/rust/model_doc.mustache b/modules/openapi-generator/src/main/resources/rust/model_doc.mustache
index 25537b2c5ed..ccfd3f8d0de 100644
--- a/modules/openapi-generator/src/main/resources/rust/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/model_doc.mustache
@@ -3,7 +3,7 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{{datatype}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{^isContainer}}{{^isDateTime}}*{{/isDateTime}}{{/isContainer}}{{{datatype}}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{^isContainer}}{{^isDateTime}}*{{/isDateTime}}{{/isContainer}}{{{dataType}}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
{{/vars}}
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/modules/openapi-generator/src/main/resources/scala-gatling/model.mustache b/modules/openapi-generator/src/main/resources/scala-gatling/model.mustache
index 5c5e39f514a..6ba1f14a449 100644
--- a/modules/openapi-generator/src/main/resources/scala-gatling/model.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-gatling/model.mustache
@@ -11,7 +11,7 @@ case class {{classname}} (
{{#description}}
/* {{{description}}} */
{{/description}}
- _{{{name}}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}
+ _{{{name}}}: {{^required}}Option[{{/required}}{{dataType}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}
{{/vars}}
)
object {{classname}} {
diff --git a/modules/openapi-generator/src/main/resources/scala-lagom-server/model.mustache b/modules/openapi-generator/src/main/resources/scala-lagom-server/model.mustache
index 2027c731c32..5b362b5fcbe 100644
--- a/modules/openapi-generator/src/main/resources/scala-lagom-server/model.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-lagom-server/model.mustache
@@ -16,7 +16,7 @@ case class {{classname}} (
{{#description}}
/* {{{description}}} */
{{/description}}
- {{{name}}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}
+ {{{name}}}: {{^required}}Option[{{/required}}{{dataType}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}
{{/isEnum}}
{{/vars}}
)
diff --git a/modules/openapi-generator/src/main/resources/scala/model.mustache b/modules/openapi-generator/src/main/resources/scala/model.mustache
index fd618c2c2ca..778a6a2c822 100644
--- a/modules/openapi-generator/src/main/resources/scala/model.mustache
+++ b/modules/openapi-generator/src/main/resources/scala/model.mustache
@@ -12,7 +12,7 @@ case class {{classname}} (
{{#description}}
// {{{description}}}
{{/description}}
- {{{name}}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}] = None{{/required}}{{#hasMore}},{{/hasMore}}
+ {{{name}}}: {{^required}}Option[{{/required}}{{dataType}}{{^required}}] = None{{/required}}{{#hasMore}},{{/hasMore}}
{{/vars}}
)
diff --git a/modules/openapi-generator/src/main/resources/scalatra/model.mustache b/modules/openapi-generator/src/main/resources/scalatra/model.mustache
index fe2c700dcf0..7baf00598ce 100644
--- a/modules/openapi-generator/src/main/resources/scalatra/model.mustache
+++ b/modules/openapi-generator/src/main/resources/scalatra/model.mustache
@@ -10,7 +10,7 @@ case class {{classname}}(
{{#description}}
/* {{{description}}} */
{{/description}}
- {{name}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}
+ {{name}}: {{^required}}Option[{{/required}}{{dataType}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}
{{/vars}}
)
diff --git a/modules/openapi-generator/src/main/resources/scalaz/model.mustache b/modules/openapi-generator/src/main/resources/scalaz/model.mustache
index e0725cb819d..9333e6bd569 100644
--- a/modules/openapi-generator/src/main/resources/scalaz/model.mustache
+++ b/modules/openapi-generator/src/main/resources/scalaz/model.mustache
@@ -13,7 +13,7 @@ import {{classname}}._
case class {{classname}} (
{{#vars}}{{#description}}/* {{{description}}} */
- {{/description}}{{name}}: {{^required}}Option[{{/required}}{{^isEnum}}{{datatype}}{{/isEnum}}{{#isEnum}}{{datatypeWithEnum}}{{/isEnum}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}{{^hasMore}}){{/hasMore}}
+ {{/description}}{{name}}: {{^required}}Option[{{/required}}{{^isEnum}}{{dataType}}{{/isEnum}}{{#isEnum}}{{datatypeWithEnum}}{{/isEnum}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}{{^hasMore}}){{/hasMore}}
{{/vars}}
object {{classname}} {
diff --git a/modules/openapi-generator/src/main/resources/slim/model.mustache b/modules/openapi-generator/src/main/resources/slim/model.mustache
index 48f586793ee..7ba5f441f4d 100644
--- a/modules/openapi-generator/src/main/resources/slim/model.mustache
+++ b/modules/openapi-generator/src/main/resources/slim/model.mustache
@@ -8,7 +8,7 @@ namespace {{package}};
* {{classname}}
*/
class {{classname}} {
- {{#vars}}/* @var {{datatype}} ${{name}} {{#description}}{{description}}{{/description}} */
+ {{#vars}}/* @var {{dataType}} ${{name}} {{#description}}{{description}}{{/description}} */
private ${{name}};
{{/vars}}
}
diff --git a/modules/openapi-generator/src/main/resources/swagger-static/model.mustache b/modules/openapi-generator/src/main/resources/swagger-static/model.mustache
index e6f85872c76..49efddbc7b9 100644
--- a/modules/openapi-generator/src/main/resources/swagger-static/model.mustache
+++ b/modules/openapi-generator/src/main/resources/swagger-static/model.mustache
@@ -4,7 +4,7 @@
{{classname}}
{{#vars}}
- - {{name}} : {{datatype}}
+
- {{name}} : {{dataType}}
{{description}}
{{#isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/swift/api.mustache b/modules/openapi-generator/src/main/resources/swift/api.mustache
index 463faeb890c..db95b539791 100644
--- a/modules/openapi-generator/src/main/resources/swift/api.mustache
+++ b/modules/openapi-generator/src/main/resources/swift/api.mustache
@@ -101,7 +101,7 @@ public class {{classname}}: APIBase {
- name: {{name}}
{{/authMethods}}
{{#hasResponseHeaders}}
- - responseHeaders: [{{#responseHeaders}}{{{baseName}}}({{{datatype}}}){{^-last}}, {{/-last}}{{/responseHeaders}}]
+ - responseHeaders: [{{#responseHeaders}}{{{baseName}}}({{{dataType}}}){{^-last}}, {{/-last}}{{/responseHeaders}}]
{{/hasResponseHeaders}}
{{#examples}}
- examples: {{{examples}}}
diff --git a/modules/openapi-generator/src/main/resources/swift/model.mustache b/modules/openapi-generator/src/main/resources/swift/model.mustache
index c9cd5984e0b..36a51a9ae09 100644
--- a/modules/openapi-generator/src/main/resources/swift/model.mustache
+++ b/modules/openapi-generator/src/main/resources/swift/model.mustache
@@ -25,7 +25,7 @@ public class {{classname}}: JSONEncodable {
{{/isEnum}}
{{^isEnum}}
{{#description}}/** {{description}} */
- {{/description}}public var {{name}}: {{{datatype}}}{{^unwrapRequired}}?{{/unwrapRequired}}{{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}
+ {{/description}}public var {{name}}: {{{dataType}}}{{^unwrapRequired}}?{{/unwrapRequired}}{{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}
{{/isEnum}}
{{/vars}}
@@ -33,7 +33,7 @@ public class {{classname}}: JSONEncodable {
public init() {}
{{/unwrapRequired}}
{{#unwrapRequired}}
- public init({{#allVars}}{{^-first}}, {{/-first}}{{name}}: {{#isEnum}}{{datatypeWithEnum}}{{/isEnum}}{{^isEnum}}{{datatype}}{{/isEnum}}{{^required}}?=nil{{/required}}{{/allVars}}) {
+ public init({{#allVars}}{{^-first}}, {{/-first}}{{name}}: {{#isEnum}}{{datatypeWithEnum}}{{/isEnum}}{{^isEnum}}{{dataType}}{{/isEnum}}{{^required}}?=nil{{/required}}{{/allVars}}) {
{{#allVars}}
self.{{name}} = {{name}}
{{/allVars}}
diff --git a/modules/openapi-generator/src/main/resources/swift3/Models.mustache b/modules/openapi-generator/src/main/resources/swift3/Models.mustache
index b5925ee10c7..5793d214aa9 100644
--- a/modules/openapi-generator/src/main/resources/swift3/Models.mustache
+++ b/modules/openapi-generator/src/main/resources/swift3/Models.mustache
@@ -341,13 +341,13 @@ class Decoders {
guard let {{name}}Source = sourceDictionary["{{baseName}}"] as AnyObject? else {
return .failure(.missingKey(key: "{{baseName}}"))
}
- guard let {{name}} = Decoders.decode(clazz: {{#isEnum}}{{^isListContainer}}{{classname}}.{{enumName}}.self{{/isListContainer}}{{#isListContainer}}Array<{{classname}}.{{enumName}}>.self{{/isListContainer}}{{/isEnum}}{{^isEnum}}{{{datatype}}}.self{{/isEnum}}.self, source: {{name}}Source).value else {
+ guard let {{name}} = Decoders.decode(clazz: {{#isEnum}}{{^isListContainer}}{{classname}}.{{enumName}}.self{{/isListContainer}}{{#isListContainer}}Array<{{classname}}.{{enumName}}>.self{{/isListContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}.self{{/isEnum}}.self, source: {{name}}Source).value else {
return .failure(.typeMismatch(expected: "{{classname}}", actual: "\({{name}}Source)"))
}
{{/requiredVars}}
let _result = {{classname}}({{#requiredVars}}{{^-first}}, {{/-first}}{{name}}: {{name}}{{/requiredVars}})
{{#optionalVars}}
- switch Decoders.decodeOptional(clazz: {{#isEnum}}{{^isListContainer}}{{classname}}.{{enumName}}.self{{/isListContainer}}{{#isListContainer}}Array<{{classname}}.{{enumName}}>.self{{/isListContainer}}{{/isEnum}}{{^isEnum}}{{{datatype}}}.self{{/isEnum}}, source: sourceDictionary["{{baseName}}"] as AnyObject?) {
+ switch Decoders.decodeOptional(clazz: {{#isEnum}}{{^isListContainer}}{{classname}}.{{enumName}}.self{{/isListContainer}}{{#isListContainer}}Array<{{classname}}.{{enumName}}>.self{{/isListContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}.self{{/isEnum}}, source: sourceDictionary["{{baseName}}"] as AnyObject?) {
case let .success(value): _result.{{name}} = value
case let .failure(error): break
}
@@ -361,7 +361,7 @@ class Decoders {
}
{{/parent}}
{{#allVars}}
- switch Decoders.decodeOptional(clazz: {{#isEnum}}{{^isListContainer}}{{classname}}.{{enumName}}.self{{/isListContainer}}{{#isListContainer}}Array<{{classname}}.{{enumName}}>.self{{/isListContainer}}{{/isEnum}}{{^isEnum}}{{{datatype}}}.self{{/isEnum}}, source: sourceDictionary["{{baseName}}"] as AnyObject?) {
+ switch Decoders.decodeOptional(clazz: {{#isEnum}}{{^isListContainer}}{{classname}}.{{enumName}}.self{{/isListContainer}}{{#isListContainer}}Array<{{classname}}.{{enumName}}>.self{{/isListContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}.self{{/isEnum}}, source: sourceDictionary["{{baseName}}"] as AnyObject?) {
{{#isEnum}}{{#isMapContainer}}/*{{/isMapContainer}}{{/isEnum}}
case let .success(value): _result.{{name}} = value
case let .failure(error): break
diff --git a/modules/openapi-generator/src/main/resources/swift3/api.mustache b/modules/openapi-generator/src/main/resources/swift3/api.mustache
index 7c3a1042317..4cdd9dc70d5 100644
--- a/modules/openapi-generator/src/main/resources/swift3/api.mustache
+++ b/modules/openapi-generator/src/main/resources/swift3/api.mustache
@@ -112,7 +112,7 @@ open class {{classname}}: APIBase {
- name: {{name}}
{{/authMethods}}
{{#hasResponseHeaders}}
- - responseHeaders: [{{#responseHeaders}}{{{baseName}}}({{{datatype}}}){{^-last}}, {{/-last}}{{/responseHeaders}}]
+ - responseHeaders: [{{#responseHeaders}}{{{baseName}}}({{{dataType}}}){{^-last}}, {{/-last}}{{/responseHeaders}}]
{{/hasResponseHeaders}}
{{#externalDocs}}
- externalDocs: {{externalDocs}}
diff --git a/modules/openapi-generator/src/main/resources/swift3/model.mustache b/modules/openapi-generator/src/main/resources/swift3/model.mustache
index e5f43ef7b27..2d608e5c6c9 100644
--- a/modules/openapi-generator/src/main/resources/swift3/model.mustache
+++ b/modules/openapi-generator/src/main/resources/swift3/model.mustache
@@ -28,7 +28,7 @@ open class {{classname}}: {{#parent}}{{{parent}}}{{/parent}}{{^parent}}JSONEncod
{{#vars}}
{{#isEnum}}
- public enum {{enumName}}: {{^isContainer}}{{datatype}}{{/isContainer}}{{#isContainer}}String{{/isContainer}} { {{#allowableValues}}{{#enumVars}}
+ public enum {{enumName}}: {{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}String{{/isContainer}} { {{#allowableValues}}{{#enumVars}}
case {{name}} = {{#isContainer}}"{{/isContainer}}{{#isString}}"{{/isString}}{{{value}}}{{#isString}}"{{/isString}}{{#isContainer}}"{{/isContainer}}{{/enumVars}}{{/allowableValues}}
}
{{/isEnum}}
@@ -40,7 +40,7 @@ open class {{classname}}: {{#parent}}{{{parent}}}{{/parent}}{{^parent}}JSONEncod
{{/isEnum}}
{{^isEnum}}
{{#description}}/** {{description}} */
- {{/description}}public var {{name}}: {{{datatype}}}{{^unwrapRequired}}?{{/unwrapRequired}}{{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#objcCompatible}}{{#vendorExtensions.x-swift-optional-scalar}}
+ {{/description}}public var {{name}}: {{{dataType}}}{{^unwrapRequired}}?{{/unwrapRequired}}{{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#objcCompatible}}{{#vendorExtensions.x-swift-optional-scalar}}
public var {{name}}Num: NSNumber? {
get {
return {{name}}.map({ return NSNumber(value: $0) })
@@ -56,7 +56,7 @@ open class {{classname}}: {{#parent}}{{{parent}}}{{/parent}}{{^parent}}JSONEncod
{{^unwrapRequired}}
{{^parent}}public init() {}{{/parent}}{{/unwrapRequired}}
{{#unwrapRequired}}
- public init({{#allVars}}{{^-first}}, {{/-first}}{{name}}: {{#isEnum}}{{datatypeWithEnum}}{{/isEnum}}{{^isEnum}}{{datatype}}{{/isEnum}}{{^required}}?=nil{{/required}}{{/allVars}}) {
+ public init({{#allVars}}{{^-first}}, {{/-first}}{{name}}: {{#isEnum}}{{datatypeWithEnum}}{{/isEnum}}{{^isEnum}}{{dataType}}{{/isEnum}}{{^required}}?=nil{{/required}}{{/allVars}}) {
{{#vars}}
self.{{name}} = {{name}}
{{/vars}}
diff --git a/modules/openapi-generator/src/main/resources/swift4/api.mustache b/modules/openapi-generator/src/main/resources/swift4/api.mustache
index 01e806ff7e5..ed4afe13a0f 100644
--- a/modules/openapi-generator/src/main/resources/swift4/api.mustache
+++ b/modules/openapi-generator/src/main/resources/swift4/api.mustache
@@ -112,7 +112,7 @@ open class {{classname}} {
- name: {{name}}
{{/authMethods}}
{{#hasResponseHeaders}}
- - responseHeaders: [{{#responseHeaders}}{{{baseName}}}({{{datatype}}}){{^-last}}, {{/-last}}{{/responseHeaders}}]
+ - responseHeaders: [{{#responseHeaders}}{{{baseName}}}({{{dataType}}}){{^-last}}, {{/-last}}{{/responseHeaders}}]
{{/hasResponseHeaders}}
{{#externalDocs}}
- externalDocs: {{externalDocs}}
diff --git a/modules/openapi-generator/src/main/resources/swift4/modelInlineEnumDeclaration.mustache b/modules/openapi-generator/src/main/resources/swift4/modelInlineEnumDeclaration.mustache
index f64aa4b1648..e2a3d08e912 100644
--- a/modules/openapi-generator/src/main/resources/swift4/modelInlineEnumDeclaration.mustache
+++ b/modules/openapi-generator/src/main/resources/swift4/modelInlineEnumDeclaration.mustache
@@ -1,4 +1,4 @@
- public enum {{enumName}}: {{^isContainer}}{{datatype}}{{/isContainer}}{{#isContainer}}String{{/isContainer}}, Codable {
+ public enum {{enumName}}: {{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}String{{/isContainer}}, Codable {
{{#allowableValues}}
{{#enumVars}}
case {{name}} = {{{value}}}
diff --git a/modules/openapi-generator/src/main/resources/swift4/modelObject.mustache b/modules/openapi-generator/src/main/resources/swift4/modelObject.mustache
index e187c494370..3021f006706 100644
--- a/modules/openapi-generator/src/main/resources/swift4/modelObject.mustache
+++ b/modules/openapi-generator/src/main/resources/swift4/modelObject.mustache
@@ -13,7 +13,7 @@ public struct {{classname}}: Codable {
{{/isEnum}}
{{^isEnum}}
{{#description}}/** {{description}} */
- {{/description}}public var {{name}}: {{{datatype}}}{{^required}}?{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#objcCompatible}}{{#vendorExtensions.x-swift-optional-scalar}}
+ {{/description}}public var {{name}}: {{{dataType}}}{{^required}}?{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#objcCompatible}}{{#vendorExtensions.x-swift-optional-scalar}}
public var {{name}}Num: NSNumber? {
get {
return {{name}}.map({ return NSNumber(value: $0) })
diff --git a/modules/openapi-generator/src/main/resources/tizen/model-body.mustache b/modules/openapi-generator/src/main/resources/tizen/model-body.mustache
index 97b31a38a9e..d179a0cf396 100644
--- a/modules/openapi-generator/src/main/resources/tizen/model-body.mustache
+++ b/modules/openapi-generator/src/main/resources/tizen/model-body.mustache
@@ -57,12 +57,12 @@ void
{
JsonArray* arr = json_node_get_array(node);
JsonNode* temp_json;
- list<{{#items}}{{datatype}}{{/items}}> new_list;
- {{#items}}{{datatype}}{{/items}} inst;
+ list<{{#items}}{{dataType}}{{/items}}> new_list;
+ {{#items}}{{dataType}}{{/items}} inst;
for (guint i=0;i new_list = static_cast > ({{getter}}());
- node = converttoJson(&new_list, "{{#items}}{{datatype}}{{/items}}", "{{containerType}}");
+ if (isprimitive("{{#items}}{{dataType}}{{/items}}")) {
+ list<{{#items}}{{dataType}}{{/items}}> new_list = static_cast > ({{getter}}());
+ node = converttoJson(&new_list, "{{#items}}{{dataType}}{{/items}}", "{{containerType}}");
} else {
node = json_node_alloc();
- list<{{#items}}{{datatype}}{{/items}}> new_list = static_cast > ({{getter}}());
+ list<{{#items}}{{dataType}}{{/items}}> new_list = static_cast > ({{getter}}());
JsonArray* json_array = json_array_new();
GError *mygerror;
{{#items}}{{^isInteger}}{{^isDate}}{{^isLong}}{{^isBoolean}}{{^isString}}{{^isDateTime}}{{^isDouble}}{{^isFloat}}
- for (list<{{datatype}}>::iterator it = new_list.begin(); it != new_list.end(); it++) {
+ for (list<{{dataType}}>::iterator it = new_list.begin(); it != new_list.end(); it++) {
mygerror = NULL;
- {{datatype}} obj = *it;
+ {{dataType}} obj = *it;
JsonNode *node_temp = json_from_string(obj.toJson(), &mygerror);
json_array_add_element(json_array, node_temp);
g_clear_error(&mygerror);
@@ -174,14 +174,14 @@ char*
}
{{#vars}}
-{{datatype}}{{#isContainer}}{{#isMapContainer}}{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{datatype}}{{/items}}>{{/isMapContainer}}{{/isContainer}}
+{{dataType}}{{#isContainer}}{{#isMapContainer}}{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{dataType}}{{/items}}>{{/isMapContainer}}{{/isContainer}}
{{classname}}::{{getter}}()
{
return {{name}};
}
void
-{{classname}}::{{setter}}({{datatype}} {{#isContainer}}{{#isMapContainer}}{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{datatype}}{{/items}}>{{/isMapContainer}}{{/isContainer}} {{name}})
+{{classname}}::{{setter}}({{dataType}} {{#isContainer}}{{#isMapContainer}}{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{dataType}}{{/items}}>{{/isMapContainer}}{{/isContainer}} {{name}})
{
this->{{name}} = {{name}};
}
diff --git a/modules/openapi-generator/src/main/resources/tizen/model-header.mustache b/modules/openapi-generator/src/main/resources/tizen/model-header.mustache
index 307e759a021..830754ca73d 100644
--- a/modules/openapi-generator/src/main/resources/tizen/model-header.mustache
+++ b/modules/openapi-generator/src/main/resources/tizen/model-header.mustache
@@ -51,16 +51,16 @@ public:
{{#vars}}
/*! \brief Get {{{description}}}
*/
- {{datatype}}{{#isContainer}}{{#isMapContainer}}{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{datatype}}{{/items}}>{{/isMapContainer}}{{/isContainer}} {{getter}}();
+ {{dataType}}{{#isContainer}}{{#isMapContainer}}{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{dataType}}{{/items}}>{{/isMapContainer}}{{/isContainer}} {{getter}}();
/*! \brief Set {{{description}}}
*/
- void {{setter}}({{datatype}} {{#isContainer}}{{#isMapContainer}}{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{datatype}}{{/items}}>{{/isMapContainer}}{{/isContainer}} {{name}});
+ void {{setter}}({{dataType}} {{#isContainer}}{{#isMapContainer}}{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{dataType}}{{/items}}>{{/isMapContainer}}{{/isContainer}} {{name}});
{{/vars}}
private:
{{#vars}}
- {{datatype}} {{#isContainer}}{{#isMapContainer}}{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{datatype}}{{/items}}>{{/isMapContainer}}{{/isContainer}}{{name}};
+ {{dataType}} {{#isContainer}}{{#isMapContainer}}{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{dataType}}{{/items}}>{{/isMapContainer}}{{/isContainer}}{{name}};
{{/vars}}
void __init();
void __cleanup();
diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/modelGeneric.mustache
index a4248ea3da0..c9da208072e 100644
--- a/modules/openapi-generator/src/main/resources/typescript-angular/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-angular/modelGeneric.mustache
@@ -5,6 +5,6 @@ export interface {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{ {{>m
* {{{description}}}
*/
{{/description}}
- {{#isReadOnly}}readonly {{/isReadOnly}}{{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+ {{#isReadOnly}}readonly {{/isReadOnly}}{{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}};
{{/vars}}
}{{>modelGenericEnums}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/modelTaggedUnion.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/modelTaggedUnion.mustache
index cd7d1c8b936..8855da7ce2c 100644
--- a/modules/openapi-generator/src/main/resources/typescript-angular/modelTaggedUnion.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-angular/modelTaggedUnion.mustache
@@ -10,7 +10,7 @@ export interface {{classname}} { {{>modelGenericAdditionalProperties}}
* {{{description}}}
*/
{{/description}}
- {{name}}{{^required}}?{{/required}}: {{#discriminatorValue}}'{{discriminatorValue}}'{{/discriminatorValue}}{{^discriminatorValue}}{{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}}{{/discriminatorValue}};
+ {{name}}{{^required}}?{{/required}}: {{#discriminatorValue}}'{{discriminatorValue}}'{{/discriminatorValue}}{{^discriminatorValue}}{{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{/discriminatorValue}};
{{/allVars}}
}
{{>modelGenericEnums}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-angularjs/model.mustache b/modules/openapi-generator/src/main/resources/typescript-angularjs/model.mustache
index f1bded256c0..fe615e49bd6 100644
--- a/modules/openapi-generator/src/main/resources/typescript-angularjs/model.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-angularjs/model.mustache
@@ -15,7 +15,7 @@ export interface {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
* {{{description}}}
*/
{{/description}}
- "{{name}}"{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+ "{{name}}"{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}};
{{/vars}}
}
diff --git a/modules/openapi-generator/src/main/resources/typescript-aurelia/models.mustache b/modules/openapi-generator/src/main/resources/typescript-aurelia/models.mustache
index 8ba959356cb..f40db1f3945 100644
--- a/modules/openapi-generator/src/main/resources/typescript-aurelia/models.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-aurelia/models.mustache
@@ -18,7 +18,7 @@ export type {{{classname}}} = {{#allowableValues}}{{#values}}'{{{.}}}'{{^-last}}
* {{{description}}}
*/
{{/description}}
- {{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+ {{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}};
{{/vars}}
{{^isEnum}}
}
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
index 585b9825bfc..d4ba9f7b862 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
@@ -14,7 +14,7 @@ export interface {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
* @type {{=<% %>=}}{<%&datatype%>}<%={{ }}=%>
* @memberof {{classname}}
*/
- {{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+ {{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}};
{{/vars}}
}{{#hasEnums}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-inversify/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-inversify/modelGeneric.mustache
index a4248ea3da0..c9da208072e 100644
--- a/modules/openapi-generator/src/main/resources/typescript-inversify/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-inversify/modelGeneric.mustache
@@ -5,6 +5,6 @@ export interface {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{ {{>m
* {{{description}}}
*/
{{/description}}
- {{#isReadOnly}}readonly {{/isReadOnly}}{{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+ {{#isReadOnly}}readonly {{/isReadOnly}}{{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}};
{{/vars}}
}{{>modelGenericEnums}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript-inversify/modelTaggedUnion.mustache b/modules/openapi-generator/src/main/resources/typescript-inversify/modelTaggedUnion.mustache
index cd7d1c8b936..8855da7ce2c 100644
--- a/modules/openapi-generator/src/main/resources/typescript-inversify/modelTaggedUnion.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-inversify/modelTaggedUnion.mustache
@@ -10,7 +10,7 @@ export interface {{classname}} { {{>modelGenericAdditionalProperties}}
* {{{description}}}
*/
{{/description}}
- {{name}}{{^required}}?{{/required}}: {{#discriminatorValue}}'{{discriminatorValue}}'{{/discriminatorValue}}{{^discriminatorValue}}{{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}}{{/discriminatorValue}};
+ {{name}}{{^required}}?{{/required}}: {{#discriminatorValue}}'{{discriminatorValue}}'{{/discriminatorValue}}{{^discriminatorValue}}{{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{/discriminatorValue}};
{{/allVars}}
}
{{>modelGenericEnums}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-jquery/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-jquery/modelGeneric.mustache
index fbe96c21506..9ea4423b95d 100644
--- a/modules/openapi-generator/src/main/resources/typescript-jquery/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-jquery/modelGeneric.mustache
@@ -9,7 +9,7 @@ export interface {{classname}} {{#parent}}extends models.{{{parent}}} {{/parent}
* {{{description}}}
*/
{{/description}}
- {{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+ {{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}};
{{/vars}}
}{{#hasEnums}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-node/api.mustache b/modules/openapi-generator/src/main/resources/typescript-node/api.mustache
index c12d04a4ddc..6eed43b0dfb 100644
--- a/modules/openapi-generator/src/main/resources/typescript-node/api.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-node/api.mustache
@@ -141,7 +141,7 @@ export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
* {{{description}}}
*/
{{/description}}
- '{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+ '{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}};
{{/vars}}
{{#discriminator}}
@@ -157,7 +157,7 @@ export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
{
"name": "{{name}}",
"baseName": "{{baseName}}",
- "type": "{{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}}"
+ "type": "{{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}"
}{{#hasMore}},
{{/hasMore}}
{{/vars}}
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/model.mustache b/modules/openapi-generator/src/main/resources/ze-ph/model.mustache
index 6535afdff50..b495c32cef1 100644
--- a/modules/openapi-generator/src/main/resources/ze-ph/model.mustache
+++ b/modules/openapi-generator/src/main/resources/ze-ph/model.mustache
@@ -19,7 +19,7 @@ class {{classname}}
* @DTA\Data(field="{{baseName}}"{{^required}}, nullable=true{{/required}}){{#vendorExtensions}}{{#internal.ze-ph.fromQuery}}
{{>model_query_var}}{{/internal.ze-ph.fromQuery}}{{/vendorExtensions}}{{#vendorExtensions}}{{^internal.ze-ph.fromQuery}}
{{>model_normal_var}}{{/internal.ze-ph.fromQuery}}{{/vendorExtensions}}{{^vendorExtensions}}
-{{>model_normal_var}}{{/vendorExtensions}} * @var {{datatype}}
+{{>model_normal_var}}{{/vendorExtensions}} * @var {{dataType}}
*/
public ${{name}};
{{/vars}}
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/model_normal_var.mustache b/modules/openapi-generator/src/main/resources/ze-ph/model_normal_var.mustache
index 2cfae5001de..3aee768b133 100644
--- a/modules/openapi-generator/src/main/resources/ze-ph/model_normal_var.mustache
+++ b/modules/openapi-generator/src/main/resources/ze-ph/model_normal_var.mustache
@@ -2,8 +2,8 @@
{{^isContainer}}
{{^isDate}}
{{^isDateTime}}
- * @DTA\Strategy(name="Object", options={"type":{{datatype}}::class})
- * @DTA\Validator(name="Dictionary", options={"type":{{datatype}}::class})
+ * @DTA\Strategy(name="Object", options={"type":{{dataType}}::class})
+ * @DTA\Validator(name="Dictionary", options={"type":{{dataType}}::class})
{{/isDateTime}}
{{/isDate}}
{{#isDate}}
@@ -17,9 +17,9 @@
{{/isContainer}}
{{#isContainer}}
* TODO check validator and strategy are correct and can handle container item type
- * @DTA\Strategy(name="ObjectArray", options={"type":{{#items}}{{datatype}}{{/items}}::class})
+ * @DTA\Strategy(name="ObjectArray", options={"type":{{#items}}{{dataType}}{{/items}}::class})
* @DTA\Validator(name="Collection", options={"validators":{
- * {"name":"Dictionary", "options":{"type":{{#items}}{{datatype}}{{/items}}::class}}
+ * {"name":"Dictionary", "options":{"type":{{#items}}{{dataType}}{{/items}}::class}}
* }})
{{/isContainer}}
{{/isPrimitiveType}}
@@ -28,12 +28,12 @@
{{#items}}
* TODO check validator and strategy are correct and can handle container item type
* @DTA\Validator(name="Collection", options={"validators":{
- * {"name":"Type", "options":{"type":"{{datatype}}"}}
+ * {"name":"Type", "options":{"type":"{{dataType}}"}}
* }})
{{/items}}
{{/isContainer}}
{{^isContainer}}
- * @DTA\Validator(name="Type", options={"type":"{{datatype}}"})
+ * @DTA\Validator(name="Type", options={"type":"{{dataType}}"})
{{/isContainer}}
{{/isPrimitiveType}}
{{#hasValidation}}
diff --git a/modules/openapi-generator/src/main/resources/ze-ph/model_query_var.mustache b/modules/openapi-generator/src/main/resources/ze-ph/model_query_var.mustache
index 54acf199052..2a542a8e2cf 100644
--- a/modules/openapi-generator/src/main/resources/ze-ph/model_query_var.mustache
+++ b/modules/openapi-generator/src/main/resources/ze-ph/model_query_var.mustache
@@ -10,20 +10,20 @@
{{/isDateTime}}
{{/isContainer}}
{{#isContainer}}
- * TODO add validator(s) and strategy for {{datatype}} and collection format {{internal.ze-ph.collectionFormat}}
+ * TODO add validator(s) and strategy for {{dataType}} and collection format {{internal.ze-ph.collectionFormat}}
{{/isContainer}}
{{/isPrimitiveType}}
{{#isPrimitiveType}}
{{#isContainer}}
{{#items}}
* TODO check validator and strategy are correct and can handle container item type
- * @DTA\Strategy(name="QueryParameterArray", options={"type":"{{datatype}}", "format":"{{internal.ze-ph.collectionFormat}}"})
- * @DTA\Validator(name="QueryParameterArrayType", options={"type":"{{datatype}}", "format":"{{internal.ze-ph.collectionFormat}}"})
+ * @DTA\Strategy(name="QueryParameterArray", options={"type":"{{dataType}}", "format":"{{internal.ze-ph.collectionFormat}}"})
+ * @DTA\Validator(name="QueryParameterArrayType", options={"type":"{{dataType}}", "format":"{{internal.ze-ph.collectionFormat}}"})
{{/items}}
{{/isContainer}}
{{^isContainer}}
- * @DTA\Strategy(name="QueryParameter", options={"type":"{{datatype}}"})
- * @DTA\Validator(name="QueryParameterType", options={"type":"{{datatype}}"})
+ * @DTA\Strategy(name="QueryParameter", options={"type":"{{dataType}}"})
+ * @DTA\Validator(name="QueryParameterType", options={"type":"{{dataType}}"})
{{/isContainer}}
{{/isPrimitiveType}}
{{#hasValidation}}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpModelTest.java
index 29cfa2586be..9c2de2e30e0 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpModelTest.java
@@ -52,7 +52,7 @@ public class CSharpModelTest {
Assert.assertEquals(property.baseName, "examples");
Assert.assertEquals(property.getter, "getExamples");
Assert.assertEquals(property.setter, "setExamples");
- Assert.assertEquals(property.datatype, "List");
+ Assert.assertEquals(property.dataType, "List");
Assert.assertEquals(property.name, "Examples");
Assert.assertNull(property.defaultValue);
Assert.assertEquals(property.baseType, "List");
@@ -77,7 +77,7 @@ public class CSharpModelTest {
Assert.assertEquals(property.baseName, "examples");
Assert.assertEquals(property.name, "Examples");
Assert.assertEquals(property.defaultValue, null);
- Assert.assertEquals(property.datatype, "Collection");
+ Assert.assertEquals(property.dataType, "Collection");
Assert.assertEquals(property.baseType, "Collection");
Assert.assertEquals(property.containerType, "array");
Assert.assertFalse(property.required);
@@ -100,7 +100,7 @@ public class CSharpModelTest {
final CodegenProperty property = generated.vars.get(1);
Assert.assertEquals(property.baseName, "examples");
Assert.assertEquals(property.name, "Examples");
- Assert.assertEquals(property.datatype, "Collection",
+ Assert.assertEquals(property.dataType, "Collection",
"returnICollection option should not modify property datatype");
Assert.assertNull(property.defaultValue);
Assert.assertEquals(property.baseType, "Collection",
@@ -137,7 +137,7 @@ public class CSharpModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "long?");
+ Assert.assertEquals(property1.dataType, "long?");
Assert.assertEquals(property1.name, "Id");
Assert.assertNull(property1.defaultValue);
Assert.assertEquals(property1.baseType, "long?");
@@ -147,7 +147,7 @@ public class CSharpModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "name");
- Assert.assertEquals(property2.datatype, "string");
+ Assert.assertEquals(property2.dataType, "string");
Assert.assertEquals(property2.name, "Name");
Assert.assertNull(property2.defaultValue);
Assert.assertEquals(property2.baseType, "string");
@@ -157,7 +157,7 @@ public class CSharpModelTest {
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
- Assert.assertEquals(property3.datatype, "DateTime?");
+ Assert.assertEquals(property3.dataType, "DateTime?");
Assert.assertEquals(property3.name, "CreatedAt");
Assert.assertNull(property3.defaultValue);
Assert.assertEquals(property3.baseType, "DateTime?");
@@ -183,7 +183,7 @@ public class CSharpModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "long?");
+ Assert.assertEquals(property1.dataType, "long?");
Assert.assertEquals(property1.name, "Id");
Assert.assertNull(property1.defaultValue);
Assert.assertEquals(property1.baseType, "long?");
@@ -193,7 +193,7 @@ public class CSharpModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "urls");
- Assert.assertEquals(property2.datatype, "List");
+ Assert.assertEquals(property2.dataType, "List");
Assert.assertEquals(property2.name, "Urls");
Assert.assertNull(property2.defaultValue);
Assert.assertEquals(property2.baseType, "List");
@@ -221,7 +221,7 @@ public class CSharpModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "translations");
- Assert.assertEquals(property1.datatype, "Dictionary");
+ Assert.assertEquals(property1.dataType, "Dictionary");
Assert.assertEquals(property1.name, "Translations");
Assert.assertEquals(property1.baseType, "Dictionary");
Assert.assertEquals(property1.containerType, "map");
@@ -245,7 +245,7 @@ public class CSharpModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
- Assert.assertEquals(property1.datatype, "Children");
+ Assert.assertEquals(property1.dataType, "Children");
Assert.assertEquals(property1.name, "Children");
Assert.assertEquals(property1.baseType, "Children");
Assert.assertFalse(property1.required);
@@ -268,7 +268,7 @@ public class CSharpModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
Assert.assertEquals(property1.complexType, "Children");
- Assert.assertEquals(property1.datatype, "List");
+ Assert.assertEquals(property1.dataType, "List");
Assert.assertEquals(property1.name, "Children");
Assert.assertEquals(property1.baseType, "List");
Assert.assertEquals(property1.containerType, "array");
@@ -294,7 +294,7 @@ public class CSharpModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
Assert.assertEquals(property1.complexType, "Children");
- Assert.assertEquals(property1.datatype, "Dictionary");
+ Assert.assertEquals(property1.dataType, "Dictionary");
Assert.assertEquals(property1.name, "Children");
Assert.assertEquals(property1.baseType, "Dictionary");
Assert.assertEquals(property1.containerType, "map");
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoModelTest.java
index 4357ab54022..2546b622836 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoModelTest.java
@@ -53,7 +53,7 @@ public class GoModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "int64");
+ Assert.assertEquals(property1.dataType, "int64");
Assert.assertEquals(property1.name, "Id");
Assert.assertNull(property1.defaultValue);
Assert.assertEquals(property1.baseType, "int64");
@@ -63,7 +63,7 @@ public class GoModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "name");
- Assert.assertEquals(property2.datatype, "string");
+ Assert.assertEquals(property2.dataType, "string");
Assert.assertEquals(property2.name, "Name");
Assert.assertNull(property2.defaultValue);
Assert.assertEquals(property2.baseType, "string");
@@ -74,7 +74,7 @@ public class GoModelTest {
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
Assert.assertEquals(property3.complexType, "time.Time");
- Assert.assertEquals(property3.datatype, "time.Time");
+ Assert.assertEquals(property3.dataType, "time.Time");
Assert.assertEquals(property3.name, "CreatedAt");
Assert.assertNull(property3.defaultValue);
Assert.assertEquals(property3.baseType, "time.Time");
@@ -100,7 +100,7 @@ public class GoModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "int64");
+ Assert.assertEquals(property1.dataType, "int64");
Assert.assertEquals(property1.name, "Id");
Assert.assertNull(property1.defaultValue);
Assert.assertEquals(property1.baseType, "int64");
@@ -110,7 +110,7 @@ public class GoModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "urls");
- Assert.assertEquals(property2.datatype, "[]string");
+ Assert.assertEquals(property2.dataType, "[]string");
Assert.assertEquals(property2.name, "Urls");
Assert.assertEquals(property2.baseType, "array");
Assert.assertFalse(property2.hasMore);
@@ -136,7 +136,7 @@ public class GoModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "translations");
- Assert.assertEquals(property1.datatype, "map[string]string");
+ Assert.assertEquals(property1.dataType, "map[string]string");
Assert.assertEquals(property1.name, "Translations");
Assert.assertEquals(property1.baseType, "map");
Assert.assertEquals(property1.containerType, "map");
@@ -160,7 +160,7 @@ public class GoModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
- Assert.assertEquals(property1.datatype, "Children");
+ Assert.assertEquals(property1.dataType, "Children");
Assert.assertEquals(property1.name, "Children");
Assert.assertEquals(property1.baseType, "Children");
Assert.assertFalse(property1.required);
@@ -182,7 +182,7 @@ public class GoModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
- Assert.assertEquals(property1.datatype, "[]Children");
+ Assert.assertEquals(property1.dataType, "[]Children");
Assert.assertEquals(property1.name, "Children");
Assert.assertEquals(property1.baseType, "array");
Assert.assertEquals(property1.containerType, "array");
@@ -208,7 +208,7 @@ public class GoModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
Assert.assertEquals(property1.complexType, "Children");
- Assert.assertEquals(property1.datatype, "map[string]Children");
+ Assert.assertEquals(property1.dataType, "map[string]Children");
Assert.assertEquals(property1.name, "Children");
Assert.assertEquals(property1.baseType, "map");
Assert.assertEquals(property1.containerType, "map");
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java
index b08bf92923a..6f68bc6dfe4 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java
@@ -47,7 +47,7 @@ public class JavaModelEnumTest {
final CodegenProperty enumVar = cm.vars.get(0);
Assert.assertEquals(enumVar.baseName, "name");
- Assert.assertEquals(enumVar.datatype, "String");
+ Assert.assertEquals(enumVar.dataType, "String");
Assert.assertEquals(enumVar.datatypeWithEnum, "NameEnum");
Assert.assertEquals(enumVar.name, "name");
Assert.assertEquals(enumVar.defaultValue, "null");
@@ -68,7 +68,7 @@ public class JavaModelEnumTest {
final CodegenProperty enumVar = cm.vars.get(0);
Assert.assertEquals(enumVar.baseName, "name");
- Assert.assertEquals(enumVar.datatype, "List");
+ Assert.assertEquals(enumVar.dataType, "List");
Assert.assertEquals(enumVar.datatypeWithEnum, "List");
Assert.assertEquals(enumVar.name, "name");
Assert.assertEquals(enumVar.defaultValue, "new ArrayList()");
@@ -76,7 +76,7 @@ public class JavaModelEnumTest {
Assert.assertTrue(enumVar.isEnum);
Assert.assertEquals(enumVar.items.baseName, "name");
- Assert.assertEquals(enumVar.items.datatype, "String");
+ Assert.assertEquals(enumVar.items.dataType, "String");
Assert.assertEquals(enumVar.items.datatypeWithEnum, "NameEnum");
Assert.assertEquals(enumVar.items.name, "name");
Assert.assertEquals(enumVar.items.defaultValue, "null");
@@ -97,7 +97,7 @@ public class JavaModelEnumTest {
final CodegenProperty enumVar = cm.vars.get(0);
Assert.assertEquals(enumVar.baseName, "name");
- Assert.assertEquals(enumVar.datatype, "List>");
+ Assert.assertEquals(enumVar.dataType, "List>");
Assert.assertEquals(enumVar.datatypeWithEnum, "List>");
Assert.assertEquals(enumVar.name, "name");
Assert.assertEquals(enumVar.defaultValue, "new ArrayList>()");
@@ -105,7 +105,7 @@ public class JavaModelEnumTest {
Assert.assertTrue(enumVar.isEnum);
Assert.assertEquals(enumVar.items.items.baseName, "name");
- Assert.assertEquals(enumVar.items.items.datatype, "String");
+ Assert.assertEquals(enumVar.items.items.dataType, "String");
Assert.assertEquals(enumVar.items.items.datatypeWithEnum, "NameEnum");
Assert.assertEquals(enumVar.items.items.name, "name");
Assert.assertEquals(enumVar.items.items.defaultValue, "null");
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java
index 7668177fd1d..6abb5df75e6 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java
@@ -91,7 +91,7 @@ public class JavaModelTest {
Assert.assertEquals(property1.nameInSnakeCase, "ID");
Assert.assertEquals(property1.getter, "getId");
Assert.assertEquals(property1.setter, "setId");
- Assert.assertEquals(property1.datatype, "Long");
+ Assert.assertEquals(property1.dataType, "Long");
Assert.assertEquals(property1.name, "id");
Assert.assertEquals(property1.defaultValue, "null");
Assert.assertEquals(property1.baseType, "Long");
@@ -105,7 +105,7 @@ public class JavaModelTest {
Assert.assertEquals(property2.nameInSnakeCase, "NAME");
Assert.assertEquals(property2.getter, "getName");
Assert.assertEquals(property2.setter, "setName");
- Assert.assertEquals(property2.datatype, "String");
+ Assert.assertEquals(property2.dataType, "String");
Assert.assertEquals(property2.name, "name");
Assert.assertEquals(property2.defaultValue, "null");
Assert.assertEquals(property2.baseType, "String");
@@ -120,7 +120,7 @@ public class JavaModelTest {
Assert.assertEquals(property3.nameInSnakeCase, "CREATED_AT");
Assert.assertEquals(property3.getter, "getCreatedAt");
Assert.assertEquals(property3.setter, "setCreatedAt");
- Assert.assertEquals(property3.datatype, "Date");
+ Assert.assertEquals(property3.dataType, "Date");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertEquals(property3.defaultValue, "null");
Assert.assertEquals(property3.baseType, "Date");
@@ -149,7 +149,7 @@ public class JavaModelTest {
Assert.assertEquals(property.baseName, "urls");
Assert.assertEquals(property.getter, "getUrls");
Assert.assertEquals(property.setter, "setUrls");
- Assert.assertEquals(property.datatype, "List");
+ Assert.assertEquals(property.dataType, "List");
Assert.assertEquals(property.name, "urls");
Assert.assertEquals(property.defaultValue, "new ArrayList()");
Assert.assertEquals(property.baseType, "List");
@@ -177,7 +177,7 @@ public class JavaModelTest {
Assert.assertEquals(property.baseName, "translations");
Assert.assertEquals(property.getter, "getTranslations");
Assert.assertEquals(property.setter, "setTranslations");
- Assert.assertEquals(property.datatype, "Map");
+ Assert.assertEquals(property.dataType, "Map");
Assert.assertEquals(property.name, "translations");
Assert.assertEquals(property.defaultValue, "new HashMap()");
Assert.assertEquals(property.baseType, "Map");
@@ -205,7 +205,7 @@ public class JavaModelTest {
Assert.assertEquals(property.baseName, "translations");
Assert.assertEquals(property.getter, "getTranslations");
Assert.assertEquals(property.setter, "setTranslations");
- Assert.assertEquals(property.datatype, "Map>");
+ Assert.assertEquals(property.dataType, "Map>");
Assert.assertEquals(property.name, "translations");
Assert.assertEquals(property.defaultValue, "new HashMap>()");
Assert.assertEquals(property.baseType, "Map");
@@ -229,7 +229,7 @@ public class JavaModelTest {
Assert.assertEquals(property.baseName, "list2D");
Assert.assertEquals(property.getter, "getList2D");
Assert.assertEquals(property.setter, "setList2D");
- Assert.assertEquals(property.datatype, "List>");
+ Assert.assertEquals(property.dataType, "List>");
Assert.assertEquals(property.name, "list2D");
Assert.assertEquals(property.defaultValue, "new ArrayList>()");
Assert.assertEquals(property.baseType, "List");
@@ -255,7 +255,7 @@ public class JavaModelTest {
Assert.assertEquals(property.baseName, "children");
Assert.assertEquals(property.getter, "getChildren");
Assert.assertEquals(property.setter, "setChildren");
- Assert.assertEquals(property.datatype, "Children");
+ Assert.assertEquals(property.dataType, "Children");
Assert.assertEquals(property.name, "children");
Assert.assertEquals(property.defaultValue, "null");
Assert.assertEquals(property.baseType, "Children");
@@ -282,7 +282,7 @@ public class JavaModelTest {
Assert.assertEquals(property.complexType, "Children");
Assert.assertEquals(property.getter, "getChildren");
Assert.assertEquals(property.setter, "setChildren");
- Assert.assertEquals(property.datatype, "List");
+ Assert.assertEquals(property.dataType, "List");
Assert.assertEquals(property.name, "children");
Assert.assertEquals(property.defaultValue, "new ArrayList()");
Assert.assertEquals(property.baseType, "List");
@@ -311,7 +311,7 @@ public class JavaModelTest {
Assert.assertEquals(property.complexType, "Children");
Assert.assertEquals(property.getter, "getChildren");
Assert.assertEquals(property.setter, "setChildren");
- Assert.assertEquals(property.datatype, "Map");
+ Assert.assertEquals(property.dataType, "Map");
Assert.assertEquals(property.name, "children");
Assert.assertEquals(property.defaultValue, "new HashMap()");
Assert.assertEquals(property.baseType, "Map");
@@ -348,7 +348,7 @@ public class JavaModelTest {
Assert.assertEquals(property.complexType, "Child");
Assert.assertEquals(property.getter, "getChildren");
Assert.assertEquals(property.setter, "setChildren");
- Assert.assertEquals(property.datatype, "List");
+ Assert.assertEquals(property.dataType, "List");
Assert.assertEquals(property.name, "children");
Assert.assertEquals(property.defaultValue, "new ArrayList()");
Assert.assertEquals(property.baseType, "List");
@@ -414,7 +414,7 @@ public class JavaModelTest {
Assert.assertEquals(property.baseName, "NAME");
Assert.assertEquals(property.getter, "getNAME");
Assert.assertEquals(property.setter, "setNAME");
- Assert.assertEquals(property.datatype, "String");
+ Assert.assertEquals(property.dataType, "String");
Assert.assertEquals(property.name, "NAME");
Assert.assertEquals(property.defaultValue, "null");
Assert.assertEquals(property.baseType, "String");
@@ -440,7 +440,7 @@ public class JavaModelTest {
Assert.assertEquals(property.baseName, "pId");
Assert.assertEquals(property.getter, "getPId");
Assert.assertEquals(property.setter, "setPId");
- Assert.assertEquals(property.datatype, "String");
+ Assert.assertEquals(property.dataType, "String");
Assert.assertEquals(property.name, "pId");
Assert.assertEquals(property.defaultValue, "null");
Assert.assertEquals(property.baseType, "String");
@@ -466,7 +466,7 @@ public class JavaModelTest {
Assert.assertEquals(property.baseName, "ATTName");
Assert.assertEquals(property.getter, "getAtTName");
Assert.assertEquals(property.setter, "setAtTName");
- Assert.assertEquals(property.datatype, "String");
+ Assert.assertEquals(property.dataType, "String");
Assert.assertEquals(property.name, "atTName");
Assert.assertEquals(property.defaultValue, "null");
Assert.assertEquals(property.baseType, "String");
@@ -528,7 +528,7 @@ public class JavaModelTest {
Assert.assertEquals(property.baseName, "inputBinaryData");
Assert.assertEquals(property.getter, "getInputBinaryData");
Assert.assertEquals(property.setter, "setInputBinaryData");
- Assert.assertEquals(property.datatype, "byte[]");
+ Assert.assertEquals(property.dataType, "byte[]");
Assert.assertEquals(property.name, "inputBinaryData");
Assert.assertEquals(property.defaultValue, "null");
Assert.assertEquals(property.baseType, "byte[]");
@@ -553,7 +553,7 @@ public class JavaModelTest {
Assert.assertEquals(property.baseName, "_");
Assert.assertEquals(property.getter, "getU");
Assert.assertEquals(property.setter, "setU");
- Assert.assertEquals(property.datatype, "String");
+ Assert.assertEquals(property.dataType, "String");
Assert.assertEquals(property.name, "u");
Assert.assertEquals(property.defaultValue, "null");
Assert.assertEquals(property.baseType, "String");
@@ -580,7 +580,7 @@ public class JavaModelTest {
.description("model with Map>")
.addProperties("map", new MapSchema()
.additionalProperties(new ArraySchema().items(new NumberSchema()))));
- Assert.assertEquals(cm1.vars.get(0).datatype, "Map>");
+ Assert.assertEquals(cm1.vars.get(0).dataType, "Map>");
Assert.assertTrue(cm1.imports.contains("BigDecimal"));
final CodegenModel cm2 = new JavaClientCodegen().fromModel("sample", new Schema()
@@ -588,7 +588,7 @@ public class JavaModelTest {
.addProperties("map", new MapSchema()
.additionalProperties(new MapSchema()
.additionalProperties(new ArraySchema().items(new NumberSchema())))));
- Assert.assertEquals(cm2.vars.get(0).datatype, "Map>>");
+ Assert.assertEquals(cm2.vars.get(0).dataType, "Map>>");
Assert.assertTrue(cm2.imports.contains("BigDecimal"));
}
@@ -680,7 +680,7 @@ public class JavaModelTest {
Assert.assertEquals(property2.baseName, "name");
Assert.assertEquals(property2.getter, "getName");
Assert.assertEquals(property2.setter, "setName");
- Assert.assertEquals(property2.datatype, "String");
+ Assert.assertEquals(property2.dataType, "String");
Assert.assertEquals(property2.name, "name");
Assert.assertEquals(property2.defaultValue, "null");
Assert.assertEquals(property2.baseType, "String");
@@ -696,7 +696,7 @@ public class JavaModelTest {
Assert.assertEquals(property3.baseName, "createdAt");
Assert.assertEquals(property3.getter, "getCreatedAt");
Assert.assertEquals(property3.setter, "setCreatedAt");
- Assert.assertEquals(property3.datatype, "Date");
+ Assert.assertEquals(property3.dataType, "Date");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertEquals(property3.defaultValue, "null");
Assert.assertEquals(property3.baseType, "Date");
@@ -745,7 +745,7 @@ public class JavaModelTest {
Assert.assertEquals(property2.baseName, "array");
Assert.assertEquals(property2.getter, "getArray");
Assert.assertEquals(property2.setter, "setArray");
- Assert.assertEquals(property2.datatype, "List");
+ Assert.assertEquals(property2.dataType, "List");
Assert.assertEquals(property2.name, "array");
Assert.assertEquals(property2.defaultValue, "new ArrayList()");
Assert.assertEquals(property2.baseType, "List");
@@ -766,7 +766,7 @@ public class JavaModelTest {
final CodegenProperty cp = codegen.fromProperty("property", property);
Assert.assertEquals(cp.baseName, "property");
- Assert.assertEquals(cp.datatype, "Boolean");
+ Assert.assertEquals(cp.dataType, "Boolean");
Assert.assertEquals(cp.name, "property");
Assert.assertEquals(cp.baseType, "Boolean");
Assert.assertTrue(cp.isNotContainer);
@@ -781,7 +781,7 @@ public class JavaModelTest {
final CodegenProperty cp = codegen.fromProperty("property", property);
Assert.assertEquals(cp.baseName, "property");
- Assert.assertEquals(cp.datatype, "Integer");
+ Assert.assertEquals(cp.dataType, "Integer");
Assert.assertEquals(cp.name, "property");
Assert.assertEquals(cp.baseType, "Integer");
Assert.assertTrue(cp.isNotContainer);
@@ -799,7 +799,7 @@ public class JavaModelTest {
Assert.assertEquals(cp.baseName, "property");
Assert.assertEquals(cp.nameInCamelCase, "Property");
Assert.assertEquals(cp.nameInSnakeCase, "PROPERTY");
- Assert.assertEquals(cp.datatype, "Long");
+ Assert.assertEquals(cp.dataType, "Long");
Assert.assertEquals(cp.name, "property");
Assert.assertEquals(cp.baseType, "Long");
Assert.assertTrue(cp.isNotContainer);
@@ -824,7 +824,7 @@ public class JavaModelTest {
Assert.assertEquals(cp1.baseName, "Integer1");
Assert.assertEquals(cp1.nameInCamelCase, "Integer1");
Assert.assertEquals(cp1.nameInSnakeCase, "INTEGER1");
- Assert.assertEquals(cp1.datatype, "Integer");
+ Assert.assertEquals(cp1.dataType, "Integer");
Assert.assertEquals(cp1.name, "integer1");
Assert.assertEquals(cp1.baseType, "Integer");
Assert.assertEquals(cp1.getter, "getInteger1");
@@ -833,7 +833,7 @@ public class JavaModelTest {
Assert.assertEquals(cp2.baseName, "Integer2");
Assert.assertEquals(cp2.nameInCamelCase, "Integer2");
Assert.assertEquals(cp2.nameInSnakeCase, "INTEGER2");
- Assert.assertEquals(cp2.datatype, "Integer");
+ Assert.assertEquals(cp2.dataType, "Integer");
Assert.assertEquals(cp2.name, "integer2");
Assert.assertEquals(cp2.baseType, "Integer");
Assert.assertEquals(cp2.getter, "getInteger2");
@@ -854,14 +854,14 @@ public class JavaModelTest {
CodegenProperty cp1 = cm.vars.get(0);
Assert.assertEquals(cp1.baseName, "Long1");
- Assert.assertEquals(cp1.datatype, "Long");
+ Assert.assertEquals(cp1.dataType, "Long");
Assert.assertEquals(cp1.name, "long1");
Assert.assertEquals(cp1.baseType, "Long");
Assert.assertEquals(cp1.getter, "getLong1");
CodegenProperty cp2 = cm.vars.get(1);
Assert.assertEquals(cp2.baseName, "Long2");
- Assert.assertEquals(cp2.datatype, "Long");
+ Assert.assertEquals(cp2.dataType, "Long");
Assert.assertEquals(cp2.name, "long2");
Assert.assertEquals(cp2.baseType, "Long");
Assert.assertEquals(cp2.getter, "getLong2");
@@ -876,7 +876,7 @@ public class JavaModelTest {
Assert.assertEquals(cp.baseName, "somePropertyWithMinMaxAndPattern");
Assert.assertEquals(cp.nameInCamelCase, "SomePropertyWithMinMaxAndPattern");
Assert.assertEquals(cp.nameInSnakeCase, "SOME_PROPERTY_WITH_MIN_MAX_AND_PATTERN");
- Assert.assertEquals(cp.datatype, "String");
+ Assert.assertEquals(cp.dataType, "String");
Assert.assertEquals(cp.name, "somePropertyWithMinMaxAndPattern");
Assert.assertEquals(cp.baseType, "String");
Assert.assertTrue(cp.isNotContainer);
@@ -902,7 +902,7 @@ public class JavaModelTest {
Assert.assertEquals(cp.baseName, "somePropertyWithMinMaxAndPattern");
Assert.assertEquals(cp.nameInCamelCase, "SomePropertyWithMinMaxAndPattern");
Assert.assertEquals(cp.nameInSnakeCase, "SOME_PROPERTY_WITH_MIN_MAX_AND_PATTERN");
- Assert.assertEquals(cp.datatype, "String");
+ Assert.assertEquals(cp.dataType, "String");
Assert.assertEquals(cp.name, "somePropertyWithMinMaxAndPattern");
Assert.assertEquals(cp.baseType, "String");
Assert.assertTrue(cp.isNotContainer);
@@ -931,7 +931,7 @@ public class JavaModelTest {
Assert.assertEquals(cp.baseName, "somePropertyWithMinMaxAndPattern");
Assert.assertEquals(cp.nameInCamelCase, "SomePropertyWithMinMaxAndPattern");
Assert.assertEquals(cp.nameInSnakeCase, "SOME_PROPERTY_WITH_MIN_MAX_AND_PATTERN");
- Assert.assertEquals(cp.datatype, "String");
+ Assert.assertEquals(cp.dataType, "String");
Assert.assertEquals(cp.name, "somePropertyWithMinMaxAndPattern");
Assert.assertEquals(cp.baseType, "String");
Assert.assertTrue(cp.isNotContainer);
@@ -956,7 +956,7 @@ public class JavaModelTest {
Assert.assertEquals(cm.vars.size(), 1);
CodegenProperty cp1 = cm.vars.get(0);
Assert.assertEquals(cp1.baseName, "pets");
- Assert.assertEquals(cp1.datatype, "List");
+ Assert.assertEquals(cp1.dataType, "List");
Assert.assertEquals(cp1.name, "pets");
Assert.assertEquals(cp1.baseType, "List");
Assert.assertTrue(cp1.isContainer);
@@ -993,7 +993,7 @@ public class JavaModelTest {
Assert.assertFalse(cp1.isMapContainer);
Assert.assertEquals(cp1.items.baseType, "Pet");
Assert.assertEquals(cp1.items.complexType, "Pet");
- Assert.assertEquals(cp1.items.datatype, "Pet");
+ Assert.assertEquals(cp1.items.dataType, "Pet");
Assert.assertEquals(co.responses.size(), 1);
@@ -1036,7 +1036,7 @@ public class JavaModelTest {
Assert.assertEquals(cm.vars.size(), 1);
CodegenProperty cp1 = cm.vars.get(0);
Assert.assertEquals(cp1.baseName, "pets");
- Assert.assertEquals(cp1.datatype, "List>");
+ Assert.assertEquals(cp1.dataType, "List>");
Assert.assertEquals(cp1.name, "pets");
Assert.assertEquals(cp1.baseType, "List");
Assert.assertEquals(cp1.getter, "getPets");
@@ -1070,10 +1070,10 @@ public class JavaModelTest {
Assert.assertFalse(cp1.isMapContainer);
Assert.assertEquals(cp1.items.baseType, "List");
Assert.assertEquals(cp1.items.complexType, "Pet");
- Assert.assertEquals(cp1.items.datatype, "List");
+ Assert.assertEquals(cp1.items.dataType, "List");
Assert.assertEquals(cp1.items.items.baseType, "Pet");
Assert.assertEquals(cp1.items.items.complexType, "Pet");
- Assert.assertEquals(cp1.items.items.datatype, "Pet");
+ Assert.assertEquals(cp1.items.items.dataType, "Pet");
Assert.assertEquals(co.responses.size(), 1);
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/javascript/JavascriptClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/javascript/JavascriptClientCodegenTest.java
index 9a54eb276a4..26778b8d532 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/javascript/JavascriptClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/javascript/JavascriptClientCodegenTest.java
@@ -81,7 +81,7 @@ public class JavascriptClientCodegenTest {
// category (property)
final CodegenProperty property1 = cm.vars.get(1);
Assert.assertEquals(property1.baseName, "category");
- Assert.assertEquals(property1.datatype, "Category");
+ Assert.assertEquals(property1.dataType, "Category");
Assert.assertEquals(property1.name, "category");
Assert.assertEquals(property1.baseType, "Category");
Assert.assertEquals(property1.defaultValueWithParam, " = Category.constructFromObject(data['category']);");
@@ -91,7 +91,7 @@ public class JavascriptClientCodegenTest {
// name (property)
final CodegenProperty property2 = cm.vars.get(2);
Assert.assertEquals(property2.baseName, "name");
- Assert.assertEquals(property2.datatype, "String");
+ Assert.assertEquals(property2.dataType, "String");
Assert.assertEquals(property2.name, "name");
Assert.assertEquals(property2.baseType, "String");
Assert.assertEquals(property2.defaultValueWithParam, " = ApiClient.convertToType(data['name'], 'String');");
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java
index c7dd086f0d8..3f014453ca3 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java
@@ -81,7 +81,7 @@ public class KotlinClientCodegenModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "kotlin.Long");
+ Assert.assertEquals(property1.dataType, "kotlin.Long");
Assert.assertEquals(property1.name, "id");
Assert.assertEquals(property1.defaultValue, "null");
Assert.assertEquals(property1.baseType, "kotlin.Long");
@@ -92,7 +92,7 @@ public class KotlinClientCodegenModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "name");
- Assert.assertEquals(property2.datatype, "kotlin.String");
+ Assert.assertEquals(property2.dataType, "kotlin.String");
Assert.assertEquals(property2.name, "name");
Assert.assertEquals(property2.defaultValue, "null");
Assert.assertEquals(property2.baseType, "kotlin.String");
@@ -103,7 +103,7 @@ public class KotlinClientCodegenModelTest {
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
- Assert.assertEquals(property3.datatype, "java.time.LocalDateTime");
+ Assert.assertEquals(property3.dataType, "java.time.LocalDateTime");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertEquals(property3.defaultValue, "null");
Assert.assertEquals(property3.baseType, "java.time.LocalDateTime");
@@ -123,7 +123,7 @@ public class KotlinClientCodegenModelTest {
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
- Assert.assertEquals(property3.datatype, "org.threeten.bp.LocalDateTime");
+ Assert.assertEquals(property3.dataType, "org.threeten.bp.LocalDateTime");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertEquals(property3.defaultValue, "null");
Assert.assertEquals(property3.baseType, "org.threeten.bp.LocalDateTime");
@@ -143,7 +143,7 @@ public class KotlinClientCodegenModelTest {
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
- Assert.assertEquals(property3.datatype, "kotlin.String");
+ Assert.assertEquals(property3.dataType, "kotlin.String");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertEquals(property3.defaultValue, "null");
Assert.assertEquals(property3.baseType, "kotlin.String");
@@ -163,7 +163,7 @@ public class KotlinClientCodegenModelTest {
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
- Assert.assertEquals(property3.datatype, "java.time.LocalDateTime");
+ Assert.assertEquals(property3.dataType, "java.time.LocalDateTime");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertEquals(property3.defaultValue, "null");
Assert.assertEquals(property3.baseType, "java.time.LocalDateTime");
@@ -188,7 +188,7 @@ public class KotlinClientCodegenModelTest {
Assert.assertEquals(property.baseName, "examples");
Assert.assertEquals(property.getter, "getExamples");
Assert.assertEquals(property.setter, "setExamples");
- Assert.assertEquals(property.datatype, "kotlin.Array");
+ Assert.assertEquals(property.dataType, "kotlin.Array");
Assert.assertEquals(property.name, "examples");
Assert.assertEquals(property.defaultValue, "null");
Assert.assertEquals(property.baseType, "kotlin.Array");
@@ -210,7 +210,7 @@ public class KotlinClientCodegenModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "mapping");
- Assert.assertEquals(property1.datatype, "kotlin.collections.Map");
+ Assert.assertEquals(property1.dataType, "kotlin.collections.Map");
Assert.assertEquals(property1.name, "mapping");
Assert.assertEquals(property1.baseType, "kotlin.collections.Map");
Assert.assertEquals(property1.containerType, "map");
@@ -232,7 +232,7 @@ public class KotlinClientCodegenModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "child");
- Assert.assertEquals(property1.datatype, "Child");
+ Assert.assertEquals(property1.dataType, "Child");
Assert.assertEquals(property1.name, "child");
Assert.assertEquals(property1.baseType, "Child");
Assert.assertFalse(property1.required);
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java
index 6b77d9bf3ff..f7458a6bc79 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java
@@ -57,7 +57,7 @@ public class ObjcModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "translations");
- Assert.assertEquals(property1.datatype, "NSDictionary*>*");
+ Assert.assertEquals(property1.dataType, "NSDictionary*>*");
Assert.assertEquals(property1.name, "translations");
Assert.assertEquals(property1.baseType, "NSDictionary");
Assert.assertEquals(property1.containerType, "map");
@@ -86,7 +86,7 @@ public class ObjcModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "NSNumber*");
+ Assert.assertEquals(property1.dataType, "NSNumber*");
Assert.assertEquals(property1.name, "_id");
Assert.assertNull(property1.defaultValue);
Assert.assertEquals(property1.baseType, "NSNumber");
@@ -97,7 +97,7 @@ public class ObjcModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "name");
- Assert.assertEquals(property2.datatype, "NSString*");
+ Assert.assertEquals(property2.dataType, "NSString*");
Assert.assertEquals(property2.name, "name");
Assert.assertNull(property2.defaultValue);
Assert.assertEquals(property2.baseType, "NSString");
@@ -108,7 +108,7 @@ public class ObjcModelTest {
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
- Assert.assertEquals(property3.datatype, "NSDate*");
+ Assert.assertEquals(property3.dataType, "NSDate*");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertNull(property3.defaultValue);
Assert.assertEquals(property3.baseType, "NSDate");
@@ -135,7 +135,7 @@ public class ObjcModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "NSNumber*");
+ Assert.assertEquals(property1.dataType, "NSNumber*");
Assert.assertEquals(property1.name, "_id");
Assert.assertNull(property1.defaultValue);
Assert.assertEquals(property1.baseType, "NSNumber");
@@ -146,7 +146,7 @@ public class ObjcModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "urls");
- Assert.assertEquals(property2.datatype, "NSArray*");
+ Assert.assertEquals(property2.dataType, "NSArray*");
Assert.assertEquals(property2.name, "urls");
Assert.assertNull(property2.defaultValue);
Assert.assertEquals(property2.baseType, "NSArray");
@@ -174,7 +174,7 @@ public class ObjcModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "translations");
- Assert.assertEquals(property1.datatype, "NSDictionary*");
+ Assert.assertEquals(property1.dataType, "NSDictionary*");
Assert.assertEquals(property1.name, "translations");
Assert.assertEquals(property1.baseType, "NSDictionary");
Assert.assertEquals(property1.containerType, "map");
@@ -199,7 +199,7 @@ public class ObjcModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
- Assert.assertEquals(property1.datatype, "OAIChildren*");
+ Assert.assertEquals(property1.dataType, "OAIChildren*");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.baseType, "OAIChildren");
Assert.assertFalse(property1.required);
@@ -223,7 +223,7 @@ public class ObjcModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
Assert.assertEquals(property1.complexType, "OAIChildren");
- Assert.assertEquals(property1.datatype, "NSArray*");
+ Assert.assertEquals(property1.dataType, "NSArray*");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.baseType, "NSArray");
Assert.assertEquals(property1.containerType, "array");
@@ -249,7 +249,7 @@ public class ObjcModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
Assert.assertEquals(property1.complexType, "OAIChildren");
- Assert.assertEquals(property1.datatype, "NSDictionary*");
+ Assert.assertEquals(property1.dataType, "NSDictionary*");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.baseType, "NSDictionary");
Assert.assertEquals(property1.containerType, "map");
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpModelTest.java
index 2d3c9bf0efe..d5b39ccd9a1 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpModelTest.java
@@ -65,7 +65,7 @@ public class PhpModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "int");
+ Assert.assertEquals(property1.dataType, "int");
Assert.assertEquals(property1.name, "id");
Assert.assertEquals(property1.defaultValue, null);
Assert.assertEquals(property1.baseType, "int");
@@ -76,7 +76,7 @@ public class PhpModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "name");
- Assert.assertEquals(property2.datatype, "string");
+ Assert.assertEquals(property2.dataType, "string");
Assert.assertEquals(property2.name, "name");
Assert.assertEquals(property2.defaultValue, null);
Assert.assertEquals(property2.baseType, "string");
@@ -88,7 +88,7 @@ public class PhpModelTest {
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
Assert.assertEquals(property3.complexType, "\\DateTime");
- Assert.assertEquals(property3.datatype, "\\DateTime");
+ Assert.assertEquals(property3.dataType, "\\DateTime");
Assert.assertEquals(property3.name, "created_at");
Assert.assertEquals(property3.defaultValue, null);
Assert.assertEquals(property3.baseType, "\\DateTime");
@@ -115,7 +115,7 @@ public class PhpModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "int");
+ Assert.assertEquals(property1.dataType, "int");
Assert.assertEquals(property1.name, "id");
Assert.assertEquals(property1.defaultValue, null);
Assert.assertEquals(property1.baseType, "int");
@@ -126,7 +126,7 @@ public class PhpModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "urls");
- Assert.assertEquals(property2.datatype, "string[]");
+ Assert.assertEquals(property2.dataType, "string[]");
Assert.assertEquals(property2.name, "urls");
Assert.assertEquals(property2.baseType, "array");
Assert.assertFalse(property2.hasMore);
@@ -153,7 +153,7 @@ public class PhpModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "translations");
- Assert.assertEquals(property1.datatype, "map[string,string]");
+ Assert.assertEquals(property1.dataType, "map[string,string]");
Assert.assertEquals(property1.name, "translations");
Assert.assertEquals(property1.baseType, "map");
Assert.assertEquals(property1.containerType, "map");
@@ -177,7 +177,7 @@ public class PhpModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
- Assert.assertEquals(property1.datatype, "\\OpenAPI\\Client\\Model\\Children");
+ Assert.assertEquals(property1.dataType, "\\OpenAPI\\Client\\Model\\Children");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.baseType, "Children");
Assert.assertFalse(property1.required);
@@ -200,7 +200,7 @@ public class PhpModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
- Assert.assertEquals(property1.datatype, "\\OpenAPI\\Client\\Model\\Children[]");
+ Assert.assertEquals(property1.dataType, "\\OpenAPI\\Client\\Model\\Children[]");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.baseType, "array");
Assert.assertEquals(property1.containerType, "array");
@@ -227,7 +227,7 @@ public class PhpModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
Assert.assertEquals(property1.complexType, "Children");
- Assert.assertEquals(property1.datatype, "map[string,\\OpenAPI\\Client\\Model\\Children]");
+ Assert.assertEquals(property1.dataType, "map[string,\\OpenAPI\\Client\\Model\\Children]");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.baseType, "map");
Assert.assertEquals(property1.containerType, "map");
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonTest.java
index 237fd5731e2..fda9261e6fc 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonTest.java
@@ -79,7 +79,7 @@ public class PythonTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "int");
+ Assert.assertEquals(property1.dataType, "int");
Assert.assertEquals(property1.name, "id");
Assert.assertNull(property1.defaultValue);
Assert.assertEquals(property1.baseType, "int");
@@ -89,7 +89,7 @@ public class PythonTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "name");
- Assert.assertEquals(property2.datatype, "str");
+ Assert.assertEquals(property2.dataType, "str");
Assert.assertEquals(property2.name, "name");
Assert.assertNull(property2.defaultValue);
Assert.assertEquals(property2.baseType, "str");
@@ -99,7 +99,7 @@ public class PythonTest {
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
- Assert.assertEquals(property3.datatype, "datetime");
+ Assert.assertEquals(property3.dataType, "datetime");
Assert.assertEquals(property3.name, "created_at");
Assert.assertNull(property3.defaultValue);
Assert.assertEquals(property3.baseType, "datetime");
@@ -125,7 +125,7 @@ public class PythonTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "int");
+ Assert.assertEquals(property1.dataType, "int");
Assert.assertEquals(property1.name, "id");
Assert.assertNull(property1.defaultValue);
Assert.assertEquals(property1.baseType, "int");
@@ -135,7 +135,7 @@ public class PythonTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "urls");
- Assert.assertEquals(property2.datatype, "list[str]");
+ Assert.assertEquals(property2.dataType, "list[str]");
Assert.assertEquals(property2.name, "urls");
Assert.assertNull(property2.defaultValue);
Assert.assertEquals(property2.baseType, "list");
@@ -163,7 +163,7 @@ public class PythonTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "translations");
- Assert.assertEquals(property1.datatype, "dict(str, str)");
+ Assert.assertEquals(property1.dataType, "dict(str, str)");
Assert.assertEquals(property1.name, "translations");
Assert.assertEquals(property1.baseType, "dict");
Assert.assertEquals(property1.containerType, "map");
@@ -187,7 +187,7 @@ public class PythonTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
- Assert.assertEquals(property1.datatype, "Children");
+ Assert.assertEquals(property1.dataType, "Children");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.baseType, "Children");
Assert.assertFalse(property1.required);
@@ -211,7 +211,7 @@ public class PythonTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
Assert.assertEquals(property1.complexType, "Children");
- Assert.assertEquals(property1.datatype, "list[Children]");
+ Assert.assertEquals(property1.dataType, "list[Children]");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.baseType, "list");
Assert.assertEquals(property1.containerType, "array");
@@ -237,7 +237,7 @@ public class PythonTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
Assert.assertEquals(property1.complexType, "Children");
- Assert.assertEquals(property1.datatype, "dict(str, Children)");
+ Assert.assertEquals(property1.dataType, "dict(str, Children)");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.baseType, "dict");
Assert.assertEquals(property1.containerType, "map");
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientCodegenTest.java
index 4460f104a48..a5672ac8a0b 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientCodegenTest.java
@@ -52,7 +52,7 @@ public class ScalaAkkaClientCodegenTest {
Assert.assertEquals(property1.baseName, "id");
Assert.assertEquals(property1.getter, "getId");
Assert.assertEquals(property1.setter, "setId");
- Assert.assertEquals(property1.datatype, "Long");
+ Assert.assertEquals(property1.dataType, "Long");
Assert.assertEquals(property1.name, "id");
Assert.assertNull(property1.defaultValue);
Assert.assertEquals(property1.baseType, "Long");
@@ -64,7 +64,7 @@ public class ScalaAkkaClientCodegenTest {
Assert.assertEquals(property2.baseName, "name");
Assert.assertEquals(property2.getter, "getName");
Assert.assertEquals(property2.setter, "setName");
- Assert.assertEquals(property2.datatype, "String");
+ Assert.assertEquals(property2.dataType, "String");
Assert.assertEquals(property2.name, "name");
Assert.assertNull(property2.defaultValue);
Assert.assertEquals(property2.baseType, "String");
@@ -76,7 +76,7 @@ public class ScalaAkkaClientCodegenTest {
Assert.assertEquals(property3.baseName, "createdAt");
Assert.assertEquals(property3.getter, "getCreatedAt");
Assert.assertEquals(property3.setter, "setCreatedAt");
- Assert.assertEquals(property3.datatype, "DateTime");
+ Assert.assertEquals(property3.dataType, "DateTime");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertNull(property3.defaultValue);
Assert.assertEquals(property3.baseType, "DateTime");
@@ -105,7 +105,7 @@ public class ScalaAkkaClientCodegenTest {
Assert.assertEquals(property1.baseName, "urls");
Assert.assertEquals(property1.getter, "getUrls");
Assert.assertEquals(property1.setter, "setUrls");
- Assert.assertEquals(property1.datatype, "Seq[String]");
+ Assert.assertEquals(property1.dataType, "Seq[String]");
Assert.assertEquals(property1.name, "urls");
Assert.assertEquals(property1.defaultValue, "Seq[String].empty ");
Assert.assertEquals(property1.baseType, "Seq");
@@ -133,7 +133,7 @@ public class ScalaAkkaClientCodegenTest {
Assert.assertEquals(property1.baseName, "translations");
Assert.assertEquals(property1.getter, "getTranslations");
Assert.assertEquals(property1.setter, "setTranslations");
- Assert.assertEquals(property1.datatype, "Map[String, String]");
+ Assert.assertEquals(property1.dataType, "Map[String, String]");
Assert.assertEquals(property1.name, "translations");
Assert.assertEquals(property1.defaultValue, "Map[String, String].empty ");
Assert.assertEquals(property1.baseType, "Map");
@@ -159,7 +159,7 @@ public class ScalaAkkaClientCodegenTest {
Assert.assertEquals(property1.baseName, "children");
Assert.assertEquals(property1.getter, "getChildren");
Assert.assertEquals(property1.setter, "setChildren");
- Assert.assertEquals(property1.datatype, "Children");
+ Assert.assertEquals(property1.dataType, "Children");
Assert.assertEquals(property1.name, "children");
Assert.assertNull(property1.defaultValue);
Assert.assertEquals(property1.baseType, "Children");
@@ -186,7 +186,7 @@ public class ScalaAkkaClientCodegenTest {
Assert.assertEquals(property1.complexType, "Children");
Assert.assertEquals(property1.getter, "getChildren");
Assert.assertEquals(property1.setter, "setChildren");
- Assert.assertEquals(property1.datatype, "Seq[Children]");
+ Assert.assertEquals(property1.dataType, "Seq[Children]");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.defaultValue, "Seq[Children].empty ");
Assert.assertEquals(property1.baseType, "Seq");
@@ -215,7 +215,7 @@ public class ScalaAkkaClientCodegenTest {
Assert.assertEquals(property1.complexType, "Children");
Assert.assertEquals(property1.getter, "getChildren");
Assert.assertEquals(property1.setter, "setChildren");
- Assert.assertEquals(property1.datatype, "Map[String, Children]");
+ Assert.assertEquals(property1.dataType, "Map[String, Children]");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.defaultValue, "Map[String, Children].empty ");
Assert.assertEquals(property1.baseType, "Map");
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalahttpclient/ScalaHttpClientModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalahttpclient/ScalaHttpClientModelTest.java
index 56a8b0987dc..09bb0706e22 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalahttpclient/ScalaHttpClientModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/scalahttpclient/ScalaHttpClientModelTest.java
@@ -66,7 +66,7 @@ public class ScalaHttpClientModelTest {
Assert.assertEquals(property1.baseName, "id");
Assert.assertEquals(property1.getter, "getId");
Assert.assertEquals(property1.setter, "setId");
- Assert.assertEquals(property1.datatype, "Long");
+ Assert.assertEquals(property1.dataType, "Long");
Assert.assertEquals(property1.name, "id");
Assert.assertNull(property1.defaultValue);
Assert.assertEquals(property1.baseType, "Long");
@@ -78,7 +78,7 @@ public class ScalaHttpClientModelTest {
Assert.assertEquals(property2.baseName, "name");
Assert.assertEquals(property2.getter, "getName");
Assert.assertEquals(property2.setter, "setName");
- Assert.assertEquals(property2.datatype, "String");
+ Assert.assertEquals(property2.dataType, "String");
Assert.assertEquals(property2.name, "name");
Assert.assertNull(property2.defaultValue);
Assert.assertEquals(property2.baseType, "String");
@@ -90,7 +90,7 @@ public class ScalaHttpClientModelTest {
Assert.assertEquals(property3.baseName, "createdAt");
Assert.assertEquals(property3.getter, "getCreatedAt");
Assert.assertEquals(property3.setter, "setCreatedAt");
- Assert.assertEquals(property3.datatype, "Date");
+ Assert.assertEquals(property3.dataType, "Date");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertNull(property3.defaultValue);
Assert.assertEquals(property3.baseType, "Date");
@@ -119,7 +119,7 @@ public class ScalaHttpClientModelTest {
Assert.assertEquals(property1.baseName, "urls");
Assert.assertEquals(property1.getter, "getUrls");
Assert.assertEquals(property1.setter, "setUrls");
- Assert.assertEquals(property1.datatype, "List[String]");
+ Assert.assertEquals(property1.dataType, "List[String]");
Assert.assertEquals(property1.name, "urls");
Assert.assertEquals(property1.defaultValue, "new ListBuffer[String]() ");
Assert.assertEquals(property1.baseType, "List");
@@ -147,7 +147,7 @@ public class ScalaHttpClientModelTest {
Assert.assertEquals(property1.baseName, "translations");
Assert.assertEquals(property1.getter, "getTranslations");
Assert.assertEquals(property1.setter, "setTranslations");
- Assert.assertEquals(property1.datatype, "Map[String, String]");
+ Assert.assertEquals(property1.dataType, "Map[String, String]");
Assert.assertEquals(property1.name, "translations");
Assert.assertEquals(property1.defaultValue, "new HashMap[String, String]() ");
Assert.assertEquals(property1.baseType, "Map");
@@ -173,7 +173,7 @@ public class ScalaHttpClientModelTest {
Assert.assertEquals(property1.baseName, "children");
Assert.assertEquals(property1.getter, "getChildren");
Assert.assertEquals(property1.setter, "setChildren");
- Assert.assertEquals(property1.datatype, "Children");
+ Assert.assertEquals(property1.dataType, "Children");
Assert.assertEquals(property1.name, "children");
Assert.assertNull(property1.defaultValue);
Assert.assertEquals(property1.baseType, "Children");
@@ -200,7 +200,7 @@ public class ScalaHttpClientModelTest {
Assert.assertEquals(property1.complexType, "Children");
Assert.assertEquals(property1.getter, "getChildren");
Assert.assertEquals(property1.setter, "setChildren");
- Assert.assertEquals(property1.datatype, "List[Children]");
+ Assert.assertEquals(property1.dataType, "List[Children]");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.defaultValue, "new ListBuffer[Children]() ");
Assert.assertEquals(property1.baseType, "List");
@@ -229,7 +229,7 @@ public class ScalaHttpClientModelTest {
Assert.assertEquals(property1.complexType, "Children");
Assert.assertEquals(property1.getter, "getChildren");
Assert.assertEquals(property1.setter, "setChildren");
- Assert.assertEquals(property1.datatype, "Map[String, Children]");
+ Assert.assertEquals(property1.dataType, "Map[String, Children]");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.defaultValue, "new HashMap[String, Children]() ");
Assert.assertEquals(property1.baseType, "Map");
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift3/Swift3ModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift3/Swift3ModelTest.java
index c57f75033d9..350d4910e1d 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift3/Swift3ModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift3/Swift3ModelTest.java
@@ -64,7 +64,7 @@ public class Swift3ModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "Int64");
+ Assert.assertEquals(property1.dataType, "Int64");
Assert.assertEquals(property1.name, "id");
Assert.assertNull(property1.defaultValue);
Assert.assertEquals(property1.baseType, "Int64");
@@ -75,7 +75,7 @@ public class Swift3ModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "name");
- Assert.assertEquals(property2.datatype, "String");
+ Assert.assertEquals(property2.dataType, "String");
Assert.assertEquals(property2.name, "name");
Assert.assertNull(property2.defaultValue);
Assert.assertEquals(property2.baseType, "String");
@@ -86,7 +86,7 @@ public class Swift3ModelTest {
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
- Assert.assertEquals(property3.datatype, "Date");
+ Assert.assertEquals(property3.dataType, "Date");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertNull(property3.defaultValue);
Assert.assertEquals(property3.baseType, "Date");
@@ -96,7 +96,7 @@ public class Swift3ModelTest {
final CodegenProperty property4 = cm.vars.get(3);
Assert.assertEquals(property4.baseName, "binary");
- Assert.assertEquals(property4.datatype, "URL");
+ Assert.assertEquals(property4.dataType, "URL");
Assert.assertEquals(property4.name, "binary");
Assert.assertNull(property4.defaultValue);
Assert.assertEquals(property4.baseType, "URL");
@@ -106,7 +106,7 @@ public class Swift3ModelTest {
final CodegenProperty property5 = cm.vars.get(4);
Assert.assertEquals(property5.baseName, "byte");
- Assert.assertEquals(property5.datatype, "Data");
+ Assert.assertEquals(property5.dataType, "Data");
Assert.assertEquals(property5.name, "byte");
Assert.assertNull(property5.defaultValue);
Assert.assertEquals(property5.baseType, "Data");
@@ -116,7 +116,7 @@ public class Swift3ModelTest {
final CodegenProperty property6 = cm.vars.get(5);
Assert.assertEquals(property6.baseName, "uuid");
- Assert.assertEquals(property6.datatype, "UUID");
+ Assert.assertEquals(property6.dataType, "UUID");
Assert.assertEquals(property6.name, "uuid");
Assert.assertNull(property6.defaultValue);
Assert.assertEquals(property6.baseType, "UUID");
@@ -126,7 +126,7 @@ public class Swift3ModelTest {
final CodegenProperty property7 = cm.vars.get(6);
Assert.assertEquals(property7.baseName, "dateOfBirth");
- Assert.assertEquals(property7.datatype, "ISOFullDate");
+ Assert.assertEquals(property7.dataType, "ISOFullDate");
Assert.assertEquals(property7.name, "dateOfBirth");
Assert.assertNull(property7.defaultValue);
Assert.assertEquals(property7.baseType, "ISOFullDate");
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift4/Swift4ModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift4/Swift4ModelTest.java
index 28ccbfa076f..099dd8ad1f0 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift4/Swift4ModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/swift4/Swift4ModelTest.java
@@ -63,7 +63,7 @@ public class Swift4ModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "Int64");
+ Assert.assertEquals(property1.dataType, "Int64");
Assert.assertEquals(property1.name, "_id");
Assert.assertNull(property1.defaultValue);
Assert.assertEquals(property1.baseType, "Int64");
@@ -74,7 +74,7 @@ public class Swift4ModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "name");
- Assert.assertEquals(property2.datatype, "String");
+ Assert.assertEquals(property2.dataType, "String");
Assert.assertEquals(property2.name, "name");
Assert.assertNull(property2.defaultValue);
Assert.assertEquals(property2.baseType, "String");
@@ -85,7 +85,7 @@ public class Swift4ModelTest {
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
- Assert.assertEquals(property3.datatype, "Date");
+ Assert.assertEquals(property3.dataType, "Date");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertNull(property3.defaultValue);
Assert.assertEquals(property3.baseType, "Date");
@@ -95,7 +95,7 @@ public class Swift4ModelTest {
final CodegenProperty property4 = cm.vars.get(3);
Assert.assertEquals(property4.baseName, "binary");
- Assert.assertEquals(property4.datatype, "URL");
+ Assert.assertEquals(property4.dataType, "URL");
Assert.assertEquals(property4.name, "binary");
Assert.assertNull(property4.defaultValue);
Assert.assertEquals(property4.baseType, "URL");
@@ -105,7 +105,7 @@ public class Swift4ModelTest {
final CodegenProperty property5 = cm.vars.get(4);
Assert.assertEquals(property5.baseName, "byte");
- Assert.assertEquals(property5.datatype, "Data");
+ Assert.assertEquals(property5.dataType, "Data");
Assert.assertEquals(property5.name, "byte");
Assert.assertNull(property5.defaultValue);
Assert.assertEquals(property5.baseType, "Data");
@@ -115,7 +115,7 @@ public class Swift4ModelTest {
final CodegenProperty property6 = cm.vars.get(5);
Assert.assertEquals(property6.baseName, "uuid");
- Assert.assertEquals(property6.datatype, "UUID");
+ Assert.assertEquals(property6.dataType, "UUID");
Assert.assertEquals(property6.name, "uuid");
Assert.assertNull(property6.defaultValue);
Assert.assertEquals(property6.baseType, "UUID");
@@ -125,7 +125,7 @@ public class Swift4ModelTest {
final CodegenProperty property7 = cm.vars.get(6);
Assert.assertEquals(property7.baseName, "dateOfBirth");
- Assert.assertEquals(property7.datatype, "Date");
+ Assert.assertEquals(property7.dataType, "Date");
Assert.assertEquals(property7.name, "dateOfBirth");
Assert.assertNull(property7.defaultValue);
Assert.assertEquals(property7.baseType, "Date");
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java
index dc769c89fef..5effa3cc10f 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java
@@ -71,7 +71,7 @@ public class TypeScriptFetchModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "number");
+ Assert.assertEquals(property1.dataType, "number");
Assert.assertEquals(property1.name, "id");
Assert.assertEquals(property1.defaultValue, "undefined");
Assert.assertEquals(property1.baseType, "number");
@@ -81,7 +81,7 @@ public class TypeScriptFetchModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "name");
- Assert.assertEquals(property2.datatype, "string");
+ Assert.assertEquals(property2.dataType, "string");
Assert.assertEquals(property2.name, "name");
Assert.assertEquals(property2.defaultValue, "undefined");
Assert.assertEquals(property2.baseType, "string");
@@ -92,7 +92,7 @@ public class TypeScriptFetchModelTest {
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
Assert.assertEquals(property3.complexType, null);
- Assert.assertEquals(property3.datatype, "Date");
+ Assert.assertEquals(property3.dataType, "Date");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertEquals(property3.defaultValue, "undefined");
Assert.assertTrue(property3.hasMore);
@@ -102,7 +102,7 @@ public class TypeScriptFetchModelTest {
final CodegenProperty property4 = cm.vars.get(3);
Assert.assertEquals(property4.baseName, "birthDate");
Assert.assertEquals(property4.complexType, null);
- Assert.assertEquals(property4.datatype, "string");
+ Assert.assertEquals(property4.dataType, "string");
Assert.assertEquals(property4.name, "birthDate");
Assert.assertEquals(property4.defaultValue, "undefined");
Assert.assertFalse(property4.hasMore);
@@ -127,7 +127,7 @@ public class TypeScriptFetchModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "number");
+ Assert.assertEquals(property1.dataType, "number");
Assert.assertEquals(property1.name, "id");
Assert.assertEquals(property1.defaultValue, "undefined");
Assert.assertEquals(property1.baseType, "number");
@@ -137,7 +137,7 @@ public class TypeScriptFetchModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "urls");
- Assert.assertEquals(property2.datatype, "Array");
+ Assert.assertEquals(property2.dataType, "Array");
Assert.assertEquals(property2.name, "urls");
Assert.assertEquals(property2.baseType, "Array");
Assert.assertFalse(property2.hasMore);
@@ -159,7 +159,7 @@ public class TypeScriptFetchModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
- Assert.assertEquals(property1.datatype, "Children");
+ Assert.assertEquals(property1.dataType, "Children");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.defaultValue, "undefined");
Assert.assertEquals(property1.baseType, "Children");
@@ -183,7 +183,7 @@ public class TypeScriptFetchModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
Assert.assertEquals(property1.complexType, "Children");
- Assert.assertEquals(property1.datatype, "Array");
+ Assert.assertEquals(property1.dataType, "Array");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.baseType, "Array");
Assert.assertFalse(property1.required);
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularModelTest.java
index eb1b2cf3413..b028aa9efca 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularModelTest.java
@@ -58,7 +58,7 @@ public class TypeScriptAngularModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "number");
+ Assert.assertEquals(property1.dataType, "number");
Assert.assertEquals(property1.name, "id");
Assert.assertEquals(property1.defaultValue, "undefined");
Assert.assertEquals(property1.baseType, "number");
@@ -68,7 +68,7 @@ public class TypeScriptAngularModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "name");
- Assert.assertEquals(property2.datatype, "string");
+ Assert.assertEquals(property2.dataType, "string");
Assert.assertEquals(property2.name, "name");
Assert.assertEquals(property2.defaultValue, "undefined");
Assert.assertEquals(property2.baseType, "string");
@@ -79,7 +79,7 @@ public class TypeScriptAngularModelTest {
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
Assert.assertEquals(property3.complexType, null);
- Assert.assertEquals(property3.datatype, "Date");
+ Assert.assertEquals(property3.dataType, "Date");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertEquals(property3.baseType, "Date");
Assert.assertEquals(property3.defaultValue, "undefined");
@@ -90,7 +90,7 @@ public class TypeScriptAngularModelTest {
final CodegenProperty property4 = cm.vars.get(3);
Assert.assertEquals(property4.baseName, "birthDate");
Assert.assertEquals(property4.complexType, null);
- Assert.assertEquals(property4.datatype, "string");
+ Assert.assertEquals(property4.dataType, "string");
Assert.assertEquals(property4.name, "birthDate");
Assert.assertEquals(property4.baseType, "string");
Assert.assertEquals(property4.defaultValue, "undefined");
@@ -116,7 +116,7 @@ public class TypeScriptAngularModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "number");
+ Assert.assertEquals(property1.dataType, "number");
Assert.assertEquals(property1.name, "id");
Assert.assertEquals(property1.defaultValue, "undefined");
Assert.assertEquals(property1.baseType, "number");
@@ -126,7 +126,7 @@ public class TypeScriptAngularModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "urls");
- Assert.assertEquals(property2.datatype, "Array");
+ Assert.assertEquals(property2.dataType, "Array");
Assert.assertEquals(property2.name, "urls");
Assert.assertEquals(property2.baseType, "Array");
Assert.assertFalse(property2.hasMore);
@@ -148,7 +148,7 @@ public class TypeScriptAngularModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
- Assert.assertEquals(property1.datatype, "Children");
+ Assert.assertEquals(property1.dataType, "Children");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.defaultValue, "undefined");
Assert.assertEquals(property1.baseType, "Children");
@@ -172,7 +172,7 @@ public class TypeScriptAngularModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
Assert.assertEquals(property1.complexType, "Children");
- Assert.assertEquals(property1.datatype, "Array");
+ Assert.assertEquals(property1.dataType, "Array");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.baseType, "Array");
Assert.assertFalse(property1.required);
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangularjs/TypeScriptAngularJsModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangularjs/TypeScriptAngularJsModelTest.java
index e58286aae3f..b158a04299e 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangularjs/TypeScriptAngularJsModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangularjs/TypeScriptAngularJsModelTest.java
@@ -57,7 +57,7 @@ public class TypeScriptAngularJsModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "number");
+ Assert.assertEquals(property1.dataType, "number");
Assert.assertEquals(property1.name, "id");
Assert.assertEquals(property1.defaultValue, "undefined");
Assert.assertEquals(property1.baseType, "number");
@@ -67,7 +67,7 @@ public class TypeScriptAngularJsModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "name");
- Assert.assertEquals(property2.datatype, "string");
+ Assert.assertEquals(property2.dataType, "string");
Assert.assertEquals(property2.name, "name");
Assert.assertEquals(property2.defaultValue, "undefined");
Assert.assertEquals(property2.baseType, "string");
@@ -78,7 +78,7 @@ public class TypeScriptAngularJsModelTest {
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
Assert.assertEquals(property3.complexType, null);
- Assert.assertEquals(property3.datatype, "Date");
+ Assert.assertEquals(property3.dataType, "Date");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertEquals(property3.defaultValue, "undefined");
Assert.assertTrue(property3.hasMore);
@@ -88,7 +88,7 @@ public class TypeScriptAngularJsModelTest {
final CodegenProperty property4 = cm.vars.get(3);
Assert.assertEquals(property4.baseName, "birthDate");
Assert.assertEquals(property4.complexType, null);
- Assert.assertEquals(property4.datatype, "string");
+ Assert.assertEquals(property4.dataType, "string");
Assert.assertEquals(property4.name, "birthDate");
Assert.assertEquals(property4.defaultValue, "undefined");
Assert.assertFalse(property4.hasMore);
@@ -113,7 +113,7 @@ public class TypeScriptAngularJsModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "number");
+ Assert.assertEquals(property1.dataType, "number");
Assert.assertEquals(property1.name, "id");
Assert.assertEquals(property1.defaultValue, "undefined");
Assert.assertEquals(property1.baseType, "number");
@@ -122,7 +122,7 @@ public class TypeScriptAngularJsModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "urls");
- Assert.assertEquals(property2.datatype, "Array");
+ Assert.assertEquals(property2.dataType, "Array");
Assert.assertEquals(property2.name, "urls");
Assert.assertEquals(property2.baseType, "Array");
Assert.assertFalse(property2.hasMore);
@@ -144,7 +144,7 @@ public class TypeScriptAngularJsModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
- Assert.assertEquals(property1.datatype, "models.Children");
+ Assert.assertEquals(property1.dataType, "models.Children");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.defaultValue, "undefined");
Assert.assertEquals(property1.baseType, "models.Children");
@@ -168,7 +168,7 @@ public class TypeScriptAngularJsModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
Assert.assertEquals(property1.complexType, "models.Children");
- Assert.assertEquals(property1.datatype, "Array");
+ Assert.assertEquals(property1.dataType, "Array");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.baseType, "Array");
Assert.assertFalse(property1.required);
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeModelTest.java
index 59dd944022c..480f5443a1d 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeModelTest.java
@@ -58,7 +58,7 @@ public class TypeScriptNodeModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "number");
+ Assert.assertEquals(property1.dataType, "number");
Assert.assertEquals(property1.name, "id");
Assert.assertEquals(property1.defaultValue, "undefined");
Assert.assertEquals(property1.baseType, "number");
@@ -67,7 +67,7 @@ public class TypeScriptNodeModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "name");
- Assert.assertEquals(property2.datatype, "string");
+ Assert.assertEquals(property2.dataType, "string");
Assert.assertEquals(property2.name, "name");
Assert.assertEquals(property2.defaultValue, "undefined");
Assert.assertEquals(property2.baseType, "string");
@@ -77,7 +77,7 @@ public class TypeScriptNodeModelTest {
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
Assert.assertEquals(property3.complexType, null);
- Assert.assertEquals(property3.datatype, "Date");
+ Assert.assertEquals(property3.dataType, "Date");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertEquals(property3.defaultValue, "undefined");
Assert.assertTrue(property3.hasMore);
@@ -86,7 +86,7 @@ public class TypeScriptNodeModelTest {
final CodegenProperty property4 = cm.vars.get(3);
Assert.assertEquals(property4.baseName, "birthDate");
Assert.assertEquals(property4.complexType, null);
- Assert.assertEquals(property4.datatype, "string");
+ Assert.assertEquals(property4.dataType, "string");
Assert.assertEquals(property4.name, "birthDate");
Assert.assertEquals(property4.defaultValue, "undefined");
Assert.assertFalse(property4.hasMore);
@@ -110,7 +110,7 @@ public class TypeScriptNodeModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id");
- Assert.assertEquals(property1.datatype, "number");
+ Assert.assertEquals(property1.dataType, "number");
Assert.assertEquals(property1.name, "id");
Assert.assertEquals(property1.defaultValue, "undefined");
Assert.assertEquals(property1.baseType, "number");
@@ -119,7 +119,7 @@ public class TypeScriptNodeModelTest {
final CodegenProperty property2 = cm.vars.get(1);
Assert.assertEquals(property2.baseName, "urls");
- Assert.assertEquals(property2.datatype, "Array");
+ Assert.assertEquals(property2.dataType, "Array");
Assert.assertEquals(property2.name, "urls");
Assert.assertEquals(property2.baseType, "Array");
Assert.assertFalse(property2.hasMore);
@@ -141,7 +141,7 @@ public class TypeScriptNodeModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
- Assert.assertEquals(property1.datatype, "Children");
+ Assert.assertEquals(property1.dataType, "Children");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.baseType, "Children");
Assert.assertFalse(property1.required);
@@ -164,7 +164,7 @@ public class TypeScriptNodeModelTest {
final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "children");
Assert.assertEquals(property1.complexType, "Children");
- Assert.assertEquals(property1.datatype, "Array");
+ Assert.assertEquals(property1.dataType, "Array");
Assert.assertEquals(property1.name, "children");
Assert.assertEquals(property1.baseType, "Array");
Assert.assertFalse(property1.required);