diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java index c374b0204c1c..0d867b0ecb14 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java @@ -307,29 +307,11 @@ public String getComplexType() { return complexType; } - /** - * @return dataType - * @deprecated since version 3.0.0, use {@link #getDataType()} instead.
- * May be removed with the next major release (4.0) - */ - @Deprecated - public String getDatatype() { - return getDataType(); - } - @Override public String getDataType() { return dataType; } - /** - * @deprecated use {@link #setDataType(String)} instead. - */ - @Deprecated - public void setDatatype(String datatype) { - this.dataType = datatype; - } - @Override public void setDataType(String dataType) { this.dataType = dataType; diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache index 70f2106ba847..dbeba5919808 100644 --- a/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache +++ b/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache @@ -128,13 +128,13 @@ static {{classname}}_t *{{classname}}_create_internal( {{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}{{^-last}},{{/-last}} {{/isEnum}} {{^isEnum}} - {{datatype}}_t *{{name}}{{^-last}},{{/-last}} + {{dataType}}_t *{{name}}{{^-last}},{{/-last}} {{/isEnum}} {{/isModel}} {{^isModel}} {{^isFreeFormObject}} {{^isEnum}} - {{datatype}}_t *{{name}}{{^-last}},{{/-last}} + {{dataType}}_t *{{name}}{{^-last}},{{/-last}} {{/isEnum}} {{#isEnum}} {{projectName}}_{{dataType}}_{{enumName}}_e {{name}}{{^-last}},{{/-last}} @@ -142,21 +142,21 @@ static {{classname}}_t *{{classname}}_create_internal( {{/isFreeFormObject}} {{/isModel}} {{#isUuid}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isUuid}} {{#isEmail}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isEmail}} {{#isFreeFormObject}} - {{datatype}}_t *{{name}}{{^-last}},{{/-last}} + {{dataType}}_t *{{name}}{{^-last}},{{/-last}} {{/isFreeFormObject}} {{/isPrimitiveType}} {{#isPrimitiveType}} {{#isNumeric}} - {{datatype}} {{name}}{{^-last}},{{/-last}} + {{dataType}} {{name}}{{^-last}},{{/-last}} {{/isNumeric}} {{#isBoolean}} - {{datatype}} {{name}}{{^-last}},{{/-last}} + {{dataType}} {{name}}{{^-last}},{{/-last}} {{/isBoolean}} {{#isEnum}} {{#isString}} @@ -165,34 +165,34 @@ static {{classname}}_t *{{classname}}_create_internal( {{/isEnum}} {{^isEnum}} {{#isString}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isString}} {{/isEnum}} {{#isByteArray}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isByteArray}} {{#isBinary}} - {{datatype}} {{name}}{{^-last}},{{/-last}} + {{dataType}} {{name}}{{^-last}},{{/-last}} {{/isBinary}} {{#isDate}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isDate}} {{#isDateTime}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isDateTime}} {{/isPrimitiveType}} {{/isContainer}} {{#isContainer}} {{#isArray}} {{#isPrimitiveType}} - {{datatype}}_t *{{name}}{{^-last}},{{/-last}} + {{dataType}}_t *{{name}}{{^-last}},{{/-last}} {{/isPrimitiveType}} {{^isPrimitiveType}} - {{datatype}}_t *{{name}}{{^-last}},{{/-last}} + {{dataType}}_t *{{name}}{{^-last}},{{/-last}} {{/isPrimitiveType}} {{/isArray}} {{#isMap}} - {{datatype}} {{name}}{{^-last}},{{/-last}} + {{dataType}} {{name}}{{^-last}},{{/-last}} {{/isMap}} {{/isContainer}} {{/vars}} @@ -218,13 +218,13 @@ __attribute__((deprecated)) {{classname}}_t *{{classname}}_create( {{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}{{^-last}},{{/-last}} {{/isEnum}} {{^isEnum}} - {{datatype}}_t *{{name}}{{^-last}},{{/-last}} + {{dataType}}_t *{{name}}{{^-last}},{{/-last}} {{/isEnum}} {{/isModel}} {{^isModel}} {{^isFreeFormObject}} {{^isEnum}} - {{datatype}}_t *{{name}}{{^-last}},{{/-last}} + {{dataType}}_t *{{name}}{{^-last}},{{/-last}} {{/isEnum}} {{#isEnum}} {{projectName}}_{{dataType}}_{{enumName}}_e {{name}}{{^-last}},{{/-last}} @@ -232,21 +232,21 @@ __attribute__((deprecated)) {{classname}}_t *{{classname}}_create( {{/isFreeFormObject}} {{/isModel}} {{#isUuid}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isUuid}} {{#isEmail}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isEmail}} {{#isFreeFormObject}} - {{datatype}}_t *{{name}}{{^-last}},{{/-last}} + {{dataType}}_t *{{name}}{{^-last}},{{/-last}} {{/isFreeFormObject}} {{/isPrimitiveType}} {{#isPrimitiveType}} {{#isNumeric}} - {{datatype}} {{name}}{{^-last}},{{/-last}} + {{dataType}} {{name}}{{^-last}},{{/-last}} {{/isNumeric}} {{#isBoolean}} - {{datatype}} {{name}}{{^-last}},{{/-last}} + {{dataType}} {{name}}{{^-last}},{{/-last}} {{/isBoolean}} {{#isEnum}} {{#isString}} @@ -255,34 +255,34 @@ __attribute__((deprecated)) {{classname}}_t *{{classname}}_create( {{/isEnum}} {{^isEnum}} {{#isString}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isString}} {{/isEnum}} {{#isByteArray}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isByteArray}} {{#isBinary}} - {{datatype}} {{name}}{{^-last}},{{/-last}} + {{dataType}} {{name}}{{^-last}},{{/-last}} {{/isBinary}} {{#isDate}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isDate}} {{#isDateTime}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isDateTime}} {{/isPrimitiveType}} {{/isContainer}} {{#isContainer}} {{#isArray}} {{#isPrimitiveType}} - {{datatype}}_t *{{name}}{{^-last}},{{/-last}} + {{dataType}}_t *{{name}}{{^-last}},{{/-last}} {{/isPrimitiveType}} {{^isPrimitiveType}} - {{datatype}}_t *{{name}}{{^-last}},{{/-last}} + {{dataType}}_t *{{name}}{{^-last}},{{/-last}} {{/isPrimitiveType}} {{/isArray}} {{#isMap}} - {{datatype}} {{name}}{{^-last}},{{/-last}} + {{dataType}} {{name}}{{^-last}},{{/-last}} {{/isMap}} {{/isContainer}} {{/vars}} diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/model-header.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/model-header.mustache index 236d9e8c3cba..d9e561141061 100644 --- a/modules/openapi-generator/src/main/resources/C-libcurl/model-header.mustache +++ b/modules/openapi-generator/src/main/resources/C-libcurl/model-header.mustache @@ -85,13 +85,13 @@ typedef struct {{classname}}_t { {{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}; //enum model {{/isEnum}} {{^isEnum}} - struct {{datatype}}_t *{{name}}; //model + struct {{dataType}}_t *{{name}}; //model {{/isEnum}} {{/isModel}} {{^isModel}} {{^isFreeFormObject}} {{^isEnum}} - {{datatype}}_t *{{name}}; // custom + {{dataType}}_t *{{name}}; // custom {{/isEnum}} {{#isEnum}} {{projectName}}_{{dataType}}_{{enumName}}_e {{name}}; //referenced enum @@ -99,21 +99,21 @@ typedef struct {{classname}}_t { {{/isFreeFormObject}} {{/isModel}} {{#isUuid}} - {{datatype}} *{{name}}; // uuid + {{dataType}} *{{name}}; // uuid {{/isUuid}} {{#isEmail}} - {{datatype}} *{{name}}; // email + {{dataType}} *{{name}}; // email {{/isEmail}} {{#isFreeFormObject}} - {{datatype}}_t *{{name}}; //object + {{dataType}}_t *{{name}}; //object {{/isFreeFormObject}} {{/isPrimitiveType}} {{#isPrimitiveType}} {{#isNumeric}} - {{datatype}} {{name}}; //numeric + {{dataType}} {{name}}; //numeric {{/isNumeric}} {{#isBoolean}} - {{datatype}} {{name}}; //boolean + {{dataType}} {{name}}; //boolean {{/isBoolean}} {{#isEnum}} {{#isString}} @@ -122,34 +122,34 @@ typedef struct {{classname}}_t { {{/isEnum}} {{^isEnum}} {{#isString}} - {{datatype}} *{{name}}; // string + {{dataType}} *{{name}}; // string {{/isString}} {{/isEnum}} {{#isByteArray}} - {{datatype}} *{{name}}; //ByteArray + {{dataType}} *{{name}}; //ByteArray {{/isByteArray}} {{#isBinary}} - {{datatype}} {{name}}; //binary + {{dataType}} {{name}}; //binary {{/isBinary}} {{#isDate}} - {{datatype}} *{{name}}; //date + {{dataType}} *{{name}}; //date {{/isDate}} {{#isDateTime}} - {{datatype}} *{{name}}; //date time + {{dataType}} *{{name}}; //date time {{/isDateTime}} {{/isPrimitiveType}} {{/isContainer}} {{#isContainer}} {{#isArray}} {{#isPrimitiveType}} - {{datatype}}_t *{{name}}; //primitive container + {{dataType}}_t *{{name}}; //primitive container {{/isPrimitiveType}} {{^isPrimitiveType}} - {{datatype}}_t *{{name}}; //nonprimitive container + {{dataType}}_t *{{name}}; //nonprimitive container {{/isPrimitiveType}} {{/isArray}} {{#isMap}} - {{datatype}} {{name}}; //map + {{dataType}} {{name}}; //map {{/isMap}} {{/isContainer}} {{/vars}} @@ -166,13 +166,13 @@ __attribute__((deprecated)) {{classname}}_t *{{classname}}_create( {{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}{{^-last}},{{/-last}} {{/isEnum}} {{^isEnum}} - {{datatype}}_t *{{name}}{{^-last}},{{/-last}} + {{dataType}}_t *{{name}}{{^-last}},{{/-last}} {{/isEnum}} {{/isModel}} {{^isModel}} {{^isFreeFormObject}} {{^isEnum}} - {{datatype}}_t *{{name}}{{^-last}},{{/-last}} + {{dataType}}_t *{{name}}{{^-last}},{{/-last}} {{/isEnum}} {{#isEnum}} {{projectName}}_{{dataType}}_{{enumName}}_e {{name}}{{^-last}},{{/-last}} @@ -180,21 +180,21 @@ __attribute__((deprecated)) {{classname}}_t *{{classname}}_create( {{/isFreeFormObject}} {{/isModel}} {{#isUuid}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isUuid}} {{#isEmail}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isEmail}} {{#isFreeFormObject}} - {{datatype}}_t *{{name}}{{^-last}},{{/-last}} + {{dataType}}_t *{{name}}{{^-last}},{{/-last}} {{/isFreeFormObject}} {{/isPrimitiveType}} {{#isPrimitiveType}} {{#isNumeric}} - {{datatype}} {{name}}{{^-last}},{{/-last}} + {{dataType}} {{name}}{{^-last}},{{/-last}} {{/isNumeric}} {{#isBoolean}} - {{datatype}} {{name}}{{^-last}},{{/-last}} + {{dataType}} {{name}}{{^-last}},{{/-last}} {{/isBoolean}} {{#isEnum}} {{#isString}} @@ -203,34 +203,34 @@ __attribute__((deprecated)) {{classname}}_t *{{classname}}_create( {{/isEnum}} {{^isEnum}} {{#isString}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isString}} {{/isEnum}} {{#isByteArray}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isByteArray}} {{#isBinary}} - {{datatype}} {{name}}{{^-last}},{{/-last}} + {{dataType}} {{name}}{{^-last}},{{/-last}} {{/isBinary}} {{#isDate}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isDate}} {{#isDateTime}} - {{datatype}} *{{name}}{{^-last}},{{/-last}} + {{dataType}} *{{name}}{{^-last}},{{/-last}} {{/isDateTime}} {{/isPrimitiveType}} {{/isContainer}} {{#isContainer}} {{#isArray}} {{#isPrimitiveType}} - {{datatype}}_t *{{name}}{{^-last}},{{/-last}} + {{dataType}}_t *{{name}}{{^-last}},{{/-last}} {{/isPrimitiveType}} {{^isPrimitiveType}} - {{datatype}}_t *{{name}}{{^-last}},{{/-last}} + {{dataType}}_t *{{name}}{{^-last}},{{/-last}} {{/isPrimitiveType}} {{/isArray}} {{#isMap}} - {{datatype}} {{name}}{{^-last}},{{/-last}} + {{dataType}} {{name}}{{^-last}},{{/-last}} {{/isMap}} {{/isContainer}} {{/vars}} diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/model_doc.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/model_doc.mustache index 823834d7ae3f..2f761b326828 100644 --- a/modules/openapi-generator/src/main/resources/C-libcurl/model_doc.mustache +++ b/modules/openapi-generator/src/main/resources/C-libcurl/model_doc.mustache @@ -4,7 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- {{#vars}} -**{{name}}** | {{^isContainer}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}**{{projectName}}_{{classVarName}}_{{enumName}}_e**{{/isEnum}}{{^isEnum}}[**{{datatype}}_t**]({{complexType}}.md) \*{{/isEnum}}{{/isModel}}{{^isModel}}{{^isFreeFormObject}}**{{datatype}}_t \***{{/isFreeFormObject}}{{/isModel}}{{#isUuid}}**{{datatype}} \***{{/isUuid}}{{#isEmail}}**{{datatype}} \***{{/isEmail}}{{#isFreeFormObject}}[**{{datatype}}_t**]({{complexType}}.md) \*{{/isFreeFormObject}}{{/isPrimitiveType}}{{#isPrimitiveType}}{{#isNumeric}}**{{datatype}}**{{/isNumeric}}{{#isBoolean}}**{{datatype}}**{{/isBoolean}}{{#isEnum}}{{#isString}}**{{projectName}}_{{classVarName}}_{{enumName}}_e**{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}**{{datatype}} \***{{/isString}}{{/isEnum}}{{#isByteArray}}**{{datatype}} \***{{/isByteArray}}{{#isBinary}}**{{datatype}}**{{/isBinary}}{{#isDate}}**{{datatype}} \***{{/isDate}}{{#isDateTime}}**{{datatype}} \***{{/isDateTime}}{{/isPrimitiveType}}{{/isContainer}}{{#isContainer}}{{#isArray}}{{#isPrimitiveType}}**{{datatype}}_t \***{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}_t**]({{complexType}}.md) \*{{/isPrimitiveType}}{{/isArray}}{{#isMap}}**{{datatype}}**{{/isMap}}{{/isContainer}} | {{description}} | {{^required}}[optional] {{/required}}{{#isReadOnly}}[readonly] {{/isReadOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}} +**{{name}}** | {{^isContainer}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}**{{projectName}}_{{classVarName}}_{{enumName}}_e**{{/isEnum}}{{^isEnum}}[**{{dataType}}_t**]({{complexType}}.md) \*{{/isEnum}}{{/isModel}}{{^isModel}}{{^isFreeFormObject}}**{{dataType}}_t \***{{/isFreeFormObject}}{{/isModel}}{{#isUuid}}**{{dataType}} \***{{/isUuid}}{{#isEmail}}**{{dataType}} \***{{/isEmail}}{{#isFreeFormObject}}[**{{dataType}}_t**]({{complexType}}.md) \*{{/isFreeFormObject}}{{/isPrimitiveType}}{{#isPrimitiveType}}{{#isNumeric}}**{{dataType}}**{{/isNumeric}}{{#isBoolean}}**{{dataType}}**{{/isBoolean}}{{#isEnum}}{{#isString}}**{{projectName}}_{{classVarName}}_{{enumName}}_e**{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}**{{dataType}} \***{{/isString}}{{/isEnum}}{{#isByteArray}}**{{dataType}} \***{{/isByteArray}}{{#isBinary}}**{{dataType}}**{{/isBinary}}{{#isDate}}**{{dataType}} \***{{/isDate}}{{#isDateTime}}**{{dataType}} \***{{/isDateTime}}{{/isPrimitiveType}}{{/isContainer}}{{#isContainer}}{{#isArray}}{{#isPrimitiveType}}**{{dataType}}_t \***{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}_t**]({{complexType}}.md) \*{{/isPrimitiveType}}{{/isArray}}{{#isMap}}**{{dataType}}**{{/isMap}}{{/isContainer}} | {{description}} | {{^required}}[optional] {{/required}}{{#isReadOnly}}[readonly] {{/isReadOnly}}{{#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/Javascript-Flowtyped/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/modelGeneric.mustache index 1ed248653dbd..124fba580d8a 100644 --- a/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/modelGeneric.mustache @@ -18,9 +18,9 @@ export type {{classname}} = { {{#vars}} /** * {{{description}}} - * @type {{=<% %>=}}{<%&datatype%>}<%={{ }}=%> + * @type {{=<% %>=}}{<%&dataType%>}<%={{ }}=%> * @memberof {{classname}} */ - {{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}}; + {{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}; {{/vars}} }{{#parent}} & {{.}}{{/parent}} diff --git a/modules/openapi-generator/src/main/resources/apex/pojo_doc.mustache b/modules/openapi-generator/src/main/resources/apex/pojo_doc.mustache index b2cdbdb9c654..3f8277c85d4e 100644 --- a/modules/openapi-generator/src/main/resources/apex/pojo_doc.mustache +++ b/modules/openapi-generator/src/main/resources/apex/pojo_doc.mustache @@ -3,7 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -{{#vars}}**{{name}}** | {{#isEnum}}[**{{datatypeWithEnum}}**](#{{datatypeWithEnum}}){{/isEnum}}{{^isEnum}}{{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}}{{/isEnum}} | {{description}} | {{^required}} [optional]{{/required}}{{#isReadOnly}} [readonly]{{/isReadOnly}} +{{#vars}}**{{name}}** | {{#isEnum}}[**{{datatypeWithEnum}}**](#{{datatypeWithEnum}}){{/isEnum}}{{^isEnum}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}}{{/isEnum}} | {{description}} | {{^required}} [optional]{{/required}}{{#isReadOnly}} [readonly]{{/isReadOnly}} {{/vars}} {{#vars}}{{#isEnum}} diff --git a/modules/openapi-generator/src/main/resources/cpp-ue4/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-ue4/model-header.mustache index ee709e587e3c..b12dd7600afc 100644 --- a/modules/openapi-generator/src/main/resources/cpp-ue4/model-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-ue4/model-header.mustache @@ -62,7 +62,7 @@ public: {{/isEnum}} {{^isEnum}} {{#description}}/* {{{.}}} */ - {{/description}}{{^required}}TOptional<{{/required}}{{{datatype}}}{{^required}}>{{/required}} {{name}}{{#required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/required}}; + {{/description}}{{^required}}TOptional<{{/required}}{{{dataType}}}{{^required}}>{{/required}} {{name}}{{#required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/required}}; {{/isEnum}} {{/vars}} }; diff --git a/modules/openapi-generator/src/main/resources/elixir/model.mustache b/modules/openapi-generator/src/main/resources/elixir/model.mustache index e7afe8407d01..2f4be60cc134 100644 --- a/modules/openapi-generator/src/main/resources/elixir/model.mustache +++ b/modules/openapi-generator/src/main/resources/elixir/model.mustache @@ -11,7 +11,7 @@ ] @type t :: %__MODULE__{ - {{#vars}}{{#atom}}{{&baseName}}{{/atom}} => {{{datatype}}}{{#isNullable}} | nil{{/isNullable}}{{^isNullable}}{{^required}} | nil{{/required}}{{/isNullable}}{{^-last}}, + {{#vars}}{{#atom}}{{&baseName}}{{/atom}} => {{{dataType}}}{{#isNullable}} | nil{{/isNullable}}{{^isNullable}}{{^required}} | nil{{/required}}{{/isNullable}}{{^-last}}, {{/-last}}{{/vars}} } diff --git a/modules/openapi-generator/src/main/resources/fsharp-giraffe-server/Model.mustache b/modules/openapi-generator/src/main/resources/fsharp-giraffe-server/Model.mustache index afb74b9a1ac5..48f853db2685 100644 --- a/modules/openapi-generator/src/main/resources/fsharp-giraffe-server/Model.mustache +++ b/modules/openapi-generator/src/main/resources/fsharp-giraffe-server/Model.mustache @@ -15,7 +15,7 @@ module {{classname}} = {{#vars}} {{#isEnum}} //#region enums - type {{datatypeWithEnum}} = {{#allowableValues}}{{#enumVars}}{{name}} of {{datatype}} {{^-last}} | {{/-last}} {{/enumVars}}{{/allowableValues}} + type {{datatypeWithEnum}} = {{#allowableValues}}{{#enumVars}}{{name}} of {{dataType}} {{^-last}} | {{/-last}} {{/enumVars}}{{/allowableValues}} //#endregion {{/isEnum}} {{/vars}} diff --git a/modules/openapi-generator/src/main/resources/julia-client/partial_model_single.mustache b/modules/openapi-generator/src/main/resources/julia-client/partial_model_single.mustache index 50e461e7c7d9..09f2777deefe 100644 --- a/modules/openapi-generator/src/main/resources/julia-client/partial_model_single.mustache +++ b/modules/openapi-generator/src/main/resources/julia-client/partial_model_single.mustache @@ -8,12 +8,12 @@ ) {{#allVars}} - - {{{name}}}::{{datatype}}{{#description}} : {{description}}{{/description}} + - {{{name}}}::{{dataType}}{{#description}} : {{description}}{{/description}} {{/allVars}} """ Base.@kwdef mutable struct {{classname}} <: OpenAPI.APIModel {{#allVars}} - {{{name}}}{{#isPrimitiveType}}::Union{Nothing, {{{datatype}}}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isContainer}}::Union{Nothing, {{#isMap}}Dict{{/isMap}}{{^isMap}}Vector{{/isMap}}}{{/isContainer}}{{/isPrimitiveType}} = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}nothing{{/defaultValue}}{{^isPrimitiveType}} # spec type: Union{ Nothing, {{datatype}} }{{/isPrimitiveType}} + {{{name}}}{{#isPrimitiveType}}::Union{Nothing, {{{dataType}}}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isContainer}}::Union{Nothing, {{#isMap}}Dict{{/isMap}}{{^isMap}}Vector{{/isMap}}}{{/isContainer}}{{/isPrimitiveType}} = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}nothing{{/defaultValue}}{{^isPrimitiveType}} # spec type: Union{ Nothing, {{dataType}} }{{/isPrimitiveType}} {{/allVars}} function {{classname}}({{#allVars}}{{{name}}}, {{/allVars}}) @@ -23,7 +23,7 @@ Base.@kwdef mutable struct {{classname}} <: OpenAPI.APIModel end end # type {{classname}} -const _property_types_{{classname}} = Dict{Symbol,String}({{#allVars}}Symbol("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}")=>"{{datatype}}", {{/allVars}}) +const _property_types_{{classname}} = Dict{Symbol,String}({{#allVars}}Symbol("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}")=>"{{dataType}}", {{/allVars}}) OpenAPI.property_type(::Type{ {{classname}} }, name::Symbol) = Union{Nothing,eval(Base.Meta.parse(_property_types_{{classname}}[name]))} function OpenAPI.check_required(o::{{classname}}) diff --git a/modules/openapi-generator/src/main/resources/julia-server/partial_model_single.mustache b/modules/openapi-generator/src/main/resources/julia-server/partial_model_single.mustache index 50e461e7c7d9..09f2777deefe 100644 --- a/modules/openapi-generator/src/main/resources/julia-server/partial_model_single.mustache +++ b/modules/openapi-generator/src/main/resources/julia-server/partial_model_single.mustache @@ -8,12 +8,12 @@ ) {{#allVars}} - - {{{name}}}::{{datatype}}{{#description}} : {{description}}{{/description}} + - {{{name}}}::{{dataType}}{{#description}} : {{description}}{{/description}} {{/allVars}} """ Base.@kwdef mutable struct {{classname}} <: OpenAPI.APIModel {{#allVars}} - {{{name}}}{{#isPrimitiveType}}::Union{Nothing, {{{datatype}}}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isContainer}}::Union{Nothing, {{#isMap}}Dict{{/isMap}}{{^isMap}}Vector{{/isMap}}}{{/isContainer}}{{/isPrimitiveType}} = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}nothing{{/defaultValue}}{{^isPrimitiveType}} # spec type: Union{ Nothing, {{datatype}} }{{/isPrimitiveType}} + {{{name}}}{{#isPrimitiveType}}::Union{Nothing, {{{dataType}}}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isContainer}}::Union{Nothing, {{#isMap}}Dict{{/isMap}}{{^isMap}}Vector{{/isMap}}}{{/isContainer}}{{/isPrimitiveType}} = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}nothing{{/defaultValue}}{{^isPrimitiveType}} # spec type: Union{ Nothing, {{dataType}} }{{/isPrimitiveType}} {{/allVars}} function {{classname}}({{#allVars}}{{{name}}}, {{/allVars}}) @@ -23,7 +23,7 @@ Base.@kwdef mutable struct {{classname}} <: OpenAPI.APIModel end end # type {{classname}} -const _property_types_{{classname}} = Dict{Symbol,String}({{#allVars}}Symbol("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}")=>"{{datatype}}", {{/allVars}}) +const _property_types_{{classname}} = Dict{Symbol,String}({{#allVars}}Symbol("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}")=>"{{dataType}}", {{/allVars}}) OpenAPI.property_type(::Type{ {{classname}} }, name::Symbol) = Union{Nothing,eval(Base.Meta.parse(_property_types_{{classname}}[name]))} function OpenAPI.check_required(o::{{classname}}) diff --git a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/models/model.mustache b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/models/model.mustache index 999c1d879a61..cf544a47dac4 100644 --- a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/models/model.mustache +++ b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/models/model.mustache @@ -27,17 +27,17 @@ class {{classname}}(Model): {{/-last}} {{/enumVars}}{{/allowableValues}} - def __init__(self{{#vars}}, {{name}}: {{datatype}}={{{defaultValue}}}{{^defaultValue}}None{{/defaultValue}}{{/vars}}): # noqa: E501 + def __init__(self{{#vars}}, {{name}}: {{dataType}}={{{defaultValue}}}{{^defaultValue}}None{{/defaultValue}}{{/vars}}): # noqa: E501 """{{classname}} - a model defined in Swagger {{#vars}} :param {{name}}: The {{name}} of this {{classname}}. # noqa: E501 - :type {{name}}: {{datatype}} + :type {{name}}: {{dataType}} {{/vars}} """ self.swagger_types = { {{#vars}} - '{{name}}': {{{datatype}}}{{^-last}},{{/-last}} + '{{name}}': {{{dataType}}}{{^-last}},{{/-last}} {{/vars}} } @@ -64,7 +64,7 @@ class {{classname}}(Model): {{/-first}} @property - def {{name}}(self) -> {{datatype}}: + def {{name}}(self) -> {{dataType}}: """Gets the {{name}} of this {{classname}}. {{#description}} @@ -72,12 +72,12 @@ class {{classname}}(Model): {{/description}} :return: The {{name}} of this {{classname}}. - :rtype: {{datatype}} + :rtype: {{dataType}} """ return self._{{name}} @{{name}}.setter - def {{name}}(self, {{name}}: {{datatype}}): + def {{name}}(self, {{name}}: {{dataType}}): """Sets the {{name}} of this {{classname}}. {{#description}} @@ -85,7 +85,7 @@ class {{classname}}(Model): {{/description}} :param {{name}}: The {{name}} of this {{classname}}. - :type {{name}}: {{datatype}} + :type {{name}}: {{dataType}} """ {{#isEnum}} allowed_values = [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}] # noqa: E501 diff --git a/modules/openapi-generator/src/main/resources/python-blueplanet/model-definitions/types/tosca/{{packageName}}/{{model}}.mustache b/modules/openapi-generator/src/main/resources/python-blueplanet/model-definitions/types/tosca/{{packageName}}/{{model}}.mustache index 7c4aa7489b58..905b95a6fa8b 100644 --- a/modules/openapi-generator/src/main/resources/python-blueplanet/model-definitions/types/tosca/{{packageName}}/{{model}}.mustache +++ b/modules/openapi-generator/src/main/resources/python-blueplanet/model-definitions/types/tosca/{{packageName}}/{{model}}.mustache @@ -27,7 +27,7 @@ resourceTypes { type = {{>prop_type}} {{/isPrimitiveType}} {{^isPrimitiveType}} - type = {{datatype}} + type = {{dataType}} {{/isPrimitiveType}} {{/isContainer}} {{#isArray}} @@ -37,7 +37,7 @@ resourceTypes { items.type = {{>prop_type}} {{/isPrimitiveType}} {{^isPrimitiveType}} - items.type = {{datatype}} + items.type = {{dataType}} {{/isPrimitiveType}} {{/items}} {{/isArray}} diff --git a/modules/openapi-generator/src/main/resources/scala-akka-http-server/model.mustache b/modules/openapi-generator/src/main/resources/scala-akka-http-server/model.mustache index 68cafc5f2c0c..8129487c2086 100644 --- a/modules/openapi-generator/src/main/resources/scala-akka-http-server/model.mustache +++ b/modules/openapi-generator/src/main/resources/scala-akka-http-server/model.mustache @@ -19,7 +19,7 @@ import {{import}} */ final case class {{classname}} ( {{#vars}} - {{{name}}}: {{^required}}Option[{{/required}}{{datatype}}{{^required}}] = None{{/required}}{{^-last}},{{/-last}} + {{{name}}}: {{^required}}Option[{{/required}}{{dataType}}{{^required}}] = None{{/required}}{{^-last}},{{/-last}} {{/vars}} ) diff --git a/modules/openapi-generator/src/main/resources/swift-combine/modelObject.mustache b/modules/openapi-generator/src/main/resources/swift-combine/modelObject.mustache index 9f83c589b57d..e321d27f6579 100644 --- a/modules/openapi-generator/src/main/resources/swift-combine/modelObject.mustache +++ b/modules/openapi-generator/src/main/resources/swift-combine/modelObject.mustache @@ -15,7 +15,7 @@ public struct {{{classname}}}: Codable { {{/isEnum}} {{^isEnum}} {{#description}}/// {{{.}}} - {{/description}}public var {{{name}}}: {{{datatype}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}} + {{/description}}public var {{{name}}}: {{{dataType}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}} {{/isEnum}} {{/allVars}} {{#hasVars}} diff --git a/modules/openapi-generator/src/main/resources/swift-combine/modelObjectCustom.mustache b/modules/openapi-generator/src/main/resources/swift-combine/modelObjectCustom.mustache index b942011c238f..ef1099621a89 100644 --- a/modules/openapi-generator/src/main/resources/swift-combine/modelObjectCustom.mustache +++ b/modules/openapi-generator/src/main/resources/swift-combine/modelObjectCustom.mustache @@ -15,7 +15,7 @@ public struct {{{classname}}}: Codable { {{/isEnum}} {{^isEnum}} {{#description}}/// {{{.}}} - {{/description}}public var {{{name}}}: {{{datatype}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}} + {{/description}}public var {{{name}}}: {{{dataType}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}} {{/isEnum}} {{/allVars}} {{#hasVars}} diff --git a/modules/openapi-generator/src/main/resources/swift5/modelObject.mustache b/modules/openapi-generator/src/main/resources/swift5/modelObject.mustache index 2b3adfa77536..d123889c4fb7 100644 --- a/modules/openapi-generator/src/main/resources/swift5/modelObject.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/modelObject.mustache @@ -32,7 +32,7 @@ {{^isEnum}} {{#description}}/** {{{.}}} */ {{/description}}{{#deprecated}}@available(*, deprecated, message: "This property is deprecated.") - {{/deprecated}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#readonlyProperties}}private(set) {{/readonlyProperties}}var {{{name}}}: {{#vendorExtensions.x-null-encodable}}NullEncodable<{{{datatype}}}>{{/vendorExtensions.x-null-encodable}}{{^vendorExtensions.x-null-encodable}}{{{datatype}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{/vendorExtensions.x-null-encodable}}{{#defaultValue}} = {{#vendorExtensions.x-null-encodable}}{{{vendorExtensions.x-null-encodable-default-value}}}{{/vendorExtensions.x-null-encodable}}{{^vendorExtensions.x-null-encodable}}{{{.}}}{{/vendorExtensions.x-null-encodable}}{{/defaultValue}} + {{/deprecated}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#readonlyProperties}}private(set) {{/readonlyProperties}}var {{{name}}}: {{#vendorExtensions.x-null-encodable}}NullEncodable<{{{dataType}}}>{{/vendorExtensions.x-null-encodable}}{{^vendorExtensions.x-null-encodable}}{{{dataType}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{/vendorExtensions.x-null-encodable}}{{#defaultValue}} = {{#vendorExtensions.x-null-encodable}}{{{vendorExtensions.x-null-encodable-default-value}}}{{/vendorExtensions.x-null-encodable}}{{^vendorExtensions.x-null-encodable}}{{{.}}}{{/vendorExtensions.x-null-encodable}}{{/defaultValue}} {{#objcCompatible}} {{#vendorExtensions.x-swift-optional-scalar}} {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var {{{name}}}Num: NSNumber? { diff --git a/modules/openapi-generator/src/main/resources/swift6/modelObject.mustache b/modules/openapi-generator/src/main/resources/swift6/modelObject.mustache index 86bae2384965..bc597edd73c5 100644 --- a/modules/openapi-generator/src/main/resources/swift6/modelObject.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/modelObject.mustache @@ -32,7 +32,7 @@ {{^isEnum}} {{#description}}/** {{{.}}} */ {{/description}}{{#deprecated}}@available(*, deprecated, message: "This property is deprecated.") - {{/deprecated}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#readonlyProperties}}private(set) {{/readonlyProperties}}var {{{name}}}: {{#vendorExtensions.x-null-encodable}}NullEncodable<{{{datatype}}}>{{/vendorExtensions.x-null-encodable}}{{^vendorExtensions.x-null-encodable}}{{{datatype}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{/vendorExtensions.x-null-encodable}}{{#defaultValue}} = {{#vendorExtensions.x-null-encodable}}{{{vendorExtensions.x-null-encodable-default-value}}}{{/vendorExtensions.x-null-encodable}}{{^vendorExtensions.x-null-encodable}}{{{.}}}{{/vendorExtensions.x-null-encodable}}{{/defaultValue}} + {{/deprecated}}{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} {{#readonlyProperties}}private(set) {{/readonlyProperties}}var {{{name}}}: {{#vendorExtensions.x-null-encodable}}NullEncodable<{{{dataType}}}>{{/vendorExtensions.x-null-encodable}}{{^vendorExtensions.x-null-encodable}}{{{dataType}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{/vendorExtensions.x-null-encodable}}{{#defaultValue}} = {{#vendorExtensions.x-null-encodable}}{{{vendorExtensions.x-null-encodable-default-value}}}{{/vendorExtensions.x-null-encodable}}{{^vendorExtensions.x-null-encodable}}{{{.}}}{{/vendorExtensions.x-null-encodable}}{{/defaultValue}} {{#objcCompatible}} {{#vendorExtensions.x-swift-optional-scalar}} {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} var {{{name}}}Num: NSNumber? { diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache index 5f14d753c854..e92cfcdcf041 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache @@ -323,7 +323,7 @@ export class {{classname}} extends runtime.BaseAPI { {{#bodyParam}} {{#isContainer}} {{^withoutRuntimeChecks}} - body: requestParameters['{{paramName}}']{{#isArray}}{{#items}}{{^isPrimitiveType}}!.map({{datatype}}ToJSON){{/isPrimitiveType}}{{/items}}{{/isArray}}, + body: requestParameters['{{paramName}}']{{#isArray}}{{#items}}{{^isPrimitiveType}}!.map({{dataType}}ToJSON){{/isPrimitiveType}}{{/items}}{{/isArray}}, {{/withoutRuntimeChecks}} {{#withoutRuntimeChecks}} body: requestParameters['{{paramName}}'], 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 16f2f4336212..4f5c345fc2a2 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache @@ -87,19 +87,19 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole {{^isPrimitiveType}} {{#isArray}} {{#uniqueItems}} - '{{name}}': {{^required}}json['{{baseName}}'] == null ? undefined : {{/required}}({{#required}}{{#isNullable}}json['{{baseName}}'] == null ? null : {{/isNullable}}{{/required}}new Set((json['{{baseName}}'] as Array).map({{#items}}{{datatype}}{{/items}}FromJSON))), + '{{name}}': {{^required}}json['{{baseName}}'] == null ? undefined : {{/required}}({{#required}}{{#isNullable}}json['{{baseName}}'] == null ? null : {{/isNullable}}{{/required}}new Set((json['{{baseName}}'] as Array).map({{#items}}{{dataType}}{{/items}}FromJSON))), {{/uniqueItems}} {{^uniqueItems}} - '{{name}}': {{^required}}json['{{baseName}}'] == null ? undefined : {{/required}}({{#required}}{{#isNullable}}json['{{baseName}}'] == null ? null : {{/isNullable}}{{/required}}(json['{{baseName}}'] as Array).map({{#items}}{{datatype}}{{/items}}FromJSON)), + '{{name}}': {{^required}}json['{{baseName}}'] == null ? undefined : {{/required}}({{#required}}{{#isNullable}}json['{{baseName}}'] == null ? null : {{/isNullable}}{{/required}}(json['{{baseName}}'] as Array).map({{#items}}{{dataType}}{{/items}}FromJSON)), {{/uniqueItems}} {{/isArray}} {{#isMap}} - '{{name}}': {{^required}}json['{{baseName}}'] == null ? undefined : {{/required}}({{#required}}{{#isNullable}}json['{{baseName}}'] == null ? null : {{/isNullable}}{{/required}}mapValues(json['{{baseName}}'], {{#items}}{{datatype}}{{/items}}FromJSON)), + '{{name}}': {{^required}}json['{{baseName}}'] == null ? undefined : {{/required}}({{#required}}{{#isNullable}}json['{{baseName}}'] == null ? null : {{/isNullable}}{{/required}}mapValues(json['{{baseName}}'], {{#items}}{{dataType}}{{/items}}FromJSON)), {{/isMap}} {{^isArray}} {{^isMap}} {{^isFreeFormObject}} - '{{name}}': {{^required}}json['{{baseName}}'] == null ? undefined : {{/required}}{{datatype}}FromJSON(json['{{baseName}}']), + '{{name}}': {{^required}}json['{{baseName}}'] == null ? undefined : {{/required}}{{dataType}}FromJSON(json['{{baseName}}']), {{/isFreeFormObject}} {{#isFreeFormObject}} '{{name}}': {{^required}}json['{{baseName}}'] == null ? undefined : {{/required}}json['{{baseName}}'], @@ -166,19 +166,19 @@ export function {{classname}}ToJSONTyped(value?: {{#hasReadOnly}}Omit<{{classnam {{^isPrimitiveType}} {{#isArray}} {{#uniqueItems}} - '{{baseName}}': {{^required}}value['{{name}}'] == null ? undefined : {{/required}}({{#required}}{{#isNullable}}value['{{name}}'] == null ? null : {{/isNullable}}{{/required}}Array.from(value['{{name}}'] as Set).map({{#items}}{{datatype}}{{/items}}ToJSON)), + '{{baseName}}': {{^required}}value['{{name}}'] == null ? undefined : {{/required}}({{#required}}{{#isNullable}}value['{{name}}'] == null ? null : {{/isNullable}}{{/required}}Array.from(value['{{name}}'] as Set).map({{#items}}{{dataType}}{{/items}}ToJSON)), {{/uniqueItems}} {{^uniqueItems}} - '{{baseName}}': {{^required}}value['{{name}}'] == null ? undefined : {{/required}}({{#required}}{{#isNullable}}value['{{name}}'] == null ? null : {{/isNullable}}{{/required}}(value['{{name}}'] as Array).map({{#items}}{{datatype}}{{/items}}ToJSON)), + '{{baseName}}': {{^required}}value['{{name}}'] == null ? undefined : {{/required}}({{#required}}{{#isNullable}}value['{{name}}'] == null ? null : {{/isNullable}}{{/required}}(value['{{name}}'] as Array).map({{#items}}{{dataType}}{{/items}}ToJSON)), {{/uniqueItems}} {{/isArray}} {{#isMap}} - '{{baseName}}': {{^required}}value['{{name}}'] == null ? undefined : {{/required}}({{#required}}{{#isNullable}}value['{{name}}'] == null ? null : {{/isNullable}}{{/required}}mapValues(value['{{name}}'], {{#items}}{{datatype}}{{/items}}ToJSON)), + '{{baseName}}': {{^required}}value['{{name}}'] == null ? undefined : {{/required}}({{#required}}{{#isNullable}}value['{{name}}'] == null ? null : {{/isNullable}}{{/required}}mapValues(value['{{name}}'], {{#items}}{{dataType}}{{/items}}ToJSON)), {{/isMap}} {{^isArray}} {{^isMap}} {{^isFreeFormObject}} - '{{baseName}}': {{datatype}}ToJSON(value['{{name}}']), + '{{baseName}}': {{dataType}}ToJSON(value['{{name}}']), {{/isFreeFormObject}} {{#isFreeFormObject}} '{{baseName}}': value['{{name}}'], diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/modelGenericInterfaces.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/modelGenericInterfaces.mustache index 68e5747598a9..ea0b275dd952 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/modelGenericInterfaces.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/modelGenericInterfaces.mustache @@ -10,13 +10,13 @@ export interface {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{ {{#vars}} /** * {{#lambda.indented_star_4}}{{{unescapedDescription}}}{{/lambda.indented_star_4}} - * @type {{=<% %>=}}{<%&datatype%>}<%={{ }}=%> + * @type {{=<% %>=}}{<%&dataType%>}<%={{ }}=%> * @memberof {{classname}} {{#deprecated}} * @deprecated {{/deprecated}} */ - {{#isReadOnly}}readonly {{/isReadOnly}}{{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}; + {{#isReadOnly}}readonly {{/isReadOnly}}{{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}; {{/vars}} }{{#hasEnums}} diff --git a/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache index 29d656c58bb1..ed1afaa1b999 100644 --- a/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache @@ -171,7 +171,7 @@ function {{nickname}}Raw({{#allParams.0}}requestParameters: {{operationIdCame {{#hasBodyParam}} {{#bodyParam}} {{#isContainer}} - body: queryParameters || requestParameters.{{paramName}}{{#isArray}}{{#items}}{{^isPrimitiveType}}?.map({{datatype}}ToJSON){{/isPrimitiveType}}{{/items}}{{/isArray}}, + body: queryParameters || requestParameters.{{paramName}}{{#isArray}}{{#items}}{{^isPrimitiveType}}?.map({{dataType}}ToJSON){{/isPrimitiveType}}{{/items}}{{/isArray}}, {{/isContainer}} {{^isContainer}} {{^isPrimitiveType}} diff --git a/modules/openapi-generator/src/main/resources/typescript-redux-query/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-redux-query/modelGeneric.mustache index 893131f90f8a..68cdfa1cb58c 100644 --- a/modules/openapi-generator/src/main/resources/typescript-redux-query/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-redux-query/modelGeneric.mustache @@ -21,10 +21,10 @@ export interface {{classname}} {{#allParents.0}}extends{{#allParents}} {{{.}}}{{ {{#vars}} /** * {{{description}}} - * @type {{=<% %>=}}{<%&datatype%>}<%={{ }}=%> + * @type {{=<% %>=}}{<%&dataType%>}<%={{ }}=%> * @memberof {{classname}} */ - {{#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}} } @@ -53,15 +53,15 @@ export function {{classname}}FromJSON(json: any): {{classname}} { {{/isPrimitiveType}} {{^isPrimitiveType}} {{#isArray}} - '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}(json['{{baseName}}'] as Array).map({{#items}}{{datatype}}{{/items}}FromJSON), + '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}(json['{{baseName}}'] as Array).map({{#items}}{{dataType}}{{/items}}FromJSON), {{/isArray}} {{#isMap}} - '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}mapValues(json['{{baseName}}'], {{#items}}{{datatype}}{{/items}}FromJSON), + '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}mapValues(json['{{baseName}}'], {{#items}}{{dataType}}{{/items}}FromJSON), {{/isMap}} {{^isArray}} {{^isMap}} {{^isFreeFormObject}} - '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}{{datatype}}FromJSON(json['{{baseName}}']), + '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}{{dataType}}FromJSON(json['{{baseName}}']), {{/isFreeFormObject}} {{#isFreeFormObject}} '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}json['{{baseName}}'], @@ -96,15 +96,15 @@ export function {{classname}}ToJSON(value?: {{classname}}): any { {{/isPrimitiveType}} {{^isPrimitiveType}} {{#isArray}} - '{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}(value.{{name}} as Array).map({{#items}}{{datatype}}{{/items}}ToJSON), + '{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}(value.{{name}} as Array).map({{#items}}{{dataType}}{{/items}}ToJSON), {{/isArray}} {{#isMap}} - '{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}mapValues(value.{{name}}, {{#items}}{{datatype}}{{/items}}ToJSON), + '{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}mapValues(value.{{name}}, {{#items}}{{dataType}}{{/items}}ToJSON), {{/isMap}} {{^isArray}} {{^isMap}} {{^isFreeFormObject}} - '{{baseName}}': {{datatype}}ToJSON(value.{{name}}), + '{{baseName}}': {{dataType}}ToJSON(value.{{name}}), {{/isFreeFormObject}} {{#isFreeFormObject}} '{{baseName}}': value.{{name}}, diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/modelGeneric.mustache index a12ceb35c3dc..58e72c53b827 100644 --- a/modules/openapi-generator/src/main/resources/typescript-rxjs/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/modelGeneric.mustache @@ -18,10 +18,10 @@ export interface {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{ {{#vars}} /**{{#description}} * {{{.}}}{{/description}} - * @type {{=<% %>=}}{<%&datatype%>}<%={{ }}=%> + * @type {{=<% %>=}}{<%&dataType%>}<%={{ }}=%> * @memberof {{classname}} */ - {{#isReadOnly}}readonly {{/isReadOnly}}{{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}; + {{#isReadOnly}}readonly {{/isReadOnly}}{{name}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}; {{/vars}} }{{#hasEnums}} diff --git a/modules/openapi-generator/src/main/resources/xojo-client/modelClass.mustache b/modules/openapi-generator/src/main/resources/xojo-client/modelClass.mustache index cc07d2b31c86..f1097f91a737 100644 --- a/modules/openapi-generator/src/main/resources/xojo-client/modelClass.mustache +++ b/modules/openapi-generator/src/main/resources/xojo-client/modelClass.mustache @@ -65,7 +65,7 @@ Protected Class {{classname}} Visible=false Group="Behavior" InitialValue="" - Type="{{{datatype}}}" + Type="{{{dataType}}}" EditorType="{{#isStringSchema}}MultiLineEditor{{/isStringSchema}}" #tag EndViewProperty{{/isByteArray}}{{/isEnum}}{{/allVars}} #tag EndViewBehavior diff --git a/modules/openapi-generator/src/main/resources/xojo-client/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/xojo-client/modelOneOf.mustache index 5151b32982ea..95b15e8480d1 100644 --- a/modules/openapi-generator/src/main/resources/xojo-client/modelOneOf.mustache +++ b/modules/openapi-generator/src/main/resources/xojo-client/modelOneOf.mustache @@ -80,7 +80,7 @@ Protected Class {{classname}} Visible=false Group="Behavior" InitialValue="" - Type="{{{datatype}}}" + Type="{{{dataType}}}" EditorType="{{#isStringSchema}}MultiLineEditor{{/isStringSchema}}" #tag EndViewProperty{{/isByteArray}}{{/isEnum}}{{/allVars}} #tag EndViewBehavior