From 0cfe02348b8ee6d54cbf5b218202585cfe0fca9e Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 12 Oct 2020 09:12:37 -0700 Subject: [PATCH] Unifies naming for isMap in Schema class properties (#7640) * Updates isMapModel + isMapContainer -> isMap * Removes git conflict characters --- docs/templating.md | 8 +++--- .../openapitools/codegen/CodegenModel.java | 16 +++++++++--- .../codegen/CodegenOperation.java | 8 +++--- .../codegen/CodegenParameter.java | 18 +++++++++---- .../openapitools/codegen/CodegenProperty.java | 16 +++++++++--- .../openapitools/codegen/CodegenResponse.java | 16 +++++++++--- .../openapitools/codegen/DefaultCodegen.java | 20 +++++++------- .../IJsonSchemaValidationProperties.java | 4 +++ .../languages/AbstractApexCodegen.java | 2 +- .../languages/AbstractCSharpCodegen.java | 2 +- .../codegen/languages/AbstractCppCodegen.java | 2 +- .../languages/AbstractFSharpCodegen.java | 2 +- .../languages/AbstractJavaCodegen.java | 2 +- .../codegen/languages/AbstractPhpCodegen.java | 2 +- .../AbstractPythonConnexionServerCodegen.java | 2 +- .../languages/AndroidClientCodegen.java | 2 +- .../codegen/languages/BashClientCodegen.java | 2 +- .../languages/CLibcurlClientCodegen.java | 2 +- .../languages/CppRestSdkClientCodegen.java | 4 +-- .../languages/ElixirClientCodegen.java | 10 +++---- .../languages/ErlangClientCodegen.java | 2 +- .../languages/ErlangProperCodegen.java | 2 +- .../codegen/languages/GoClientCodegen.java | 8 +++--- .../languages/HaskellHttpClientCodegen.java | 6 ++--- .../languages/JavaCXFExtServerCodegen.java | 26 +++++++++---------- .../JavascriptApolloClientCodegen.java | 6 ++--- .../languages/JavascriptClientCodegen.java | 6 ++--- .../codegen/languages/OCamlClientCodegen.java | 4 +-- .../codegen/languages/ObjcClientCodegen.java | 2 +- .../codegen/languages/PerlClientCodegen.java | 2 +- .../languages/PowerShellClientCodegen.java | 8 +++--- .../languages/ProtobufSchemaCodegen.java | 2 +- .../languages/PythonClientCodegen.java | 2 +- .../codegen/languages/RClientCodegen.java | 6 ++--- .../codegen/languages/RubyClientCodegen.java | 2 +- .../codegen/languages/RustClientCodegen.java | 2 +- .../languages/ScalaAkkaHttpServerCodegen.java | 2 +- .../ScalaPlayFrameworkServerCodegen.java | 2 +- .../codegen/languages/Swift4Codegen.java | 4 +-- .../languages/Swift5ClientCodegen.java | 4 +-- .../TypeScriptFetchClientCodegen.java | 2 +- .../TypeScriptReduxQueryClientCodegen.java | 2 +- .../TypeScriptRxjsClientCodegen.java | 2 +- .../resources/C-libcurl/api-body.mustache | 4 +-- .../resources/C-libcurl/api-header.mustache | 4 +-- .../resources/C-libcurl/model-body.mustache | 20 +++++++------- .../resources/C-libcurl/model-header.mustache | 8 +++--- .../src/main/resources/Eiffel/model.mustache | 4 +-- .../Java/jackson_annotations.mustache | 2 +- .../Java/libraries/jersey2/pojo.mustache | 4 +-- .../Java/libraries/microprofile/pojo.mustache | 14 +++++----- .../Java/libraries/okhttp-gson/api.mustache | 2 +- .../src/main/resources/Java/pojo.mustache | 4 +-- .../resources/JavaJaxRS/cxf-cdi/pojo.mustache | 4 +-- .../resources/JavaJaxRS/cxf-ext/pojo.mustache | 12 ++++----- .../resources/JavaJaxRS/cxf/pojo.mustache | 12 ++++----- .../main/resources/JavaJaxRS/pojo.mustache | 4 +-- .../JavaJaxRS/resteasy/returnTypes.mustache | 2 +- .../resources/JavaJaxRS/returnTypes.mustache | 2 +- .../exampleReturnTypes.mustache | 2 +- .../newApiController.mustache | 12 ++++----- .../resources/JavaPlayFramework/pojo.mustache | 4 +-- .../JavaPlayFramework/returnTypes.mustache | 2 +- .../returnTypesNoVoid.mustache | 2 +- .../returnTypesNoVoidNoAbstract.mustache | 2 +- .../JavaSpring/exampleReturnTypes.mustache | 2 +- .../main/resources/JavaSpring/pojo.mustache | 4 +-- .../resources/JavaSpring/queryParams.mustache | 2 +- .../resources/JavaSpring/returnTypes.mustache | 2 +- .../aspnetcore/2.0/controller.mustache | 2 +- .../resources/aspnetcore/2.0/model.mustache | 2 +- .../aspnetcore/2.1/controller.mustache | 2 +- .../resources/aspnetcore/2.1/model.mustache | 2 +- .../aspnetcore/3.0/controller.mustache | 2 +- .../resources/aspnetcore/3.0/model.mustache | 2 +- .../cpp-pistache-server/api-source.mustache | 2 +- .../cpp-qt5-client/api-body.mustache | 16 ++++++------ .../cpp-qt5-client/model-body.mustache | 8 +++--- .../apirequest.cpp.mustache | 24 ++++++++--------- .../model-body.mustache | 8 +++--- .../cpp-rest-sdk-client/api-source.mustache | 14 +++++----- .../cpp-tizen-client/api-body.mustache | 16 ++++++------ .../cpp-tizen-client/api-header.mustache | 4 +-- .../cpp-tizen-client/model-body.mustache | 12 ++++----- .../cpp-tizen-client/model-header.mustache | 6 ++--- .../csharp-netcore/modelGeneric.mustache | 6 ++--- .../resources/csharp/modelGeneric.mustache | 6 ++--- .../src/main/resources/dart/api.mustache | 8 +++--- .../src/main/resources/dart/class.mustache | 8 +++--- .../src/main/resources/dart2/api.mustache | 8 +++--- .../src/main/resources/dart2/class.mustache | 20 +++++++------- .../src/main/resources/elixir/api.mustache | 2 +- .../src/main/resources/elixir/model.mustache | 2 +- .../src/main/resources/elm/operation.mustache | 2 +- .../main/resources/elm/recordField.mustache | 2 +- .../elm/recordFieldValueDecoder.mustache | 2 +- .../elm/recordFieldValueEncoder.mustache | 2 +- .../fsharp-giraffe-server/Handler.mustache | 2 +- .../main/resources/go/model_simple.mustache | 16 ++++++------ .../haskell-http-client/Model.mustache | 2 +- .../resources/java-msf4j-server/pojo.mustache | 4 +-- .../java-msf4j-server/returnTypes.mustache | 2 +- .../java-pkmst/exampleReturnTypes.mustache | 2 +- .../main/resources/java-pkmst/pojo.mustache | 4 +-- .../resources/java-pkmst/returnTypes.mustache | 2 +- .../kotlin-client/data_class.mustache | 2 +- .../libraries/multiplatform/api.mustache | 16 ++++++------ .../kotlin-spring/returnTypes.mustache | 2 +- .../src/main/resources/lua/api.mustache | 8 +++--- .../resources/objc/Model.xcdatamodel.mustache | 2 +- .../objc/NSManagedObject-header.mustache | 2 +- .../objc/NSManagedObjectBuilder-body.mustache | 8 +++--- .../main/resources/ocaml/api-impl.mustache | 2 +- .../src/main/resources/ocaml/model.mustache | 2 +- .../src/main/resources/ocaml/to_json.mustache | 2 +- .../php-symfony/model_variables.mustache | 8 +++--- .../python-aiohttp/controller.mustache | 8 +++--- .../resources/python-aiohttp/model.mustache | 4 +-- .../controllers/controller.mustache | 8 +++--- .../app/{{packageName}}/models/model.mustache | 4 +-- .../tosca/{{packageName}}/{{model}}.mustache | 4 +-- .../python-flask/controller.mustache | 8 +++--- .../resources/python-flask/model.mustache | 4 +-- .../src/main/resources/python/model.mustache | 4 +-- .../src/main/resources/r/api.mustache | 6 ++--- .../src/main/resources/r/api_doc.mustache | 2 +- .../src/main/resources/r/model.mustache | 14 +++++----- .../partial_model_generic.mustache | 4 +-- .../ruby-on-rails-server/model.mustache | 4 +-- .../rust-server/client-operation.mustache | 8 +++--- .../resources/rust-server/models.mustache | 16 ++++++------ .../rust-server/server-operation.mustache | 2 +- .../src/main/resources/rust/model.mustache | 2 +- .../scala-play-server/caseClass.mustache | 10 +++---- .../scala-play-server/model.mustache | 4 +-- .../simpleParentJsonFormat.mustache | 2 +- .../resources/typescript-fetch/apis.mustache | 12 ++++----- .../typescript-fetch/modelGeneric.mustache | 16 ++++++------ .../modelGeneric.mustache | 16 ++++++------ .../codegen/java/JavaClientCodegenTest.java | 6 ++--- .../codegen/java/JavaModelTest.java | 6 ++--- .../javascript-apollo/src/model/Pet.js | 10 +++---- 142 files changed, 439 insertions(+), 403 deletions(-) diff --git a/docs/templating.md b/docs/templating.md index 2fa49e73673..25f48524e66 100644 --- a/docs/templating.md +++ b/docs/templating.md @@ -635,7 +635,7 @@ A `Pet` model with three properties will provide a _lot_ of information about th "isEmail" : false, "isFreeFormObject" : false, "isListContainer" : false, - "isMapContainer" : false, + "isMap" : false, "isEnum" : false, "isReadOnly" : false, "isWriteOnly" : false, @@ -687,7 +687,7 @@ A `Pet` model with three properties will provide a _lot_ of information about th "isEmail" : false, "isFreeFormObject" : false, "isListContainer" : false, - "isMapContainer" : false, + "isMap" : false, "isEnum" : false, "isReadOnly" : false, "isWriteOnly" : false, @@ -739,7 +739,7 @@ A `Pet` model with three properties will provide a _lot_ of information about th "isEmail" : false, "isFreeFormObject" : false, "isListContainer" : false, - "isMapContainer" : false, + "isMap" : false, "isEnum" : false, "isReadOnly" : false, "isWriteOnly" : false, @@ -772,7 +772,7 @@ A `Pet` model with three properties will provide a _lot_ of information about th "hasOptional" : true, "isArrayModel" : false, "hasChildren" : false, - "isMapModel" : false, + "isMap" : false, "hasOnlyReadOnly" : false, "vendorExtensions" : { } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java index e96d1f3889a..2987042a888 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java @@ -94,7 +94,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { public boolean hasOptional; public boolean isArrayModel; public boolean hasChildren; - public boolean isMapModel; + public boolean isMap; /** * Indicates the OAS schema specifies "deprecated: true". */ @@ -586,6 +586,14 @@ public class CodegenModel implements IJsonSchemaValidationProperties { this.isDateTime = isDateTime; } + @Override + public boolean getIsMap() { return isMap; } + + @Override + public void setIsMap(boolean isMap) { + this.isMap = isMap; + } + // indicates if the model component has validation on the root level schema // this will be true when minItems or minProperties is set public boolean hasValidation() { @@ -698,7 +706,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { hasOptional == that.hasOptional && isArrayModel == that.isArrayModel && hasChildren == that.hasChildren && - isMapModel == that.isMapModel && + isMap == that.isMap && isDeprecated == that.isDeprecated && hasOnlyReadOnly == that.hasOnlyReadOnly && getUniqueItems() == that.getUniqueItems() && @@ -768,7 +776,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { getVars(), getAllVars(), getRequiredVars(), getOptionalVars(), getReadOnlyVars(), getReadWriteVars(), getParentVars(), getAllowableValues(), getMandatory(), getAllMandatory(), getImports(), hasVars, isEmptyVars(), hasMoreModels, hasEnums, isEnum, isNullable, hasRequired, hasOptional, isArrayModel, - hasChildren, isMapModel, isDeprecated, hasOnlyReadOnly, getExternalDocumentation(), getVendorExtensions(), + hasChildren, isMap, isDeprecated, hasOnlyReadOnly, getExternalDocumentation(), getVendorExtensions(), getAdditionalPropertiesType(), getMaxProperties(), getMinProperties(), getUniqueItems(), getMaxItems(), getMinItems(), getMaxLength(), getMinLength(), getExclusiveMinimum(), getExclusiveMaximum(), getMinimum(), getMaximum(), getPattern(), getMultipleOf(), getItems(), getIsModel()); @@ -833,7 +841,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { sb.append(", hasOptional=").append(hasOptional); sb.append(", isArrayModel=").append(isArrayModel); sb.append(", hasChildren=").append(hasChildren); - sb.append(", isMapModel=").append(isMapModel); + sb.append(", isMap=").append(isMap); sb.append(", isDeprecated=").append(isDeprecated); sb.append(", hasOnlyReadOnly=").append(hasOnlyReadOnly); sb.append(", externalDocumentation=").append(externalDocumentation); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java index f18293eaf20..c9a5bd1d99a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java @@ -25,7 +25,7 @@ import java.util.*; public class CodegenOperation { public final List responseHeaders = new ArrayList(); public boolean hasAuthMethods, hasConsumes, hasProduces, hasParams, hasOptionalParams, hasRequiredParams, - returnTypeIsPrimitive, returnSimpleType, subresourceOperation, isMapContainer, + returnTypeIsPrimitive, returnSimpleType, subresourceOperation, isMap, isListContainer, isMultipart, hasMore = true, isResponseBinary = false, isResponseFile = false, hasReference = false, isRestfulIndex, isRestfulShow, isRestfulCreate, isRestfulUpdate, isRestfulDestroy, @@ -255,7 +255,7 @@ public class CodegenOperation { sb.append(", returnTypeIsPrimitive=").append(returnTypeIsPrimitive); sb.append(", returnSimpleType=").append(returnSimpleType); sb.append(", subresourceOperation=").append(subresourceOperation); - sb.append(", isMapContainer=").append(isMapContainer); + sb.append(", isMap=").append(isMap); sb.append(", isListContainer=").append(isListContainer); sb.append(", isMultipart=").append(isMultipart); sb.append(", hasMore=").append(hasMore); @@ -329,7 +329,7 @@ public class CodegenOperation { returnTypeIsPrimitive == that.returnTypeIsPrimitive && returnSimpleType == that.returnSimpleType && subresourceOperation == that.subresourceOperation && - isMapContainer == that.isMapContainer && + isMap == that.isMap && isListContainer == that.isListContainer && isMultipart == that.isMultipart && hasMore == that.hasMore && @@ -392,7 +392,7 @@ public class CodegenOperation { public int hashCode() { return Objects.hash(responseHeaders, hasAuthMethods, hasConsumes, hasProduces, hasParams, hasOptionalParams, - hasRequiredParams, returnTypeIsPrimitive, returnSimpleType, subresourceOperation, isMapContainer, + hasRequiredParams, returnTypeIsPrimitive, returnSimpleType, subresourceOperation, isMap, isListContainer, isMultipart, hasMore, isResponseBinary, isResponseFile, hasReference, isRestfulIndex, isRestfulShow, isRestfulCreate, isRestfulUpdate, isRestfulDestroy, isRestful, isDeprecated, isCallbackRequest, uniqueItems, path, operationId, returnType, httpMethod, returnBaseType, diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java index bb3f54deaf6..0d64505a296 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java @@ -36,7 +36,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { public String jsonSchema; public boolean isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType; - public boolean isListContainer, isMapContainer; + public boolean isListContainer, isMap; public boolean isFile; public boolean isEnum; public List _enum; @@ -181,7 +181,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { output.isFreeFormObject = this.isFreeFormObject; output.isAnyType = this.isAnyType; output.isListContainer = this.isListContainer; - output.isMapContainer = this.isMapContainer; + output.isMap = this.isMap; output.isExplode = this.isExplode; output.style = this.style; output.contentType = this.contentType; @@ -191,7 +191,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { @Override public int hashCode() { - return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, hasMore, isContainer, secondaryParam, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName, style, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isListContainer, isMapContainer, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf); + return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, hasMore, isContainer, secondaryParam, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName, style, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isListContainer, isMap, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf); } @Override @@ -230,7 +230,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { isFreeFormObject == that.isFreeFormObject && isAnyType == that.isAnyType && isListContainer == that.isListContainer && - isMapContainer == that.isMapContainer && + isMap == that.isMap && isFile == that.isFile && isEnum == that.isEnum && hasValidation == that.hasValidation && @@ -319,7 +319,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { sb.append(", isFreeFormObject=").append(isFreeFormObject); sb.append(", isAnyType=").append(isAnyType); sb.append(", isListContainer=").append(isListContainer); - sb.append(", isMapContainer=").append(isMapContainer); + sb.append(", isMap=").append(isMap); sb.append(", isFile=").append(isFile); sb.append(", isEnum=").append(isEnum); sb.append(", _enum=").append(_enum); @@ -511,5 +511,13 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { public void setIsDateTime(boolean isDateTime) { this.isDateTime = isDateTime; } + + @Override + public boolean getIsMap() { return isMap; } + + @Override + public void setIsMap(boolean isMap) { + this.isMap = isMap; + } } 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 de8b5033663..49bbb340ab4 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 @@ -145,7 +145,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti */ public boolean isAnyType; public boolean isListContainer; - public boolean isMapContainer; + public boolean isMap; public boolean isEnum; public boolean isReadOnly; public boolean isWriteOnly; @@ -485,6 +485,14 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti this.isDateTime = isDateTime; } + @Override + public boolean getIsMap() { return isMap; } + + @Override + public void setIsMap(boolean isMap) { + this.isMap = isMap; + } + public Map getVendorExtensions() { return vendorExtensions; } @@ -685,7 +693,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti sb.append(", isEmail=").append(isEmail); sb.append(", isFreeFormObject=").append(isFreeFormObject); sb.append(", isListContainer=").append(isListContainer); - sb.append(", isMapContainer=").append(isMapContainer); + sb.append(", isMap=").append(isMap); sb.append(", isEnum=").append(isEnum); sb.append(", isReadOnly=").append(isReadOnly); sb.append(", isWriteOnly=").append(isWriteOnly); @@ -752,7 +760,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti isEmail == that.isEmail && isFreeFormObject == that.isFreeFormObject && isListContainer == that.isListContainer && - isMapContainer == that.isMapContainer && + isMap == that.isMap && isEnum == that.isEnum && isReadOnly == that.isReadOnly && isWriteOnly == that.isWriteOnly && @@ -817,7 +825,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti hasMoreNonReadOnly, isPrimitiveType, isModel, isContainer, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBinary, isFile, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, - isListContainer, isMapContainer, isEnum, isReadOnly, isWriteOnly, isNullable, + isListContainer, isMap, isEnum, isReadOnly, isWriteOnly, isNullable, isSelfReference, isCircularReference, isDiscriminator, _enum, allowableValues, items, mostInnerItems, vendorExtensions, hasValidation, isInherited, discriminatorValue, nameInCamelCase, nameInSnakeCase, enumName, maxItems, minItems, isXmlAttribute, xmlPrefix, xmlName, diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java index 0883444569b..8a2796a7f7c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java @@ -53,7 +53,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { public boolean isDefault; public boolean simpleType; public boolean primitiveType; - public boolean isMapContainer; + public boolean isMap; public boolean isListContainer; public boolean isBinary = false; public boolean isFile = false; @@ -80,7 +80,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { return Objects.hash(headers, code, message, hasMore, examples, dataType, baseType, containerType, hasHeaders, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBoolean, isDate, isDateTime, isUuid, isEmail, isModel, isFreeFormObject, isAnyType, isDefault, simpleType, primitiveType, - isMapContainer, isListContainer, isBinary, isFile, schema, jsonSchema, vendorExtensions, items, + isMap, isListContainer, isBinary, isFile, schema, jsonSchema, vendorExtensions, items, getMaxProperties(), getMinProperties(), uniqueItems, getMaxItems(), getMinItems(), getMaxLength(), getMinLength(), exclusiveMinimum, exclusiveMaximum, getMinimum(), getMaximum(), getPattern()); } @@ -111,7 +111,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { isDefault == that.isDefault && simpleType == that.simpleType && primitiveType == that.primitiveType && - isMapContainer == that.isMapContainer && + isMap == that.isMap && isListContainer == that.isListContainer && isBinary == that.isBinary && isFile == that.isFile && @@ -306,6 +306,14 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { this.isDateTime = isDateTime; } + @Override + public boolean getIsMap() { return isMap; } + + @Override + public void setIsMap(boolean isMap) { + this.isMap = isMap; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("CodegenResponse{"); @@ -337,7 +345,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { sb.append(", isDefault=").append(isDefault); sb.append(", simpleType=").append(simpleType); sb.append(", primitiveType=").append(primitiveType); - sb.append(", isMapContainer=").append(isMapContainer); + sb.append(", isMap=").append(isMap); sb.append(", isListContainer=").append(isListContainer); sb.append(", isBinary=").append(isBinary); sb.append(", isFile=").append(isFile); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index a27b542419b..a9d86fddb07 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -2508,7 +2508,7 @@ public class DefaultCodegen implements CodegenConfig { } if (ModelUtils.isMapSchema(schema)) { addAdditionPropertiesToCodeGenModel(m, schema); - m.isMapModel = true; + m.isMap = true; } else if (ModelUtils.isIntegerSchema(schema)) { // integer type // NOTE: Integral schemas as CodegenModel is a rare use case and may be removed at a later date. // Sync of properties is done for consistency with other data types like CodegenParameter/CodegenProperty. @@ -3333,7 +3333,7 @@ public class DefaultCodegen implements CodegenConfig { updatePropertyForArray(property, cp); } else if (ModelUtils.isMapSchema(p)) { property.isContainer = true; - property.isMapContainer = true; + property.isMap = true; property.containerType = "map"; property.baseType = getSchemaType(p); property.minItems = p.getMinProperties(); @@ -3451,7 +3451,7 @@ public class DefaultCodegen implements CodegenConfig { protected CodegenProperty getMostInnerItems(CodegenProperty property) { CodegenProperty currentProperty = property; - while (currentProperty != null && (Boolean.TRUE.equals(currentProperty.isMapContainer) + while (currentProperty != null && (Boolean.TRUE.equals(currentProperty.isMap) || Boolean.TRUE.equals(currentProperty.isListContainer))) { currentProperty = currentProperty.items; } @@ -3471,7 +3471,7 @@ public class DefaultCodegen implements CodegenConfig { */ protected void updateDataTypeWithEnumForArray(CodegenProperty property) { CodegenProperty baseItem = property.items; - while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMapContainer) + while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMap) || Boolean.TRUE.equals(baseItem.isListContainer))) { baseItem = baseItem.items; } @@ -3499,7 +3499,7 @@ public class DefaultCodegen implements CodegenConfig { */ protected void updateDataTypeWithEnumForMap(CodegenProperty property) { CodegenProperty baseItem = property.items; - while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMapContainer) + while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMap) || Boolean.TRUE.equals(baseItem.isListContainer))) { baseItem = baseItem.items; } @@ -3627,7 +3627,7 @@ public class DefaultCodegen implements CodegenConfig { if (cm.isContainer) { op.returnContainer = cm.containerType; if ("map".equals(cm.containerType)) { - op.isMapContainer = true; + op.isMap = true; } else if ("list".equalsIgnoreCase(cm.containerType)) { op.isListContainer = true; } else if ("array".equalsIgnoreCase(cm.containerType)) { @@ -4081,7 +4081,7 @@ public class DefaultCodegen implements CodegenConfig { if (cp.isContainer) { r.simpleType = false; r.containerType = cp.containerType; - r.isMapContainer = "map".equals(cp.containerType); + r.isMap = "map".equals(cp.containerType); r.isListContainer = "list".equalsIgnoreCase(cp.containerType) || "array".equalsIgnoreCase(cp.containerType) || "set".equalsIgnoreCase(cp.containerType); @@ -4093,7 +4093,7 @@ public class DefaultCodegen implements CodegenConfig { } if (r.baseType == null) { - r.isMapContainer = false; + r.isMap = false; r.isListContainer = false; r.primitiveType = true; r.simpleType = true; @@ -4280,7 +4280,7 @@ public class DefaultCodegen implements CodegenConfig { codegenParameter.mostInnerItems = codegenProperty.mostInnerItems; codegenParameter.baseType = codegenProperty.dataType; codegenParameter.isContainer = true; - codegenParameter.isMapContainer = true; + codegenParameter.isMap = true; // recursively add import while (codegenProperty != null) { @@ -6064,7 +6064,7 @@ public class DefaultCodegen implements CodegenConfig { codegenParameter.dataType = getTypeDeclaration(schema); codegenParameter.baseType = getSchemaType(inner); codegenParameter.isContainer = Boolean.TRUE; - codegenParameter.isMapContainer = Boolean.TRUE; + codegenParameter.isMap = Boolean.TRUE; codegenParameter.isNullable = codegenProperty.isNullable; setParameterBooleanFlagWithCodegenProperty(codegenParameter, codegenProperty); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java index 0cd11b50a57..7f9725fb2af 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java @@ -68,4 +68,8 @@ public interface IJsonSchemaValidationProperties { boolean getIsDateTime(); void setIsDateTime(boolean isDateTime); + + boolean getIsMap(); + + void setIsMap(boolean isMap); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java index 17b687a3cf2..411eb0c4705 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java @@ -288,7 +288,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code if (p.items != null && p.items.example != null) { p.example = "new " + p.dataType + "{" + p.items.example + "}"; } - } else if (Boolean.TRUE.equals(p.isMapContainer)) { + } else if (Boolean.TRUE.equals(p.isMap)) { if (p.items != null && p.items.example != null) { p.example = "new " + p.dataType + "{" + p.items.example + "}"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index d925cf16833..566e2fa33d3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -654,7 +654,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co } } else { operation.returnContainer = operation.returnType; - operation.isMapContainer = this.mapTypes.contains(typeMapping); + operation.isMap = this.mapTypes.contains(typeMapping); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java index f7c62d2b7a6..e0707ff2a81 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java @@ -351,7 +351,7 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg Map mo = (Map) _mo; CodegenModel cm = (CodegenModel) mo.get("model"); // cannot handle inheritance from maps and arrays in C++ - if((cm.isArrayModel || cm.isMapModel ) && (cm.parentModel == null)) { + if((cm.isArrayModel || cm.isMap ) && (cm.parentModel == null)) { cm.parent = null; } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java index c258b22eb09..fc11075475d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java @@ -548,7 +548,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co } } else { operation.returnContainer = operation.returnType; - operation.isMapContainer = this.mapTypes.contains(typeMapping); + operation.isMap = this.mapTypes.contains(typeMapping); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 4521ca49ea7..2a30ad9327f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -979,7 +979,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code } else { example = "Arrays.asList()"; } - } else if (Boolean.TRUE.equals(p.isMapContainer)) { + } else if (Boolean.TRUE.equals(p.isMap)) { example = "new HashMap()"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index d475cfb8e10..4a38749a481 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -599,7 +599,7 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg example = "NULL"; } else if (Boolean.TRUE.equals(p.isListContainer)) { example = "array(" + example + ")"; - } else if (Boolean.TRUE.equals(p.isMapContainer)) { + } else if (Boolean.TRUE.equals(p.isMap)) { example = "array('key' => " + example + ")"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java index 4bf8b029e0c..fc3d4f4d2e5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java @@ -820,7 +820,7 @@ public abstract class AbstractPythonConnexionServerCodegen extends DefaultCodege if (Boolean.TRUE.equals(p.isBodyParam)) { example = "[" + example + "]"; } - } else if (Boolean.TRUE.equals(p.isMapContainer)) { + } else if (Boolean.TRUE.equals(p.isMap)) { example = "{'key': " + example + "}"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java index 6a5e2ee83af..ea78070738c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java @@ -367,7 +367,7 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi example = "null"; } else if (Boolean.TRUE.equals(p.isListContainer)) { example = "Arrays.asList(" + example + ")"; - } else if (Boolean.TRUE.equals(p.isMapContainer)) { + } else if (Boolean.TRUE.equals(p.isMap)) { example = "new HashMap()"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java index 93e9d09e470..1c6302ea05a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java @@ -785,7 +785,7 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig { example = "NULL"; } else if (Boolean.TRUE.equals(p.isListContainer)) { example = "[" + example + "]"; - } else if (Boolean.TRUE.equals(p.isMapContainer)) { + } else if (Boolean.TRUE.equals(p.isMap)) { example = "{'key': " + example + "}"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java index c059ff91397..0fd05d8d1ca 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java @@ -702,7 +702,7 @@ public class CLibcurlClientCodegen extends DefaultCodegen implements CodegenConf example = "nil"; } else if (Boolean.TRUE.equals(p.isListContainer)) { example = "[" + example + "]"; - } else if (Boolean.TRUE.equals(p.isMapContainer)) { + } else if (Boolean.TRUE.equals(p.isMap)) { example = "{'key' => " + example + "}"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java index 149a10be6dd..d83aa7a08fd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java @@ -408,10 +408,10 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen { boolean isPrimitiveType = parameter.isPrimitiveType == Boolean.TRUE; boolean isListContainer = parameter.isListContainer == Boolean.TRUE; - boolean isMapContainer = parameter.isMapContainer == Boolean.TRUE; + boolean isMap = parameter.isMap == Boolean.TRUE; boolean isString = parameter.isString == Boolean.TRUE; - if (!isPrimitiveType && !isListContainer && !isMapContainer && !isString && !parameter.dataType.startsWith("std::shared_ptr")) { + if (!isPrimitiveType && !isListContainer && !isMap && !isString && !parameter.dataType.startsWith("std::shared_ptr")) { parameter.dataType = "std::shared_ptr<" + parameter.dataType + ">"; } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java index 757a0d23f9b..2d15cd5d729 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java @@ -583,7 +583,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig this.isDefault = o.isDefault; this.simpleType = o.simpleType; this.primitiveType = o.primitiveType; - this.isMapContainer = o.isMapContainer; + this.isMap = o.isMap; this.isListContainer = o.isListContainer; this.isBinary = o.isBinary; this.isFile = o.isFile; @@ -609,7 +609,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig public String decodedStruct() { // Let Poison decode the entire response into a generic blob - if (isMapContainer) { + if (isMap) { return "%{}"; } // Primitive return type, don't even try to decode @@ -652,7 +652,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig this.returnTypeIsPrimitive = o.returnTypeIsPrimitive; this.returnSimpleType = o.returnSimpleType; this.subresourceOperation = o.subresourceOperation; - this.isMapContainer = o.isMapContainer; + this.isMap = o.isMap; this.isListContainer = o.isListContainer; this.isMultipart = o.isMultipart; this.hasMore = o.hasMore; @@ -777,7 +777,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig sb.append("list("); buildTypespec(param.items, sb); sb.append(")"); - } else if (param.isMapContainer) { + } else if (param.isMap) { // %{optional(String.t) => } sb.append("%{optional(String.t) => "); buildTypespec(param.items, sb); @@ -806,7 +806,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig sb.append("list("); buildTypespec(property.items, sb); sb.append(")"); - } else if (property.isMapContainer) { + } else if (property.isMap) { sb.append("%{optional(String.t) => "); buildTypespec(property.items, sb); sb.append("}"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java index 48de55ac142..46c63bac59e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java @@ -403,7 +403,7 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig this.returnTypeIsPrimitive = o.returnTypeIsPrimitive; this.returnSimpleType = o.returnSimpleType; this.subresourceOperation = o.subresourceOperation; - this.isMapContainer = o.isMapContainer; + this.isMap = o.isMap; this.isListContainer = o.isListContainer; this.isMultipart = o.isMultipart; this.hasMore = o.hasMore; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java index 096a688b9d3..d62d3f59926 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java @@ -515,7 +515,7 @@ public class ErlangProperCodegen extends DefaultCodegen implements CodegenConfig this.returnTypeIsPrimitive = o.returnTypeIsPrimitive; this.returnSimpleType = o.returnSimpleType; this.subresourceOperation = o.subresourceOperation; - this.isMapContainer = o.isMapContainer; + this.isMap = o.isMap; this.isListContainer = o.isListContainer; this.isMultipart = o.isMultipart; this.hasMore = o.hasMore; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java index dacd1141827..7ce6d2e191c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java @@ -392,7 +392,7 @@ public class GoClientCodegen extends AbstractGoCodegen { for (CodegenProperty param : model.vars) { param.vendorExtensions.put("x-go-base-type", param.dataType); - if (!param.isNullable || param.isMapContainer || param.isListContainer || + if (!param.isNullable || param.isMap || param.isListContainer || param.isFreeFormObject || param.isAnyType) { continue; } @@ -420,7 +420,7 @@ public class GoClientCodegen extends AbstractGoCodegen { } // additionalProperties: true and parent - if (model.isAdditionalPropertiesTrue && model.parent != null && Boolean.FALSE.equals(model.isMapModel)) { + if (model.isAdditionalPropertiesTrue && model.parent != null && Boolean.FALSE.equals(model.isMap)) { imports.add(createMapping("import", "reflect")); imports.add(createMapping("import", "strings")); } @@ -463,7 +463,7 @@ public class GoClientCodegen extends AbstractGoCodegen { private String constructExampleCode(CodegenParameter codegenParameter, HashMap modelMaps, HashMap processedModelMap) { if (codegenParameter.isListContainer) { // array return codegenParameter.dataType + "{" + constructExampleCode(codegenParameter.items, modelMaps, processedModelMap) + "}"; - } else if (codegenParameter.isMapContainer) { + } else if (codegenParameter.isMap) { return "map[string]string{ \"Key\" = \"Value\" }"; } else if (codegenParameter.isPrimitiveType) { // primitive type if (codegenParameter.isString) { @@ -503,7 +503,7 @@ public class GoClientCodegen extends AbstractGoCodegen { private String constructExampleCode(CodegenProperty codegenProperty, HashMap modelMaps, HashMap processedModelMap) { if (codegenProperty.isListContainer) { // array return codegenProperty.dataType + "{" + constructExampleCode(codegenProperty.items, modelMaps, processedModelMap) + ")"; - } else if (codegenProperty.isMapContainer) { // map + } else if (codegenProperty.isMap) { // map return "map[string]string{ \"Key\" = \"Value\" }"; } else if (codegenProperty.isPrimitiveType) { // primitive type if (codegenProperty.isString) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java index e716bde6e43..5af6e7205df 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java @@ -728,7 +728,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC } if (typeMapping.containsKey(param.dataType) - || param.isMapContainer || param.isListContainer + || param.isMap || param.isListContainer || param.isPrimitiveType || param.isFile || (param.isEnum || param.allowableValues != null) || !param.isBodyParam) { String dataType = genEnums && param.isEnum ? param.datatypeWithEnum : param.dataType; @@ -1064,7 +1064,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC unknownMimeTypes.add(m); } for (CodegenParameter param : op.allParams) { - if (param.isBodyParam || param.isFormParam && (!param.isPrimitiveType && !param.isListContainer && !param.isMapContainer)) { + if (param.isBodyParam || param.isFormParam && (!param.isPrimitiveType && !param.isListContainer && !param.isMap)) { Set mimeTypes = modelMimeTypes.containsKey(param.dataType) ? modelMimeTypes.get(param.dataType) : new HashSet(); mimeTypes.add(mimeType); modelMimeTypes.put(param.dataType, mimeTypes); @@ -1314,7 +1314,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC @Override protected void updateDataTypeWithEnumForMap(CodegenProperty property) { CodegenProperty baseItem = property.items; - while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMapContainer) || Boolean.TRUE.equals(baseItem.isListContainer))) { + while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMap) || Boolean.TRUE.equals(baseItem.isListContainer))) { baseItem = baseItem.items; } if (baseItem != null) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java index bb727af8f2b..c666aa26800 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java @@ -65,7 +65,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF boolean isArray; boolean isContainer; boolean isListContainer; - boolean isMapContainer; + boolean isMap; boolean isPrimitiveType; CodegenVariable items; Integer minItems; @@ -94,9 +94,9 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF dataType = op.returnType; enumName = null;// op.enumName; allowableValues = null;// op.allowableValues; - isContainer = op.isListContainer || op.isMapContainer; + isContainer = op.isListContainer || op.isMap; isListContainer = op.isListContainer; - isMapContainer = op.isMapContainer; + isMap = op.isMap; isPrimitiveType = op.returnTypeIsPrimitive; minItems = null;// op.minItems; minimum = null;// op.minimum; @@ -110,7 +110,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF varVendorExtensions = op.vendorExtensions; init(parent, testDataPath, models); - if (op.isListContainer || op.isMapContainer) { + if (op.isListContainer || op.isMap) { items = new CodegenVariable(); items.dataType = op.returnBaseType; items.isPrimitiveType = op.returnTypeIsPrimitive; @@ -131,7 +131,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF allowableValues = param.allowableValues; isContainer = param.isContainer; isListContainer = param.isListContainer; - isMapContainer = param.isMapContainer; + isMap = param.isMap; isPrimitiveType = param.isPrimitiveType; minItems = param.minItems; minimum = param.minimum; @@ -158,7 +158,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF allowableValues = prop.allowableValues; isContainer = prop.isContainer; isListContainer = prop.isListContainer; - isMapContainer = prop.isMapContainer; + isMap = prop.isMap; isPrimitiveType = prop.isPrimitiveType; minItems = prop.minItems; minimum = prop.minimum; @@ -216,10 +216,10 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF this.isArray = dataType.endsWith("[]"); this.testDataPath = testDataPath; CodegenModel cm = models.get(dataType); - if (cm != null && (cm.isArrayModel || cm.isMapModel)) { + if (cm != null && (cm.isArrayModel || cm.isMap)) { this.isContainer = true; this.isListContainer = cm.isArrayModel; - this.isMapContainer = cm.isMapModel; + this.isMap = cm.isMap; this.items = new CodegenVariable(); this.items.name = "item"; this.items.dataType = cm.additionalPropertiesType; @@ -249,7 +249,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF public String toString() { return "CodegenVariable [name=" + name + ", dataType=" + dataType + ", dataFormat=" + dataFormat + ", isArray=" + isArray + ", isContainer=" + isContainer + ", isListContainer=" + isListContainer - + ", isMapContainer=" + isMapContainer + ", isPrimitiveType=" + isPrimitiveType + ", testDataPath=" + + ", isMap=" + isMap + ", isPrimitiveType=" + isPrimitiveType + ", testDataPath=" + testDataPath + ", enumName=" + enumName + ", allowableValues=" + allowableValues + ", minItems=" + minItems + ", itemCount=" + itemCount + ", minimum=" + minimum + ", maximum=" + maximum + ", exclusiveMinimum=" + exclusiveMinimum + ", exclusiveMaximum=" + exclusiveMaximum @@ -512,7 +512,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF CodegenVariable parent, String localVar, Collection localVars, Map models) { CodegenModel cm = models.get(parent.dataType); - if (cm != null) { // TODO: handle isArrayModel and isMapModel + if (cm != null) { // TODO: handle isArrayModel and isMap for (CodegenProperty cp : cm.allVars) { CodegenVariable var = new CodegenVariable(parent, cp, null, models); if (var.isContainer || !var.isPrimitiveType) { @@ -883,7 +883,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF if (var.isListContainer) appendListValue(buffer, indent, op, var, localVar, localVars, models); - else if (var.isMapContainer) + else if (var.isMap) appendMapValue(buffer, indent, op, var, localVar, localVars, models); else if (var.isArray) appendArrayValue(buffer, indent, op, var, localVar, localVars, models); @@ -1204,7 +1204,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF .append(op.operationId).append('/').append(var.name).append('"'); if (var.isListContainer) buffer.append(", ").append(var.getComponentType()).append(".class"); - else if (var.isMapContainer) + else if (var.isMap) buffer.append(", Map.class"); else if (!hasCacheMethod(var)) buffer.append(", ").append(var.dataType).append(".class"); @@ -1229,7 +1229,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF .append(op.operationId).append('/').append(var.name).append('"'); if (var.isListContainer) buffer.append(", ").append(var.getComponentType()).append(".class"); - else if (var.isMapContainer) + else if (var.isMap) buffer.append(", Map.class"); else if (!hasCacheMethod(var)) buffer.append(", ").append(var.dataType).append(".class"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java index b92c70e2aa1..bc9fc67d0ff 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java @@ -682,7 +682,7 @@ public class JavascriptApolloClientCodegen extends DefaultCodegen implements Cod if (Boolean.TRUE.equals(p.isListContainer)) { example = setPropertyExampleValue(p.items); example = "[" + example + "]"; - } else if (Boolean.TRUE.equals(p.isMapContainer)) { + } else if (Boolean.TRUE.equals(p.isMap)) { example = setPropertyExampleValue(p.items); example = "{key: " + example + "}"; } else if (example == null) { @@ -880,7 +880,7 @@ public class JavascriptApolloClientCodegen extends DefaultCodegen implements Cod String dataType = trimBrackets(cp.dataType); if (Boolean.TRUE.equals(cp.isListContainer)) { return "Array.<" + dataType + ">"; - } else if (Boolean.TRUE.equals(cp.isMapContainer)) { + } else if (Boolean.TRUE.equals(cp.isMap)) { return "Object."; } return dataType; @@ -891,7 +891,7 @@ public class JavascriptApolloClientCodegen extends DefaultCodegen implements Cod if (returnType != null) { if (Boolean.TRUE.equals(co.isListContainer)) { return "Array.<" + returnType + ">"; - } else if (Boolean.TRUE.equals(co.isMapContainer)) { + } else if (Boolean.TRUE.equals(co.isMap)) { return "Object."; } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java index 2d38cd2e6b2..48e2c3ac704 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java @@ -733,7 +733,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo if (Boolean.TRUE.equals(p.isListContainer)) { example = setPropertyExampleValue(p.items); example = "[" + example + "]"; - } else if (Boolean.TRUE.equals(p.isMapContainer)) { + } else if (Boolean.TRUE.equals(p.isMap)) { example = setPropertyExampleValue(p.items); example = "{key: " + example + "}"; } else if (example == null) { @@ -945,7 +945,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo dataType = getModelledType(dataType); if (Boolean.TRUE.equals(cp.isListContainer)) { return "Array.<" + dataType + ">"; - } else if (Boolean.TRUE.equals(cp.isMapContainer)) { + } else if (Boolean.TRUE.equals(cp.isMap)) { return "Object."; } return dataType; @@ -963,7 +963,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo returnType = getModelledType(returnType); if (Boolean.TRUE.equals(co.isListContainer)) { return "Array.<" + returnType + ">"; - } else if (Boolean.TRUE.equals(co.isMapContainer)) { + } else if (Boolean.TRUE.equals(co.isMap)) { return "Object."; } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java index b16634b97f8..ddf9f9d6264 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java @@ -237,7 +237,7 @@ public class OCamlClientCodegen extends DefaultCodegen implements CodegenConfig @Override protected void updateDataTypeWithEnumForMap(CodegenProperty property) { CodegenProperty baseItem = property.items; - while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMapContainer) + while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMap) || Boolean.TRUE.equals(baseItem.isListContainer))) { baseItem = baseItem.items; } @@ -255,7 +255,7 @@ public class OCamlClientCodegen extends DefaultCodegen implements CodegenConfig @Override protected void updateDataTypeWithEnumForArray(CodegenProperty property) { CodegenProperty baseItem = property.items; - while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMapContainer) + while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMap) || Boolean.TRUE.equals(baseItem.isListContainer))) { baseItem = baseItem.items; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java index b8dd22f8d57..0505383472b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java @@ -773,7 +773,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { example = "NULL"; } else if (Boolean.TRUE.equals(p.isListContainer)) { example = "@[" + example + "]"; - } else if (Boolean.TRUE.equals(p.isMapContainer)) { + } else if (Boolean.TRUE.equals(p.isMap)) { example = "@{@\"key\" : " + example + "}"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java index 04757f27d10..461bfe667f1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java @@ -511,7 +511,7 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { if (Boolean.TRUE.equals(p.isListContainer)) { example = setPropertyExampleValue(p.items); example = "(" + example + ")"; - } else if (Boolean.TRUE.equals(p.isMapContainer)) { + } else if (Boolean.TRUE.equals(p.isMap)) { example = setPropertyExampleValue(p.items); example = "('key' => " + example + "}"; } else if (example == null) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java index b78ec0820be..b265938cad7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java @@ -998,7 +998,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo private String constructExampleCode(CodegenParameter codegenParameter, HashMap modelMaps, HashMap processedModelMap) { if (codegenParameter.isListContainer) { // array return "@(" + constructExampleCode(codegenParameter.items, modelMaps, processedModelMap) + ")"; - } else if (codegenParameter.isMapContainer) { // TODO: map, file type + } else if (codegenParameter.isMap) { // TODO: map, file type return "@{ \"Key\" = \"Value\" }"; } else if (languageSpecificPrimitives.contains(codegenParameter.dataType) || nullablePrimitives.contains(codegenParameter.dataType)) { // primitive type @@ -1040,7 +1040,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo private String constructExampleCode(CodegenProperty codegenProperty, HashMap modelMaps, HashMap processedModelMap) { if (codegenProperty.isListContainer) { // array return "@(" + constructExampleCode(codegenProperty.items, modelMaps, processedModelMap) + ")"; - } else if (codegenProperty.isMapContainer) { // map + } else if (codegenProperty.isMap) { // map return "\"TODO\""; } else if (languageSpecificPrimitives.contains(codegenProperty.dataType) || // primitive type nullablePrimitives.contains(codegenProperty.dataType)) { // nullable primitive type @@ -1118,7 +1118,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo return dataType; } else if (cp.isListContainer) { // array return getPSDataType(cp.items) + "[]"; - } else if (cp.isMapContainer) { // map + } else if (cp.isMap) { // map return "System.Collections.Hashtable"; } else { // model return "PSCustomObject"; @@ -1136,7 +1136,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo return dataType; } else if (cp.isListContainer) { // array return getPSDataType(cp.items) + "[]"; - } else if (cp.isMapContainer) { // map + } else if (cp.isMap) { // map return "System.Collections.Hashtable"; } else { // model return "PSCustomObject"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java index 07bd07ae425..420210649b5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java @@ -410,7 +410,7 @@ public class ProtobufSchemaCodegen extends DefaultCodegen implements CodegenConf // add x-protobuf-type: repeated if it's an array if (Boolean.TRUE.equals(p.isListContainer)) { p.vendorExtensions.put("x-protobuf-type", "repeated"); - } else if (Boolean.TRUE.equals(p.isMapContainer)) { + } else if (Boolean.TRUE.equals(p.isMap)) { LOGGER.warn("Map parameter (name: {}, operation ID: {}) not yet supported", p.paramName, op.operationId); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java index a4061c84de6..72a6ad4ed43 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java @@ -956,7 +956,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig example = "None"; } else if (Boolean.TRUE.equals(p.isListContainer)) { example = "[" + example + "]"; - } else if (Boolean.TRUE.equals(p.isMapContainer)) { + } else if (Boolean.TRUE.equals(p.isMap)) { example = "{'key': " + example + "}"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java index c719f5ebfb4..d6efb3b87dd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java @@ -586,7 +586,7 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig { example = "NULL"; } else if (Boolean.TRUE.equals(p.isListContainer)) { example = "[" + example + "]"; - } else if (Boolean.TRUE.equals(p.isMapContainer)) { + } else if (Boolean.TRUE.equals(p.isMap)) { example = "{'key' => " + example + "}"; } @@ -707,7 +707,7 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig { public String constructExampleCode(CodegenParameter codegenParameter, HashMap modelMaps) { if (codegenParameter.isListContainer) { // array return "list(" + constructExampleCode(codegenParameter.items, modelMaps) + ")"; - } else if (codegenParameter.isMapContainer) { // TODO: map + } else if (codegenParameter.isMap) { // TODO: map return "TODO"; } else if (languageSpecificPrimitives.contains(codegenParameter.dataType)) { // primitive type return codegenParameter.example; @@ -725,7 +725,7 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig { public String constructExampleCode(CodegenProperty codegenProperty, HashMap modelMaps) { if (codegenProperty.isListContainer) { // array return "list(" + constructExampleCode(codegenProperty.items, modelMaps) + ")"; - } else if (codegenProperty.isMapContainer) { // TODO: map + } else if (codegenProperty.isMap) { // TODO: map return "TODO"; } else if (languageSpecificPrimitives.contains(codegenProperty.dataType)) { // primitive type if ("character".equals(codegenProperty.dataType)) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java index 02eaffd0956..3bf7af4028e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java @@ -584,7 +584,7 @@ public class RubyClientCodegen extends AbstractRubyCodegen { example = "nil"; } else if (Boolean.TRUE.equals(p.isListContainer)) { example = "[" + example + "]"; - } else if (Boolean.TRUE.equals(p.isMapContainer)) { + } else if (Boolean.TRUE.equals(p.isMap)) { example = "{'key' => " + example + "}"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java index 4bb48c30e0f..e5aa64d4b3a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java @@ -559,7 +559,7 @@ public class RustClientCodegen extends DefaultCodegen implements CodegenConfig { if ( end > 0 ) { p.dataType = "Vec<" + rt.substring("Vec<".length(), end).trim() + ">"; } - } else if (p.isMapContainer && !languageSpecificPrimitives.contains(p.dataType)) { + } else if (p.isMap && !languageSpecificPrimitives.contains(p.dataType)) { // map of model String rt = p.dataType; int end = rt.lastIndexOf(">"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java index fad4644bb1e..6fcd4f66821 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java @@ -444,7 +444,7 @@ class Marshaller { public Marshaller(CodegenParameter parameter) { if (parameter.isListContainer) { this.varName = parameter.baseType + "List"; - } else if (parameter.isMapContainer) { + } else if (parameter.isMap) { this.varName = parameter.baseType + "Map"; } else if (parameter.isContainer) { this.varName = parameter.baseType + "Container"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java index 5737feb4c2f..d9da4795609 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java @@ -440,7 +440,7 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem } } - if (cm.isMapModel) { + if (cm.isMap) { defaultValue.append(", Map.empty"); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java index 0c389b58e72..d6cc612391a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java @@ -1009,7 +1009,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig { public String constructExampleCode(CodegenParameter codegenParameter, HashMap modelMaps) { if (codegenParameter.isListContainer) { // array return "[" + constructExampleCode(codegenParameter.items, modelMaps) + "]"; - } else if (codegenParameter.isMapContainer) { // TODO: map, file type + } else if (codegenParameter.isMap) { // TODO: map, file type return "\"TODO\""; } else if (languageSpecificPrimitives.contains(codegenParameter.dataType)) { // primitive type if ("String".equals(codegenParameter.dataType) || "Character".equals(codegenParameter.dataType)) { @@ -1049,7 +1049,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig { public String constructExampleCode(CodegenProperty codegenProperty, HashMap modelMaps) { if (codegenProperty.isListContainer) { // array return "[" + constructExampleCode(codegenProperty.items, modelMaps) + "]"; - } else if (codegenProperty.isMapContainer) { // TODO: map, file type + } else if (codegenProperty.isMap) { // TODO: map, file type return "\"TODO\""; } else if (languageSpecificPrimitives.contains(codegenProperty.dataType)) { // primitive type if ("String".equals(codegenProperty.dataType) || "Character".equals(codegenProperty.dataType)) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java index 44d927ae014..ede7606b7f5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java @@ -1012,7 +1012,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig public String constructExampleCode(CodegenParameter codegenParameter, HashMap modelMaps, ExampleCodeGenerationContext context) { if (codegenParameter.isListContainer) { // array return "[" + constructExampleCode(codegenParameter.items, modelMaps, context) + "]"; - } else if (codegenParameter.isMapContainer) { // TODO: map, file type + } else if (codegenParameter.isMap) { // TODO: map, file type return "\"TODO\""; } else if (languageSpecificPrimitives.contains(codegenParameter.dataType)) { // primitive type if ("String".equals(codegenParameter.dataType) || "Character".equals(codegenParameter.dataType)) { @@ -1052,7 +1052,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig private String constructExampleCode(CodegenProperty codegenProperty, HashMap modelMaps, ExampleCodeGenerationContext context) { if (codegenProperty.isListContainer) { // array return "[" + constructExampleCode(codegenProperty.items, modelMaps, context) + "]"; - } else if (codegenProperty.isMapContainer) { // TODO: map, file type + } else if (codegenProperty.isMap) { // TODO: map, file type return "\"TODO\""; } else if (languageSpecificPrimitives.contains(codegenProperty.dataType)) { // primitive type if ("String".equals(codegenProperty.dataType) || "Character".equals(codegenProperty.dataType)) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java index eec358455da..35c31b66e3d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java @@ -301,7 +301,7 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege List operationList = (List) _operations.get("operation"); for (CodegenOperation op : operationList) { if("object".equals(op.returnType)) { - op.isMapContainer = true; + op.isMap = true; op.returnSimpleType = false; } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java index aac1d6bc8d9..3a2ce5bd90b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java @@ -249,7 +249,7 @@ public class TypeScriptReduxQueryClientCodegen extends AbstractTypeScriptClientC List operationList = (List) _operations.get("operation"); for (CodegenOperation op : operationList) { if("object".equals(op.returnType)) { - op.isMapContainer = true; + op.isMap = true; op.returnSimpleType = false; } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java index 673d4d41e45..d36a768e52e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java @@ -365,7 +365,7 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen this.returnTypeIsPrimitive = o.returnTypeIsPrimitive; this.returnSimpleType = o.returnSimpleType; this.subresourceOperation = o.subresourceOperation; - this.isMapContainer = o.isMapContainer; + this.isMap = o.isMap; this.isListContainer = o.isListContainer; this.isMultipart = o.isMultipart; this.hasMore = o.hasMore; diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache index f60e66f0f22..13ef8b7d52e 100644 --- a/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache +++ b/modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache @@ -98,8 +98,8 @@ end: // {{{notes}}} // {{/notes}} -{{#returnType}}{{#returnTypeIsPrimitive}}{{#returnSimpleType}}{{{.}}}*{{/returnSimpleType}}{{^returnSimpleType}}{{#isListContainer}}{{{.}}}_t*{{/isListContainer}}{{#isMapContainer}}{{{.}}}{{/isMapContainer}}{{/returnSimpleType}}{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}{{{.}}}_t*{{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void{{/returnType}} -{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}}, {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isListContainer}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isListContainer}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMapContainer}}{{dataType}}{{/isMapContainer}}{{/isContainer}} {{{paramName}}} {{/allParams}}) +{{#returnType}}{{#returnTypeIsPrimitive}}{{#returnSimpleType}}{{{.}}}*{{/returnSimpleType}}{{^returnSimpleType}}{{#isListContainer}}{{{.}}}_t*{{/isListContainer}}{{#isMap}}{{{.}}}{{/isMap}}{{/returnSimpleType}}{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}{{{.}}}_t*{{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void{{/returnType}} +{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}}, {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isListContainer}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isListContainer}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMap}}{{dataType}}{{/isMap}}{{/isContainer}} {{{paramName}}} {{/allParams}}) { list_t *localVarQueryParameters = {{#hasQueryParams}}list_create();{{/hasQueryParams}}{{^hasQueryParams}}NULL;{{/hasQueryParams}} list_t *localVarHeaderParameters = {{#hasHeaderParams}}list_create();{{/hasHeaderParams}}{{^hasHeaderParams}}NULL;{{/hasHeaderParams}} diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache index 7631aa03554..2ee99aaf1d8 100644 --- a/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache +++ b/modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache @@ -32,8 +32,8 @@ typedef enum { {{projectName}}_{{operationId}}_{{enumName}}_NULL = 0{{#enumVars // {{{notes}}} // {{/notes}} -{{#returnType}}{{#returnTypeIsPrimitive}}{{#returnSimpleType}}{{{.}}}*{{/returnSimpleType}}{{^returnSimpleType}}{{#isListContainer}}{{{.}}}_t*{{/isListContainer}}{{#isMapContainer}}{{{.}}}{{/isMapContainer}}{{/returnSimpleType}}{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}{{{.}}}_t*{{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void{{/returnType}} -{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}}, {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isListContainer}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isListContainer}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMapContainer}}{{dataType}}{{/isMapContainer}}{{/isContainer}} {{{paramName}}} {{/allParams}}); +{{#returnType}}{{#returnTypeIsPrimitive}}{{#returnSimpleType}}{{{.}}}*{{/returnSimpleType}}{{^returnSimpleType}}{{#isListContainer}}{{{.}}}_t*{{/isListContainer}}{{#isMap}}{{{.}}}{{/isMap}}{{/returnSimpleType}}{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}{{{.}}}_t*{{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void{{/returnType}} +{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}}, {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isListContainer}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isListContainer}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMap}}{{dataType}}{{/isMap}}{{/isContainer}} {{{paramName}}} {{/allParams}}); {{/operation}} 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 8547193db45..ea22c40fc9f 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 @@ -186,9 +186,9 @@ char* {{name}}{{classname}}_ToString({{projectName}}_{{classVarName}}_{{enumName {{datatype}}_t *{{name}}{{#hasMore}},{{/hasMore}} {{/isPrimitiveType}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{datatype}} {{name}}{{#hasMore}},{{/hasMore}} - {{/isMapContainer}} + {{/isMap}} {{/isContainer}} {{/vars}} ) { @@ -259,14 +259,14 @@ void {{classname}}_free({{classname}}_t *{{classname}}) { list_free({{classname}}->{{name}}); {{/isPrimitiveType}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} list_ForEach(listEntry, {{classname}}->{{name}}) { keyValuePair_t *localKeyValue = (keyValuePair_t*) listEntry->data; free (localKeyValue->key); free (localKeyValue->value); } list_free({{classname}}->{{name}}); - {{/isMapContainer}} + {{/isMap}} {{/isContainer}} {{/vars}} free({{classname}}); @@ -430,7 +430,7 @@ cJSON *{{classname}}_convertToJSON({{classname}}_t *{{classname}}) { } {{/isPrimitiveType}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} cJSON *{{{name}}} = cJSON_AddObjectToObject(item, "{{{baseName}}}"); if({{{name}}} == NULL) { goto fail; //primitive map container @@ -462,7 +462,7 @@ cJSON *{{classname}}_convertToJSON({{classname}}_t *{{classname}}) { {{/items}} } } - {{/isMapContainer}} + {{/isMap}} {{/isContainer}} {{^required}} {{^isEnum}} } {{/isEnum}} @@ -653,7 +653,7 @@ fail: } {{/isPrimitiveType}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} list_t *{{{name}}}List; {{^required}}if ({{{name}}}) { {{/required}} cJSON *{{{name}}}_local_map; @@ -690,7 +690,7 @@ fail: {{/items}} list_addElement({{{name}}}List , localMapKeyPair); } - {{/isMapContainer}} + {{/isMap}} {{/isContainer}} {{^required}} } @@ -760,9 +760,9 @@ fail: {{^required}}{{{name}}} ? {{/required}}{{{name}}}List{{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} {{/isPrimitiveType}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{^required}}{{{name}}} ? {{/required}}{{{name}}}List{{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} - {{/isMapContainer}} + {{/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 1fa938ed4a2..2cb2f8e41a0 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 @@ -136,9 +136,9 @@ typedef struct {{classname}}_t { {{datatype}}_t *{{name}}; //nonprimitive container {{/isPrimitiveType}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{datatype}} {{name}}; //map - {{/isMapContainer}} + {{/isMap}} {{/isContainer}} {{/vars}} @@ -206,9 +206,9 @@ typedef struct {{classname}}_t { {{datatype}}_t *{{name}}{{#hasMore}},{{/hasMore}} {{/isPrimitiveType}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{datatype}} {{name}}{{#hasMore}},{{/hasMore}} - {{/isMapContainer}} + {{/isMap}} {{/isContainer}} {{/vars}} ); diff --git a/modules/openapi-generator/src/main/resources/Eiffel/model.mustache b/modules/openapi-generator/src/main/resources/Eiffel/model.mustache index b7d07e784ed..21e82871868 100644 --- a/modules/openapi-generator/src/main/resources/Eiffel/model.mustache +++ b/modules/openapi-generator/src/main/resources/Eiffel/model.mustache @@ -80,7 +80,7 @@ feature -- Change Element end end {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} if attached {{name}} as l_{{name}} then Result.append ("%N{{name}}:") across l_{{name}} as ic loop @@ -93,7 +93,7 @@ feature -- Change Element Result.append ("%N") end end - {{/isMapContainer}} + {{/isMap}} {{^isContainer}} if attached {{name}} as l_{{name}} then Result.append ("%N{{name}}:") diff --git a/modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache b/modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache index ac01b293cc1..3819d3d2dd2 100644 --- a/modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache +++ b/modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache @@ -5,7 +5,7 @@ * Else use custom behaviour, IOW use whatever is defined on the object mapper }} @JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}}) - @JsonInclude({{#isMapContainer}}{{#items.isNullable}}content = JsonInclude.Include.ALWAYS, {{/items.isNullable}}{{/isMapContainer}}value = JsonInclude.Include.{{#required}}ALWAYS{{/required}}{{^required}}USE_DEFAULTS{{/required}}) + @JsonInclude({{#isMap}}{{#items.isNullable}}content = JsonInclude.Include.ALWAYS, {{/items.isNullable}}{{/isMap}}value = JsonInclude.Include.{{#required}}ALWAYS{{/required}}{{^required}}USE_DEFAULTS{{/required}}) {{#withXml}} {{^isContainer}} @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}") diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache index a32b23d6cb7..6ac2083704a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache @@ -146,7 +146,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE {{/vendorExtensions.x-is-jackson-optional-nullable}} } {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} @@ -170,7 +170,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} } - {{/isMapContainer}} + {{/isMap}} {{/isReadOnly}} /** diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache index 675813a088d..c250bd2a36d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache @@ -76,18 +76,18 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ {{#vendorExtensions.x-extra-annotation}} {{{vendorExtensions.x-extra-annotation}}} {{/vendorExtensions.x-extra-annotation}} -{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#withXml}}{{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{dataType}} {{getter}}() { +{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#withXml}}{{#isEnum}}{{^isListContainer}}{{^isMap}}public {{dataType}} {{getter}}() { if ({{name}} == null) { return null; } return {{name}}.value(); - }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{/withXml}}{{^withXml}}{{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{datatypeWithEnum}} {{getter}}() { + }{{/isMap}}{{/isListContainer}}{{/isEnum}}{{/withXml}}{{^withXml}}{{#isEnum}}{{^isListContainer}}{{^isMap}}public {{datatypeWithEnum}} {{getter}}() { return {{name}}; - }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{/withXml}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() { + }{{/isMap}}{{/isListContainer}}{{/isEnum}}{{/withXml}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; - }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMapContainer}}public {{{datatypeWithEnum}}} {{getter}}() { + }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMap}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; - }{{/isMapContainer}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() { + }{{/isMap}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; }{{/isEnum}} @@ -110,13 +110,13 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ return this; } {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { this.{{name}}.put(key, {{name}}Item); return this; } - {{/isMapContainer}} + {{/isMap}} {{/isReadOnly}} {{/vars}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache index 98bcd3d4654..821972f3391 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache @@ -166,7 +166,7 @@ public class {{classname}} { ExecutableValidator executableValidator = factory.getValidator().forExecutables(); Object[] parameterValues = { {{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}} }; - Method method = this.getClass().getMethod("{{operationId}}WithHttpInfo"{{#allParams}}, {{#isListContainer}}java.util.List{{/isListContainer}}{{#isMapContainer}}java.util.Map{{/isMapContainer}}{{^isListContainer}}{{^isMapContainer}}{{{dataType}}}{{/isMapContainer}}{{/isListContainer}}.class{{/allParams}}); + Method method = this.getClass().getMethod("{{operationId}}WithHttpInfo"{{#allParams}}, {{#isListContainer}}java.util.List{{/isListContainer}}{{#isMap}}java.util.Map{{/isMap}}{{^isListContainer}}{{^isMap}}{{{dataType}}}{{/isMap}}{{/isListContainer}}.class{{/allParams}}); Set> violations = executableValidator.validateParameters(this, method, parameterValues); diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache index e6749289b7c..a442eb4e182 100644 --- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache @@ -129,7 +129,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE {{/vendorExtensions.x-is-jackson-optional-nullable}} } {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} @@ -153,7 +153,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} } - {{/isMapContainer}} + {{/isMap}} {{/isReadOnly}} /** diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache index 73377389233..6db33e864a8 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache @@ -56,7 +56,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali } {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{^required}} @@ -67,7 +67,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali this.{{name}}.put(key, {{name}}Item); return this; } - {{/isMapContainer}} + {{/isMap}} {{/vars}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache index 68f2c4d06c7..a3e7a35cf40 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache @@ -70,13 +70,13 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ {{#vendorExtensions.x-extra-annotation}} {{{vendorExtensions.x-extra-annotation}}} {{/vendorExtensions.x-extra-annotation}} -{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{dataType}} {{getter}}() { +{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#isEnum}}{{^isListContainer}}{{^isMap}}public {{dataType}} {{getter}}() { return {{name}} == null ? null : {{name}}.value(); - }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() { + }{{/isMap}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; - }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMapContainer}}public {{{datatypeWithEnum}}} {{getter}}() { + }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMap}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; - }{{/isMapContainer}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() { + }{{/isMap}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; }{{/isEnum}} @@ -113,7 +113,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ return this; } {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} /** * Puts a new item into the {{name}} map. @@ -125,7 +125,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ this.{{name}}.put(key, {{name}}Item); return this; } - {{/isMapContainer}} + {{/isMap}} {{/vars}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache index d3ca8b1652b..ac430d2bf3a 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache @@ -55,16 +55,16 @@ import com.fasterxml.jackson.annotation.JsonProperty; {{#vendorExtensions.x-extra-annotation}} {{{vendorExtensions.x-extra-annotation}}} {{/vendorExtensions.x-extra-annotation}} -{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{dataType}} {{getter}}() { +{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#isEnum}}{{^isListContainer}}{{^isMap}}public {{dataType}} {{getter}}() { if ({{name}} == null) { return null; } return {{name}}.value(); - }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() { + }{{/isMap}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; - }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMapContainer}}public {{{datatypeWithEnum}}} {{getter}}() { + }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMap}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; - }{{/isMapContainer}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() { + }{{/isMap}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; }{{/isEnum}} @@ -84,13 +84,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; return this; } {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { this.{{name}}.put(key, {{name}}Item); return this; } - {{/isMapContainer}} + {{/isMap}} {{/isReadOnly}} {{/vars}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache index eaed2ff2072..24f7c8941d3 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache @@ -55,7 +55,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali return this; } {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{^required}} @@ -66,7 +66,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali this.{{name}}.put(key, {{name}}Item); return this; } - {{/isMapContainer}} + {{/isMap}} /** {{#description}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/returnTypes.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/returnTypes.mustache index 873e4fdc664..1e8ec04d95e 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/returnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/returnTypes.mustache @@ -1 +1 @@ -{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/returnTypes.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/returnTypes.mustache index 873e4fdc664..1e8ec04d95e 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/returnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/returnTypes.mustache @@ -1 +1 @@ -{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/exampleReturnTypes.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/exampleReturnTypes.mustache index e406c368dfd..cb97c7a021b 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/exampleReturnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/exampleReturnTypes.mustache @@ -1 +1 @@ -{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache index 356cdf87e38..fd5a931a482 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache @@ -75,11 +75,11 @@ public class {{classname}}Controller extends Controller { OpenAPIUtils.validate(curItem); } {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} for (Map.Entry entry : {{paramName}}.entrySet()) { OpenAPIUtils.validate(entry.getValue()); } - {{/isMapContainer}} + {{/isMap}} {{^isContainer}} OpenAPIUtils.validate({{paramName}}); {{/isContainer}} @@ -219,11 +219,11 @@ public class {{classname}}Controller extends Controller { OpenAPIUtils.validate(curItem); } {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} for (Map.Entry entry : obj.entrySet()) { OpenAPIUtils.validate(entry.getValue()); } - {{/isMapContainer}} + {{/isMap}} {{^returnContainer}} OpenAPIUtils.validate(obj); {{/returnContainer}} @@ -236,11 +236,11 @@ public class {{classname}}Controller extends Controller { OpenAPIUtils.validate(curItem); } {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} for (Map.Entry entry : obj.entrySet()) { OpenAPIUtils.validate(entry.getValue()); } - {{/isMapContainer}} + {{/isMap}} {{^returnContainer}} OpenAPIUtils.validate(obj); {{/returnContainer}} diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache index fad79fda01e..72e4d036e26 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache @@ -50,7 +50,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali return this; } {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{^required}} @@ -61,7 +61,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali this.{{name}}.put(key, {{name}}Item); return this; } - {{/isMapContainer}} + {{/isMap}} /** {{#description}} diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypes.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypes.mustache index 2fc81df496f..1d7037d991f 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypes.mustache @@ -1 +1 @@ -{{#returnType}}{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}{{^returnType}}void{{/returnType}} \ No newline at end of file +{{#returnType}}{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}{{^returnType}}void{{/returnType}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoid.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoid.mustache index fb106adb635..347fceccddb 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoid.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoid.mustache @@ -1 +1 @@ -{{#returnType}}{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}} \ No newline at end of file +{{#returnType}}{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoidNoAbstract.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoidNoAbstract.mustache index 49b189ace26..c946f4885a1 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoidNoAbstract.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoidNoAbstract.mustache @@ -1 +1 @@ -{{#returnType}}{{#returnContainer}}{{#isMapContainer}}HashMap{{/isMapContainer}}{{#isListContainer}}{{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}} \ No newline at end of file +{{#returnType}}{{#returnContainer}}{{#isMap}}HashMap{{/isMap}}{{#isListContainer}}{{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/exampleReturnTypes.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/exampleReturnTypes.mustache index 985bc9d2153..029df5ade8a 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/exampleReturnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/exampleReturnTypes.mustache @@ -1 +1 @@ -{{#returnContainer}}{{#isMapContainer}}Map{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMap}}Map{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index 29d99bd7163..23cc3530380 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -81,7 +81,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{^parent}} return this; } {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{^required}} @@ -92,7 +92,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{^parent}} this.{{name}}.put(key, {{name}}Item); return this; } - {{/isMapContainer}} + {{/isMap}} /** {{#description}} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/queryParams.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/queryParams.mustache index 0f79dd06de5..a22a8366cf0 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/queryParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/queryParams.mustache @@ -1 +1 @@ -{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}) {{#useBeanValidation}}@Valid{{/useBeanValidation}}{{^isModel}} @RequestParam(value = {{#isMapContainer}}""{{/isMapContainer}}{{^isMapContainer}}"{{baseName}}"{{/isMapContainer}}{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{^isContainer}}{{#defaultValue}}, defaultValue={{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}){{/isModel}}{{#isDate}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE){{/isDate}}{{#isDateTime}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME){{/isDateTime}} {{>optionalDataType}} {{paramName}}{{/isQueryParam}} \ No newline at end of file +{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}) {{#useBeanValidation}}@Valid{{/useBeanValidation}}{{^isModel}} @RequestParam(value = {{#isMap}}""{{/isMap}}{{^isMap}}"{{baseName}}"{{/isMap}}{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{^isContainer}}{{#defaultValue}}, defaultValue={{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}){{/isModel}}{{#isDate}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE){{/isDate}}{{#isDateTime}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME){{/isDateTime}} {{>optionalDataType}} {{paramName}}{{/isQueryParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache index 27f37ca8ef2..a78483e8559 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache @@ -1 +1 @@ -{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{#reactive}}Flux{{/reactive}}{{^reactive}}{{{returnContainer}}}{{/reactive}}<{{{returnType}}}>{{/isListContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{#reactive}}Flux{{/reactive}}{{^reactive}}{{{returnContainer}}}{{/reactive}}<{{{returnType}}}>{{/isListContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/controller.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/controller.mustache index afb6b08eddc..69d947b3d91 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/controller.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/controller.mustache @@ -44,7 +44,7 @@ namespace {{packageName}}.Controllers {{#examples}} exampleJson = "{{{example}}}"; {{/examples}} - {{#isListCollection}}{{>listReturn}}{{/isListCollection}}{{^isListCollection}}{{#isMapContainer}}{{>mapReturn}}{{/isMapContainer}}{{^isMapContainer}}{{>objectReturn}}{{/isMapContainer}}{{/isListCollection}} + {{#isListCollection}}{{>listReturn}}{{/isListCollection}}{{^isListCollection}}{{#isMap}}{{>mapReturn}}{{/isMap}}{{^isMap}}{{>objectReturn}}{{/isMap}}{{/isListCollection}} {{!TODO: defaultResponse, examples, auth, consumes, produces, nickname, externalDocs, imports, security}} //TODO: Change the data returned return new ObjectResult(example);{{/returnType}}{{^returnType}} diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache index 44218b0a889..cab116b21cb 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache @@ -70,7 +70,7 @@ namespace {{packageName}}.Models /// Returns the JSON string presentation of the object /// /// JSON string presentation of the object - public {{#parent}}{{^isMapModel}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMapModel}}{{/parent}}string ToJson() + public {{#parent}}{{^isMap}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMap}}{{/parent}}string ToJson() { return JsonConvert.SerializeObject(this, Formatting.Indented); } diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache index 19a6acbc53e..982ad45526e 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache @@ -68,7 +68,7 @@ namespace {{apiPackage}} {{#examples}} exampleJson = "{{{example}}}"; {{/examples}} - {{#isListCollection}}{{>listReturn}}{{/isListCollection}}{{^isListCollection}}{{#isMapContainer}}{{>mapReturn}}{{/isMapContainer}}{{^isMapContainer}}{{>objectReturn}}{{/isMapContainer}}{{/isListCollection}} + {{#isListCollection}}{{>listReturn}}{{/isListCollection}}{{^isListCollection}}{{#isMap}}{{>mapReturn}}{{/isMap}}{{^isMap}}{{>objectReturn}}{{/isMap}}{{/isListCollection}} {{!TODO: defaultResponse, examples, auth, consumes, produces, nickname, externalDocs, imports, security}} //TODO: Change the data returned return {{#operationResultTask}}Task.FromResult({{/operationResultTask}}new ObjectResult(example){{#operationResultTask}}){{/operationResultTask}};{{/returnType}}{{^returnType}} diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache index 8ae491d52cc..d758faae1bd 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache @@ -73,7 +73,7 @@ namespace {{modelPackage}} /// Returns the JSON string presentation of the object /// /// JSON string presentation of the object - public {{#parent}}{{^isMapModel}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMapModel}}{{/parent}}string ToJson() + public {{#parent}}{{^isMap}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMap}}{{/parent}}string ToJson() { return JsonConvert.SerializeObject(this, Formatting.Indented); } diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache index 2fe77a01be3..1a6fa5e91ea 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache @@ -68,7 +68,7 @@ namespace {{apiPackage}} {{#examples}} exampleJson = "{{{example}}}"; {{/examples}} - {{#isListCollection}}{{>listReturn}}{{/isListCollection}}{{^isListCollection}}{{#isMapContainer}}{{>mapReturn}}{{/isMapContainer}}{{^isMapContainer}}{{>objectReturn}}{{/isMapContainer}}{{/isListCollection}} + {{#isListCollection}}{{>listReturn}}{{/isListCollection}}{{^isListCollection}}{{#isMap}}{{>mapReturn}}{{/isMap}}{{^isMap}}{{>objectReturn}}{{/isMap}}{{/isListCollection}} {{!TODO: defaultResponse, examples, auth, consumes, produces, nickname, externalDocs, imports, security}} //TODO: Change the data returned return {{#operationResultTask}}Task.FromResult({{/operationResultTask}}new ObjectResult(example){{#operationResultTask}}){{/operationResultTask}};{{/returnType}}{{^returnType}} diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache index 8ae491d52cc..d758faae1bd 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache @@ -73,7 +73,7 @@ namespace {{modelPackage}} /// Returns the JSON string presentation of the object /// /// JSON string presentation of the object - public {{#parent}}{{^isMapModel}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMapModel}}{{/parent}}string ToJson() + public {{#parent}}{{^isMap}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMap}}{{/parent}}string ToJson() { return JsonConvert.SerializeObject(this, Formatting.Indented); } diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache index 4dc8e995cc7..9b88928f1cd 100644 --- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache @@ -43,7 +43,7 @@ void {{classname}}::{{operationIdSnakeCase}}_handler(const Pistache::Rest::Reque // Getting the body param {{#bodyParam}} {{^isPrimitiveType}}{{^isContainer}} - {{baseType}} {{paramName}};{{/isContainer}}{{#isListContainer}}std::vector<{{items.baseType}}> {{paramName}};{{/isListContainer}}{{#isMapContainer}}std::map {{paramName}};{{/isMapContainer}}{{/isPrimitiveType}} + {{baseType}} {{paramName}};{{/isContainer}}{{#isListContainer}}std::vector<{{items.baseType}}> {{paramName}};{{/isListContainer}}{{#isMap}}std::map {{paramName}};{{/isMap}}{{/isPrimitiveType}} {{#isPrimitiveType}} {{dataType}} {{paramName}}; {{/isPrimitiveType}} diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache index a074b516e83..4713296092c 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache @@ -134,8 +134,8 @@ void {{classname}}::{{nickname}}({{#allParams}}const {{{dataType}}} &{{paramName {{#formParams}}{{^isFile}} input.add_var("{{baseName}}", ::{{cppNamespace}}::toStringValue({{paramName}}));{{/isFile}}{{#isFile}} input.add_file("{{baseName}}", {{paramName}}.local_filename, {{paramName}}.request_filename, {{paramName}}.mime_type);{{/isFile}}{{/formParams}}{{#bodyParams}}{{#isContainer}}{{#isListContainer}} - QJsonDocument doc(::{{cppNamespace}}::toJsonValue({{paramName}}).toArray());{{/isListContainer}}{{#isMapContainer}} - QJsonDocument doc(::{{cppNamespace}}::toJsonValue({{paramName}}).toObject());{{/isMapContainer}} + QJsonDocument doc(::{{cppNamespace}}::toJsonValue({{paramName}}).toArray());{{/isListContainer}}{{#isMap}} + QJsonDocument doc(::{{cppNamespace}}::toJsonValue({{paramName}}).toObject());{{/isMap}} QByteArray bytes = doc.toJson(); input.request_body.append(bytes); {{/isContainer}}{{^isContainer}}{{#isString}} @@ -181,13 +181,13 @@ void {{classname}}::{{nickname}}Callback({{prefix}}HttpRequestWorker *worker) { } {{/isListContainer}} {{^isListContainer}} - {{^isMapContainer}} + {{^isMap}} {{#returnTypeIsPrimitive}} {{{returnType}}} output; ::{{cppNamespace}}::fromStringValue(QString(worker->response), output); {{/returnTypeIsPrimitive}} - {{/isMapContainer}} - {{#isMapContainer}} + {{/isMap}} + {{#isMap}} {{{returnType}}} output; QString json(worker->response); QByteArray array(json.toStdString().c_str()); @@ -198,12 +198,12 @@ void {{classname}}::{{nickname}}Callback({{prefix}}HttpRequestWorker *worker) { ::{{cppNamespace}}::fromJsonValue(val, obj[key]); output.insert(key, val); } - {{/isMapContainer}} - {{^isMapContainer}} + {{/isMap}} + {{^isMap}} {{^returnTypeIsPrimitive}} {{{returnType}}} output{{^isResponseFile}}(QString(worker->response)){{/isResponseFile}}{{#isResponseFile}} = worker->getHttpFileElement(){{/isResponseFile}}; {{/returnTypeIsPrimitive}} - {{/isMapContainer}} + {{/isMap}} {{/isListContainer}} {{/returnType}} worker->deleteLater(); diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-body.mustache index e48e1597db1..c66c10b3da7 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-body.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-body.mustache @@ -55,26 +55,26 @@ void {{classname}}::fromJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnu m_{{name}}_isValid = true; if(arr.count() > 0) { for (const QJsonValue jval : arr) { - {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#items.isMapContainer}}QMap{{/items.isMapContainer}} item; + {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#items.isMap}}QMap{{/items.isMap}} item; m_{{name}}_isValid &= ::{{cppNamespace}}::fromJsonValue(item, jval); m_{{name}}_isSet = !jval.isNull() && m_{{name}}_isValid; {{name}}.push_back(item); } } - }{{/isListContainer}}{{#isMapContainer}} + }{{/isListContainer}}{{#isMap}} if(json["{{baseName}}"].isObject()){ auto varmap = json["{{baseName}}"].toObject().toVariantMap(); m_{{name}}_isValid = true; if(varmap.count() > 0){ for(auto val : varmap.keys()){ - {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#items.isMapContainer}}QMap{{/items.isMapContainer}} item; + {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#items.isMap}}QMap{{/items.isMap}} item; auto jval = QJsonValue::fromVariant(varmap.value(val)); m_{{name}}_isValid &= ::{{cppNamespace}}::fromJsonValue(item, jval); m_{{name}}_isSet &= !jval.isNull() && m_{{name}}_isValid; {{name}}.insert({{name}}.end(), val, item); } } - }{{/isMapContainer}}{{/items.isContainer}}{{/isContainer}}{{^-last}} + }{{/isMap}}{{/items.isContainer}}{{/isContainer}}{{^-last}} {{/-last}} {{/vars}}{{/isEnum}}{{#isEnum}}{{#allowableValues}}{{#enumVars}}{{#-first}}{{#isString}}fromJson(json.toString());{{/isString}}{{^isString}}m_value = static_cast(json.toInt());{{/isString}}{{/-first}}{{/enumVars}}{{/allowableValues}}{{/isEnum}} } diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache index b1373df9f1e..1dc3cbb2d5a 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache @@ -74,7 +74,7 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} } {{/isListContainer}} {{^isListContainer}} - {{^isMapContainer}} + {{^isMap}} {{#isPrimitiveType}}{{^isFreeFormObject}} {{{dataType}}} {{paramName}}; ::{{cppNamespace}}::fromStringValue(QString(socket->readAll()), {{paramName}}); @@ -84,8 +84,8 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} QJsonDocument resObject = QJsonDocument::fromJson(socket->readAll()); ::{{cppNamespace}}::fromJsonValue({{paramName}}, resObject.object()); {{/isFreeFormObject}} - {{/isMapContainer}} - {{#isMapContainer}} + {{/isMap}} + {{#isMap}} QJsonDocument doc; socket->readJson(doc); QJsonObject obj = doc.object(); @@ -95,8 +95,8 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} ::{{cppNamespace}}::fromJsonValue(val, obj[key]); {{paramName}}.insert(key, val); } - {{/isMapContainer}} - {{^isMapContainer}} + {{/isMap}} + {{^isMap}} {{^isPrimitiveType}} QJsonDocument doc; socket->readJson(doc); @@ -104,7 +104,7 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} {{{dataType}}} {{paramName}}; ::{{cppNamespace}}::fromJsonValue({{paramName}}, obj); {{/isPrimitiveType}} - {{/isMapContainer}} + {{/isMap}} {{/isListContainer}} {{/bodyParam}}{{/bodyParams}} @@ -114,13 +114,13 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} {{/operation}}{{/operations}} {{#operations}}{{#operation}}void {{classname}}Request::{{nickname}}Response({{#returnType}}const {{{returnType}}}& res{{/returnType}}){ - setSocketResponseHeaders();{{#returnType}}{{#isMapContainer}} + setSocketResponseHeaders();{{#returnType}}{{#isMap}} QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).toObject()); - socket->writeJson(resDoc);{{/isMapContainer}}{{^isMapContainer}}{{^returnTypeIsPrimitive}}{{^vendorExtensions.x-returns-enum}} + socket->writeJson(resDoc);{{/isMap}}{{^isMap}}{{^returnTypeIsPrimitive}}{{^vendorExtensions.x-returns-enum}} QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isListContainer}}Object{{/isListContainer}}{{#isListContainer}}Array{{/isListContainer}}()); socket->writeJson(resDoc);{{/vendorExtensions.x-returns-enum}}{{#vendorExtensions.x-returns-enum}} socket->write(::{{cppNamespace}}::toStringValue(res).toUtf8());{{/vendorExtensions.x-returns-enum}}{{/returnTypeIsPrimitive}}{{#returnTypeIsPrimitive}} - socket->write({{#isListContainer}}QString("["+{{/isListContainer}}::{{cppNamespace}}::toStringValue(res){{#isListContainer}}+"]"){{/isListContainer}}.toUtf8());{{/returnTypeIsPrimitive}}{{/isMapContainer}}{{/returnType}}{{^returnType}} + socket->write({{#isListContainer}}QString("["+{{/isListContainer}}::{{cppNamespace}}::toStringValue(res){{#isListContainer}}+"]"){{/isListContainer}}.toUtf8());{{/returnTypeIsPrimitive}}{{/isMap}}{{/returnType}}{{^returnType}} socket->setStatusCode(QHttpEngine::Socket::OK); socket->writeHeaders();{{/returnType}} if(socket->isOpen()){ @@ -132,13 +132,13 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} {{#operations}}{{#operation}}void {{classname}}Request::{{nickname}}Error({{#returnType}}const {{{returnType}}}& res, {{/returnType}}QNetworkReply::NetworkError error_type, QString& error_str){ Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors setSocketResponseHeaders();{{#returnType}} - Q_UNUSED(error_str); // response will be used instead of error string{{#isMapContainer}} + Q_UNUSED(error_str); // response will be used instead of error string{{#isMap}} QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).toObject()); - socket->writeJson(resDoc);{{/isMapContainer}}{{^isMapContainer}}{{^returnTypeIsPrimitive}}{{^vendorExtensions.x-returns-enum}} + socket->writeJson(resDoc);{{/isMap}}{{^isMap}}{{^returnTypeIsPrimitive}}{{^vendorExtensions.x-returns-enum}} QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isListContainer}}Object{{/isListContainer}}{{#isListContainer}}Array{{/isListContainer}}()); socket->writeJson(resDoc);{{/vendorExtensions.x-returns-enum}}{{#vendorExtensions.x-returns-enum}} socket->write(::{{cppNamespace}}::toStringValue(res).toUtf8());{{/vendorExtensions.x-returns-enum}}{{/returnTypeIsPrimitive}}{{#returnTypeIsPrimitive}} - socket->write({{#isListContainer}}QString("["+{{/isListContainer}}::{{cppNamespace}}::toStringValue(res){{#isListContainer}}+"]"){{/isListContainer}}.toUtf8());{{/returnTypeIsPrimitive}}{{/isMapContainer}}{{/returnType}}{{^returnType}} + socket->write({{#isListContainer}}QString("["+{{/isListContainer}}::{{cppNamespace}}::toStringValue(res){{#isListContainer}}+"]"){{/isListContainer}}.toUtf8());{{/returnTypeIsPrimitive}}{{/isMap}}{{/returnType}}{{^returnType}} socket->setStatusCode(QHttpEngine::Socket::NotFound); socket->write(error_str.toUtf8());{{/returnType}} if(socket->isOpen()){ diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-body.mustache index e48e1597db1..c66c10b3da7 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-body.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-body.mustache @@ -55,26 +55,26 @@ void {{classname}}::fromJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnu m_{{name}}_isValid = true; if(arr.count() > 0) { for (const QJsonValue jval : arr) { - {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#items.isMapContainer}}QMap{{/items.isMapContainer}} item; + {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#items.isMap}}QMap{{/items.isMap}} item; m_{{name}}_isValid &= ::{{cppNamespace}}::fromJsonValue(item, jval); m_{{name}}_isSet = !jval.isNull() && m_{{name}}_isValid; {{name}}.push_back(item); } } - }{{/isListContainer}}{{#isMapContainer}} + }{{/isListContainer}}{{#isMap}} if(json["{{baseName}}"].isObject()){ auto varmap = json["{{baseName}}"].toObject().toVariantMap(); m_{{name}}_isValid = true; if(varmap.count() > 0){ for(auto val : varmap.keys()){ - {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#items.isMapContainer}}QMap{{/items.isMapContainer}} item; + {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#items.isMap}}QMap{{/items.isMap}} item; auto jval = QJsonValue::fromVariant(varmap.value(val)); m_{{name}}_isValid &= ::{{cppNamespace}}::fromJsonValue(item, jval); m_{{name}}_isSet &= !jval.isNull() && m_{{name}}_isValid; {{name}}.insert({{name}}.end(), val, item); } } - }{{/isMapContainer}}{{/items.isContainer}}{{/isContainer}}{{^-last}} + }{{/isMap}}{{/items.isContainer}}{{/isContainer}}{{^-last}} {{/-last}} {{/vars}}{{/isEnum}}{{#isEnum}}{{#allowableValues}}{{#enumVars}}{{#-first}}{{#isString}}fromJson(json.toString());{{/isString}}{{^isString}}m_value = static_cast(json.toInt());{{/isString}}{{/-first}}{{/enumVars}}{{/allowableValues}}{{/isEnum}} } diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache index cbd91c2d3a6..5681becfa97 100644 --- a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache @@ -202,7 +202,7 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r localVarJsonArray.push_back(ModelBase::toJson(localVarItem)); } localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("{{paramName}}"), localVarJsonArray, utility::conversions::to_string_t("application/json"))); - }{{/isListContainer}}{{#isMapContainer}} + }{{/isListContainer}}{{#isMap}} { std::map localVarJsonMap; for( auto& localVarItem : {{paramName}}{{^required}}.get(){{/required}} ) @@ -211,14 +211,14 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r localVarJsonMap.insert( std::pair(localVarItem.first, ModelBase::toJson(localVarItem.second) )); } localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("{{paramName}}"), localVarJsonMap, utility::conversions::to_string_t("application/json"))); - }{{/isMapContainer}} - {{^isListContainer}}{{^isMapContainer}}{{#isString}}localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("{{paramName}}"), {{paramName}})); + }{{/isMap}} + {{^isListContainer}}{{^isMap}}{{#isString}}localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("{{paramName}}"), {{paramName}})); {{/isString}}{{^isString}}if({{^required}}{{paramName}} && (*{{paramName}}){{/required}}{{#required}}{{paramName}}{{/required}}.get()) { {{^required}}(*{{/required}}{{paramName}}{{^required}}){{/required}}->toMultipart(localVarMultipart, utility::conversions::to_string_t("{{paramName}}")); } {{/isString}} - {{/isMapContainer}}{{/isListContainer}}{{/isPrimitiveType}} + {{/isMap}}{{/isListContainer}}{{/isPrimitiveType}} localVarHttpBody = localVarMultipart; localVarRequestHttpContentType += utility::conversions::to_string_t("; boundary=") + localVarMultipart->getBoundary(); @@ -326,14 +326,14 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r {{{vendorExtensions.x-codegen-response.items.datatype}}} localVarItemObj; ModelBase::fromJson(localVarItem, localVarItemObj); localVarResult.push_back(localVarItemObj); - }{{/isListContainer}}{{#isMapContainer}} + }{{/isListContainer}}{{#isMap}} for( auto& localVarItem : localVarJson.as_object() ) { {{{vendorExtensions.x-codegen-response.items.datatype}}} localVarItemObj; ModelBase::fromJson(localVarItem.second, localVarItemObj); localVarResult[localVarItem.first] = localVarItemObj; - }{{/isMapContainer}}{{^isListContainer}}{{^isMapContainer}} - ModelBase::fromJson(localVarJson, localVarResult);{{/isMapContainer}}{{/isListContainer}} + }{{/isMap}}{{^isListContainer}}{{^isMap}} + ModelBase::fromJson(localVarJson, localVarResult);{{/isMap}}{{/isListContainer}} }{{#vendorExtensions.x-codegen-response.isString}} else if(localVarResponseHttpContentType == utility::conversions::to_string_t("text/plain")) { diff --git a/modules/openapi-generator/src/main/resources/cpp-tizen-client/api-body.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/api-body.mustache index be351f437a6..81c822b2ad1 100644 --- a/modules/openapi-generator/src/main/resources/cpp-tizen-client/api-body.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-tizen-client/api-body.mustache @@ -53,13 +53,13 @@ static gpointer __{{classname}}threadFunc(gpointer data) static bool {{nickname}}Processor(MemoryStruct_s p_chunk, long code, char* errormsg, void* userData, void(* voidHandler)()) { - {{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMapContainer}}{{returnType}}{{/isMapContainer}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ) - = reinterpret_cast{{/isListContainer}}{{#isMapContainer}}{{returnType}}{{/isMapContainer}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* )> (voidHandler);{{/returnType}} + {{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMap}}{{returnType}}{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ) + = reinterpret_cast{{/isListContainer}}{{#isMap}}{{returnType}}{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* )> (voidHandler);{{/returnType}} {{^returnType}}void(* handler)(Error, void* ) = reinterpret_cast (voidHandler);{{/returnType}} JsonNode* pJson; char * data = p_chunk.memory; - {{#returnType}}{{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMapContainer}}{{returnType}}{{/isMapContainer}} out;{{/returnContainer}} + {{#returnType}}{{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMap}}{{returnType}}{{/isMap}} out;{{/returnContainer}} {{^returnContainer}}{{returnType}} out;{{/returnContainer}}{{/returnType}} if (code >= 200 && code < 300) { @@ -136,7 +136,7 @@ static bool {{nickname}}Processor(MemoryStruct_s p_chunk, long code, char* error static bool {{nickname}}Helper(char * accessToken, {{#allParams}}{{#isContainer}}{{{dataType}}}<{{baseType}}> {{paramName}}{{/isContainer}}{{^isContainer}}{{{dataType}}} {{paramName}}{{/isContainer}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}} - {{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMapContainer}}{{returnType}}{{/isMapContainer}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}} + {{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMap}}{{returnType}}{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}} {{^returnType}}void(* handler)(Error, void* ) {{/returnType}}, void* userData, bool isAsync) { @@ -230,7 +230,7 @@ static bool {{nickname}}Helper(char * accessToken, - {{#isMapContainer}} + {{#isMap}} //IF CODE IS HERE, SOMETHING IS SLIGHTLY WRONG! if (isprimitive("{{baseType}}")) { node = converttoJson(&{{paramName}}, "{{baseType}}", "array"); @@ -250,7 +250,7 @@ static bool {{nickname}}Helper(char * accessToken, json_array_unref(json_array); } {{/isDouble}}{{/isDateTime}}{{/isString}}{{/isFloat}}{{/isBoolean}}{{/isLong}}{{/isDate}}{{/isInteger}} - {{/isMapContainer}} + {{/isMap}} {{/isContainer}} {{^isContainer}} @@ -329,7 +329,7 @@ static bool {{nickname}}Helper(char * accessToken, bool {{classname}}::{{nickname}}Async(char * accessToken, {{#allParams}}{{#isContainer}}{{{dataType}}}<{{baseType}}> {{paramName}}{{/isContainer}}{{^isContainer}}{{{dataType}}} {{paramName}}{{/isContainer}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}} - {{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMapContainer}}{{returnType}}{{/isMapContainer}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}} + {{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMap}}{{returnType}}{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}} {{^returnType}}void(* handler)(Error, void* ) {{/returnType}}, void* userData) { return {{nickname}}Helper(accessToken, @@ -339,7 +339,7 @@ bool {{classname}}::{{nickname}}Async(char * accessToken, bool {{classname}}::{{nickname}}Sync(char * accessToken, {{#allParams}}{{#isContainer}}{{{dataType}}}<{{baseType}}> {{paramName}}{{/isContainer}}{{^isContainer}}{{{dataType}}} {{paramName}}{{/isContainer}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}} - {{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMapContainer}}{{returnType}}{{/isMapContainer}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}} + {{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMap}}{{returnType}}{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}} {{^returnType}}void(* handler)(Error, void* ) {{/returnType}}, void* userData) { return {{nickname}}Helper(accessToken, diff --git a/modules/openapi-generator/src/main/resources/cpp-tizen-client/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/api-header.mustache index 77366bde156..79a7ed407ac 100644 --- a/modules/openapi-generator/src/main/resources/cpp-tizen-client/api-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-tizen-client/api-header.mustache @@ -38,7 +38,7 @@ public: */ bool {{nickname}}Sync(char * accessToken, {{#allParams}}{{#isContainer}}{{{dataType}}}<{{baseType}}> {{paramName}}{{/isContainer}}{{^isContainer}}{{{dataType}}} {{paramName}}{{/isContainer}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}} - {{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMapContainer}}{{returnType}}{{/isMapContainer}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}} + {{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMap}}{{returnType}}{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}} {{^returnType}}void(* handler)(Error, void* ) {{/returnType}}, void* userData); /*! \brief {{{summary}}}. *Asynchronous* @@ -51,7 +51,7 @@ bool {{nickname}}Sync(char * accessToken, */ bool {{nickname}}Async(char * accessToken, {{#allParams}}{{#isContainer}}{{{dataType}}}<{{baseType}}> {{paramName}}{{/isContainer}}{{^isContainer}}{{{dataType}}} {{paramName}}{{/isContainer}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}} - {{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMapContainer}}{{returnType}}{{/isMapContainer}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}} + {{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMap}}{{returnType}}{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}} {{^returnType}}void(* handler)(Error, void* ) {{/returnType}}, void* userData); diff --git a/modules/openapi-generator/src/main/resources/cpp-tizen-client/model-body.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/model-body.mustache index 6a68be601a2..cf6b0a97886 100644 --- a/modules/openapi-generator/src/main/resources/cpp-tizen-client/model-body.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-tizen-client/model-body.mustache @@ -72,14 +72,14 @@ void } {{name}} = new_list; } - {{/isListContainer}}{{#isMapContainer}} + {{/isListContainer}}{{#isMap}} { JsonObject* json_obj = json_node_get_object(node); map new_map; json_object_foreach_member(json_obj,helper_func,&new_map); {{name}} = new_map; } - {{/isMapContainer}}{{/isContainer}} + {{/isMap}}{{/isContainer}} {{^isContainer}} if (isprimitive("{{baseType}}")) { @@ -131,7 +131,7 @@ char* {{/isListContainer}} - {{#isMapContainer}}{ + {{#isMap}}{ JsonObject* json_obj; map new_list = static_cast > ({{getter}}()); json_obj = json_object_new(); @@ -145,7 +145,7 @@ char* json_node_init_object(node, json_obj); json_object_unref(json_obj); } - {{/isMapContainer}} + {{/isMap}} {{/isContainer}} {{^isContainer}} @@ -174,14 +174,14 @@ char* } {{#vars}} -{{dataType}}{{#isContainer}}{{#isMapContainer}}{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{dataType}}{{/items}}>{{/isMapContainer}}{{/isContainer}} +{{dataType}}{{#isContainer}}{{#isMap}}{{/isMap}}{{^isMap}}<{{#items}}{{dataType}}{{/items}}>{{/isMap}}{{/isContainer}} {{classname}}::{{getter}}() { return {{name}}; } void -{{classname}}::{{setter}}({{dataType}} {{#isContainer}}{{#isMapContainer}}{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{dataType}}{{/items}}>{{/isMapContainer}}{{/isContainer}} {{name}}) +{{classname}}::{{setter}}({{dataType}} {{#isContainer}}{{#isMap}}{{/isMap}}{{^isMap}}<{{#items}}{{dataType}}{{/items}}>{{/isMap}}{{/isContainer}} {{name}}) { this->{{name}} = {{name}}; } diff --git a/modules/openapi-generator/src/main/resources/cpp-tizen-client/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/model-header.mustache index 830754ca73d..f9ecd1518bb 100644 --- a/modules/openapi-generator/src/main/resources/cpp-tizen-client/model-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-tizen-client/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}}{{#isMap}}{{/isMap}}{{^isMap}}<{{#items}}{{dataType}}{{/items}}>{{/isMap}}{{/isContainer}} {{getter}}(); /*! \brief Set {{{description}}} */ - void {{setter}}({{dataType}} {{#isContainer}}{{#isMapContainer}}{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{dataType}}{{/items}}>{{/isMapContainer}}{{/isContainer}} {{name}}); + void {{setter}}({{dataType}} {{#isContainer}}{{#isMap}}{{/isMap}}{{^isMap}}<{{#items}}{{dataType}}{{/items}}>{{/isMap}}{{/isContainer}} {{name}}); {{/vars}} private: {{#vars}} - {{dataType}} {{#isContainer}}{{#isMapContainer}}{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{dataType}}{{/items}}>{{/isMapContainer}}{{/isContainer}}{{name}}; + {{dataType}} {{#isContainer}}{{#isMap}}{{/isMap}}{{^isMap}}<{{#items}}{{dataType}}{{/items}}>{{/isMap}}{{/isContainer}}{{name}}; {{/vars}} void __init(); void __cleanup(); diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache index cc9fa77a730..668b86a2a2e 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache @@ -154,7 +154,7 @@ /// Returns the JSON string presentation of the object /// /// JSON string presentation of the object - public {{#parent}}{{^isArrayModel}}{{^isMapModel}}override {{/isMapModel}}{{/isArrayModel}}{{/parent}}{{^parent}}virtual {{/parent}}string ToJson() + public {{#parent}}{{^isArrayModel}}{{^isMap}}override {{/isMap}}{{/isArrayModel}}{{/parent}}{{^parent}}virtual {{/parent}}string ToJson() { return JsonConvert.SerializeObject(this, Formatting.Indented); } @@ -273,9 +273,9 @@ {{/discriminator}} {{#parent}} {{^isArrayModel}} - {{^isMapModel}} + {{^isMap}} foreach(var x in BaseValidate(validationContext)) yield return x; - {{/isMapModel}} + {{/isMap}} {{/isArrayModel}} {{/parent}} {{#vars}} diff --git a/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache index 65422c10c4d..bb6f8991b09 100644 --- a/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache @@ -137,7 +137,7 @@ this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}; /// Returns the JSON string presentation of the object /// /// JSON string presentation of the object - public {{#parent}}{{^isArrayModel}}{{^isMapModel}}override {{/isMapModel}}{{/isArrayModel}}{{/parent}}{{^parent}}virtual {{/parent}}string ToJson() + public {{#parent}}{{^isArrayModel}}{{^isMap}}override {{/isMap}}{{/isArrayModel}}{{/parent}}{{^parent}}virtual {{/parent}}string ToJson() { return JsonConvert.SerializeObject(this, Formatting.Indented); } @@ -252,9 +252,9 @@ this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}; {{/hasChildren}} {{#parent}} {{^isArrayModel}} - {{^isMapModel}} + {{^isMap}} foreach(var x in base.BaseValidate(validationContext)) yield return x; - {{/isMapModel}} + {{/isMap}} {{/isArrayModel}} {{/parent}} {{#vars}} diff --git a/modules/openapi-generator/src/main/resources/dart/api.mustache b/modules/openapi-generator/src/main/resources/dart/api.mustache index 373ce2508b3..184f90515e0 100644 --- a/modules/openapi-generator/src/main/resources/dart/api.mustache +++ b/modules/openapi-generator/src/main/resources/dart/api.mustache @@ -97,16 +97,16 @@ class {{classname}} { {{/returnType}} {{/isListContainer}} {{^isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{#returnType}} return new {{{returnType}}}.from(apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}')); {{/returnType}}; - {{/isMapContainer}} - {{^isMapContainer}} + {{/isMap}} + {{^isMap}} {{#returnType}} return apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}') as {{{returnType}}}; {{/returnType}} - {{/isMapContainer}} + {{/isMap}} {{/isListContainer}} } else { return{{#returnType}} null{{/returnType}}; diff --git a/modules/openapi-generator/src/main/resources/dart/class.mustache b/modules/openapi-generator/src/main/resources/dart/class.mustache index 9739e84c69a..132e3686c67 100644 --- a/modules/openapi-generator/src/main/resources/dart/class.mustache +++ b/modules/openapi-generator/src/main/resources/dart/class.mustache @@ -32,12 +32,12 @@ class {{classname}} { {{name}} = {{complexType}}.listFromJson(json['{{baseName}}']); {{/isListContainer}} {{^isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{name}} = {{complexType}}.mapFromJson(json['{{baseName}}']); - {{/isMapContainer}} - {{^isMapContainer}} + {{/isMap}} + {{^isMap}} {{name}} = new {{complexType}}.fromJson(json['{{baseName}}']); - {{/isMapContainer}} + {{/isMap}} {{/isListContainer}} {{/complexType}} {{^complexType}} diff --git a/modules/openapi-generator/src/main/resources/dart2/api.mustache b/modules/openapi-generator/src/main/resources/dart2/api.mustache index 8bff5b93f83..e032490bb4e 100644 --- a/modules/openapi-generator/src/main/resources/dart2/api.mustache +++ b/modules/openapi-generator/src/main/resources/dart2/api.mustache @@ -174,16 +174,16 @@ class {{{classname}}} { {{/returnType}} {{/isListContainer}} {{^isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{#returnType}} return {{{returnType}}}.from(apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}')); {{/returnType}} - {{/isMapContainer}} - {{^isMapContainer}} + {{/isMap}} + {{^isMap}} {{#returnType}} return apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}') as {{{returnType}}}; {{/returnType}} - {{/isMapContainer}} + {{/isMap}} {{/isListContainer}} } return{{#returnType}} null{{/returnType}}; diff --git a/modules/openapi-generator/src/main/resources/dart2/class.mustache b/modules/openapi-generator/src/main/resources/dart2/class.mustache index 84380954d8f..5e0d5e98b7d 100644 --- a/modules/openapi-generator/src/main/resources/dart2/class.mustache +++ b/modules/openapi-generator/src/main/resources/dart2/class.mustache @@ -56,7 +56,7 @@ class {{{classname}}} { {{/items.isListContainer}} {{/isListContainer}} {{^isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{#items.isListContainer}} {{{name}}} = json['{{{baseName}}}'] == null ? null @@ -72,10 +72,10 @@ class {{{classname}}} { ? null : {{{complexType}}}.mapFromJson(json['{{{baseName}}}']); {{/items.isListContainer}} - {{/isMapContainer}} - {{^isMapContainer}} + {{/isMap}} + {{^isMap}} {{{name}}} = {{{complexType}}}.fromJson(json['{{{baseName}}}']); - {{/isMapContainer}} + {{/isMap}} {{/isListContainer}} {{/complexType}} {{^complexType}} @@ -90,12 +90,12 @@ class {{{classname}}} { {{/isEnum}} {{/isListContainer}} {{^isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{{name}}} = json['{{{baseName}}}'] == null ? null : (json['{{{baseName}}}'] as Map).cast(); - {{/isMapContainer}} - {{^isMapContainer}} + {{/isMap}} + {{^isMap}} {{#isNumber}} {{{name}}} = json['{{{baseName}}}'] == null ? null : @@ -109,7 +109,7 @@ class {{{classname}}} { {{{name}}} = {{{classname}}}{{{enumName}}}.fromJson(json['{{{baseName}}}']); {{/isEnum}} {{/isNumber}} - {{/isMapContainer}} + {{/isMap}} {{/isListContainer}} {{/complexType}} {{/isDate}} @@ -128,9 +128,9 @@ class {{{classname}}} { {{#isListContainer}} List<{{{classname}}}{{{enumName}}}> {{{name}}}; {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} Map {{{name}}}; - {{/isMapContainer}} + {{/isMap}} {{/isContainer}} {{^isContainer}} {{#allowableValues}} diff --git a/modules/openapi-generator/src/main/resources/elixir/api.mustache b/modules/openapi-generator/src/main/resources/elixir/api.mustache index 201731ce2e6..fa783b57c11 100644 --- a/modules/openapi-generator/src/main/resources/elixir/api.mustache +++ b/modules/openapi-generator/src/main/resources/elixir/api.mustache @@ -35,7 +35,7 @@ defmodule {{moduleName}}.Api.{{classname}} do {{/optionalParams}} ## Returns - {:ok, {{#isListContainer}}[%{{returnBaseType}}{}, ...]{{/isListContainer}}{{#isMapContainer}}%{}{{/isMapContainer}}{{^returnType}}%{}{{/returnType}}{{#returnSimpleType}}%{{#returnType}}{{#isMapContainer}}{{/isMapContainer}}{{{moduleName}}}.Model.{{{returnType}}}{{/returnType}}{}{{/returnSimpleType}}} on success + {:ok, {{#isListContainer}}[%{{returnBaseType}}{}, ...]{{/isListContainer}}{{#isMap}}%{}{{/isMap}}{{^returnType}}%{}{{/returnType}}{{#returnSimpleType}}%{{#returnType}}{{#isMap}}{{/isMap}}{{{moduleName}}}.Model.{{{returnType}}}{{/returnType}}{}{{/returnSimpleType}}} on success {:error, info} on failure """ {{{typespec}}} diff --git a/modules/openapi-generator/src/main/resources/elixir/model.mustache b/modules/openapi-generator/src/main/resources/elixir/model.mustache index 98c01f9096d..c9a95580f49 100644 --- a/modules/openapi-generator/src/main/resources/elixir/model.mustache +++ b/modules/openapi-generator/src/main/resources/elixir/model.mustache @@ -23,7 +23,7 @@ defimpl Poison.Decoder, for: {{moduleName}}.Model.{{classname}} do value {{#vars}} {{^isPrimitiveType}} - {{#datatype}}|> deserialize(:"{{baseName}}", {{#isListContainer}}:list, {{moduleName}}.Model.{{items.datatype}}{{/isListContainer}}{{#isMapContainer}}:map, {{moduleName}}.Model.{{items.datatype}}{{/isMapContainer}}{{#isDate}}:date, nil{{/isDate}}{{#isDateTime}}:date, nil{{/isDateTime}}{{^isDate}}{{^isDateTime}}{{^isMapContainer}}{{^isListContainer}}:struct, {{moduleName}}.Model.{{dataType}}{{/isListContainer}}{{/isMapContainer}}{{/isDateTime}}{{/isDate}}, options) + {{#datatype}}|> deserialize(:"{{baseName}}", {{#isListContainer}}:list, {{moduleName}}.Model.{{items.datatype}}{{/isListContainer}}{{#isMap}}:map, {{moduleName}}.Model.{{items.datatype}}{{/isMap}}{{#isDate}}:date, nil{{/isDate}}{{#isDateTime}}:date, nil{{/isDateTime}}{{^isDate}}{{^isDateTime}}{{^isMap}}{{^isListContainer}}:struct, {{moduleName}}.Model.{{dataType}}{{/isListContainer}}{{/isMap}}{{/isDateTime}}{{/isDate}}, options) {{/datatype}} {{/isPrimitiveType}} {{/vars}} diff --git a/modules/openapi-generator/src/main/resources/elm/operation.mustache b/modules/openapi-generator/src/main/resources/elm/operation.mustache index f83584bbd94..895d621e85a 100644 --- a/modules/openapi-generator/src/main/resources/elm/operation.mustache +++ b/modules/openapi-generator/src/main/resources/elm/operation.mustache @@ -33,7 +33,7 @@ import Uuid exposing (Uuid){{/includeUuid}} {-| {{{notes}}} -} {{/notes}} -{{operationId}} : {{#allParams}}{{^required}}Maybe {{/required}}{{#isListContainer}}List {{/isListContainer}}{{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{#isModel}}Api.Data.{{/isModel}}{{dataType}}{{/datatypeWithEnum}} -> {{/allParams}}{{#authMethods}}{{#isBasicBearer}}String -> {{/isBasicBearer}}{{/authMethods}}Api.Request {{^responses}}(){{/responses}}{{#responses}}{{#is2xx}}{{^dataType}}(){{/dataType}}{{#isMapContainer}}(Dict.Dict String {{/isMapContainer}}{{#isListContainer}}(List {{/isListContainer}}{{^primitiveType}}{{^isUuid}}Api.Data.{{/isUuid}}{{/primitiveType}}{{#items}}{{#isModel}}Api.Data.{{/isModel}}{{/items}}{{dataType}}{{#isListContainer}}){{/isListContainer}}{{#isMapContainer}}){{/isMapContainer}}{{/is2xx}}{{/responses}} +{{operationId}} : {{#allParams}}{{^required}}Maybe {{/required}}{{#isListContainer}}List {{/isListContainer}}{{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{#isModel}}Api.Data.{{/isModel}}{{dataType}}{{/datatypeWithEnum}} -> {{/allParams}}{{#authMethods}}{{#isBasicBearer}}String -> {{/isBasicBearer}}{{/authMethods}}Api.Request {{^responses}}(){{/responses}}{{#responses}}{{#is2xx}}{{^dataType}}(){{/dataType}}{{#isMap}}(Dict.Dict String {{/isMap}}{{#isListContainer}}(List {{/isListContainer}}{{^primitiveType}}{{^isUuid}}Api.Data.{{/isUuid}}{{/primitiveType}}{{#items}}{{#isModel}}Api.Data.{{/isModel}}{{/items}}{{dataType}}{{#isListContainer}}){{/isListContainer}}{{#isMap}}){{/isMap}}{{/is2xx}}{{/responses}} {{operationId}}{{#allParams}} {{>paramName}}{{/allParams}}{{#authMethods}}{{#isBasicBearer}} auth_token{{/isBasicBearer}}{{/authMethods}} = Api.request "{{httpMethod}}" diff --git a/modules/openapi-generator/src/main/resources/elm/recordField.mustache b/modules/openapi-generator/src/main/resources/elm/recordField.mustache index 78bd5ff0fa3..064618e7231 100644 --- a/modules/openapi-generator/src/main/resources/elm/recordField.mustache +++ b/modules/openapi-generator/src/main/resources/elm/recordField.mustache @@ -1 +1 @@ -{{#isNullable}}Maybe {{#isContainer}}({{/isContainer}}{{/isNullable}}{{^isNullable}}{{^required}}Maybe {{#isContainer}}({{/isContainer}}{{/required}}{{/isNullable}}{{#isListContainer}}List {{/isListContainer}}{{#isMapContainer}}Dict.Dict String {{/isMapContainer}}{{#isEnum}}{{classname}}{{enumName}}{{/isEnum}}{{^isEnum}}{{#items}}({{>recordField}}){{/items}}{{^isContainer}}{{dataType}}{{/isContainer}}{{/isEnum}}{{#isContainer}}{{#isNullable}}){{/isNullable}}{{^isNullable}}{{^required}}){{/required}}{{/isNullable}}{{/isContainer}} \ No newline at end of file +{{#isNullable}}Maybe {{#isContainer}}({{/isContainer}}{{/isNullable}}{{^isNullable}}{{^required}}Maybe {{#isContainer}}({{/isContainer}}{{/required}}{{/isNullable}}{{#isListContainer}}List {{/isListContainer}}{{#isMap}}Dict.Dict String {{/isMap}}{{#isEnum}}{{classname}}{{enumName}}{{/isEnum}}{{^isEnum}}{{#items}}({{>recordField}}){{/items}}{{^isContainer}}{{dataType}}{{/isContainer}}{{/isEnum}}{{#isContainer}}{{#isNullable}}){{/isNullable}}{{^isNullable}}{{^required}}){{/required}}{{/isNullable}}{{/isContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/elm/recordFieldValueDecoder.mustache b/modules/openapi-generator/src/main/resources/elm/recordFieldValueDecoder.mustache index f57d5ed5eb8..afd0b00ccd3 100644 --- a/modules/openapi-generator/src/main/resources/elm/recordFieldValueDecoder.mustache +++ b/modules/openapi-generator/src/main/resources/elm/recordFieldValueDecoder.mustache @@ -1 +1 @@ -{{#isListContainer}}(Json.Decode.list {{/isListContainer}}{{#isMapContainer}}(Json.Decode.dict {{/isMapContainer}}{{#items}}{{>recordFieldValueDecoder}}{{/items}}{{^isContainer}}{{#isCircularReference}}(Json.Decode.lazy (\_ -> {{/isCircularReference}}{{>fieldDecoder}}{{#isCircularReference}})){{/isCircularReference}}{{/isContainer}}{{#isListContainer}}){{/isListContainer}}{{#isMapContainer}}){{/isMapContainer}} \ No newline at end of file +{{#isListContainer}}(Json.Decode.list {{/isListContainer}}{{#isMap}}(Json.Decode.dict {{/isMap}}{{#items}}{{>recordFieldValueDecoder}}{{/items}}{{^isContainer}}{{#isCircularReference}}(Json.Decode.lazy (\_ -> {{/isCircularReference}}{{>fieldDecoder}}{{#isCircularReference}})){{/isCircularReference}}{{/isContainer}}{{#isListContainer}}){{/isListContainer}}{{#isMap}}){{/isMap}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/elm/recordFieldValueEncoder.mustache b/modules/openapi-generator/src/main/resources/elm/recordFieldValueEncoder.mustache index e072d4731c9..98cb15e99c8 100644 --- a/modules/openapi-generator/src/main/resources/elm/recordFieldValueEncoder.mustache +++ b/modules/openapi-generator/src/main/resources/elm/recordFieldValueEncoder.mustache @@ -1 +1 @@ -{{#isContainer}}({{#isListContainer}}Json.Encode.list{{/isListContainer}}{{#isMapContainer}}Json.Encode.dict identity{{/isMapContainer}} {{#items}}{{>recordFieldValueEncoder}}{{/items}}{{/isContainer}}{{^isContainer}}{{>fieldEncoder}}{{/isContainer}}{{#isContainer}}){{/isContainer}} \ No newline at end of file +{{#isContainer}}({{#isListContainer}}Json.Encode.list{{/isListContainer}}{{#isMap}}Json.Encode.dict identity{{/isMap}} {{#items}}{{>recordFieldValueEncoder}}{{/items}}{{/isContainer}}{{^isContainer}}{{>fieldEncoder}}{{/isContainer}}{{#isContainer}}){{/isContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/fsharp-giraffe-server/Handler.mustache b/modules/openapi-generator/src/main/resources/fsharp-giraffe-server/Handler.mustache index 908d0faf5bf..02d959293c5 100644 --- a/modules/openapi-generator/src/main/resources/fsharp-giraffe-server/Handler.mustache +++ b/modules/openapi-generator/src/main/resources/fsharp-giraffe-server/Handler.mustache @@ -55,7 +55,7 @@ module {{classname}}Handler = return! (match result with {{#responses}} | {{operationId}}{{#isDefault}}Default{{/isDefault}}StatusCode{{^isDefault}}{{code}}{{/isDefault}} resolved -> - setStatusCode {{code}} >=> {{#primitiveType}}{{^isMapContainer}}text{{/isMapContainer}}{{/primitiveType}}{{^primitiveType}}json{{/primitiveType}} resolved.content + setStatusCode {{code}} >=> {{#primitiveType}}{{^isMap}}text{{/isMap}}{{/primitiveType}}{{^primitiveType}}json{{/primitiveType}} resolved.content {{/responses}} ) next ctx } diff --git a/modules/openapi-generator/src/main/resources/go/model_simple.mustache b/modules/openapi-generator/src/main/resources/go/model_simple.mustache index ddf021192f6..a7187cfd603 100644 --- a/modules/openapi-generator/src/main/resources/go/model_simple.mustache +++ b/modules/openapi-generator/src/main/resources/go/model_simple.mustache @@ -1,11 +1,11 @@ // {{classname}}{{#description}} {{{description}}}{{/description}}{{^description}} struct for {{{classname}}}{{/description}} type {{classname}} struct { {{#parent}} -{{^isMapModel}} +{{^isMap}} {{^isArrayModel}} {{{parent}}} {{/isArrayModel}} -{{/isMapModel}} +{{/isMap}} {{#isArrayModel}} Items {{{parent}}} {{/isArrayModel}} @@ -225,7 +225,7 @@ func (o *{{classname}}) Unset{{name}}() { func (o {{classname}}) MarshalJSON() ([]byte, error) { toSerialize := {{#isArrayModel}}make([]interface{}, len(o.Items)){{/isArrayModel}}{{^isArrayModel}}map[string]interface{}{}{{/isArrayModel}} {{#parent}} - {{^isMapModel}} + {{^isMap}} {{^isArrayModel}} serialized{{parent}}, err{{parent}} := json.Marshal(o.{{parent}}) if err{{parent}} != nil { @@ -236,7 +236,7 @@ func (o {{classname}}) MarshalJSON() ([]byte, error) { return []byte{}, err{{parent}} } {{/isArrayModel}} - {{/isMapModel}} + {{/isMap}} {{#isArrayModel}} for i, item := range o.Items { toSerialize[i] = item @@ -278,7 +278,7 @@ func (o {{classname}}) MarshalJSON() ([]byte, error) { {{#isAdditionalPropertiesTrue}} func (o *{{{classname}}}) UnmarshalJSON(bytes []byte) (err error) { {{#parent}} -{{^isMapModel}} +{{^isMap}} type {{classname}}WithoutEmbeddedStruct struct { {{#vars}} {{^-first}} @@ -341,8 +341,8 @@ func (o *{{{classname}}}) UnmarshalJSON(bytes []byte) (err error) { } return err -{{/isMapModel}} -{{#isMapModel}} +{{/isMap}} +{{#isMap}} var{{{classname}}} := _{{{classname}}}{} if err = json.Unmarshal(bytes, &var{{{classname}}}); err == nil { @@ -359,7 +359,7 @@ func (o *{{{classname}}}) UnmarshalJSON(bytes []byte) (err error) { } return err -{{/isMapModel}} +{{/isMap}} {{/parent}} {{^parent}} var{{{classname}}} := _{{{classname}}}{} diff --git a/modules/openapi-generator/src/main/resources/haskell-http-client/Model.mustache b/modules/openapi-generator/src/main/resources/haskell-http-client/Model.mustache index c42a4ee01ff..72f708073f4 100644 --- a/modules/openapi-generator/src/main/resources/haskell-http-client/Model.mustache +++ b/modules/openapi-generator/src/main/resources/haskell-http-client/Model.mustache @@ -117,7 +117,7 @@ mk{{classname}} -> {{/required}}{{/vars}}{{classname}} mk{{classname}} {{#vars}}{{#required}}{{name}} {{/required}}{{/vars}}= {{classname}} - { {{#vars}}{{#required}}{{name}}{{/required}}{{^required}}{{name}} = {{#isListContainer}}Nothing{{/isListContainer}}{{#isMapContainer}}Nothing{{/isMapContainer}}{{^isContainer}}Nothing{{/isContainer}}{{/required}}{{#hasMore}} + { {{#vars}}{{#required}}{{name}}{{/required}}{{^required}}{{name}} = {{#isListContainer}}Nothing{{/isListContainer}}{{#isMap}}Nothing{{/isMap}}{{^isContainer}}Nothing{{/isContainer}}{{/required}}{{#hasMore}} , {{/hasMore}}{{/vars}} } {{/generateModelConstructors}}{{/isAlias}}{{/isEnum}}{{/model}}{{/models}} diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache index 956455628dd..5bf2578e840 100644 --- a/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache @@ -47,7 +47,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali return this; } {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{^required}} @@ -58,7 +58,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali this.{{name}}.put(key, {{name}}Item); return this; } - {{/isMapContainer}} + {{/isMap}} {{/isReadOnly}} /** diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/returnTypes.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/returnTypes.mustache index 873e4fdc664..1e8ec04d95e 100644 --- a/modules/openapi-generator/src/main/resources/java-msf4j-server/returnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/returnTypes.mustache @@ -1 +1 @@ -{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/exampleReturnTypes.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/exampleReturnTypes.mustache index e406c368dfd..cb97c7a021b 100644 --- a/modules/openapi-generator/src/main/resources/java-pkmst/exampleReturnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/java-pkmst/exampleReturnTypes.mustache @@ -1 +1 @@ -{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache index bddf3661cce..c5a7f68191d 100644 --- a/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache @@ -53,7 +53,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali return this; } {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { {{^required}} @@ -64,7 +64,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali this.{{name}}.put(key, {{name}}Item); return this; } - {{/isMapContainer}} + {{/isMap}} /** {{#description}} diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/returnTypes.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/returnTypes.mustache index 873e4fdc664..1e8ec04d95e 100644 --- a/modules/openapi-generator/src/main/resources/java-pkmst/returnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/java-pkmst/returnTypes.mustache @@ -1 +1 @@ -{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file 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 1b63b087811..4bbbac52f75 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 @@ -46,7 +46,7 @@ import java.io.Serializable {{#allVars}} {{#required}}{{>data_class_req_var}}{{/required}}{{^required}}{{>data_class_opt_var}}{{/required}}{{^-last}},{{/-last}} {{/allVars}} -){{/discriminator}}{{#parent}}{{^serializableModel}}{{^parcelizeModels}} : {{{parent}}}{{#isMapModel}}(){{/isMapModel}}{{#isArrayModel}}(){{/isArrayModel}}{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{#serializableModel}}{{^parcelizeModels}} : {{{parent}}}{{#isMapModel}}(){{/isMapModel}}{{#isArrayModel}}(){{/isArrayModel}}, Serializable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{^serializableModel}}{{#parcelizeModels}} : {{{parent}}}{{#isMapModel}}(){{/isMapModel}}{{#isArrayModel}}(){{/isArrayModel}}, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{#serializableModel}}{{#parcelizeModels}} : {{{parent}}}{{#isMapModel}}(){{/isMapModel}}{{#isArrayModel}}(){{/isArrayModel}}, Serializable, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{#serializableModel}}{{^parcelizeModels}} : Serializable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{^serializableModel}}{{#parcelizeModels}} : Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{#serializableModel}}{{#parcelizeModels}} : Serializable, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#vendorExtensions.x-has-data-class-body}} { +){{/discriminator}}{{#parent}}{{^serializableModel}}{{^parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArrayModel}}(){{/isArrayModel}}{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{#serializableModel}}{{^parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArrayModel}}(){{/isArrayModel}}, Serializable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{^serializableModel}}{{#parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArrayModel}}(){{/isArrayModel}}, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{#serializableModel}}{{#parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArrayModel}}(){{/isArrayModel}}, Serializable, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{#serializableModel}}{{^parcelizeModels}} : Serializable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{^serializableModel}}{{#parcelizeModels}} : Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{#serializableModel}}{{#parcelizeModels}} : Serializable, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#vendorExtensions.x-has-data-class-body}} { {{/vendorExtensions.x-has-data-class-body}} {{#serializableModel}} {{#nonPublicApi}}internal {{/nonPublicApi}}companion object { diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache index d268f23a77d..e7b7687272b 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache @@ -43,7 +43,7 @@ import kotlinx.serialization.internal.StringDescriptor val localVariableAuthNames = listOf({{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}}) - val localVariableBody = {{#hasBodyParam}}{{#bodyParam}}{{#isListContainer}}{{operationIdCamelCase}}Request({{{paramName}}}{{^isList}}.asList(){{/isList}}){{/isListContainer}}{{^isListContainer}}{{#isMapContainer}}{{operationIdCamelCase}}Request({{{paramName}}}){{/isMapContainer}}{{^isMapContainer}}{{{paramName}}}{{/isMapContainer}}{{/isListContainer}}{{/bodyParam}}{{/hasBodyParam}} + val localVariableBody = {{#hasBodyParam}}{{#bodyParam}}{{#isListContainer}}{{operationIdCamelCase}}Request({{{paramName}}}{{^isList}}.asList(){{/isList}}){{/isListContainer}}{{^isListContainer}}{{#isMap}}{{operationIdCamelCase}}Request({{{paramName}}}){{/isMap}}{{^isMap}}{{{paramName}}}{{/isMap}}{{/isListContainer}}{{/bodyParam}}{{/hasBodyParam}} {{^hasBodyParam}} {{#hasFormParams}} {{#isMultipart}} @@ -87,20 +87,20 @@ import kotlinx.serialization.internal.StringDescriptor localVariableConfig, localVariableBody, localVariableAuthNames - ).{{#isListContainer}}wrap<{{operationIdCamelCase}}Response>().map { value{{^isList}}.toTypedArray(){{/isList}} }{{/isListContainer}}{{^isListContainer}}{{#isMapContainer}}wrap<{{operationIdCamelCase}}Response>().map { value }{{/isMapContainer}}{{^isMapContainer}}wrap(){{/isMapContainer}}{{/isListContainer}} + ).{{#isListContainer}}wrap<{{operationIdCamelCase}}Response>().map { value{{^isList}}.toTypedArray(){{/isList}} }{{/isListContainer}}{{^isListContainer}}{{#isMap}}wrap<{{operationIdCamelCase}}Response>().map { value }{{/isMap}}{{^isMap}}wrap(){{/isMap}}{{/isListContainer}} } {{#hasBodyParam}} {{#bodyParam}} -{{#isListContainer}}{{>serial_wrapper_request_list}}{{/isListContainer}}{{#isMapContainer}}{{>serial_wrapper_request_map}}{{/isMapContainer}} +{{#isListContainer}}{{>serial_wrapper_request_list}}{{/isListContainer}}{{#isMap}}{{>serial_wrapper_request_map}}{{/isMap}} {{/bodyParam}} {{/hasBodyParam}} {{#isListContainer}} {{>serial_wrapper_response_list}} {{/isListContainer}} -{{#isMapContainer}} +{{#isMap}} {{>serial_wrapper_response_map}} -{{/isMapContainer}} +{{/isMap}} {{/operation}} @@ -109,15 +109,15 @@ import kotlinx.serialization.internal.StringDescriptor {{#operation}} {{#hasBodyParam}} {{#bodyParam}} - {{#isListContainer}}serializer.setMapper({{operationIdCamelCase}}Request::class, {{operationIdCamelCase}}Request.serializer()){{/isListContainer}}{{#isMapContainer}}serializer.setMapper({{operationIdCamelCase}}Request::class, {{operationIdCamelCase}}Request.serializer()){{/isMapContainer}} + {{#isListContainer}}serializer.setMapper({{operationIdCamelCase}}Request::class, {{operationIdCamelCase}}Request.serializer()){{/isListContainer}}{{#isMap}}serializer.setMapper({{operationIdCamelCase}}Request::class, {{operationIdCamelCase}}Request.serializer()){{/isMap}} {{/bodyParam}} {{/hasBodyParam}} {{#isListContainer}} serializer.setMapper({{operationIdCamelCase}}Response::class, {{operationIdCamelCase}}Response.serializer()) {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} serializer.setMapper({{operationIdCamelCase}}Response::class, {{operationIdCamelCase}}Response.serializer()) - {{/isMapContainer}} + {{/isMap}} {{/operation}} } } diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/returnTypes.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/returnTypes.mustache index 5fa33ef700e..37a952389e6 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/returnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/returnTypes.mustache @@ -1 +1 @@ -{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{#reactive}}Flow{{/reactive}}{{^reactive}}{{{returnContainer}}}{{/reactive}}<{{{returnType}}}>{{/isListContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{#reactive}}Flow{{/reactive}}{{^reactive}}{{{returnContainer}}}{{/reactive}}<{{{returnType}}}>{{/isListContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/lua/api.mustache b/modules/openapi-generator/src/main/resources/lua/api.mustache index f8e6dfc86dc..4dc3879b867 100644 --- a/modules/openapi-generator/src/main/resources/lua/api.mustache +++ b/modules/openapi-generator/src/main/resources/lua/api.mustache @@ -133,14 +133,14 @@ function {{classname}}:{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, end return result, headers {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} return result, headers - {{/isMapContainer}} - {{^isMapContainer}} + {{/isMap}} + {{^isMap}} {{^isListContainer}} return {{packageName}}_{{returnType}}.cast(result), headers {{/isListContainer}} - {{/isMapContainer}} + {{/isMap}} {{/returnTypeIsPrimitive}} {{/returnType}} {{^returnType}} diff --git a/modules/openapi-generator/src/main/resources/objc/Model.xcdatamodel.mustache b/modules/openapi-generator/src/main/resources/objc/Model.xcdatamodel.mustache index dddac8fd743..f433471f1fd 100644 --- a/modules/openapi-generator/src/main/resources/objc/Model.xcdatamodel.mustache +++ b/modules/openapi-generator/src/main/resources/objc/Model.xcdatamodel.mustache @@ -3,7 +3,7 @@ {{#models}}{{#model}} {{#isArrayModel}} -{{/isArrayModel}}{{^isArrayModel}}{{#vars}}{{#complexType}} {{/complexType}}{{^complexType}} {{/complexType}}{{#vendorExtensions.x-is-unique}} +{{/isArrayModel}}{{^isArrayModel}}{{#vars}}{{#complexType}} {{/complexType}}{{^complexType}} {{/complexType}}{{#vendorExtensions.x-is-unique}} {{/vendorExtensions.x-is-unique}} {{/vars}} {{/isArrayModel}} diff --git a/modules/openapi-generator/src/main/resources/objc/NSManagedObject-header.mustache b/modules/openapi-generator/src/main/resources/objc/NSManagedObject-header.mustache index 2c8ba41f1ab..f873afe032a 100644 --- a/modules/openapi-generator/src/main/resources/objc/NSManagedObject-header.mustache +++ b/modules/openapi-generator/src/main/resources/objc/NSManagedObject-header.mustache @@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN {{#vars}} {{#description}}/* {{{description}}} {{^required}}[optional]{{/required}} */{{/description}} -@property (nullable, nonatomic, retain) {{^complexType}}{{{ datatype }}}{{/complexType}}{{#complexType}}{{#isListContainer}}NSOrderedSet<{{{complexType}}}ManagedObject*>*{{/isListContainer}}{{^isListContainer}}{{#isMapContainer}}{{{ datatype }}}{{/isMapContainer}}{{^isMapContainer}}{{{complexType}}}ManagedObject*{{/isMapContainer}}{{/isListContainer}}{{/complexType}} {{name}}; +@property (nullable, nonatomic, retain) {{^complexType}}{{{ datatype }}}{{/complexType}}{{#complexType}}{{#isListContainer}}NSOrderedSet<{{{complexType}}}ManagedObject*>*{{/isListContainer}}{{^isListContainer}}{{#isMap}}{{{ datatype }}}{{/isMap}}{{^isMap}}{{{complexType}}}ManagedObject*{{/isMap}}{{/isListContainer}}{{/complexType}} {{name}}; {{/vars}} {{/isArrayModel}} @end diff --git a/modules/openapi-generator/src/main/resources/objc/NSManagedObjectBuilder-body.mustache b/modules/openapi-generator/src/main/resources/objc/NSManagedObjectBuilder-body.mustache index 9407eb027ef..4dd4ba44001 100644 --- a/modules/openapi-generator/src/main/resources/objc/NSManagedObjectBuilder-body.mustache +++ b/modules/openapi-generator/src/main/resources/objc/NSManagedObjectBuilder-body.mustache @@ -14,8 +14,8 @@ self = [super init]; if (self != nil) { {{#isArrayModel}} _entriesBuilder = [[{{arrayModelType}}ManagedObjectBuilder alloc] init]; -{{/isArrayModel}}{{#vars}}{{#complexType}}{{^isMapContainer}} _{{name}}Builder = [[{{complexType}}ManagedObjectBuilder alloc] init]; -{{/isMapContainer}}{{/complexType}}{{/vars}} } +{{/isArrayModel}}{{#vars}}{{#complexType}}{{^isMap}} _{{name}}Builder = [[{{complexType}}ManagedObjectBuilder alloc] init]; +{{/isMap}}{{/complexType}}{{/vars}} } return self; } @@ -47,12 +47,12 @@ [convertedObjs addObject:convertedObj]; } managedObject.{{name}} = convertedObjs; - }{{/isListContainer}}{{^isListContainer}}{{^isMapContainer}} + }{{/isListContainer}}{{^isListContainer}}{{^isMap}} if(!managedObject.{{name}}) { managedObject.{{name}} = [self.{{name}}Builder {{complexType}}ManagedObjectFrom{{complexType}}:object.{{name}} context:managedObject.managedObjectContext]; } else { [self.{{name}}Builder update{{complexType}}ManagedObject:managedObject.{{name}} with{{complexType}}:object.{{name}}]; - }{{/isMapContainer}}{{#isMapContainer}}managedObject.{{name}} = [object.{{name}} copy];{{/isMapContainer}}{{/isListContainer}}{{/complexType}} + }{{/isMap}}{{#isMap}}managedObject.{{name}} = [object.{{name}} copy];{{/isMap}}{{/isListContainer}}{{/complexType}} {{/vars}}{{#isArrayModel}} NSMutableOrderedSet * convertedObjs = [NSMutableOrderedSet orderedSet]; for (id innerObject in object) { id convertedObj = [self.entriesBuilder {{arrayModelType}}ManagedObjectFrom{{arrayModelType}}:innerObject context:managedObject.managedObjectContext]; diff --git a/modules/openapi-generator/src/main/resources/ocaml/api-impl.mustache b/modules/openapi-generator/src/main/resources/ocaml/api-impl.mustache index f7fb1520d39..cf1834d914f 100644 --- a/modules/openapi-generator/src/main/resources/ocaml/api-impl.mustache +++ b/modules/openapi-generator/src/main/resources/ocaml/api-impl.mustache @@ -60,7 +60,7 @@ let {{{operationId}}} {{^hasParams}}(){{/hasParams}}{{#allParams}}{{> to_param}} Request.handle_unit_response resp {{/returnType}} {{#returnType}} - Request.read_json_body{{#returnContainer}}{{#isListContainer}}_as_list{{/isListContainer}}{{#isMapContainer}}_as_map{{/isMapContainer}}{{#returnBaseType}}{{^vendorExtensions.x-return-free-form-object}}_of{{/vendorExtensions.x-return-free-form-object}}{{/returnBaseType}}{{/returnContainer}}{{^returnContainer}}{{#returnBaseType}}{{^vendorExtensions.x-return-free-form-object}}_as{{/vendorExtensions.x-return-free-form-object}}{{/returnBaseType}}{{/returnContainer}} {{#returnType}}{{^vendorExtensions.x-return-free-form-object}}({{> of_json}}){{/vendorExtensions.x-return-free-form-object}}{{/returnType}} resp body + Request.read_json_body{{#returnContainer}}{{#isListContainer}}_as_list{{/isListContainer}}{{#isMap}}_as_map{{/isMap}}{{#returnBaseType}}{{^vendorExtensions.x-return-free-form-object}}_of{{/vendorExtensions.x-return-free-form-object}}{{/returnBaseType}}{{/returnContainer}}{{^returnContainer}}{{#returnBaseType}}{{^vendorExtensions.x-return-free-form-object}}_as{{/vendorExtensions.x-return-free-form-object}}{{/returnBaseType}}{{/returnContainer}} {{#returnType}}{{^vendorExtensions.x-return-free-form-object}}({{> of_json}}){{/vendorExtensions.x-return-free-form-object}}{{/returnType}} resp body {{/returnType}} {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/ocaml/model.mustache b/modules/openapi-generator/src/main/resources/ocaml/model.mustache index dd45db1915b..949e7bae26c 100644 --- a/modules/openapi-generator/src/main/resources/ocaml/model.mustache +++ b/modules/openapi-generator/src/main/resources/ocaml/model.mustache @@ -16,7 +16,7 @@ type t = { (* {{{description}}} *) {{/description}} {{#isEnum}} - {{{name}}}: {{^isMapContainer}}Enums.{{/isMapContainer}}{{{datatypeWithEnum}}}{{^isContainer}}{{#required}}{{#defaultValue}}[@default {{{defaultValue}}}]{{/defaultValue}}{{/required}}{{/isContainer}}{{^isContainer}}{{#required}}{{#isNullable}} option [@default {{#defaultValue}}Some({{{defaultValue}}}){{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}]{{/isNullable}}{{/required}}{{/isContainer}}{{^isContainer}}{{^required}} option [@default {{#defaultValue}}Some({{{defaultValue}}}){{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}]{{/required}}{{/isContainer}}; + {{{name}}}: {{^isMap}}Enums.{{/isMap}}{{{datatypeWithEnum}}}{{^isContainer}}{{#required}}{{#defaultValue}}[@default {{{defaultValue}}}]{{/defaultValue}}{{/required}}{{/isContainer}}{{^isContainer}}{{#required}}{{#isNullable}} option [@default {{#defaultValue}}Some({{{defaultValue}}}){{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}]{{/isNullable}}{{/required}}{{/isContainer}}{{^isContainer}}{{^required}} option [@default {{#defaultValue}}Some({{{defaultValue}}}){{/defaultValue}}{{^defaultValue}}None{{/defaultValue}}]{{/required}}{{/isContainer}}; {{/isEnum}} {{^isEnum}} {{{name}}}: {{{datatypeWithEnum}}}{{^isContainer}}{{#required}}{{#isNullable}} option{{/isNullable}}{{/required}}{{/isContainer}}{{^isContainer}}{{^required}} option [@default None]{{/required}}{{/isContainer}}; diff --git a/modules/openapi-generator/src/main/resources/ocaml/to_json.mustache b/modules/openapi-generator/src/main/resources/ocaml/to_json.mustache index a0fa3504a7a..2f7b5103197 100644 --- a/modules/openapi-generator/src/main/resources/ocaml/to_json.mustache +++ b/modules/openapi-generator/src/main/resources/ocaml/to_json.mustache @@ -1 +1 @@ -{{#isListContainer}}{{#items}}(JsonSupport.of_list_of {{> to_json}}){{/items}}{{/isListContainer}}{{#isMapContainer}}{{#items}}(JsonSupport.of_map_of {{> to_json}}){{/items}}{{/isMapContainer}}{{#isString}}JsonSupport.of_string{{/isString}}{{#isLong}}JsonSupport.of_int64{{/isLong}}{{#isInteger}}JsonSupport.of_int32{{/isInteger}}{{#isFloat}}JsonSupport.of_float{{/isFloat}}{{#isNumber}}JsonSupport.of_float{{/isNumber}}{{#isDouble}}JsonSupport.of_float{{/isDouble}}{{#isBoolean}}JsonSupport.of_bool{{/isBoolean}}{{^isEnum}}{{#isModel}}{{#vendorExtensions.x-model-module}}{{{vendorExtensions.x-model-module}}}.to_yojson{{/vendorExtensions.x-model-module}}{{^vendorExtensions.x-model-module}}{{{baseType}}}.to_yojson{{/vendorExtensions.x-model-module}}{{/isModel}}{{/isEnum}}{{^isModel}}{{^isContainer}}{{#isEnum}}Enums.{{{datatypeWithEnum}}}_to_yojson{{/isEnum}}{{/isContainer}}{{/isModel}} \ No newline at end of file +{{#isListContainer}}{{#items}}(JsonSupport.of_list_of {{> to_json}}){{/items}}{{/isListContainer}}{{#isMap}}{{#items}}(JsonSupport.of_map_of {{> to_json}}){{/items}}{{/isMap}}{{#isString}}JsonSupport.of_string{{/isString}}{{#isLong}}JsonSupport.of_int64{{/isLong}}{{#isInteger}}JsonSupport.of_int32{{/isInteger}}{{#isFloat}}JsonSupport.of_float{{/isFloat}}{{#isNumber}}JsonSupport.of_float{{/isNumber}}{{#isDouble}}JsonSupport.of_float{{/isDouble}}{{#isBoolean}}JsonSupport.of_bool{{/isBoolean}}{{^isEnum}}{{#isModel}}{{#vendorExtensions.x-model-module}}{{{vendorExtensions.x-model-module}}}.to_yojson{{/vendorExtensions.x-model-module}}{{^vendorExtensions.x-model-module}}{{{baseType}}}.to_yojson{{/vendorExtensions.x-model-module}}{{/isModel}}{{/isEnum}}{{^isModel}}{{^isContainer}}{{#isEnum}}Enums.{{{datatypeWithEnum}}}_to_yojson{{/isEnum}}{{/isContainer}}{{/isModel}} \ No newline at end of file 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 38959f360eb..3ef46d1c9b0 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 @@ -26,16 +26,16 @@ * @Assert\Type("{{dataType}}") {{/items}} * }) - {{#isMapContainer}} + {{#isMap}} {{#items}} * @Type("array") {{/items}} - {{/isMapContainer}} - {{^isMapContainer}} + {{/isMap}} + {{^isMap}} {{#items}} * @Type("array<{{dataType}}>") {{/items}} - {{/isMapContainer}} + {{/isMap}} {{/isContainer}} {{^isContainer}} {{#isDate}} diff --git a/modules/openapi-generator/src/main/resources/python-aiohttp/controller.mustache b/modules/openapi-generator/src/main/resources/python-aiohttp/controller.mustache index c9adc6c12ce..3db5061272e 100644 --- a/modules/openapi-generator/src/main/resources/python-aiohttp/controller.mustache +++ b/modules/openapi-generator/src/main/resources/python-aiohttp/controller.mustache @@ -43,7 +43,7 @@ async def {{operationId}}(request: web.Request, {{#allParams}}{{paramName}}{{^re {{/isPrimitiveType}} {{/items}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{#items}} {{#isPrimitiveType}} :type {{paramName}}: Dict[str, {{>param_type}}] @@ -52,7 +52,7 @@ async def {{operationId}}(request: web.Request, {{#allParams}}{{paramName}}{{^re :type {{paramName}}: dict | bytes {{/isPrimitiveType}} {{/items}} - {{/isMapContainer}} + {{/isMap}} {{/allParams}} """ @@ -85,7 +85,7 @@ async def {{operationId}}(request: web.Request, {{#allParams}}{{paramName}}{{^re {{/complexType}} {{/items}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{#items}} {{#isDate}} {{paramName}} = {k: util.deserialize_date(v) for k, v in {{paramName}}} @@ -97,7 +97,7 @@ async def {{operationId}}(request: web.Request, {{#allParams}}{{paramName}}{{^re {{paramName}} = {k: {{baseType}}.from_dict(v) for k, v in {{paramName}}} {{/complexType}} {{/items}} - {{/isMapContainer}} + {{/isMap}} {{/allParams}} return web.Response(status=200) {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/python-aiohttp/model.mustache b/modules/openapi-generator/src/main/resources/python-aiohttp/model.mustache index 63b9b7361c1..573264d16d1 100644 --- a/modules/openapi-generator/src/main/resources/python-aiohttp/model.mustache +++ b/modules/openapi-generator/src/main/resources/python-aiohttp/model.mustache @@ -99,14 +99,14 @@ class {{classname}}(Model): ", ".join(map(str, allowed_values))) ) {{/isListContainer}} -{{#isMapContainer}} +{{#isMap}} if not set({{{name}}}.keys()).issubset(set(allowed_values)): raise ValueError( "Invalid keys in `{{{name}}}` [{0}], must be a subset of [{1}]" .format(", ".join(map(str, set({{{name}}}.keys()) - set(allowed_values))), ", ".join(map(str, allowed_values))) ) -{{/isMapContainer}} +{{/isMap}} {{/isContainer}} {{^isContainer}} allowed_values = [{{#isNullable}}None,{{/isNullable}}{{#allowableValues}}{{#values}}{{#isString}}"{{/isString}}{{{this}}}{{#isString}}"{{/isString}}{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}] # noqa: E501 diff --git a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/controllers/controller.mustache b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/controllers/controller.mustache index 6fff6e4613f..7c1911cc64c 100644 --- a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/controllers/controller.mustache +++ b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/controllers/controller.mustache @@ -43,7 +43,7 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{ {{/isPrimitiveType}} {{/items}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{#items}} {{#isPrimitiveType}} :type {{paramName}}: Dict[str, {{#isString}}str{{/isString}}{{#isInteger}}int{{/isInteger}}{{#isLong}}int{{/isLong}}{{#isFloat}}float{{/isFloat}}{{#isDouble}}float{{/isDouble}}{{#isByteArray}}str{{/isByteArray}}{{#isBinary}}str{{/isBinary}}{{#isBoolean}}bool{{/isBoolean}}{{#isDate}}str{{/isDate}}{{#isDateTime}}str{{/isDateTime}}] @@ -52,7 +52,7 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{ :type {{paramName}}: dict | bytes {{/isPrimitiveType}} {{/items}} - {{/isMapContainer}} + {{/isMap}} {{/allParams}} :rtype: {{#returnType}}{{.}}{{/returnType}}{{^returnType}}None{{/returnType}} @@ -90,7 +90,7 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{ {{/complexType}} {{/items}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{#items}} {{#isDate}} if connexion.request.is_json: @@ -105,7 +105,7 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{ {{paramName}} = {k: {{baseType}}.from_dict(v) for k, v in six.iteritems(connexion.request.get_json())} # noqa: E501 {{/complexType}} {{/items}} - {{/isMapContainer}} + {{/isMap}} {{/allParams}} return 'do some magic!' {{/operation}} 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 7bb398f9f73..c3eb12eecc1 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 @@ -98,14 +98,14 @@ class {{classname}}(Model): ", ".join(map(str, allowed_values))) ) {{/isListContainer}} -{{#isMapContainer}} +{{#isMap}} if not set({{{name}}}.keys()).issubset(set(allowed_values)): raise ValueError( "Invalid keys in `{{{name}}}` [{0}], must be a subset of [{1}]" # noqa: E501 .format(", ".join(map(str, set({{{name}}}.keys()) - set(allowed_values))), # noqa: E501 ", ".join(map(str, allowed_values))) ) -{{/isMapContainer}} +{{/isMap}} {{/isContainer}} {{^isContainer}} if {{{name}}} not in allowed_values: 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 b3cfc28ffc6..b9155499e53 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 @@ -41,9 +41,9 @@ resourceTypes { {{/isPrimitiveType}} {{/items}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} # TODO - {{/isMapContainer}} + {{/isMap}} description = "{{description}}" {{#isEnum}} enum = [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}] diff --git a/modules/openapi-generator/src/main/resources/python-flask/controller.mustache b/modules/openapi-generator/src/main/resources/python-flask/controller.mustache index 9b7fdb19874..9b9c9593248 100644 --- a/modules/openapi-generator/src/main/resources/python-flask/controller.mustache +++ b/modules/openapi-generator/src/main/resources/python-flask/controller.mustache @@ -43,7 +43,7 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{ {{/isPrimitiveType}} {{/items}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{#items}} {{#isPrimitiveType}} :type {{paramName}}: Dict[str, {{>param_type}}] @@ -52,7 +52,7 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{ :type {{paramName}}: dict | bytes {{/isPrimitiveType}} {{/items}} - {{/isMapContainer}} + {{/isMap}} {{/allParams}} :rtype: {{#returnType}}{{.}}{{/returnType}}{{^returnType}}None{{/returnType}} @@ -90,7 +90,7 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{ {{/complexType}} {{/items}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{#items}} {{#isDate}} if connexion.request.is_json: @@ -105,7 +105,7 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{ {{paramName}} = {k: {{baseType}}.from_dict(v) for k, v in six.iteritems(connexion.request.get_json())} # noqa: E501 {{/complexType}} {{/items}} - {{/isMapContainer}} + {{/isMap}} {{/allParams}} return 'do some magic!' {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/python-flask/model.mustache b/modules/openapi-generator/src/main/resources/python-flask/model.mustache index 0b2fd37cbc5..346e6f15f58 100644 --- a/modules/openapi-generator/src/main/resources/python-flask/model.mustache +++ b/modules/openapi-generator/src/main/resources/python-flask/model.mustache @@ -108,14 +108,14 @@ class {{classname}}(Model): ", ".join(map(str, allowed_values))) ) {{/isListContainer}} -{{#isMapContainer}} +{{#isMap}} if not set({{{name}}}.keys()).issubset(set(allowed_values)): raise ValueError( "Invalid keys in `{{{name}}}` [{0}], must be a subset of [{1}]" # noqa: E501 .format(", ".join(map(str, set({{{name}}}.keys()) - set(allowed_values))), # noqa: E501 ", ".join(map(str, allowed_values))) ) -{{/isMapContainer}} +{{/isMap}} {{/isContainer}} {{^isContainer}} allowed_values = [{{#isNullable}}None,{{/isNullable}}{{#allowableValues}}{{#values}}{{#isString}}"{{/isString}}{{{this}}}{{#isString}}"{{/isString}}{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}] # noqa: E501 diff --git a/modules/openapi-generator/src/main/resources/python/model.mustache b/modules/openapi-generator/src/main/resources/python/model.mustache index 2b3299a6f2b..1696dc55bab 100644 --- a/modules/openapi-generator/src/main/resources/python/model.mustache +++ b/modules/openapi-generator/src/main/resources/python/model.mustache @@ -127,7 +127,7 @@ class {{classname}}(object): ", ".join(map(str, allowed_values))) ) {{/isListContainer}} -{{#isMapContainer}} +{{#isMap}} if (self.local_vars_configuration.client_side_validation and not set({{{name}}}.keys()).issubset(set(allowed_values))): # noqa: E501 raise ValueError( @@ -135,7 +135,7 @@ class {{classname}}(object): .format(", ".join(map(str, set({{{name}}}.keys()) - set(allowed_values))), # noqa: E501 ", ".join(map(str, allowed_values))) ) -{{/isMapContainer}} +{{/isMap}} {{/isContainer}} {{^isContainer}} allowed_values = [{{#isNullable}}None,{{/isNullable}}{{#allowableValues}}{{#values}}{{#isString}}"{{/isString}}{{{this}}}{{#isString}}"{{/isString}}{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}] # noqa: E501 diff --git a/modules/openapi-generator/src/main/resources/r/api.mustache b/modules/openapi-generator/src/main/resources/r/api.mustache index a32d43ba2e6..778fcc61f40 100644 --- a/modules/openapi-generator/src/main/resources/r/api.mustache +++ b/modules/openapi-generator/src/main/resources/r/api.mustache @@ -30,14 +30,14 @@ {{/isPrimitiveType}} {{/items}} {{/isListContainer}} -{{#isMapContainer}} +{{#isMap}} {{#isPrimitiveType}} #' \item \emph{ @param } {{paramName}} named list( {{dataType}} ) {{/isPrimitiveType}} {{^isPrimitiveType}} #' \item \emph{ @param } {{paramName}} named list( \link{{=<% %>=}}{<%dataType%>}<%={{ }}=%> ) {{/isPrimitiveType}} -{{/isMapContainer}} +{{/isMap}} {{/isContainer}} {{^isContainer}} {{#isPrimitiveType}} @@ -51,7 +51,7 @@ {{/allParams}} {{#returnType}} {{^returnTypeIsPrimitive}} -#' \item \emph{ @returnType } {{#returnContainer}}{{#isListContainer}}list( {{/isListContainer}}{{#isMapContainer}}named list( {{/isMapContainer}}{{/returnContainer}}\link{{=<% %>=}}{<%#returnContainer%><%={{ }}=%>{{returnBaseType}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{=<% %>=}}<%/returnContainer%>}<%={{ }}=%>{{#returnContainer}}{{#isListContainer}} ){{/isListContainer}}{{#isMapContainer}} ){{/isMapContainer}}{{/returnContainer}} \cr +#' \item \emph{ @returnType } {{#returnContainer}}{{#isListContainer}}list( {{/isListContainer}}{{#isMap}}named list( {{/isMap}}{{/returnContainer}}\link{{=<% %>=}}{<%#returnContainer%><%={{ }}=%>{{returnBaseType}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{=<% %>=}}<%/returnContainer%>}<%={{ }}=%>{{#returnContainer}}{{#isListContainer}} ){{/isListContainer}}{{#isMap}} ){{/isMap}}{{/returnContainer}} \cr {{/returnTypeIsPrimitive}} {{/returnType}} #' diff --git a/modules/openapi-generator/src/main/resources/r/api_doc.mustache b/modules/openapi-generator/src/main/resources/r/api_doc.mustache index 49c944282db..1d0198c16bb 100644 --- a/modules/openapi-generator/src/main/resources/r/api_doc.mustache +++ b/modules/openapi-generator/src/main/resources/r/api_doc.mustache @@ -79,7 +79,7 @@ dput(result) {{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}} Name | Type | Description | Notes ------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}} -{{#allParams}} **{{paramName}}** | {{#isEnum}}Enum {{#allowableValues}}{{values}}{{/allowableValues}} {{/isEnum}}{{^isEnum}}{{#isContainer}}{{#isListContainer}}{{#items}}{{#isPrimitiveType}}list( **{{dataType}}** ){{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}list( [**{{dataType}}**]({{baseType}}.md) ){{/isFile}}{{/isPrimitiveType}}{{/items}}{{/isListContainer}}{{#isMapContainer}}{{#isPrimitiveType}}named list( **{{dataType}}** ){{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}named list( [**{{dataType}}**]({{baseType}}.md) ){{/isFile}}{{/isPrimitiveType}}{{/isMapContainer}}{{/isContainer}}{{^isContainer}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}{{/isContainer}}{{/isEnum}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}} +{{#allParams}} **{{paramName}}** | {{#isEnum}}Enum {{#allowableValues}}{{values}}{{/allowableValues}} {{/isEnum}}{{^isEnum}}{{#isContainer}}{{#isListContainer}}{{#items}}{{#isPrimitiveType}}list( **{{dataType}}** ){{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}list( [**{{dataType}}**]({{baseType}}.md) ){{/isFile}}{{/isPrimitiveType}}{{/items}}{{/isListContainer}}{{#isMap}}{{#isPrimitiveType}}named list( **{{dataType}}** ){{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}named list( [**{{dataType}}**]({{baseType}}.md) ){{/isFile}}{{/isPrimitiveType}}{{/isMap}}{{/isContainer}}{{^isContainer}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}{{/isContainer}}{{/isEnum}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}} {{/allParams}} ### Return type diff --git a/modules/openapi-generator/src/main/resources/r/model.mustache b/modules/openapi-generator/src/main/resources/r/model.mustache index aba9d1b987b..d17b7d69be0 100644 --- a/modules/openapi-generator/src/main/resources/r/model.mustache +++ b/modules/openapi-generator/src/main/resources/r/model.mustache @@ -9,7 +9,7 @@ #' @format An \code{R6Class} generator object #' {{#vars}} -#' @field {{baseName}} {{title}} {{#isContainer}}{{#isListContainer}}list( {{/isListContainer}}{{#isMapContainer}}named list( {{/isMapContainer}}{{/isContainer}}{{^isPrimitiveType}}\link{{=<% %>=}}{<%/isPrimitiveType%><%={{ }}=%>{{#isContainer}}{{#items}}{{dataType}}{{/items}}{{/isContainer}}{{^isContainer}}{{dataType}}{{/isContainer}}{{=<% %>=}}<%^isPrimitiveType%>}<%={{ }}=%>{{/isPrimitiveType}}{{#isContainer}}{{#isListContainer}} ){{/isListContainer}}{{#isMapContainer}} ){{/isMapContainer}}{{/isContainer}} {{^required}}[optional]{{/required}} +#' @field {{baseName}} {{title}} {{#isContainer}}{{#isListContainer}}list( {{/isListContainer}}{{#isMap}}named list( {{/isMap}}{{/isContainer}}{{^isPrimitiveType}}\link{{=<% %>=}}{<%/isPrimitiveType%><%={{ }}=%>{{#isContainer}}{{#items}}{{dataType}}{{/items}}{{/isContainer}}{{^isContainer}}{{dataType}}{{/isContainer}}{{=<% %>=}}<%^isPrimitiveType%>}<%={{ }}=%>{{/isPrimitiveType}}{{#isContainer}}{{#isListContainer}} ){{/isListContainer}}{{#isMap}} ){{/isMap}}{{/isContainer}} {{^required}}[optional]{{/required}} #' {{/vars}} #' @importFrom R6 R6Class @@ -126,14 +126,14 @@ lapply(self$`{{baseName}}`, function(x) x$toJSON()) {{/isPrimitiveType}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{#isPrimitiveType}} self$`{{baseName}}` {{/isPrimitiveType}} {{^isPrimitiveType}} lapply(self$`{{baseName}}`, function(x) x$toJSON()) {{/isPrimitiveType}} - {{/isMapContainer}} + {{/isMap}} {{/isContainer}} {{^isContainer}} {{#isPrimitiveType}} @@ -183,13 +183,13 @@ {{^isPrimitiveType}}[%s] {{/isPrimitiveType}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{#isPrimitiveType}} {{#isNumeric}}%d{{/isNumeric}}{{^isNumeric}}"%s"{{/isNumeric}} {{/isPrimitiveType}} {{^isPrimitiveType}}%s {{/isPrimitiveType}} - {{/isMapContainer}} + {{/isMap}} {{/isContainer}} {{^isContainer}} {{#isPrimitiveType}} @@ -207,14 +207,14 @@ paste(sapply(self$`{{{baseName}}}`, function(x) jsonlite::toJSON(x$toJSON(), auto_unbox=TRUE, digits = NA)), collapse=",") {{/isPrimitiveType}} {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} {{#isPrimitiveType}} jsonlite::toJSON(lapply(self$`{{{baseName}}}`, function(x){ x }), auto_unbox = TRUE, digits=NA) {{/isPrimitiveType}} {{^isPrimitiveType}} jsonlite::toJSON(lapply(self$`{{{baseName}}}`, function(x){ x$toJSON() }), auto_unbox = TRUE, digits=NA) {{/isPrimitiveType}} - {{/isMapContainer}} + {{/isMap}} {{/isContainer}} {{^isContainer}} {{#isPrimitiveType}} diff --git a/modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache b/modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache index 536d8f2926b..6cb3892ea3b 100644 --- a/modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache +++ b/modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache @@ -137,11 +137,11 @@ self.{{{name}}} = value end {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} if (value = attributes[:'{{{name}}}']).is_a?(Hash) self.{{{name}}} = value end - {{/isMapContainer}} + {{/isMap}} {{^isContainer}} self.{{{name}}} = attributes[:'{{{name}}}'] {{/isContainer}} diff --git a/modules/openapi-generator/src/main/resources/ruby-on-rails-server/model.mustache b/modules/openapi-generator/src/main/resources/ruby-on-rails-server/model.mustache index 8fc9455c2b7..42fd1352e2c 100644 --- a/modules/openapi-generator/src/main/resources/ruby-on-rails-server/model.mustache +++ b/modules/openapi-generator/src/main/resources/ruby-on-rails-server/model.mustache @@ -7,6 +7,6 @@ class {{classname}} < ApplicationRecord {{#requiredVars}} validates_presence_of :{{name}} {{/requiredVars}}{{#vars}}{{#isListContainer}} - serialize :{{name}}, Array{{/isListContainer}}{{#isMapContainer}} - serialize :{{name}}, Hash{{/isMapContainer}}{{/vars}} + serialize :{{name}}, Array{{/isListContainer}}{{#isMap}} + serialize :{{name}}, Hash{{/isMap}}{{/vars}} end{{/model}}{{/models}} diff --git a/modules/openapi-generator/src/main/resources/rust-server/client-operation.mustache b/modules/openapi-generator/src/main/resources/rust-server/client-operation.mustache index 8db0196e44b..a4ba4326fd9 100644 --- a/modules/openapi-generator/src/main/resources/rust-server/client-operation.mustache +++ b/modules/openapi-generator/src/main/resources/rust-server/client-operation.mustache @@ -357,7 +357,7 @@ {{#-first}} // Header parameters {{/-first}} -{{^isMapContainer}} +{{^isMap}} {{^required}} match param_{{{paramName}}} { Some(param_{{{paramName}}}) => { @@ -376,10 +376,10 @@ None => {} } {{/required}} -{{/isMapContainer}} -{{#isMapContainer}} +{{/isMap}} +{{#isMap}} let param_{{{paramName}}}: Option<{{{dataType}}}> = None; -{{/isMapContainer}} +{{/isMap}} {{/headerParams}} let mut response = client_service.call((request, context.clone())) 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 63bc8e469c8..bdb4a6f2738 100644 --- a/modules/openapi-generator/src/main/resources/rust-server/models.mustache +++ b/modules/openapi-generator/src/main/resources/rust-server/models.mustache @@ -45,12 +45,12 @@ impl std::str::FromStr for {{{classname}}} { {{/isEnum}} {{^isEnum}} {{#dataType}} -{{#isMapModel}} +{{#isMap}} #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] -{{/isMapModel}} -{{^isMapModel}} +{{/isMap}} +{{^isMap}} #[derive(Debug, Clone, PartialEq, PartialOrd, serde::Serialize, serde::Deserialize)] -{{/isMapModel}} +{{/isMap}} #[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))] {{#xmlName}} #[serde(rename = "{{{xmlName}}}")] @@ -318,13 +318,13 @@ impl std::string::ToString for {{{classname}}} { {{#isBinary}} // Skipping {{baseName}} in query parameter serialization {{/isBinary}} -{{#isMapContainer}} +{{#isMap}} // Skipping {{baseName}} in query parameter serialization -{{/isMapContainer}} +{{/isMap}} {{^isPrimitiveType}} // Skipping {{baseName}} in query parameter serialization {{/isPrimitiveType}} -{{^isByteArray}}{{^isBinary}}{{^isMapContainer}}{{#isPrimitiveType}} +{{^isByteArray}}{{^isBinary}}{{^isMap}}{{#isPrimitiveType}} {{#required}} params.push("{{{baseName}}}".to_string()); {{^isListContainer}} @@ -365,7 +365,7 @@ impl std::string::ToString for {{{classname}}} { {{/isListContainer}} } {{/required}} -{{/isPrimitiveType}}{{/isMapContainer}}{{/isBinary}}{{/isByteArray}} +{{/isPrimitiveType}}{{/isMap}}{{/isBinary}}{{/isByteArray}} {{/vars}} params.join(",").to_string() } diff --git a/modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache b/modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache index 106a0f71970..9d17fab2775 100644 --- a/modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache +++ b/modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache @@ -355,7 +355,7 @@ {{#-first}} // Form parameters {{/-first}} - let param_{{{paramName}}} = {{^isContainer}}{{#vendorExtensions}}{{{x-example}}};{{/vendorExtensions}}{{/isContainer}}{{#isListContainer}}{{#required}}Vec::new();{{/required}}{{^required}}None;{{/required}}{{/isListContainer}}{{#isMapContainer}}None;{{/isMapContainer}} + let param_{{{paramName}}} = {{^isContainer}}{{#vendorExtensions}}{{{x-example}}};{{/vendorExtensions}}{{/isContainer}}{{#isListContainer}}{{#required}}Vec::new();{{/required}}{{^required}}None;{{/required}}{{/isListContainer}}{{#isMap}}None;{{/isMap}} {{#-last}} {{/-last}} diff --git a/modules/openapi-generator/src/main/resources/rust/model.mustache b/modules/openapi-generator/src/main/resources/rust/model.mustache index c845b7d2cf8..cc21bda61a9 100644 --- a/modules/openapi-generator/src/main/resources/rust/model.mustache +++ b/modules/openapi-generator/src/main/resources/rust/model.mustache @@ -62,7 +62,7 @@ impl {{{classname}}} { pub fn new({{#requiredVars}}{{{name}}}: {{#isNullable}}Option<{{/isNullable}}{{#isEnum}}{{{enumName}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}}>{{/isNullable}}{{^-last}}, {{/-last}}{{/requiredVars}}) -> {{{classname}}} { {{{classname}}} { {{#vars}} - {{{name}}}{{^required}}{{#isListContainer}}: None{{/isListContainer}}{{#isMapContainer}}: None{{/isMapContainer}}{{^isContainer}}: None{{/isContainer}}{{/required}}, + {{{name}}}{{^required}}{{#isListContainer}}: None{{/isListContainer}}{{#isMap}}: None{{/isMap}}{{^isContainer}}: None{{/isContainer}}{{/required}}, {{/vars}} } } diff --git a/modules/openapi-generator/src/main/resources/scala-play-server/caseClass.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/caseClass.mustache index d8a0c4dadb0..566622f8db1 100644 --- a/modules/openapi-generator/src/main/resources/scala-play-server/caseClass.mustache +++ b/modules/openapi-generator/src/main/resources/scala-play-server/caseClass.mustache @@ -1,17 +1,17 @@ case class {{classname}}( {{#vars}} - {{&name}}: {{^required}}Option[{{/required}}{{#isEnum}}{{classname}}.{{enumName}}.Value{{/isEnum}}{{^isEnum}}{{dataType}}{{/isEnum}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}{{^hasMore}}{{#isMapModel}},{{/isMapModel}}{{/hasMore}} + {{&name}}: {{^required}}Option[{{/required}}{{#isEnum}}{{classname}}.{{enumName}}.Value{{/isEnum}}{{^isEnum}}{{dataType}}{{/isEnum}}{{^required}}]{{/required}}{{#hasMore}},{{/hasMore}}{{^hasMore}}{{#isMap}},{{/isMap}}{{/hasMore}} {{/vars}} -{{#isMapModel}} +{{#isMap}} additionalProperties: {{parent}} -{{/isMapModel}} +{{/isMap}} ) object {{classname}} { {{^vendorExtensions.x-has-files}} - implicit lazy val {{classVarName}}JsonFormat: Format[{{classname}}] = {{^isMapModel}}Json.format[{{classname}}]{{/isMapModel}}{{#isMapModel}}{ + implicit lazy val {{classVarName}}JsonFormat: Format[{{classname}}] = {{^isMap}}Json.format[{{classname}}]{{/isMap}}{{#isMap}}{ {{#lambda.indented_4}}{{>extensibleObjectJsonFormat}}{{/lambda.indented_4}} - }{{/isMapModel}} + }{{/isMap}} {{/vendorExtensions.x-has-files}} {{#vendorExtensions.x-has-files}} // NOTE: The JSON format for {{classname}} was not generated because it contains a file variable which cannot be encoded to JSON. diff --git a/modules/openapi-generator/src/main/resources/scala-play-server/model.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/model.mustache index 4e5cc13d6fe..9b9e6240977 100644 --- a/modules/openapi-generator/src/main/resources/scala-play-server/model.mustache +++ b/modules/openapi-generator/src/main/resources/scala-play-server/model.mustache @@ -13,9 +13,9 @@ import {{import}} {{#isArrayModel}} * @param items The items of this array-like object. {{/isArrayModel}} - {{#isMapModel}} + {{#isMap}} * @param additionalProperties Any additional properties this model may have. - {{/isMapModel}} + {{/isMap}} */ {{>generatedAnnotation}} {{^isArrayModel}} diff --git a/modules/openapi-generator/src/main/resources/scala-play-server/simpleParentJsonFormat.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/simpleParentJsonFormat.mustache index 60a21e6727c..5cffef84aa8 100644 --- a/modules/openapi-generator/src/main/resources/scala-play-server/simpleParentJsonFormat.mustache +++ b/modules/openapi-generator/src/main/resources/scala-play-server/simpleParentJsonFormat.mustache @@ -2,5 +2,5 @@ val innerFormat = Format.of[{{parent}}] Format( innerFormat.map(inner => {{classname}}(inner)), - {{classVarName}} => innerFormat.writes({{classVarName}}.{{#isArrayModel}}items{{/isArrayModel}}{{#isMapModel}}additionalProperties{{/isMapModel}} + {{classVarName}} => innerFormat.writes({{classVarName}}.{{#isArrayModel}}items{{/isArrayModel}}{{#isMap}}additionalProperties{{/isMap}} ) \ No newline at end of file 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 056e0dbb267..f3df16ba5f7 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache @@ -275,9 +275,9 @@ export class {{classname}} extends runtime.BaseAPI { {{/isResponseFile}} {{^isResponseFile}} {{#returnTypeIsPrimitive}} - {{#isMapContainer}} + {{#isMap}} return new runtime.JSONApiResponse(response); - {{/isMapContainer}} + {{/isMap}} {{#isListContainer}} return new runtime.JSONApiResponse(response); {{/isListContainer}} @@ -290,12 +290,12 @@ export class {{classname}} extends runtime.BaseAPI { return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map({{returnBaseType}}FromJSON)); {{/isListContainer}} {{^isListContainer}} - {{#isMapContainer}} + {{#isMap}} return new runtime.JSONApiResponse(response, (jsonValue) => runtime.mapValues(jsonValue, {{returnBaseType}}FromJSON)); - {{/isMapContainer}} - {{^isMapContainer}} + {{/isMap}} + {{^isMap}} return new runtime.JSONApiResponse(response, (jsonValue) => {{returnBaseType}}FromJSON(jsonValue)); - {{/isMapContainer}} + {{/isMap}} {{/isListContainer}} {{/returnTypeIsPrimitive}} {{/isResponseFile}} 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 bd593da1830..f2e2ecc8043 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache @@ -78,18 +78,18 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole {{#isListContainer}} '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}({{#isNullable}}json['{{baseName}}'] === null ? null : {{/isNullable}}(json['{{baseName}}'] as Array).map({{#items}}{{datatype}}{{/items}}FromJSON)), {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}({{#isNullable}}json['{{baseName}}'] === null ? null : {{/isNullable}}mapValues(json['{{baseName}}'], {{#items}}{{datatype}}{{/items}}FromJSON)), - {{/isMapContainer}} + {{/isMap}} {{^isListContainer}} - {{^isMapContainer}} + {{^isMap}} {{^isFreeFormObject}} '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}{{datatype}}FromJSON(json['{{baseName}}']), {{/isFreeFormObject}} {{#isFreeFormObject}} '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}json['{{baseName}}'], {{/isFreeFormObject}} - {{/isMapContainer}} + {{/isMap}} {{/isListContainer}} {{/isPrimitiveType}} {{/vars}} @@ -122,18 +122,18 @@ export function {{classname}}ToJSON(value?: {{classname}} | null): any { {{#isListContainer}} '{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}({{#isNullable}}value.{{name}} === null ? null : {{/isNullable}}(value.{{name}} as Array).map({{#items}}{{datatype}}{{/items}}ToJSON)), {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} '{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}({{#isNullable}}value.{{name}} === null ? null : {{/isNullable}}mapValues(value.{{name}}, {{#items}}{{datatype}}{{/items}}ToJSON)), - {{/isMapContainer}} + {{/isMap}} {{^isListContainer}} - {{^isMapContainer}} + {{^isMap}} {{^isFreeFormObject}} '{{baseName}}': {{datatype}}ToJSON(value.{{name}}), {{/isFreeFormObject}} {{#isFreeFormObject}} '{{baseName}}': value.{{name}}, {{/isFreeFormObject}} - {{/isMapContainer}} + {{/isMap}} {{/isListContainer}} {{/isPrimitiveType}} {{/isReadOnly}} 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 1f1f9b6158a..72b0a08bedb 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 @@ -55,18 +55,18 @@ export function {{classname}}FromJSON(json: any): {{classname}} { {{#isListContainer}} '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}(json['{{baseName}}'] as Array).map({{#items}}{{datatype}}{{/items}}FromJSON), {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}mapValues(json['{{baseName}}'], {{#items}}{{datatype}}{{/items}}FromJSON), - {{/isMapContainer}} + {{/isMap}} {{^isListContainer}} - {{^isMapContainer}} + {{^isMap}} {{^isFreeFormObject}} '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}{{datatype}}FromJSON(json['{{baseName}}']), {{/isFreeFormObject}} {{#isFreeFormObject}} '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}json['{{baseName}}'], {{/isFreeFormObject}} - {{/isMapContainer}} + {{/isMap}} {{/isListContainer}} {{/isPrimitiveType}} {{/vars}} @@ -98,18 +98,18 @@ export function {{classname}}ToJSON(value?: {{classname}}): any { {{#isListContainer}} '{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}(value.{{name}} as Array).map({{#items}}{{datatype}}{{/items}}ToJSON), {{/isListContainer}} - {{#isMapContainer}} + {{#isMap}} '{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}mapValues(value.{{name}}, {{#items}}{{datatype}}{{/items}}ToJSON), - {{/isMapContainer}} + {{/isMap}} {{^isListContainer}} - {{^isMapContainer}} + {{^isMap}} {{^isFreeFormObject}} '{{baseName}}': {{datatype}}ToJSON(value.{{name}}), {{/isFreeFormObject}} {{#isFreeFormObject}} '{{baseName}}': value.{{name}}, {{/isFreeFormObject}} - {{/isMapContainer}} + {{/isMap}} {{/isListContainer}} {{/isPrimitiveType}} {{/isReadOnly}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index 8e477627d83..dd7932748b4 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -807,7 +807,7 @@ public class JavaClientCodegenTest { Assert.assertFalse(cp4.required); Assert.assertTrue(cp4.isPrimitiveType); Assert.assertTrue(cp4.isContainer); - Assert.assertTrue(cp4.isMapContainer); + Assert.assertTrue(cp4.isMap); Assert.assertTrue(cp4.isFreeFormObject); Assert.assertFalse(cp4.isAnyType); @@ -818,7 +818,7 @@ public class JavaClientCodegenTest { Assert.assertFalse(cp5.required); Assert.assertTrue(cp5.isPrimitiveType); Assert.assertTrue(cp5.isContainer); - Assert.assertTrue(cp5.isMapContainer); + Assert.assertTrue(cp5.isMap); Assert.assertTrue(cp5.isFreeFormObject); Assert.assertFalse(cp5.isAnyType); @@ -829,7 +829,7 @@ public class JavaClientCodegenTest { Assert.assertFalse(cp6.required); Assert.assertTrue(cp6.isPrimitiveType); Assert.assertTrue(cp6.isContainer); - Assert.assertTrue(cp6.isMapContainer); + Assert.assertTrue(cp6.isMap); Assert.assertTrue(cp6.isFreeFormObject); Assert.assertFalse(cp6.isAnyType); 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 821521bf42d..4d917da8e7e 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 @@ -1143,7 +1143,7 @@ public class JavaModelTest { Assert.assertEquals(cp1.baseType, "List"); Assert.assertTrue(cp1.isContainer); Assert.assertTrue(cp1.isListContainer); - Assert.assertFalse(cp1.isMapContainer); + Assert.assertFalse(cp1.isMap); Assert.assertEquals(cp1.getter, "getPets"); Assert.assertEquals(cp1.items.baseType, "Pet"); @@ -1173,7 +1173,7 @@ public class JavaModelTest { Assert.assertEquals(cp1.dataType, "List"); Assert.assertTrue(cp1.isContainer); Assert.assertTrue(cp1.isListContainer); - Assert.assertFalse(cp1.isMapContainer); + Assert.assertFalse(cp1.isMap); Assert.assertEquals(cp1.items.baseType, "Pet"); Assert.assertEquals(cp1.items.complexType, "Pet"); Assert.assertEquals(cp1.items.dataType, "Pet"); @@ -1253,7 +1253,7 @@ public class JavaModelTest { Assert.assertEquals(cp1.dataType, "List>"); Assert.assertTrue(cp1.isContainer); Assert.assertTrue(cp1.isListContainer); - Assert.assertFalse(cp1.isMapContainer); + Assert.assertFalse(cp1.isMap); Assert.assertEquals(cp1.items.baseType, "List"); Assert.assertEquals(cp1.items.complexType, "Pet"); Assert.assertEquals(cp1.items.dataType, "List"); diff --git a/samples/client/petstore/javascript-apollo/src/model/Pet.js b/samples/client/petstore/javascript-apollo/src/model/Pet.js index d11236972a2..ccc1138bbfe 100644 --- a/samples/client/petstore/javascript-apollo/src/model/Pet.js +++ b/samples/client/petstore/javascript-apollo/src/model/Pet.js @@ -39,19 +39,19 @@ class Pet { /** * @member {Array.} photoUrls +}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, hasMore=false, required=false, deprecated=false, secondaryParam=false, hasMoreNonReadOnly=false, isPrimitiveType=true, isModel=false, isContainer=false, isString=true, isNumeric=false, isInteger=false, isLong=false, isNumber=false, isFloat=false, isDouble=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isListContainer=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, _enum=null, allowableValues=null, items=null, mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='PhotoUrls', nameInSnakeCase='PHOTO_URLS', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false}>} photoUrls * @type {Array.} +}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, hasMore=false, required=false, deprecated=false, secondaryParam=false, hasMoreNonReadOnly=false, isPrimitiveType=true, isModel=false, isContainer=false, isString=true, isNumeric=false, isInteger=false, isLong=false, isNumber=false, isFloat=false, isDouble=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isListContainer=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, _enum=null, allowableValues=null, items=null, mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='PhotoUrls', nameInSnakeCase='PHOTO_URLS', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false}>} */ photoUrls; /** * @member {Array.} tags +}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, hasMore=false, required=false, deprecated=false, secondaryParam=false, hasMoreNonReadOnly=false, isPrimitiveType=false, isModel=true, isContainer=false, isString=false, isNumeric=false, isInteger=false, isLong=false, isNumber=false, isFloat=false, isDouble=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isListContainer=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, _enum=null, allowableValues=null, items=null, mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='Tags', nameInSnakeCase='TAGS', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false}>} tags * @type {Array.} +}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, hasMore=false, required=false, deprecated=false, secondaryParam=false, hasMoreNonReadOnly=false, isPrimitiveType=false, isModel=true, isContainer=false, isString=false, isNumeric=false, isInteger=false, isLong=false, isNumber=false, isFloat=false, isDouble=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isListContainer=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, _enum=null, allowableValues=null, items=null, mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='Tags', nameInSnakeCase='TAGS', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false}>} */ tags; /** @@ -69,7 +69,7 @@ class Pet { * @param name {String} * @param photoUrls {Array.} +}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, hasMore=false, required=false, deprecated=false, secondaryParam=false, hasMoreNonReadOnly=false, isPrimitiveType=true, isModel=false, isContainer=false, isString=true, isNumeric=false, isInteger=false, isLong=false, isNumber=false, isFloat=false, isDouble=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isListContainer=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, _enum=null, allowableValues=null, items=null, mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='PhotoUrls', nameInSnakeCase='PHOTO_URLS', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false}>} */ constructor(name, photoUrls) {