diff --git a/docs/templating.md b/docs/templating.md index f6ab9bc06b1..4901f927893 100644 --- a/docs/templating.md +++ b/docs/templating.md @@ -634,7 +634,7 @@ A `Pet` model with three properties will provide a _lot_ of information about th "isUuid" : false, "isEmail" : false, "isFreeFormObject" : false, - "isListContainer" : false, + "isArray" : false, "isMap" : false, "isEnum" : false, "isReadOnly" : false, @@ -686,7 +686,7 @@ A `Pet` model with three properties will provide a _lot_ of information about th "isUuid" : false, "isEmail" : false, "isFreeFormObject" : false, - "isListContainer" : false, + "isArray" : false, "isMap" : false, "isEnum" : false, "isReadOnly" : false, @@ -738,7 +738,7 @@ A `Pet` model with three properties will provide a _lot_ of information about th "isUuid" : false, "isEmail" : false, "isFreeFormObject" : false, - "isListContainer" : false, + "isArray" : false, "isMap" : false, "isEnum" : false, "isReadOnly" : false, @@ -770,7 +770,7 @@ A `Pet` model with three properties will provide a _lot_ of information about th "isEnum" : false, "hasRequired" : true, "hasOptional" : true, - "isArrayModel" : false, + "isArray" : false, "hasChildren" : false, "isMap" : false, "hasOnlyReadOnly" : false, 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 2987042a888..dfd9f1a470e 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 @@ -92,7 +92,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { * Indicates the type has at least one optional property. */ public boolean hasOptional; - public boolean isArrayModel; + public boolean isArray; public boolean hasChildren; public boolean isMap; /** @@ -594,6 +594,14 @@ public class CodegenModel implements IJsonSchemaValidationProperties { this.isMap = isMap; } + @Override + public boolean getIsArray() { return isArray; } + + @Override + public void setIsArray(boolean isArray) { + this.isArray = isArray; + } + // 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() { @@ -704,7 +712,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { isNullable == that.isNullable && hasRequired == that.hasRequired && hasOptional == that.hasOptional && - isArrayModel == that.isArrayModel && + isArray == that.isArray && hasChildren == that.hasChildren && isMap == that.isMap && isDeprecated == that.isDeprecated && @@ -775,7 +783,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { isDate, isDateTime, getVars(), getAllVars(), getRequiredVars(), getOptionalVars(), getReadOnlyVars(), getReadWriteVars(), getParentVars(), getAllowableValues(), getMandatory(), getAllMandatory(), getImports(), hasVars, - isEmptyVars(), hasMoreModels, hasEnums, isEnum, isNullable, hasRequired, hasOptional, isArrayModel, + isEmptyVars(), hasMoreModels, hasEnums, isEnum, isNullable, hasRequired, hasOptional, isArray, hasChildren, isMap, isDeprecated, hasOnlyReadOnly, getExternalDocumentation(), getVendorExtensions(), getAdditionalPropertiesType(), getMaxProperties(), getMinProperties(), getUniqueItems(), getMaxItems(), getMinItems(), getMaxLength(), getMinLength(), getExclusiveMinimum(), getExclusiveMaximum(), getMinimum(), @@ -839,7 +847,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { sb.append(", isNullable=").append(isNullable); sb.append(", hasRequired=").append(hasRequired); sb.append(", hasOptional=").append(hasOptional); - sb.append(", isArrayModel=").append(isArrayModel); + sb.append(", isArray=").append(isArray); sb.append(", hasChildren=").append(hasChildren); sb.append(", isMap=").append(isMap); sb.append(", isDeprecated=").append(isDeprecated); 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 c9a5bd1d99a..259644a648c 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 @@ -26,7 +26,7 @@ public class CodegenOperation { public final List responseHeaders = new ArrayList(); public boolean hasAuthMethods, hasConsumes, hasProduces, hasParams, hasOptionalParams, hasRequiredParams, returnTypeIsPrimitive, returnSimpleType, subresourceOperation, isMap, - isListContainer, isMultipart, hasMore = true, + isArray, isMultipart, hasMore = true, isResponseBinary = false, isResponseFile = false, hasReference = false, isRestfulIndex, isRestfulShow, isRestfulCreate, isRestfulUpdate, isRestfulDestroy, isRestful, isDeprecated, isCallbackRequest, uniqueItems; @@ -256,7 +256,7 @@ public class CodegenOperation { sb.append(", returnSimpleType=").append(returnSimpleType); sb.append(", subresourceOperation=").append(subresourceOperation); sb.append(", isMap=").append(isMap); - sb.append(", isListContainer=").append(isListContainer); + sb.append(", isArray=").append(isArray); sb.append(", isMultipart=").append(isMultipart); sb.append(", hasMore=").append(hasMore); sb.append(", isResponseBinary=").append(isResponseBinary); @@ -330,7 +330,7 @@ public class CodegenOperation { returnSimpleType == that.returnSimpleType && subresourceOperation == that.subresourceOperation && isMap == that.isMap && - isListContainer == that.isListContainer && + isArray == that.isArray && isMultipart == that.isMultipart && hasMore == that.hasMore && isResponseBinary == that.isResponseBinary && @@ -393,7 +393,7 @@ public class CodegenOperation { return Objects.hash(responseHeaders, hasAuthMethods, hasConsumes, hasProduces, hasParams, hasOptionalParams, hasRequiredParams, returnTypeIsPrimitive, returnSimpleType, subresourceOperation, isMap, - isListContainer, isMultipart, hasMore, isResponseBinary, isResponseFile, hasReference, isRestfulIndex, + isArray, isMultipart, hasMore, isResponseBinary, isResponseFile, hasReference, isRestfulIndex, isRestfulShow, isRestfulCreate, isRestfulUpdate, isRestfulDestroy, isRestful, isDeprecated, isCallbackRequest, uniqueItems, path, operationId, returnType, httpMethod, returnBaseType, returnContainer, summary, unescapedNotes, notes, baseName, defaultResponse, discriminator, consumes, 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 0d64505a296..f7a7c92c364 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, isMap; + public boolean isArray, isMap; public boolean isFile; public boolean isEnum; public List _enum; @@ -180,7 +180,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { output.isEmail = this.isEmail; output.isFreeFormObject = this.isFreeFormObject; output.isAnyType = this.isAnyType; - output.isListContainer = this.isListContainer; + output.isArray = this.isArray; output.isMap = this.isMap; output.isExplode = this.isExplode; output.style = this.style; @@ -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, 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); + 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, isArray, 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 @@ -229,7 +229,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { isEmail == that.isEmail && isFreeFormObject == that.isFreeFormObject && isAnyType == that.isAnyType && - isListContainer == that.isListContainer && + isArray == that.isArray && isMap == that.isMap && isFile == that.isFile && isEnum == that.isEnum && @@ -318,7 +318,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { sb.append(", isEmail=").append(isEmail); sb.append(", isFreeFormObject=").append(isFreeFormObject); sb.append(", isAnyType=").append(isAnyType); - sb.append(", isListContainer=").append(isListContainer); + sb.append(", isArray=").append(isArray); sb.append(", isMap=").append(isMap); sb.append(", isFile=").append(isFile); sb.append(", isEnum=").append(isEnum); @@ -519,5 +519,13 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { public void setIsMap(boolean isMap) { this.isMap = isMap; } + + @Override + public boolean getIsArray() { return isArray; } + + @Override + public void setIsArray(boolean isArray) { + this.isArray = isArray; + } } 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 49bbb340ab4..e37e1147229 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 @@ -144,7 +144,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti * If the nullable attribute is set to true, the 'null' value is valid. */ public boolean isAnyType; - public boolean isListContainer; + public boolean isArray; public boolean isMap; public boolean isEnum; public boolean isReadOnly; @@ -493,6 +493,14 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti this.isMap = isMap; } + @Override + public boolean getIsArray() { return isArray; } + + @Override + public void setIsArray(boolean isArray) { + this.isArray = isArray; + } + public Map getVendorExtensions() { return vendorExtensions; } @@ -692,7 +700,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti sb.append(", isUri=").append(isUri); sb.append(", isEmail=").append(isEmail); sb.append(", isFreeFormObject=").append(isFreeFormObject); - sb.append(", isListContainer=").append(isListContainer); + sb.append(", isArray=").append(isArray); sb.append(", isMap=").append(isMap); sb.append(", isEnum=").append(isEnum); sb.append(", isReadOnly=").append(isReadOnly); @@ -759,7 +767,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti isUri == that.isUri && isEmail == that.isEmail && isFreeFormObject == that.isFreeFormObject && - isListContainer == that.isListContainer && + isArray == that.isArray && isMap == that.isMap && isEnum == that.isEnum && isReadOnly == that.isReadOnly && @@ -825,7 +833,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, isMap, isEnum, isReadOnly, isWriteOnly, isNullable, + isArray, 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 8a2796a7f7c..cc8397e95a8 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 @@ -54,7 +54,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { public boolean simpleType; public boolean primitiveType; public boolean isMap; - public boolean isListContainer; + public boolean isArray; public boolean isBinary = false; public boolean isFile = false; public Object schema; @@ -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, - isMap, isListContainer, isBinary, isFile, schema, jsonSchema, vendorExtensions, items, + isMap, isArray, isBinary, isFile, schema, jsonSchema, vendorExtensions, items, getMaxProperties(), getMinProperties(), uniqueItems, getMaxItems(), getMinItems(), getMaxLength(), getMinLength(), exclusiveMinimum, exclusiveMaximum, getMinimum(), getMaximum(), getPattern()); } @@ -112,7 +112,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { simpleType == that.simpleType && primitiveType == that.primitiveType && isMap == that.isMap && - isListContainer == that.isListContainer && + isArray == that.isArray && isBinary == that.isBinary && isFile == that.isFile && items == that.items && @@ -285,6 +285,14 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { @Override public boolean getIsModel() { return isModel; } + @Override + public boolean getIsArray() { return isArray; } + + @Override + public void setIsArray(boolean isArray) { + this.isArray = isArray; + } + @Override public void setIsModel(boolean isModel) { this.isModel = isModel; @@ -346,7 +354,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { sb.append(", simpleType=").append(simpleType); sb.append(", primitiveType=").append(primitiveType); sb.append(", isMap=").append(isMap); - sb.append(", isListContainer=").append(isListContainer); + sb.append(", isArray=").append(isArray); sb.append(", isBinary=").append(isBinary); sb.append(", isFile=").append(isFile); sb.append(", schema=").append(schema); 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 a9d86fddb07..c48426336a2 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 @@ -2313,7 +2313,7 @@ public class DefaultCodegen implements CodegenConfig { m.isNullable = true; } if (ModelUtils.isArraySchema(schema)) { - m.isArrayModel = true; + m.isArray = true; CodegenProperty arrayProperty = fromProperty(name, schema); m.setItems(arrayProperty.items); m.arrayModelType = arrayProperty.complexType; @@ -3303,7 +3303,7 @@ public class DefaultCodegen implements CodegenConfig { if (ModelUtils.isArraySchema(p)) { property.isContainer = true; - property.isListContainer = true; + property.isArray = true; if (ModelUtils.isSet(p)) { property.containerType = "set"; } else { @@ -3452,7 +3452,7 @@ public class DefaultCodegen implements CodegenConfig { protected CodegenProperty getMostInnerItems(CodegenProperty property) { CodegenProperty currentProperty = property; while (currentProperty != null && (Boolean.TRUE.equals(currentProperty.isMap) - || Boolean.TRUE.equals(currentProperty.isListContainer))) { + || Boolean.TRUE.equals(currentProperty.isArray))) { currentProperty = currentProperty.items; } return currentProperty; @@ -3472,7 +3472,7 @@ public class DefaultCodegen implements CodegenConfig { protected void updateDataTypeWithEnumForArray(CodegenProperty property) { CodegenProperty baseItem = property.items; while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMap) - || Boolean.TRUE.equals(baseItem.isListContainer))) { + || Boolean.TRUE.equals(baseItem.isArray))) { baseItem = baseItem.items; } if (baseItem != null) { @@ -3500,7 +3500,7 @@ public class DefaultCodegen implements CodegenConfig { protected void updateDataTypeWithEnumForMap(CodegenProperty property) { CodegenProperty baseItem = property.items; while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMap) - || Boolean.TRUE.equals(baseItem.isListContainer))) { + || Boolean.TRUE.equals(baseItem.isArray))) { baseItem = baseItem.items; } @@ -3629,11 +3629,11 @@ public class DefaultCodegen implements CodegenConfig { if ("map".equals(cm.containerType)) { op.isMap = true; } else if ("list".equalsIgnoreCase(cm.containerType)) { - op.isListContainer = true; + op.isArray = true; } else if ("array".equalsIgnoreCase(cm.containerType)) { - op.isListContainer = true; + op.isArray = true; } else if ("set".equalsIgnoreCase(cm.containerType)) { - op.isListContainer = true; + op.isArray = true; } } else { op.returnSimpleType = true; @@ -4082,7 +4082,7 @@ public class DefaultCodegen implements CodegenConfig { r.simpleType = false; r.containerType = cp.containerType; r.isMap = "map".equals(cp.containerType); - r.isListContainer = "list".equalsIgnoreCase(cp.containerType) || + r.isArray = "list".equalsIgnoreCase(cp.containerType) || "array".equalsIgnoreCase(cp.containerType) || "set".equalsIgnoreCase(cp.containerType); } else { @@ -4094,7 +4094,7 @@ public class DefaultCodegen implements CodegenConfig { if (r.baseType == null) { r.isMap = false; - r.isListContainer = false; + r.isArray = false; r.primitiveType = true; r.simpleType = true; } @@ -4266,7 +4266,7 @@ public class DefaultCodegen implements CodegenConfig { codegenParameter.mostInnerItems = codegenProperty.mostInnerItems; codegenParameter.baseType = codegenProperty.dataType; codegenParameter.isContainer = true; - codegenParameter.isListContainer = true; + codegenParameter.isArray = true; // recursively add import while (codegenProperty != null) { @@ -5796,7 +5796,7 @@ public class DefaultCodegen implements CodegenConfig { codegenParameter.baseType = codegenProperty.dataType; codegenParameter.isPrimitiveType = false; codegenParameter.isContainer = true; - codegenParameter.isListContainer = true; + codegenParameter.isArray = true; codegenParameter.description = escapeText(s.getDescription()); codegenParameter.dataType = getTypeDeclaration(arraySchema); if (codegenParameter.baseType != null && codegenParameter.enumName != null) { @@ -6107,7 +6107,7 @@ public class DefaultCodegen implements CodegenConfig { codegenParameter.dataType = getTypeDeclaration(arraySchema); codegenParameter.baseType = getSchemaType(inner); codegenParameter.isContainer = Boolean.TRUE; - codegenParameter.isListContainer = Boolean.TRUE; + codegenParameter.isArray = 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 7f9725fb2af..fe451e62471 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 @@ -72,4 +72,8 @@ public interface IJsonSchemaValidationProperties { boolean getIsMap(); void setIsMap(boolean isMap); + + boolean getIsArray(); + + void setIsArray(boolean isArray); } 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 411eb0c4705..2a775eef4c2 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 @@ -284,7 +284,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code p.example = "Date.newInstance(1960, 2, 17)"; } else if (Boolean.TRUE.equals(p.isDateTime)) { p.example = "Datetime.newInstanceGmt(2013, 11, 12, 3, 3, 3)"; - } else if (Boolean.TRUE.equals(p.isListContainer)) { + } else if (Boolean.TRUE.equals(p.isArray)) { if (p.items != null && p.items.example != null) { p.example = "new " + p.dataType + "{" + p.items.example + "}"; } @@ -468,7 +468,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code @Override public void postProcessParameter(CodegenParameter parameter) { - if (parameter.isBodyParam && parameter.isListContainer) { + if (parameter.isBodyParam && parameter.isArray) { // items of array bodyParams are being nested an extra level too deep for some reason parameter.items = parameter.items.items; setParameterExampleValue(parameter); 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 566e2fa33d3..a12409e15e9 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 @@ -641,7 +641,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co } if (this.collectionTypes.contains(typeMapping)) { - operation.isListContainer = true; + operation.isArray = true; operation.returnContainer = operation.returnType; if (this.returnICollection && ( typeMapping.startsWith("List") || 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 e0707ff2a81..f03ac52aece 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.isMap ) && (cm.parentModel == null)) { + if((cm.isArray || 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 fc11075475d..c2e3fee78da 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 @@ -535,7 +535,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co } if (this.collectionTypes.contains(typeMapping)) { - operation.isListContainer = true; + operation.isArray = true; operation.returnContainer = operation.returnType; if (this.returnICollection && ( typeMapping.startsWith("List") || 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 fc87e5bc968..3df2f596887 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 @@ -966,7 +966,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code if (example == null) { example = "null"; - } else if (Boolean.TRUE.equals(p.isListContainer)) { + } else if (Boolean.TRUE.equals(p.isArray)) { if (p.items.defaultValue != null) { String innerExample; 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 4a38749a481..3b0efcaa380 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 @@ -597,7 +597,7 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg if (example == null) { example = "NULL"; - } else if (Boolean.TRUE.equals(p.isListContainer)) { + } else if (Boolean.TRUE.equals(p.isArray)) { example = "array(" + example + ")"; } 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 fc3d4f4d2e5..6149be35ac1 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 @@ -811,12 +811,12 @@ public abstract class AbstractPythonConnexionServerCodegen extends DefaultCodege example = p.items.defaultValue; } if (example == null) { - if (Boolean.TRUE.equals(p.isListContainer)) { + if (Boolean.TRUE.equals(p.isArray)) { example = "[]"; } else { example = "None"; } - } else if (Boolean.TRUE.equals(p.isListContainer)) { + } else if (Boolean.TRUE.equals(p.isArray)) { if (Boolean.TRUE.equals(p.isBodyParam)) { example = "[" + 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 ea78070738c..a0d2814847b 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 @@ -365,7 +365,7 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi if (example == null) { example = "null"; - } else if (Boolean.TRUE.equals(p.isListContainer)) { + } else if (Boolean.TRUE.equals(p.isArray)) { example = "Arrays.asList(" + example + ")"; } 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 1c6302ea05a..13c10ae2c9c 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 @@ -783,7 +783,7 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig { if (example == null) { example = "NULL"; - } else if (Boolean.TRUE.equals(p.isListContainer)) { + } else if (Boolean.TRUE.equals(p.isArray)) { example = "[" + example + "]"; } 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 0fd05d8d1ca..b56dce759e3 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 @@ -700,7 +700,7 @@ public class CLibcurlClientCodegen extends DefaultCodegen implements CodegenConf if (example == null) { example = "nil"; - } else if (Boolean.TRUE.equals(p.isListContainer)) { + } else if (Boolean.TRUE.equals(p.isArray)) { example = "[" + example + "]"; } 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 d83aa7a08fd..8dd888dd7db 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 @@ -407,11 +407,11 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen { super.postProcessParameter(parameter); boolean isPrimitiveType = parameter.isPrimitiveType == Boolean.TRUE; - boolean isListContainer = parameter.isListContainer == Boolean.TRUE; + boolean isArray = parameter.isArray == Boolean.TRUE; boolean isMap = parameter.isMap == Boolean.TRUE; boolean isString = parameter.isString == Boolean.TRUE; - if (!isPrimitiveType && !isListContainer && !isMap && !isString && !parameter.dataType.startsWith("std::shared_ptr")) { + if (!isPrimitiveType && !isArray && !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/CppRestbedServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java index c06fb7f6635..f710e3a6588 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java @@ -446,10 +446,10 @@ public class CppRestbedServerCodegen extends AbstractCppCodegen { super.postProcessParameter(parameter); boolean isPrimitiveType = parameter.isPrimitiveType == Boolean.TRUE; - boolean isListContainer = parameter.isListContainer == Boolean.TRUE; + boolean isArray = parameter.isArray == Boolean.TRUE; boolean isString = parameter.isString == Boolean.TRUE; - if (!isPrimitiveType && !isListContainer && !isString && !parameter.dataType.startsWith("std::shared_ptr")) { + if (!isPrimitiveType && !isArray && !isString && !parameter.dataType.startsWith("std::shared_ptr")) { parameter.dataType = "std::shared_ptr<" + parameter.dataType + ">"; parameter.defaultValue = "std::make_shared<" + parameter.dataType + ">()"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartJaguarClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartJaguarClientCodegen.java index f4cc7dd1df3..d932c346a4f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartJaguarClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartJaguarClientCodegen.java @@ -251,7 +251,7 @@ public class DartJaguarClientCodegen extends DartClientCodegen { for (CodegenProperty p : cm.vars) { String protoType = protoTypeMapping.get(p.openApiType); - if (p.isListContainer) { + if (p.isArray) { String innerType = protoTypeMapping.get(p.mostInnerItems.openApiType); protoType = protoType + " " + (innerType == null ? p.mostInnerItems.openApiType : innerType); } 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 2d15cd5d729..e0784bdb86f 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 @@ -584,7 +584,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig this.simpleType = o.simpleType; this.primitiveType = o.primitiveType; this.isMap = o.isMap; - this.isListContainer = o.isListContainer; + this.isArray = o.isArray; this.isBinary = o.isBinary; this.isFile = o.isFile; this.schema = o.schema; @@ -615,11 +615,11 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig // Primitive return type, don't even try to decode if (baseType == null || (simpleType && primitiveType)) { return "false"; - } else if (isListContainer && languageSpecificPrimitives().contains(baseType)) { + } else if (isArray && languageSpecificPrimitives().contains(baseType)) { return "[]"; } StringBuilder sb = new StringBuilder(); - if (isListContainer) { + if (isArray) { sb.append("["); } sb.append("%"); @@ -627,7 +627,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig sb.append(".Model."); sb.append(baseType); sb.append("{}"); - if (isListContainer) { + if (isArray) { sb.append("]"); } return sb.toString(); @@ -653,7 +653,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig this.returnSimpleType = o.returnSimpleType; this.subresourceOperation = o.subresourceOperation; this.isMap = o.isMap; - this.isListContainer = o.isListContainer; + this.isArray = o.isArray; this.isMultipart = o.isMultipart; this.hasMore = o.hasMore; this.isResponseBinary = o.isResponseBinary; @@ -772,7 +772,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig private void buildTypespec(CodegenParameter param, StringBuilder sb) { if (param.dataType == null) { sb.append("nil"); - } else if (param.isListContainer) { + } else if (param.isArray) { // list() sb.append("list("); buildTypespec(param.items, sb); @@ -802,7 +802,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig private void buildTypespec(CodegenProperty property, StringBuilder sb) { if (property == null) { LOGGER.error("CodegenProperty cannot be null. Please report the issue to https://github.com/openapitools/openapi-generator with the spec"); - } else if (property.isListContainer) { + } else if (property.isArray) { sb.append("list("); buildTypespec(property.items, sb); sb.append(")"); @@ -868,7 +868,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig this.isEnum = cm.isEnum; this.hasRequired = cm.hasRequired; this.hasOptional = cm.hasOptional; - this.isArrayModel = cm.isArrayModel; + this.isArray = cm.isArray; this.hasChildren = cm.hasChildren; this.hasOnlyReadOnly = cm.hasOnlyReadOnly; this.externalDocumentation = cm.externalDocumentation; 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 46c63bac59e..3dd6f686ab9 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 @@ -203,7 +203,7 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig String r = ""; CodegenParameter q = (CodegenParameter) o; if (q.required) { - if (q.isListContainer) { + if (q.isArray) { r += "[{<<\"" + q.baseName + "\">>, X} || X <- " + q.paramName + "]"; } else { r += "{<<\"" + q.baseName + "\">>, " + q.paramName + "}"; @@ -317,7 +317,7 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig // force http method to lower case o.httpMethod = o.httpMethod.toLowerCase(Locale.ROOT); - if (o.isListContainer) { + if (o.isArray) { o.returnType = "[" + o.returnBaseType + "]"; } @@ -404,7 +404,7 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig this.returnSimpleType = o.returnSimpleType; this.subresourceOperation = o.subresourceOperation; this.isMap = o.isMap; - this.isListContainer = o.isListContainer; + this.isArray = o.isArray; this.isMultipart = o.isMultipart; this.hasMore = o.hasMore; this.isResponseBinary = o.isResponseBinary; 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 d62d3f59926..8f771d82b6c 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 @@ -265,7 +265,7 @@ public class ErlangProperCodegen extends DefaultCodegen implements CodegenConfig String r = ""; CodegenParameter q = (CodegenParameter) o; if (q.required) { - if (q.isListContainer) { + if (q.isArray) { r += "[{<<\"" + q.baseName + "\">>, X} || X <- " + q.paramName + "]"; } else { r += "{<<\"" + q.baseName + "\">>, " + q.paramName + "}"; @@ -376,7 +376,7 @@ public class ErlangProperCodegen extends DefaultCodegen implements CodegenConfig // force http method to lower case o.httpMethod = o.httpMethod.toLowerCase(Locale.ROOT); - if (o.isListContainer) { + if (o.isArray) { o.returnType = "[" + o.returnBaseType + "]"; } @@ -486,7 +486,7 @@ public class ErlangProperCodegen extends DefaultCodegen implements CodegenConfig this.isEnum = cm.isEnum; this.hasRequired = cm.hasRequired; this.hasOptional = cm.hasOptional; - this.isArrayModel = cm.isArrayModel; + this.isArray = cm.isArray; this.hasChildren = cm.hasChildren; this.hasOnlyReadOnly = cm.hasOnlyReadOnly; this.externalDocumentation = cm.externalDocumentation; @@ -516,7 +516,7 @@ public class ErlangProperCodegen extends DefaultCodegen implements CodegenConfig this.returnSimpleType = o.returnSimpleType; this.subresourceOperation = o.subresourceOperation; this.isMap = o.isMap; - this.isListContainer = o.isListContainer; + this.isArray = o.isArray; this.isMultipart = o.isMultipart; this.hasMore = o.hasMore; this.isResponseBinary = o.isResponseBinary; 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 b7bd85aa43a..ef49c8bc8f4 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.isMap || param.isListContainer || + if (!param.isNullable || param.isMap || param.isArray || param.isFreeFormObject || param.isAnyType) { continue; } @@ -461,7 +461,7 @@ public class GoClientCodegen extends AbstractGoCodegen { } private String constructExampleCode(CodegenParameter codegenParameter, HashMap modelMaps, HashMap processedModelMap) { - if (codegenParameter.isListContainer) { // array + if (codegenParameter.isArray) { // array return codegenParameter.dataType + "{" + constructExampleCode(codegenParameter.items, modelMaps, processedModelMap) + "}"; } else if (codegenParameter.isMap) { return codegenParameter.dataType + "{ \"key\": " + constructExampleCode(codegenParameter.items, modelMaps, processedModelMap) + "}"; @@ -501,8 +501,8 @@ 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) + "}"; + if (codegenProperty.isArray) { // array + return codegenProperty.dataType + "{" + constructExampleCode(codegenProperty.items, modelMaps, processedModelMap) + ")"; } else if (codegenProperty.isMap) { // map return codegenProperty.dataType + "{ \"key\": " + constructExampleCode(codegenProperty.items, modelMaps, processedModelMap) + "}"; } else if (codegenProperty.isPrimitiveType) { // primitive type 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 5af6e7205df..d550047d298 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 @@ -718,7 +718,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC param.vendorExtensions.put(VENDOR_EXTENSION_X_IS_BODY_OR_FORM_PARAM, param.isBodyParam || param.isFormParam); if (!StringUtils.isBlank(param.collectionFormat)) { param.vendorExtensions.put(VENDOR_EXTENSION_X_COLLECTION_FORMAT, mapCollectionFormat(param.collectionFormat)); - } else if (!param.isBodyParam && (param.isListContainer || param.dataType.startsWith("["))) { // param.isListContainer is sometimes false for list types + } else if (!param.isBodyParam && (param.isArray || param.dataType.startsWith("["))) { // param.isArray is sometimes false for list types // defaulting due to https://github.com/wing328/openapi-generator/issues/72 param.collectionFormat = "csv"; param.vendorExtensions.put(VENDOR_EXTENSION_X_COLLECTION_FORMAT, mapCollectionFormat(param.collectionFormat)); @@ -728,7 +728,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC } if (typeMapping.containsKey(param.dataType) - || param.isMap || param.isListContainer + || param.isMap || param.isArray || 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.isMap)) { + if (param.isBodyParam || param.isFormParam && (!param.isPrimitiveType && !param.isArray && !param.isMap)) { Set mimeTypes = modelMimeTypes.containsKey(param.dataType) ? modelMimeTypes.get(param.dataType) : new HashSet(); mimeTypes.add(mimeType); modelMimeTypes.put(param.dataType, mimeTypes); @@ -1271,7 +1271,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC cm.isEnum = genEnums && cm.isEnum; if (cm.isAlias) { String dataType = cm.dataType; - if (dataType == null && cm.isArrayModel) { // isAlias + arrayModelType missing "datatype" + if (dataType == null && cm.isArray) { // isAlias + arrayModelType missing "datatype" dataType = "[" + cm.arrayModelType + "]"; } if (dataType != null) { @@ -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.isMap) || Boolean.TRUE.equals(baseItem.isListContainer))) { + while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMap) || Boolean.TRUE.equals(baseItem.isArray))) { baseItem = baseItem.items; } if (baseItem != null) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java index fab903fa493..ce99f44f87e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java @@ -513,7 +513,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf // Query parameters appended to routes for (CodegenParameter param : op.queryParams) { String paramType = param.dataType; - if (param.isListContainer) { + if (param.isArray) { if (StringUtils.isEmpty(param.collectionFormat)) { param.collectionFormat = "csv"; } @@ -548,7 +548,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf path.add("Header \"" + param.baseName + "\" " + param.dataType); String paramType = param.dataType; - if (param.isListContainer) { + if (param.isArray) { if (StringUtils.isEmpty(param.collectionFormat)) { param.collectionFormat = "csv"; } 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 c666aa26800..a6a34983b5a 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 @@ -94,8 +94,8 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF dataType = op.returnType; enumName = null;// op.enumName; allowableValues = null;// op.allowableValues; - isContainer = op.isListContainer || op.isMap; - isListContainer = op.isListContainer; + isContainer = op.isArray || op.isMap; + isListContainer = op.isArray; isMap = op.isMap; isPrimitiveType = op.returnTypeIsPrimitive; minItems = null;// op.minItems; @@ -110,7 +110,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF varVendorExtensions = op.vendorExtensions; init(parent, testDataPath, models); - if (op.isListContainer || op.isMap) { + if (op.isArray || op.isMap) { items = new CodegenVariable(); items.dataType = op.returnBaseType; items.isPrimitiveType = op.returnTypeIsPrimitive; @@ -130,7 +130,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF enumName = param.enumName; allowableValues = param.allowableValues; isContainer = param.isContainer; - isListContainer = param.isListContainer; + isListContainer = param.isArray; isMap = param.isMap; isPrimitiveType = param.isPrimitiveType; minItems = param.minItems; @@ -157,7 +157,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF enumName = prop.enumName; allowableValues = prop.allowableValues; isContainer = prop.isContainer; - isListContainer = prop.isListContainer; + isListContainer = prop.isArray; isMap = prop.isMap; isPrimitiveType = prop.isPrimitiveType; minItems = prop.minItems; @@ -216,9 +216,9 @@ 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.isMap)) { + if (cm != null && (cm.isArray || cm.isMap)) { this.isContainer = true; - this.isListContainer = cm.isArrayModel; + this.isListContainer = cm.isArray; this.isMap = cm.isMap; this.items = new CodegenVariable(); this.items.name = "item"; 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 bc9fc67d0ff..dd05aaab2f8 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 @@ -679,7 +679,7 @@ public class JavascriptApolloClientCodegen extends DefaultCodegen implements Cod } // container - if (Boolean.TRUE.equals(p.isListContainer)) { + if (Boolean.TRUE.equals(p.isArray)) { example = setPropertyExampleValue(p.items); example = "[" + example + "]"; } else if (Boolean.TRUE.equals(p.isMap)) { @@ -878,7 +878,7 @@ public class JavascriptApolloClientCodegen extends DefaultCodegen implements Cod private String getJSDocType(CodegenParameter cp) { String dataType = trimBrackets(cp.dataType); - if (Boolean.TRUE.equals(cp.isListContainer)) { + if (Boolean.TRUE.equals(cp.isArray)) { return "Array.<" + dataType + ">"; } else if (Boolean.TRUE.equals(cp.isMap)) { return "Object."; @@ -889,7 +889,7 @@ public class JavascriptApolloClientCodegen extends DefaultCodegen implements Cod private String getJSDocType(CodegenOperation co) { String returnType = trimBrackets(co.returnType); if (returnType != null) { - if (Boolean.TRUE.equals(co.isListContainer)) { + if (Boolean.TRUE.equals(co.isArray)) { return "Array.<" + returnType + ">"; } 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 48e2c3ac704..09c2af940b8 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 @@ -730,7 +730,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo } // container - if (Boolean.TRUE.equals(p.isListContainer)) { + if (Boolean.TRUE.equals(p.isArray)) { example = setPropertyExampleValue(p.items); example = "[" + example + "]"; } else if (Boolean.TRUE.equals(p.isMap)) { @@ -943,7 +943,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo String dataType = trimBrackets(cp.dataType); if (isModelledType(cp)) dataType = getModelledType(dataType); - if (Boolean.TRUE.equals(cp.isListContainer)) { + if (Boolean.TRUE.equals(cp.isArray)) { return "Array.<" + dataType + ">"; } else if (Boolean.TRUE.equals(cp.isMap)) { return "Object."; @@ -961,7 +961,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo if (returnType != null) { if (isModelledType(co)) returnType = getModelledType(returnType); - if (Boolean.TRUE.equals(co.isListContainer)) { + if (Boolean.TRUE.equals(co.isArray)) { return "Array.<" + returnType + ">"; } 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 ddf9f9d6264..e23d1cd222c 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 @@ -238,7 +238,7 @@ public class OCamlClientCodegen extends DefaultCodegen implements CodegenConfig protected void updateDataTypeWithEnumForMap(CodegenProperty property) { CodegenProperty baseItem = property.items; while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMap) - || Boolean.TRUE.equals(baseItem.isListContainer))) { + || Boolean.TRUE.equals(baseItem.isArray))) { baseItem = baseItem.items; } @@ -256,7 +256,7 @@ public class OCamlClientCodegen extends DefaultCodegen implements CodegenConfig protected void updateDataTypeWithEnumForArray(CodegenProperty property) { CodegenProperty baseItem = property.items; while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMap) - || Boolean.TRUE.equals(baseItem.isListContainer))) { + || Boolean.TRUE.equals(baseItem.isArray))) { baseItem = baseItem.items; } if (baseItem != null) { 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 0505383472b..11d68c0771e 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 @@ -771,7 +771,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { if (example == null) { example = "NULL"; - } else if (Boolean.TRUE.equals(p.isListContainer)) { + } else if (Boolean.TRUE.equals(p.isArray)) { example = "@[" + example + "]"; } 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 461bfe667f1..16c360a7ba8 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 @@ -508,7 +508,7 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { } // container - if (Boolean.TRUE.equals(p.isListContainer)) { + if (Boolean.TRUE.equals(p.isArray)) { example = setPropertyExampleValue(p.items); example = "(" + example + ")"; } else if (Boolean.TRUE.equals(p.isMap)) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PlantumlDocumentationCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PlantumlDocumentationCodegen.java index 773c767e1a4..23e527eb91a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PlantumlDocumentationCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PlantumlDocumentationCodegen.java @@ -128,10 +128,10 @@ public class PlantumlDocumentationCodegen extends DefaultCodegen implements Code Map field = new HashMap<>(); field.put("name", codegenProperty.getBaseName()); field.put("isRequired", codegenProperty.getRequired()); - field.put("isList", codegenProperty.isListContainer); + field.put("isList", codegenProperty.isArray); field.put("complexDataType", getComplexDataTypeFor(codegenProperty)); - String dataType = codegenProperty.isListContainer && codegenProperty.getItems() != null ? "List<" + toModelName(codegenProperty.getItems().getDataType()) + ">" : toModelName(codegenProperty.getDataType()); + String dataType = codegenProperty.isArray && codegenProperty.getItems() != null ? "List<" + toModelName(codegenProperty.getItems().getDataType()) + ">" : toModelName(codegenProperty.getDataType()); field.put("dataType", dataType); return field; @@ -168,7 +168,7 @@ public class PlantumlDocumentationCodegen extends DefaultCodegen implements Code private String getComplexDataTypeFor(CodegenProperty codegenProperty) { if (codegenProperty.isModel) { return toModelName(codegenProperty.getDataType()); - } else if (codegenProperty.isListContainer && codegenProperty.getItems().isModel) { + } else if (codegenProperty.isArray && codegenProperty.getItems().isModel) { return toModelName((codegenProperty.getItems().getDataType())); } 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 b265938cad7..fa012ed2d52 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 @@ -996,7 +996,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo } private String constructExampleCode(CodegenParameter codegenParameter, HashMap modelMaps, HashMap processedModelMap) { - if (codegenParameter.isListContainer) { // array + if (codegenParameter.isArray) { // array return "@(" + constructExampleCode(codegenParameter.items, modelMaps, processedModelMap) + ")"; } else if (codegenParameter.isMap) { // TODO: map, file type return "@{ \"Key\" = \"Value\" }"; @@ -1038,7 +1038,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo } private String constructExampleCode(CodegenProperty codegenProperty, HashMap modelMaps, HashMap processedModelMap) { - if (codegenProperty.isListContainer) { // array + if (codegenProperty.isArray) { // array return "@(" + constructExampleCode(codegenProperty.items, modelMaps, processedModelMap) + ")"; } else if (codegenProperty.isMap) { // map return "\"TODO\""; @@ -1116,7 +1116,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo dataType = "System.Nullable[" + dataType + "]"; } return dataType; - } else if (cp.isListContainer) { // array + } else if (cp.isArray) { // array return getPSDataType(cp.items) + "[]"; } else if (cp.isMap) { // map return "System.Collections.Hashtable"; @@ -1134,7 +1134,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo dataType = "System.Nullable[" + dataType + "]"; } return dataType; - } else if (cp.isListContainer) { // array + } else if (cp.isArray) { // array return getPSDataType(cp.items) + "[]"; } else if (cp.isMap) { // map return "System.Collections.Hashtable"; 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 420210649b5..3c8d402bd0d 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 @@ -223,14 +223,14 @@ public class ProtobufSchemaCodegen extends DefaultCodegen implements CodegenConf int index = 1; for (CodegenProperty var : cm.vars) { // add x-protobuf-type: repeated if it's an array - if (Boolean.TRUE.equals(var.isListContainer)) { + if (Boolean.TRUE.equals(var.isArray)) { var.vendorExtensions.put("x-protobuf-type", "repeated"); } // add x-protobuf-data-type // ref: https://developers.google.com/protocol-buffers/docs/proto3 if (!var.vendorExtensions.containsKey("x-protobuf-data-type")) { - if (var.isListContainer) { + if (var.isArray) { var.vendorExtensions.put("x-protobuf-data-type", var.items.dataType); } else { var.vendorExtensions.put("x-protobuf-data-type", var.dataType); @@ -408,7 +408,7 @@ public class ProtobufSchemaCodegen extends DefaultCodegen implements CodegenConf int index = 1; for (CodegenParameter p : op.allParams) { // add x-protobuf-type: repeated if it's an array - if (Boolean.TRUE.equals(p.isListContainer)) { + if (Boolean.TRUE.equals(p.isArray)) { p.vendorExtensions.put("x-protobuf-type", "repeated"); } else if (Boolean.TRUE.equals(p.isMap)) { LOGGER.warn("Map parameter (name: {}, operation ID: {}) not yet supported", p.paramName, op.operationId); @@ -417,7 +417,7 @@ public class ProtobufSchemaCodegen extends DefaultCodegen implements CodegenConf // add x-protobuf-data-type // ref: https://developers.google.com/protocol-buffers/docs/proto3 if (!p.vendorExtensions.containsKey("x-protobuf-data-type")) { - if (Boolean.TRUE.equals(p.isListContainer)) { + if (Boolean.TRUE.equals(p.isArray)) { p.vendorExtensions.put("x-protobuf-data-type", p.items.dataType); } else { p.vendorExtensions.put("x-protobuf-data-type", p.dataType); 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 72a6ad4ed43..96c1ac8d452 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 @@ -954,7 +954,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig if (example == null) { example = "None"; - } else if (Boolean.TRUE.equals(p.isListContainer)) { + } else if (Boolean.TRUE.equals(p.isArray)) { example = "[" + example + "]"; } else if (Boolean.TRUE.equals(p.isMap)) { example = "{'key': " + example + "}"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java index 8cafa0983b2..3ff8c20f406 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java @@ -462,7 +462,7 @@ public class PythonClientExperimentalCodegen extends PythonClientCodegen { if (cp.isPrimitiveType && p.get$ref() != null) { cp.complexType = cp.dataType; } - if (cp.isListContainer && cp.complexType == null && cp.mostInnerItems.complexType != null) { + if (cp.isArray && cp.complexType == null && cp.mostInnerItems.complexType != null) { cp.complexType = cp.mostInnerItems.complexType; } return cp; @@ -602,7 +602,7 @@ public class PythonClientExperimentalCodegen extends PythonClientCodegen { public void postProcessModelProperty(CodegenModel model, CodegenProperty p) { postProcessPattern(p.pattern, p.vendorExtensions); // set property.complexType so the model docs will link to the ClassName.md - if (p.complexType == null && p.isListContainer && p.mostInnerItems.complexType != null && !languageSpecificPrimitives.contains(p.mostInnerItems.complexType)) { + if (p.complexType == null && p.isArray && p.mostInnerItems.complexType != null && !languageSpecificPrimitives.contains(p.mostInnerItems.complexType)) { // fix ListContainers p.complexType = p.mostInnerItems.complexType; } 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 d6efb3b87dd..bc9ee0f8432 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 @@ -584,7 +584,7 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig { if (example == null) { example = "NULL"; - } else if (Boolean.TRUE.equals(p.isListContainer)) { + } else if (Boolean.TRUE.equals(p.isArray)) { example = "[" + example + "]"; } else if (Boolean.TRUE.equals(p.isMap)) { example = "{'key' => " + example + "}"; @@ -705,7 +705,7 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig { } public String constructExampleCode(CodegenParameter codegenParameter, HashMap modelMaps) { - if (codegenParameter.isListContainer) { // array + if (codegenParameter.isArray) { // array return "list(" + constructExampleCode(codegenParameter.items, modelMaps) + ")"; } else if (codegenParameter.isMap) { // TODO: map return "TODO"; @@ -723,7 +723,7 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig { } public String constructExampleCode(CodegenProperty codegenProperty, HashMap modelMaps) { - if (codegenProperty.isListContainer) { // array + if (codegenProperty.isArray) { // array return "list(" + constructExampleCode(codegenProperty.items, modelMaps) + ")"; } else if (codegenProperty.isMap) { // TODO: map return "TODO"; 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 3bf7af4028e..1bb52b400fd 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 @@ -582,7 +582,7 @@ public class RubyClientCodegen extends AbstractRubyCodegen { if (example == null) { example = "nil"; - } else if (Boolean.TRUE.equals(p.isListContainer)) { + } else if (Boolean.TRUE.equals(p.isArray)) { example = "[" + example + "]"; } 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 e5aa64d4b3a..09222896124 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 @@ -552,7 +552,7 @@ public class RustClientCodegen extends DefaultCodegen implements CodegenConfig { } for (CodegenParameter p : operation.allParams) { - if (p.isListContainer && !languageSpecificPrimitives.contains(p.dataType)) { + if (p.isArray && !languageSpecificPrimitives.contains(p.dataType)) { // array of model String rt = p.dataType; int end = rt.lastIndexOf(">"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java index c676505a8a2..81b33ca2e94 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java @@ -1122,7 +1122,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig { // type. codegenParameter.dataType = getTypeDeclaration(original_schema); codegenParameter.isPrimitiveType = false; - codegenParameter.isListContainer = false; + codegenParameter.isArray = false; codegenParameter.isString = false; codegenParameter.isByteArray = ModelUtils.isByteArraySchema(original_schema); @@ -1587,7 +1587,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig { param.vendorExtensions.put("x-format-string", "{}"); example = (param.example != null) ? param.example : ""; } - } else if (param.isListContainer) { + } else if (param.isArray) { param.vendorExtensions.put("x-format-string", "{:?}"); example = (param.example != null) ? param.example : "&Vec::new()"; } else { @@ -1600,7 +1600,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig { if (param.required) { if (example != null) { param.vendorExtensions.put("x-example", example); - } else if (param.isListContainer) { + } else if (param.isArray) { // Use the empty list if we don't have an example param.vendorExtensions.put("x-example", "&Vec::new()"); } else { 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 6fcd4f66821..7b6627e45a3 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 @@ -442,7 +442,7 @@ class Marshaller { } public Marshaller(CodegenParameter parameter) { - if (parameter.isListContainer) { + if (parameter.isArray) { this.varName = parameter.baseType + "List"; } else if (parameter.isMap) { this.varName = parameter.baseType + "Map"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java index 70a3258b4cc..22ba6f10905 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java @@ -432,7 +432,7 @@ public class ScalaFinchServerCodegen extends DefaultCodegen implements CodegenCo if (p.isBodyParam) { p.vendorExtensions.put("x-codegen-normalized-path-type", "jsonBody[" + p.dataType + "]"); p.vendorExtensions.put("x-codegen-normalized-input-type", p.dataType); - } else if (p.isContainer || p.isListContainer) { + } else if (p.isContainer || p.isArray) { p.vendorExtensions.put("x-codegen-normalized-path-type", toPathParameter(p, "params", false)); p.vendorExtensions.put("x-codegen-normalized-input-type", p.dataType.replaceAll("^[^\\[]+", "Seq")); } else if (p.isQueryParam) { 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 b4e9eff2942..f3cde7aef1b 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 @@ -1008,7 +1008,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig { } public String constructExampleCode(CodegenParameter codegenParameter, HashMap modelMaps) { - if (codegenParameter.isListContainer) { // array + if (codegenParameter.isArray) { // array return "[" + constructExampleCode(codegenParameter.items, modelMaps) + "]"; } else if (codegenParameter.isMap) { // TODO: map, file type return "\"TODO\""; @@ -1048,7 +1048,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig { } public String constructExampleCode(CodegenProperty codegenProperty, HashMap modelMaps) { - if (codegenProperty.isListContainer) { // array + if (codegenProperty.isArray) { // array return "[" + constructExampleCode(codegenProperty.items, modelMaps) + "]"; } else if (codegenProperty.isMap) { // TODO: map, file type return "\"TODO\""; 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 ff5ad108d3a..a5022f5f12d 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 @@ -1011,7 +1011,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig } public String constructExampleCode(CodegenParameter codegenParameter, HashMap modelMaps, ExampleCodeGenerationContext context) { - if (codegenParameter.isListContainer) { // array + if (codegenParameter.isArray) { // array return "[" + constructExampleCode(codegenParameter.items, modelMaps, context) + "]"; } else if (codegenParameter.isMap) { // TODO: map, file type return "\"TODO\""; @@ -1051,7 +1051,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig } private String constructExampleCode(CodegenProperty codegenProperty, HashMap modelMaps, ExampleCodeGenerationContext context) { - if (codegenProperty.isListContainer) { // array + if (codegenProperty.isArray) { // array return "[" + constructExampleCode(codegenProperty.items, modelMaps, context) + "]"; } else if (codegenProperty.isMap) { // TODO: map, file type return "\"TODO\""; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java index 01aac376295..1c7f3749215 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java @@ -94,7 +94,7 @@ public class TypeScriptAureliaClientCodegen extends AbstractTypeScriptClientCode // Collect models to be imported for (CodegenParameter param : op.allParams) { - if (!param.isPrimitiveType && !param.isListContainer && !param.dataType.equals("any")) { + if (!param.isPrimitiveType && !param.isArray && !param.dataType.equals("any")) { modelImports.add(param.dataType); } } 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 d36a768e52e..9d397611d28 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 @@ -280,14 +280,14 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen setParamNameAlternative(p, p.paramName, paramNameAlternative); for (CodegenParameter param : op.headerParams) { - if (param.isListContainer) { + if (param.isArray) { hasListContainers = true; } setParamNameAlternative(param, p.paramName, paramNameAlternative); } for (CodegenParameter param : op.queryParams) { - if (param.isListContainer && !param.isCollectionFormatMulti) { + if (param.isArray && !param.isCollectionFormatMulti) { hasListContainers = true; } if (param.required) { @@ -299,7 +299,7 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen } for (CodegenParameter param : op.formParams) { - if (param.isListContainer && !param.isCollectionFormatMulti) { + if (param.isArray && !param.isCollectionFormatMulti) { hasListContainers = true; } setParamNameAlternative(param, p.paramName, paramNameAlternative); @@ -366,7 +366,7 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen this.returnSimpleType = o.returnSimpleType; this.subresourceOperation = o.subresourceOperation; this.isMap = o.isMap; - this.isListContainer = o.isListContainer; + this.isArray = o.isArray; this.isMultipart = o.isMultipart; this.hasMore = o.hasMore; this.isResponseBinary = o.isResponseBinary; diff --git a/modules/openapi-generator/src/main/resources/Ada/model-body.mustache b/modules/openapi-generator/src/main/resources/Ada/model-body.mustache index 114109c8e99..4c744def310 100644 --- a/modules/openapi-generator/src/main/resources/Ada/model-body.mustache +++ b/modules/openapi-generator/src/main/resources/Ada/model-body.mustache @@ -5,7 +5,7 @@ package body {{package}}.Models is use Swagger.Streams; {{#orderedModels}} -{{#model}}{{^isArrayModel}} +{{#model}}{{^isArray}} procedure Serialize (Into : in out Swagger.Streams.Output_Stream'Class; Name : in String; @@ -53,7 +53,7 @@ package body {{package}}.Models is end loop; end Deserialize; -{{/isArrayModel}}{{/model}} +{{/isArray}}{{/model}} {{/orderedModels}} end {{package}}.Models; diff --git a/modules/openapi-generator/src/main/resources/Ada/model-spec.mustache b/modules/openapi-generator/src/main/resources/Ada/model-spec.mustache index 62b81b979bb..a29428e2df7 100644 --- a/modules/openapi-generator/src/main/resources/Ada/model-spec.mustache +++ b/modules/openapi-generator/src/main/resources/Ada/model-spec.mustache @@ -5,7 +5,7 @@ with Swagger.Streams; with Ada.Containers.Vectors; package {{package}}.Models is -{{#orderedModels}}{{#model}}{{^isArrayModel}} +{{#orderedModels}}{{#model}}{{^isArray}} {{#title}} -- ------------------------------ -- {{title}}{{#description}} -- {{#lambdaAdaComment}}{{description}}{{/lambdaAdaComment}}{{/description}} @@ -37,9 +37,9 @@ package {{package}}.Models is Name : in String; Value : out {{classname}}_Vectors.Vector); -{{/isArrayModel}}{{#isArrayModel}} +{{/isArray}}{{#isArray}} subtype {{classname}} is {{arrayModelType}}_Type_Vectors.Vector; -{{/isArrayModel}}{{/model}} +{{/isArray}}{{/model}} {{/orderedModels}} end {{package}}.Models; 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 13ef8b7d52e..bd05c15145d 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}}{{#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}}) +{{#returnType}}{{#returnTypeIsPrimitive}}{{#returnSimpleType}}{{{.}}}*{{/returnSimpleType}}{{^returnSimpleType}}{{#isArray}}{{{.}}}_t*{{/isArray}}{{#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}}{{^isArray}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isArray}}{{#isContainer}}{{#isArray}}{{dataType}}_t *{{/isArray}}{{#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}} @@ -207,17 +207,17 @@ end: {{#queryParams}} // query parameters - {{^isListContainer}} + {{^isArray}} char *keyQuery_{{{paramName}}} = NULL; {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}char *{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}char *{{/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}}{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}} valueQuery_{{{paramName}}} {{#isString}}{{^isEnum}}= NULL{{/isEnum}}{{/isString}}{{#isInteger}}= NULL{{/isInteger}}; keyValuePair_t *keyPairQuery_{{paramName}} = 0; - {{/isListContainer}} + {{/isArray}} if ({{paramName}}) { - {{#isListContainer}} + {{#isArray}} list_addElement(localVarQueryParameters,{{paramName}}); - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} keyQuery_{{{paramName}}} = strdup("{{{baseName}}}"); {{#isInteger}} valueQuery_{{{paramName}}} = calloc(1,MAX_NUMBER_LENGTH); @@ -235,7 +235,7 @@ end: keyPairQuery_{{paramName}} = keyValuePair_create(keyQuery_{{{paramName}}}, {{#isEnum}}(void *)strdup({{{operationId}}}_{{enumName}}_ToString( {{/isEnum}}{{^isString}}{{^isInteger}}{{^isBoolean}}&{{/isBoolean}}{{/isInteger}}{{/isString}}valueQuery_{{{paramName}}}{{#isEnum}})){{/isEnum}}); list_addElement(localVarQueryParameters,keyPairQuery_{{paramName}}); - {{/isListContainer}} + {{/isArray}} } {{/queryParams}} {{#formParams}} @@ -270,7 +270,7 @@ end: {{#bodyParam}} // Body Param - {{#isListContainer}} + {{#isArray}} //notstring cJSON *localVar_{{paramName}} = NULL; cJSON *localVarItemJSON_{{paramName}} = NULL; @@ -298,8 +298,8 @@ end: cJSON_AddItemToArray(localVarSingleItemJSON_{{paramName}}, localVar_{{paramName}}); localVarBodyParameters = cJSON_Print(localVarItemJSON_{{paramName}}); } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} cJSON *localVarSingleItemJSON_{{paramName}} = NULL; if ({{paramName}} != NULL) { @@ -307,7 +307,7 @@ end: localVarSingleItemJSON_{{paramName}} = {{dataType}}_convertToJSON({{paramName}}); localVarBodyParameters = cJSON_Print(localVarSingleItemJSON_{{paramName}}); } - {{/isListContainer}} + {{/isArray}} {{/bodyParam}} {{#produces}} list_addElement(localVarHeaderType,"{{{mediaType}}}"); //produces @@ -417,7 +417,7 @@ end: free(keyPairHeader_{{paramName}}); {{/headerParams}} {{#bodyParams}} - {{#isListContainer}} + {{#isArray}} if (localVarItemJSON_{{paramName}}) { cJSON_Delete(localVarItemJSON_{{paramName}}); localVarItemJSON_{{paramName}} = NULL; @@ -431,17 +431,17 @@ end: localVar_{{paramName}} = NULL; } free(localVarBodyParameters); - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if (localVarSingleItemJSON_{{paramName}}) { cJSON_Delete(localVarSingleItemJSON_{{paramName}}); localVarSingleItemJSON_{{paramName}} = NULL; } free(localVarBodyParameters); - {{/isListContainer}} + {{/isArray}} {{/bodyParams}} {{#queryParams}} - {{^isListContainer}} + {{^isArray}} {{#isString}} if(keyQuery_{{{paramName}}}){ free(keyQuery_{{{paramName}}}); @@ -468,7 +468,7 @@ end: keyPairQuery_{{{paramName}}} = NULL; } {{/isString}} - {{/isListContainer}} + {{/isArray}} {{/queryParams}} {{#formParams}} {{#isFile}} @@ -543,7 +543,7 @@ end: free(keyPairHeader_{{paramName}}); {{/headerParams}} {{#bodyParams}} - {{#isListContainer}} + {{#isArray}} if (localVarItemJSON_{{paramName}}) { cJSON_Delete(localVarItemJSON_{{paramName}}); localVarItemJSON_{{paramName}} = NULL; @@ -557,17 +557,17 @@ end: localVar_{{paramName}} = NULL; } free(localVarBodyParameters); - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if (localVarSingleItemJSON_{{paramName}}) { cJSON_Delete(localVarSingleItemJSON_{{paramName}}); localVarSingleItemJSON_{{paramName}} = NULL; } free(localVarBodyParameters); - {{/isListContainer}} + {{/isArray}} {{/bodyParams}} {{#queryParams}} - {{^isListContainer}} + {{^isArray}} {{#isString}} if(keyQuery_{{{paramName}}}){ free(keyQuery_{{{paramName}}}); @@ -592,7 +592,7 @@ end: keyPairQuery_{{{paramName}}} = NULL; } {{/isString}} - {{/isListContainer}} + {{/isArray}} {{/queryParams}} {{#formParams}} {{#isFile}} 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 2ee99aaf1d8..3199c99e3d2 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}}{{#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}}); +{{#returnType}}{{#returnTypeIsPrimitive}}{{#returnSimpleType}}{{{.}}}*{{/returnSimpleType}}{{^returnSimpleType}}{{#isArray}}{{{.}}}_t*{{/isArray}}{{#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}}{{^isArray}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isArray}}{{#isContainer}}{{#isArray}}{{dataType}}_t *{{/isArray}}{{#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 ea22c40fc9f..e054b388ba6 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 @@ -178,14 +178,14 @@ char* {{name}}{{classname}}_ToString({{projectName}}_{{classVarName}}_{{enumName {{/isPrimitiveType}} {{/isContainer}} {{#isContainer}} - {{#isListContainer}} + {{#isArray}} {{#isPrimitiveType}} {{datatype}}_t *{{name}}{{#hasMore}},{{/hasMore}} {{/isPrimitiveType}} {{^isPrimitiveType}} {{datatype}}_t *{{name}}{{#hasMore}},{{/hasMore}} {{/isPrimitiveType}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} {{datatype}} {{name}}{{#hasMore}},{{/hasMore}} {{/isMap}} @@ -245,7 +245,7 @@ void {{classname}}_free({{classname}}_t *{{classname}}) { {{/isPrimitiveType}} {{/isContainer}} {{#isContainer}} - {{#isListContainer}} + {{#isArray}} {{#isPrimitiveType}} list_ForEach(listEntry, {{classname}}->{{name}}) { free(listEntry->data); @@ -258,7 +258,7 @@ void {{classname}}_free({{classname}}_t *{{classname}}) { } list_free({{classname}}->{{name}}); {{/isPrimitiveType}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} list_ForEach(listEntry, {{classname}}->{{name}}) { keyValuePair_t *localKeyValue = (keyValuePair_t*) listEntry->data; @@ -381,7 +381,7 @@ cJSON *{{classname}}_convertToJSON({{classname}}_t *{{classname}}) { {{/isPrimitiveType}} {{/isContainer}} {{#isContainer}} - {{#isListContainer}} + {{#isArray}} {{#isPrimitiveType}} cJSON *{{{name}}} = cJSON_AddArrayToObject(item, "{{{baseName}}}"); if({{{name}}} == NULL) { @@ -429,7 +429,7 @@ cJSON *{{classname}}_convertToJSON({{classname}}_t *{{classname}}) { } } {{/isPrimitiveType}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} cJSON *{{{name}}} = cJSON_AddObjectToObject(item, "{{{baseName}}}"); if({{{name}}} == NULL) { @@ -595,7 +595,7 @@ fail: {{/isPrimitiveType}} {{/isContainer}} {{#isContainer}} - {{#isListContainer}} + {{#isArray}} {{#isPrimitiveType}} list_t *{{{name}}}List; {{^required}}if ({{{name}}}) { {{/required}} @@ -652,7 +652,7 @@ fail: list_addElement({{{name}}}List, {{#isEnum}}{{#items}}(void *){{/items}}{{/isEnum}}{{{name}}}Item); } {{/isPrimitiveType}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} list_t *{{{name}}}List; {{^required}}if ({{{name}}}) { {{/required}} @@ -752,14 +752,14 @@ fail: {{/isPrimitiveType}} {{/isContainer}} {{#isContainer}} - {{#isListContainer}} + {{#isArray}} {{#isPrimitiveType}} {{^required}}{{{name}}} ? {{/required}}{{{name}}}List{{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} {{/isPrimitiveType}} {{^isPrimitiveType}} {{^required}}{{{name}}} ? {{/required}}{{{name}}}List{{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} {{/isPrimitiveType}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} {{^required}}{{{name}}} ? {{/required}}{{{name}}}List{{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} {{/isMap}} 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 2cb2f8e41a0..24d0020522d 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 @@ -128,14 +128,14 @@ typedef struct {{classname}}_t { {{/isPrimitiveType}} {{/isContainer}} {{#isContainer}} - {{#isListContainer}} + {{#isArray}} {{#isPrimitiveType}} {{datatype}}_t *{{name}}; //primitive container {{/isPrimitiveType}} {{^isPrimitiveType}} {{datatype}}_t *{{name}}; //nonprimitive container {{/isPrimitiveType}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} {{datatype}} {{name}}; //map {{/isMap}} @@ -198,14 +198,14 @@ typedef struct {{classname}}_t { {{/isPrimitiveType}} {{/isContainer}} {{#isContainer}} - {{#isListContainer}} + {{#isArray}} {{#isPrimitiveType}} {{datatype}}_t *{{name}}{{#hasMore}},{{/hasMore}} {{/isPrimitiveType}} {{^isPrimitiveType}} {{datatype}}_t *{{name}}{{#hasMore}},{{/hasMore}} {{/isPrimitiveType}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} {{datatype}} {{name}}{{#hasMore}},{{/hasMore}} {{/isMap}} diff --git a/modules/openapi-generator/src/main/resources/Eiffel/model.mustache b/modules/openapi-generator/src/main/resources/Eiffel/model.mustache index 21e82871868..a7640016b40 100644 --- a/modules/openapi-generator/src/main/resources/Eiffel/model.mustache +++ b/modules/openapi-generator/src/main/resources/Eiffel/model.mustache @@ -71,7 +71,7 @@ feature -- Change Element Result.append("%Nclass {{classname}}%N") {{#vars}} {{^isInherited}} - {{#isListContainer}} + {{#isArray}} if attached {{name}} as l_{{name}} then across l_{{name}} as ic loop Result.append ("%N {{name}}:") @@ -79,7 +79,7 @@ feature -- Change Element Result.append ("%N") end end - {{/isListContainer}} + {{/isArray}} {{#isMap}} if attached {{name}} as l_{{name}} then Result.append ("%N{{name}}:") diff --git a/modules/openapi-generator/src/main/resources/Eiffel/test/api_test.mustache b/modules/openapi-generator/src/main/resources/Eiffel/test/api_test.mustache index 27fc2027c06..20d56fef6ac 100644 --- a/modules/openapi-generator/src/main/resources/Eiffel/test/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/Eiffel/test/api_test.mustache @@ -31,9 +31,9 @@ feature -- Test routines {{#allParams}} {{#required}} {{#isContainer}} - {{#isListContainer}} + {{#isArray}} -- create {ARRAYED_{{dataType}}} l_{{paramName}}.make (2) - {{/isListContainer}} + {{/isArray}} {{/isContainer}} {{^isContainer}} -- l_{{paramName}} 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 6ac2083704a..3ee4fcffd1c 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 @@ -121,7 +121,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE {{/vendorExtensions.x-is-jackson-optional-nullable}} return this; } - {{#isListContainer}} + {{#isArray}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} @@ -145,7 +145,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} } - {{/isListContainer}} + {{/isArray}} {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { @@ -342,25 +342,25 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE public void writeToParcel(Parcel out, int flags) { {{#model}} -{{#isArrayModel}} +{{#isArray}} out.writeList(this); -{{/isArrayModel}} -{{^isArrayModel}} +{{/isArray}} +{{^isArray}} {{#parent}} super.writeToParcel(out, flags); {{/parent}} {{#vars}} out.writeValue({{name}}); {{/vars}} -{{/isArrayModel}} +{{/isArray}} {{/model}} } {{classname}}(Parcel in) { -{{#isArrayModel}} +{{#isArray}} in.readTypedList(this, {{arrayModelType}}.CREATOR); -{{/isArrayModel}} -{{^isArrayModel}} +{{/isArray}} +{{^isArray}} {{#parent}} super(in); {{/parent}} @@ -372,7 +372,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE {{name}} = ({{{datatypeWithEnum}}})in.readValue({{complexType}}.class.getClassLoader()); {{/isPrimitiveType}} {{/vars}} -{{/isArrayModel}} +{{/isArray}} } public int describeContents() { @@ -382,14 +382,14 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE public static final Parcelable.Creator<{{classname}}> CREATOR = new Parcelable.Creator<{{classname}}>() { public {{classname}} createFromParcel(Parcel in) { {{#model}} -{{#isArrayModel}} +{{#isArray}} {{classname}} result = new {{classname}}(); result.addAll(in.readArrayList({{arrayModelType}}.class.getClassLoader())); return result; -{{/isArrayModel}} -{{^isArrayModel}} +{{/isArray}} +{{^isArray}} return new {{classname}}(in); -{{/isArrayModel}} +{{/isArray}} {{/model}} } public {{classname}}[] newArray(int size) { 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 c250bd2a36d..24e6e7e7d05 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,16 +76,16 @@ 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}}{{^isMap}}public {{dataType}} {{getter}}() { +{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#withXml}}{{#isEnum}}{{^isArray}}{{^isMap}}public {{dataType}} {{getter}}() { if ({{name}} == null) { return null; } return {{name}}.value(); - }{{/isMap}}{{/isListContainer}}{{/isEnum}}{{/withXml}}{{^withXml}}{{#isEnum}}{{^isListContainer}}{{^isMap}}public {{datatypeWithEnum}} {{getter}}() { + }{{/isMap}}{{/isArray}}{{/isEnum}}{{/withXml}}{{^withXml}}{{#isEnum}}{{^isArray}}{{^isMap}}public {{datatypeWithEnum}} {{getter}}() { return {{name}}; - }{{/isMap}}{{/isListContainer}}{{/isEnum}}{{/withXml}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() { + }{{/isMap}}{{/isArray}}{{/isEnum}}{{/withXml}}{{#isEnum}}{{#isArray}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; - }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMap}}public {{{datatypeWithEnum}}} {{getter}}() { + }{{/isArray}}{{/isEnum}}{{#isEnum}}{{#isMap}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; }{{/isMap}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; @@ -103,13 +103,13 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ this.{{name}} = {{name}}; return this; } - {{#isListContainer}} + {{#isArray}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { this.{{name}}.add({{name}}Item); return this; } - {{/isListContainer}} + {{/isArray}} {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache index b47b3bffbef..544fbf16498 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache @@ -121,7 +121,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE {{/vendorExtensions.x-is-jackson-optional-nullable}} return this; } - {{#isListContainer}} + {{#isArray}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} @@ -145,7 +145,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} } - {{/isListContainer}} + {{/isArray}} {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { @@ -317,25 +317,25 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE public void writeToParcel(Parcel out, int flags) { {{#model}} -{{#isArrayModel}} +{{#isArray}} out.writeList(this); -{{/isArrayModel}} -{{^isArrayModel}} +{{/isArray}} +{{^isArray}} {{#parent}} super.writeToParcel(out, flags); {{/parent}} {{#vars}} out.writeValue({{name}}); {{/vars}} -{{/isArrayModel}} +{{/isArray}} {{/model}} } {{classname}}(Parcel in) { -{{#isArrayModel}} +{{#isArray}} in.readTypedList(this, {{arrayModelType}}.CREATOR); -{{/isArrayModel}} -{{^isArrayModel}} +{{/isArray}} +{{^isArray}} {{#parent}} super(in); {{/parent}} @@ -347,7 +347,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE {{name}} = ({{{datatypeWithEnum}}})in.readValue({{complexType}}.class.getClassLoader()); {{/isPrimitiveType}} {{/vars}} -{{/isArrayModel}} +{{/isArray}} } public int describeContents() { @@ -357,14 +357,14 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE public static final Parcelable.Creator<{{classname}}> CREATOR = new Parcelable.Creator<{{classname}}>() { public {{classname}} createFromParcel(Parcel in) { {{#model}} -{{#isArrayModel}} +{{#isArray}} {{classname}} result = new {{classname}}(); result.addAll(in.readArrayList({{arrayModelType}}.class.getClassLoader())); return result; -{{/isArrayModel}} -{{^isArrayModel}} +{{/isArray}} +{{^isArray}} return new {{classname}}(in); -{{/isArrayModel}} +{{/isArray}} {{/model}} } public {{classname}}[] newArray(int size) { 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 821972f3391..d5158d55273 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}}{{#isMap}}java.util.Map{{/isMap}}{{^isListContainer}}{{^isMap}}{{{dataType}}}{{/isMap}}{{/isListContainer}}.class{{/allParams}}); + Method method = this.getClass().getMethod("{{operationId}}WithHttpInfo"{{#allParams}}, {{#isArray}}java.util.List{{/isArray}}{{#isMap}}java.util.Map{{/isMap}}{{^isArray}}{{^isMap}}{{{dataType}}}{{/isMap}}{{/isArray}}.class{{/allParams}}); Set> violations = executableValidator.validateParameters(this, method, parameterValues); diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache index a8077006c8f..a62a10c0c12 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache @@ -62,7 +62,7 @@ public class {{classname}} { * @see {{summary}} Documentation {{/externalDocs}} */ - public {{#returnType}}{{#isListContainer}}Flux<{{{returnBaseType}}}>{{/isListContainer}}{{^isListContainer}}Mono<{{{returnType}}}>{{/isListContainer}} {{/returnType}}{{^returnType}}Mono {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws WebClientResponseException { + public {{#returnType}}{{#isArray}}Flux<{{{returnBaseType}}}>{{/isArray}}{{^isArray}}Mono<{{{returnType}}}>{{/isArray}} {{/returnType}}{{^returnType}}Mono {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws WebClientResponseException { Object postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}; {{#allParams}} {{#required}} @@ -124,8 +124,8 @@ public class {{classname}} { String[] localVarAuthNames = new String[] { {{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}} }; - {{#returnType}}ParameterizedTypeReference<{{#isListContainer}}{{{returnBaseType}}}{{/isListContainer}}{{^isListContainer}}{{{returnType}}}{{/isListContainer}}> localVarReturnType = new ParameterizedTypeReference<{{#isListContainer}}{{{returnBaseType}}}{{/isListContainer}}{{^isListContainer}}{{{returnType}}}{{/isListContainer}}>() {};{{/returnType}}{{^returnType}}ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {};{{/returnType}} - return apiClient.{{#isListContainer}}invokeFluxAPI{{/isListContainer}}{{^isListContainer}}invokeAPI{{/isListContainer}}("{{{path}}}", HttpMethod.{{httpMethod}}, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + {{#returnType}}ParameterizedTypeReference<{{#isArray}}{{{returnBaseType}}}{{/isArray}}{{^isArray}}{{{returnType}}}{{/isArray}}> localVarReturnType = new ParameterizedTypeReference<{{#isArray}}{{{returnBaseType}}}{{/isArray}}{{^isArray}}{{{returnType}}}{{/isArray}}>() {};{{/returnType}}{{^returnType}}ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {};{{/returnType}} + return apiClient.{{#isArray}}invokeFluxAPI{{/isArray}}{{^isArray}}invokeAPI{{/isArray}}("{{{path}}}", HttpMethod.{{httpMethod}}, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); } {{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api_test.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api_test.mustache index 1b730bf43a7..edd2c06a70b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api_test.mustache @@ -33,7 +33,7 @@ public class {{classname}}Test { {{#allParams}} {{{dataType}}} {{paramName}} = null; {{/allParams}} - {{#returnType}}{{{returnType}}} response = {{/returnType}}api.{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#isListContainer}}.collectList().block(){{/isListContainer}}{{^isListContainer}}.block(){{/isListContainer}}; + {{#returnType}}{{{returnType}}} response = {{/returnType}}api.{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#isArray}}.collectList().block(){{/isArray}}{{^isArray}}.block(){{/isArray}}; // TODO: test validations } diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache index a442eb4e182..17d0c1b5a10 100644 --- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache @@ -104,7 +104,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE {{^vendorExtensions.x-is-jackson-optional-nullable}}this.{{name}} = {{name}};{{/vendorExtensions.x-is-jackson-optional-nullable}} return this; } - {{#isListContainer}} + {{#isArray}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} @@ -128,7 +128,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE return this; {{/vendorExtensions.x-is-jackson-optional-nullable}} } - {{/isListContainer}} + {{/isArray}} {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { @@ -312,25 +312,25 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE public void writeToParcel(Parcel out, int flags) { {{#model}} -{{#isArrayModel}} +{{#isArray}} out.writeList(this); -{{/isArrayModel}} -{{^isArrayModel}} +{{/isArray}} +{{^isArray}} {{#parent}} super.writeToParcel(out, flags); {{/parent}} {{#vars}} out.writeValue({{name}}); {{/vars}} -{{/isArrayModel}} +{{/isArray}} {{/model}} } {{classname}}(Parcel in) { -{{#isArrayModel}} +{{#isArray}} in.readTypedList(this, {{arrayModelType}}.CREATOR); -{{/isArrayModel}} -{{^isArrayModel}} +{{/isArray}} +{{^isArray}} {{#parent}} super(in); {{/parent}} @@ -342,7 +342,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE {{name}} = ({{{datatypeWithEnum}}})in.readValue({{complexType}}.class.getClassLoader()); {{/isPrimitiveType}} {{/vars}} -{{/isArrayModel}} +{{/isArray}} } public int describeContents() { @@ -352,14 +352,14 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE public static final Parcelable.Creator<{{classname}}> CREATOR = new Parcelable.Creator<{{classname}}>() { public {{classname}} createFromParcel(Parcel in) { {{#model}} -{{#isArrayModel}} +{{#isArray}} {{classname}} result = new {{classname}}(); result.addAll(in.readArrayList({{arrayModelType}}.class.getClassLoader())); return result; -{{/isArrayModel}} -{{^isArrayModel}} +{{/isArray}} +{{^isArray}} return new {{classname}}(in); -{{/isArrayModel}} +{{/isArray}} {{/model}} } public {{classname}}[] newArray(int size) { 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 6db33e864a8..027a3adfff0 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 @@ -43,7 +43,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali public void {{setter}}({{{datatypeWithEnum}}} {{name}}) { this.{{name}} = {{name}}; } - {{#isListContainer}} + {{#isArray}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{^required}} @@ -54,7 +54,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali this.{{name}}.add({{name}}Item); return this; } - {{/isListContainer}} + {{/isArray}} {{#isMap}} 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 a3e7a35cf40..b5546d95a40 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,11 +70,11 @@ 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}}{{^isMap}}public {{dataType}} {{getter}}() { +{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#isEnum}}{{^isArray}}{{^isMap}}public {{dataType}} {{getter}}() { return {{name}} == null ? null : {{name}}.value(); - }{{/isMap}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() { + }{{/isMap}}{{/isArray}}{{/isEnum}}{{#isEnum}}{{#isArray}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; - }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMap}}public {{{datatypeWithEnum}}} {{getter}}() { + }{{/isArray}}{{/isEnum}}{{#isEnum}}{{#isMap}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; }{{/isMap}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; @@ -100,7 +100,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ this.{{name}} = {{name}}; return this; } - {{#isListContainer}} + {{#isArray}} /** * Adds a new item to the {{name}} list. @@ -112,7 +112,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ this.{{name}}.add({{name}}Item); return this; } - {{/isListContainer}} + {{/isArray}} {{#isMap}} /** 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 ac430d2bf3a..d30876ae41e 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache @@ -55,14 +55,14 @@ import com.fasterxml.jackson.annotation.JsonProperty; {{#vendorExtensions.x-extra-annotation}} {{{vendorExtensions.x-extra-annotation}}} {{/vendorExtensions.x-extra-annotation}} -{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#isEnum}}{{^isListContainer}}{{^isMap}}public {{dataType}} {{getter}}() { +{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#isEnum}}{{^isArray}}{{^isMap}}public {{dataType}} {{getter}}() { if ({{name}} == null) { return null; } return {{name}}.value(); - }{{/isMap}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() { + }{{/isMap}}{{/isArray}}{{/isEnum}}{{#isEnum}}{{#isArray}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; - }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMap}}public {{{datatypeWithEnum}}} {{getter}}() { + }{{/isArray}}{{/isEnum}}{{#isEnum}}{{#isMap}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; }{{/isMap}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; @@ -77,13 +77,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; this.{{name}} = {{name}}; return this; } - {{#isListContainer}} + {{#isArray}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { this.{{name}}.add({{name}}Item); return this; } - {{/isListContainer}} + {{/isArray}} {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache index 24f7c8941d3..72443482947 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache @@ -43,7 +43,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali this.{{name}} = {{name}}; return this; } - {{#isListContainer}} + {{#isArray}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{^required}} @@ -54,7 +54,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali this.{{name}}.add({{name}}Item); return this; } - {{/isListContainer}} + {{/isArray}} {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { 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 1e8ec04d95e..433b7334785 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}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isArray}}{{{returnContainer}}}<{{{returnType}}}>{{/isArray}}{{/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 1e8ec04d95e..433b7334785 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/returnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/returnTypes.mustache @@ -1 +1 @@ -{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isArray}}{{{returnContainer}}}<{{{returnType}}}>{{/isArray}}{{/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 cb97c7a021b..442c40f781d 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/exampleReturnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/exampleReturnTypes.mustache @@ -1 +1 @@ -{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isArray}}{{{returnContainer}}}{{/isArray}}{{/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 fd5a931a482..78590697b8f 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache @@ -70,11 +70,11 @@ public class {{classname}}Controller extends Controller { {{paramName}} = mapper.readValue(node{{paramName}}.toString(), {{#isContainer}}new TypeReference<{{{dataType}}}>(){}{{/isContainer}}{{^isContainer}}{{{dataType}}}.class{{/isContainer}}); {{#useBeanValidation}} if (configuration.getBoolean("useInputBeanValidation")) { - {{#isListContainer}} + {{#isArray}} for ({{{items.baseType}}} curItem : {{paramName}}) { OpenAPIUtils.validate(curItem); } - {{/isListContainer}} + {{/isArray}} {{#isMap}} for (Map.Entry entry : {{paramName}}.entrySet()) { OpenAPIUtils.validate(entry.getValue()); @@ -214,11 +214,11 @@ public class {{classname}}Controller extends Controller { {{#useBeanValidation}} {{^supportAsync}} if (configuration.getBoolean("useOutputBeanValidation")) { - {{#isListContainer}} + {{#isArray}} for ({{{returnType}}} curItem : obj) { OpenAPIUtils.validate(curItem); } - {{/isListContainer}} + {{/isArray}} {{#isMap}} for (Map.Entry entry : obj.entrySet()) { OpenAPIUtils.validate(entry.getValue()); @@ -231,11 +231,11 @@ public class {{classname}}Controller extends Controller { {{/supportAsync}} {{#supportAsync}} if (configuration.getBoolean("useOutputBeanValidation")) { - {{#isListContainer}} + {{#isArray}} for ({{{returnType}}} curItem : obj) { OpenAPIUtils.validate(curItem); } - {{/isListContainer}} + {{/isArray}} {{#isMap}} for (Map.Entry entry : obj.entrySet()) { OpenAPIUtils.validate(entry.getValue()); diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache index 72e4d036e26..72a799bd1e5 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache @@ -38,7 +38,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali this.{{name}} = {{name}}; return this; } - {{#isListContainer}} + {{#isArray}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{^required}} @@ -49,7 +49,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali {{name}}.add({{name}}Item); return this; } - {{/isListContainer}} + {{/isArray}} {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypes.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypes.mustache index 1d7037d991f..7892591273a 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}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}{{^returnType}}void{{/returnType}} \ No newline at end of file +{{#returnType}}{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isArray}}{{{returnContainer}}}<{{{returnType}}}>{{/isArray}}{{/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 347fceccddb..709a28e3c06 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}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}} \ No newline at end of file +{{#returnType}}{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isArray}}{{{returnContainer}}}<{{{returnType}}}>{{/isArray}}{{/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 c946f4885a1..f94384feff3 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}}{{#isMap}}HashMap{{/isMap}}{{#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}}{{#isArray}}{{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<{{{returnType}}}>{{/isArray}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache index 683db5cc209..34372c78c6b 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/api.mustache @@ -131,7 +131,7 @@ public interface {{classname}} { } // Override this method - {{#jdk8-default-interface}}default {{/jdk8-default-interface}} {{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{operationId}}({{#allParams}}{{^isFile}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isListContainer}}Mono{{/isListContainer}}{{#isListContainer}}Flux{{/isListContainer}}<{{{baseType}}}>{{/reactive}}{{/isBodyParam}}{{/isFile}}{{#isFile}}{{#reactive}}Flux{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{/isFile}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}ServerWebExchange exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}, @ApiIgnore final Pageable pageable{{/vendorExtensions.x-spring-paginated}}){{#unhandledException}} throws Exception{{/unhandledException}} { + {{#jdk8-default-interface}}default {{/jdk8-default-interface}} {{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{operationId}}({{#allParams}}{{^isFile}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isArray}}Mono{{/isArray}}{{#isArray}}Flux{{/isArray}}<{{{baseType}}}>{{/reactive}}{{/isBodyParam}}{{/isFile}}{{#isFile}}{{#reactive}}Flux{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{/isFile}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}ServerWebExchange exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}, @ApiIgnore final Pageable pageable{{/vendorExtensions.x-spring-paginated}}){{#unhandledException}} throws Exception{{/unhandledException}} { {{/delegate-method}} {{^isDelegate}} {{>methodBody}} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache index 53c3fb375ad..4182e613fde 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache @@ -69,7 +69,7 @@ public interface {{classname}}Delegate { {{/externalDocs}} * @see {{classname}}#{{operationId}} */ - {{#jdk8-default-interface}}default {{/jdk8-default-interface}}{{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{operationId}}({{#allParams}}{{^isFile}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isListContainer}}Mono{{/isListContainer}}{{#isListContainer}}Flux{{/isListContainer}}<{{{baseType}}}>{{/reactive}}{{/isBodyParam}}{{/isFile}}{{#isFile}}{{#isListContainer}}List<{{/isListContainer}}{{#reactive}}Flux{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isListContainer}}>{{/isListContainer}}{{/isFile}} {{paramName}}{{#hasMore}}, + {{#jdk8-default-interface}}default {{/jdk8-default-interface}}{{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{operationId}}({{#allParams}}{{^isFile}}{{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isArray}}Mono{{/isArray}}{{#isArray}}Flux{{/isArray}}<{{{baseType}}}>{{/reactive}}{{/isBodyParam}}{{/isFile}}{{#isFile}}{{#isArray}}List<{{/isArray}}{{#reactive}}Flux{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isArray}}>{{/isArray}}{{/isFile}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#reactive}}{{#hasParams}}, {{/hasParams}}ServerWebExchange exchange{{/reactive}}{{#vendorExtensions.x-spring-paginated}}, final Pageable pageable{{/vendorExtensions.x-spring-paginated}}){{#unhandledException}} throws Exception{{/unhandledException}}{{^jdk8-default-interface}};{{/jdk8-default-interface}}{{#jdk8-default-interface}} { {{>methodBody}} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/bodyParams.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/bodyParams.mustache index c2a1faa8c9f..e91a37d40b6 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/bodyParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{^isContainer}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue={{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}) {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isListContainer}}Mono{{/isListContainer}}{{#isListContainer}}Flux{{/isListContainer}}<{{{baseType}}}>{{/reactive}} {{paramName}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{^isContainer}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue={{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}) {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isArray}}Mono{{/isArray}}{{#isArray}}Flux{{/isArray}}<{{{baseType}}}>{{/reactive}} {{paramName}}{{/isBodyParam}} \ 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 029df5ade8a..d13cee710cf 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/exampleReturnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/exampleReturnTypes.mustache @@ -1 +1 @@ -{{#returnContainer}}{{#isMap}}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/formParams.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/formParams.mustache index a97688aa95c..04564e162dc 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/formParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/formParams.mustache @@ -1 +1 @@ -{{#isFormParam}}{{^isFile}}@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}} @RequestPart(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}@ApiParam(value = "{{{description}}}") {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestPart(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{#isListContainer}}List<{{/isListContainer}}{{#reactive}}Flux{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isListContainer}}>{{/isListContainer}} {{baseName}}{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{#isFormParam}}{{^isFile}}@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}} @RequestPart(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}@ApiParam(value = "{{{description}}}") {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestPart(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{#isArray}}List<{{/isArray}}{{#reactive}}Flux{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isArray}}>{{/isArray}} {{baseName}}{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/formParams.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/formParams.mustache index cd13f632085..cec76d91502 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/formParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/formParams.mustache @@ -1 +1 @@ -{{#isFormParam}}{{^isFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue={{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}) @RequestParam(value="{{baseName}}"{{#required}}, required=true{{/required}}{{^required}}, required=false{{/required}}) {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}@ApiParam(value = "{{{description}}}") @RequestParam("{{baseName}}") {{#isListContainer}}List<{{/isListContainer}}{{#reactive}}Flux{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isListContainer}}>{{/isListContainer}} {{paramName}}{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{#isFormParam}}{{^isFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue={{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}) @RequestParam(value="{{baseName}}"{{#required}}, required=true{{/required}}{{^required}}, required=false{{/required}}) {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}@ApiParam(value = "{{{description}}}") @RequestParam("{{baseName}}") {{#isArray}}List<{{/isArray}}{{#reactive}}Flux{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isArray}}>{{/isArray}} {{paramName}}{{/isFile}}{{/isFormParam}} \ 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 23cc3530380..b871708d821 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -61,7 +61,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{^parent}} {{/openApiNullable}} return this; } - {{#isListContainer}} + {{#isArray}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{#openApiNullable}} @@ -80,7 +80,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{^parent}} {{/openApiNullable}} return this; } - {{/isListContainer}} + {{/isArray}} {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache index a78483e8559..0d2b380d74d 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache @@ -1 +1 @@ -{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{#reactive}}Flux{{/reactive}}{{^reactive}}{{{returnContainer}}}{{/reactive}}<{{{returnType}}}>{{/isListContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#isMap}}Map{{/isMap}}{{#isArray}}{{#reactive}}Flux{{/reactive}}{{^reactive}}{{{returnContainer}}}{{/reactive}}<{{{returnType}}}>{{/isArray}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaVertXServer/AsyncCall.mustache b/modules/openapi-generator/src/main/resources/JavaVertXServer/AsyncCall.mustache index d941d4644d2..dfaaea6a273 100644 --- a/modules/openapi-generator/src/main/resources/JavaVertXServer/AsyncCall.mustache +++ b/modules/openapi-generator/src/main/resources/JavaVertXServer/AsyncCall.mustache @@ -1,12 +1,12 @@ service.{{operationId}}({{#hasParams}}{{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{^hasMore}}, {{/hasMore}}{{/allParams}}{{/hasParams}}result -> { if (result.succeeded()) {{#returnType}} - {{#isListContainer}} + {{#isArray}} message.reply(new JsonArray(Json.encode(result.result())).encodePrettily()); - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} message.reply(new JsonObject(Json.encode(result.result())).encodePrettily()); - {{/isListContainer}} + {{/isArray}} {{/returnType}} {{^returnType}} message.reply(null); diff --git a/modules/openapi-generator/src/main/resources/JavaVertXServer/RxCall.mustache b/modules/openapi-generator/src/main/resources/JavaVertXServer/RxCall.mustache index b28db6dae66..7331a163f6d 100644 --- a/modules/openapi-generator/src/main/resources/JavaVertXServer/RxCall.mustache +++ b/modules/openapi-generator/src/main/resources/JavaVertXServer/RxCall.mustache @@ -1,12 +1,12 @@ service.{{operationId}}({{#hasParams}}{{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{/hasParams}}).subscribe( {{#returnType}} result -> { - {{#isListContainer}} + {{#isArray}} message.reply(new JsonArray(Json.encode(result)).encodePrettily()); - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} message.reply(new JsonObject(Json.encode(result)).encodePrettily()); - {{/isListContainer}} + {{/isArray}} {{/returnType}} {{^returnType}} () -> { diff --git a/modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache b/modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache index 66d7f51f8c5..288e926541b 100644 --- a/modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache +++ b/modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache @@ -41,7 +41,7 @@ public class {{classname}}Verticle extends AbstractVerticle { String serviceId = "{{#vendorExtensions}}{{x-serviceid}}{{/vendorExtensions}}"; {{#hasParams}} {{#allParams}} - {{#isListContainer}} + {{#isArray}} JsonArray {{paramName}}Param = message.body().getJsonArray("{{baseName}}"); {{#required}} if({{paramName}}Param == null) { @@ -55,8 +55,8 @@ public class {{classname}}Verticle extends AbstractVerticle { {{{dataType}}} {{paramName}} = ({{paramName}}Param == null) ? {{#defaultValue}}{{defaultValue}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}} : Json.mapper.readValue({{paramName}}Param.encode(), Json.mapper.getTypeFactory().constructCollectionType(List.class, {{{baseType}}}.class)); {{/required}} - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} {{#isPrimitiveType}} {{#isString}} String {{paramName}}Param = message.body().getString("{{baseName}}"); @@ -93,7 +93,7 @@ public class {{classname}}Verticle extends AbstractVerticle { } {{{dataType}}} {{paramName}} = Json.mapper.readValue({{paramName}}Param.encode(), {{{dataType}}}.class); {{/isPrimitiveType}} - {{/isListContainer}} + {{/isArray}} {{/allParams}} {{/hasParams}} {{#rxInterface}} diff --git a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/headerParams.mustache b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/headerParams.mustache index 3980b77c9b1..a09e8383592 100644 --- a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/headerParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/headerParams.mustache @@ -1,13 +1,13 @@ {{#isHeaderParam}} -{{^isListContainer}} +{{^isArray}} {{#isModel}} {{{dataType}}} {{paramName}} = requestParameters.headerParameter("{{baseName}}") != null ? DatabindCodec.mapper().convertValue(requestParameters.headerParameter("{{baseName}}").get(), new TypeReference<{{{dataType}}}>(){}) : null; {{/isModel}} {{^isModel}} {{{dataType}}} {{paramName}} = requestParameters.headerParameter("{{baseName}}") != null ? requestParameters.headerParameter("{{baseName}}").get{{dataType}}() : null; {{/isModel}} -{{/isListContainer}} -{{#isListContainer}} +{{/isArray}} +{{#isArray}} {{{dataType}}} {{paramName}} = requestParameters.headerParameter("{{baseName}}") != null ? DatabindCodec.mapper().convertValue(requestParameters.headerParameter("{{baseName}}").get(), new TypeReference<{{{dataType}}}>(){}) : null; -{{/isListContainer}} +{{/isArray}} {{/isHeaderParam}} diff --git a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/pathParams.mustache b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/pathParams.mustache index 4022a342721..da9fcd6a087 100644 --- a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/pathParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/pathParams.mustache @@ -1,13 +1,13 @@ {{#isPathParam}} -{{^isListContainer}} +{{^isArray}} {{#isModel}} {{{dataType}}} {{paramName}} = requestParameters.pathParameter("{{baseName}}") != null ? DatabindCodec.mapper().convertValue(requestParameters.pathParameter("{{baseName}}").get(), new TypeReference<{{{dataType}}}>(){}) : null; {{/isModel}} {{^isModel}} {{{dataType}}} {{paramName}} = requestParameters.pathParameter("{{baseName}}") != null ? requestParameters.pathParameter("{{baseName}}").get{{dataType}}() : null; {{/isModel}} -{{/isListContainer}} -{{#isListContainer}} +{{/isArray}} +{{#isArray}} {{{dataType}}} {{paramName}} = requestParameters.pathParameter("{{baseName}}") != null ? DatabindCodec.mapper().convertValue(requestParameters.pathParameter("{{baseName}}").get(), new TypeReference<{{{dataType}}}>(){}) : null; -{{/isListContainer}} +{{/isArray}} {{/isPathParam}} diff --git a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/queryParams.mustache b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/queryParams.mustache index 1badafce1b6..70a41051955 100644 --- a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/queryParams.mustache +++ b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/queryParams.mustache @@ -1,13 +1,13 @@ {{#isQueryParam}} -{{^isListContainer}} +{{^isArray}} {{#isModel}} {{{dataType}}} {{paramName}} = requestParameters.queryParameter("{{baseName}}") != null ? DatabindCodec.mapper().convertValue(requestParameters.queryParameter("{{baseName}}").get(), new TypeReference<{{{dataType}}}>(){}) : null; {{/isModel}} {{^isModel}} {{{dataType}}} {{paramName}} = requestParameters.queryParameter("{{baseName}}") != null ? requestParameters.queryParameter("{{baseName}}").get{{dataType}}() : null; {{/isModel}} -{{/isListContainer}} -{{#isListContainer}} +{{/isArray}} +{{#isArray}} {{{dataType}}} {{paramName}} = requestParameters.queryParameter("{{baseName}}") != null ? DatabindCodec.mapper().convertValue(requestParameters.queryParameter("{{baseName}}").get(), new TypeReference<{{{dataType}}}>(){}) : null; -{{/isListContainer}} +{{/isArray}} {{/isQueryParam}} diff --git a/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/api.mustache b/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/api.mustache index 989b8b40d63..03a021e00d6 100644 --- a/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/api.mustache +++ b/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/api.mustache @@ -136,7 +136,7 @@ export const {{classname}}FetchParamCreator = function (configuration?: Configur {{/authMethods}} {{#queryParams}} - {{#isListContainer}} + {{#isArray}} if ({{paramName}}) { {{#isCollectionFormatMulti}} localVarQueryParameter['{{baseName}}'] = {{paramName}}; @@ -145,8 +145,8 @@ export const {{classname}}FetchParamCreator = function (configuration?: Configur localVarQueryParameter['{{baseName}}'] = {{paramName}}.join(COLLECTION_FORMATS["{{collectionFormat}}"]); {{/isCollectionFormatMulti}} } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if ({{paramName}} !== undefined) { {{#isDateTime}} localVarQueryParameter['{{baseName}}'] = (({{paramName}}:any):Date).toISOString(); @@ -160,24 +160,24 @@ export const {{classname}}FetchParamCreator = function (configuration?: Configur {{/isDate}} {{/isDateTime}} } - {{/isListContainer}} + {{/isArray}} {{/queryParams}} {{#headerParams}} - {{#isListContainer}} + {{#isArray}} if ({{paramName}}) { localVarHeaderParameter['{{baseName}}'] = {{paramName}}.join(COLLECTION_FORMATS["{{collectionFormat}}"]); } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if ({{paramName}} !== undefined && {{paramName}} !== null) { localVarHeaderParameter['{{baseName}}'] = (({{paramName}}:any):string); } - {{/isListContainer}} + {{/isArray}} {{/headerParams}} {{#formParams}} - {{#isListContainer}} + {{#isArray}} if ({{paramName}}) { {{#isCollectionFormatMulti}} {{paramName}}.forEach((element) => { @@ -188,12 +188,12 @@ export const {{classname}}FetchParamCreator = function (configuration?: Configur localVarFormParams.set('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS["{{collectionFormat}}"])); {{/isCollectionFormatMulti}} } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if ({{paramName}} !== undefined) { localVarFormParams.set('{{baseName}}', (({{paramName}}:any):string)); } - {{/isListContainer}} + {{/isArray}} {{/formParams}} {{#bodyParam}} diff --git a/modules/openapi-generator/src/main/resources/apex/api.mustache b/modules/openapi-generator/src/main/resources/apex/api.mustache index 7cd21f0ea79..e5a2cdbd879 100644 --- a/modules/openapi-generator/src/main/resources/apex/api.mustache +++ b/modules/openapi-generator/src/main/resources/apex/api.mustache @@ -39,17 +39,17 @@ public class {{classname}} { // cast query params to verify their expected type {{/hasQueryParams}} {{#queryParams}} - {{#isListContainer}} + {{#isArray}} {{#isCollectionFormatMulti}} query.addAll(client.makeParams('{{baseName}}', ({{{dataType}}}) params.get('{{paramName}}'))); {{/isCollectionFormatMulti}} {{^isCollectionFormatMulti}} query.addAll(client.makeParam('{{baseName}}', ({{{dataType}}}) params.get('{{paramName}}'), '{{collectionFormat}}')); {{/isCollectionFormatMulti}} - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} query.addAll(client.makeParam('{{baseName}}', ({{{dataType}}}) params.get('{{paramName}}'))); - {{/isListContainer}} + {{/isArray}} {{^hasMore}} {{/hasMore}} @@ -60,17 +60,17 @@ public class {{classname}} { // cast form params to verify their expected type {{/hasFormParams}} {{#formParams}} - {{#isListContainer}} + {{#isArray}} {{#isCollectionFormatMulti}} form.addAll(client.makeParams('{{baseName}}', ({{{dataType}}}) params.get('{{paramName}}'))); {{/isCollectionFormatMulti}} {{^isCollectionFormatMulti}} form.addAll(client.makeParam('{{baseName}}', ({{{dataType}}}) params.get('{{paramName}}'), '{{collectionFormat}}')); {{/isCollectionFormatMulti}} - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} form.addAll(client.makeParam('{{baseName}}', ({{{dataType}}}) params.get('{{paramName}}'))); - {{/isListContainer}} + {{/isArray}} {{/formParams}} {{#returnType}}return ({{{returnType}}}) {{/returnType}}client.invoke( 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 cab116b21cb..6a91d399606 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}}{{^isMap}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMap}}{{/parent}}string ToJson() + public {{#parent}}{{^isMap}}{{^isArray}}new {{/isArray}}{{/isMap}}{{/parent}}string ToJson() { return JsonConvert.SerializeObject(this, Formatting.Indented); } 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 d758faae1bd..0469669e3e5 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}}{{^isMap}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMap}}{{/parent}}string ToJson() + public {{#parent}}{{^isMap}}{{^isArray}}new {{/isArray}}{{/isMap}}{{/parent}}string ToJson() { return JsonConvert.SerializeObject(this, Formatting.Indented); } 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 d758faae1bd..0469669e3e5 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}}{{^isMap}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMap}}{{/parent}}string ToJson() + public {{#parent}}{{^isMap}}{{^isArray}}new {{/isArray}}{{/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 9b88928f1cd..af08b597ee4 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}}{{#isMap}}std::map {{paramName}};{{/isMap}}{{/isPrimitiveType}} + {{baseType}} {{paramName}};{{/isContainer}}{{#isArray}}std::vector<{{items.baseType}}> {{paramName}};{{/isArray}}{{#isMap}}std::map {{paramName}};{{/isMap}}{{/isPrimitiveType}} {{#isPrimitiveType}} {{dataType}} {{paramName}}; {{/isPrimitiveType}} @@ -52,9 +52,9 @@ void {{classname}}::{{operationIdSnakeCase}}_handler(const Pistache::Rest::Reque // Getting the query params {{#queryParams}} auto {{paramName}}Query = request.query().get("{{baseName}}"); - Pistache::Optional<{{^isContainer}}{{dataType}}{{/isContainer}}{{#isListContainer}}std::vector<{{items.baseType}}>{{/isListContainer}}> {{paramName}}; + Pistache::Optional<{{^isContainer}}{{dataType}}{{/isContainer}}{{#isArray}}std::vector<{{items.baseType}}>{{/isArray}}> {{paramName}}; if(!{{paramName}}Query.isEmpty()){ - {{^isContainer}}{{dataType}}{{/isContainer}}{{#isListContainer}}std::vector<{{items.baseType}}>{{/isListContainer}} valueQuery_instance; + {{^isContainer}}{{dataType}}{{/isContainer}}{{#isArray}}std::vector<{{items.baseType}}>{{/isArray}} valueQuery_instance; if(fromStringValue({{paramName}}Query.get(), valueQuery_instance)){ {{paramName}} = Pistache::Some(valueQuery_instance); } 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 4713296092c..34f99a6197d 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 @@ -133,8 +133,8 @@ void {{classname}}::{{nickname}}({{#allParams}}const {{{dataType}}} &{{paramName {{prefix}}HttpRequestInput input(fullPath, "{{httpMethod}}"); {{#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}}{{#isMap}} + input.add_file("{{baseName}}", {{paramName}}.local_filename, {{paramName}}.request_filename, {{paramName}}.mime_type);{{/isFile}}{{/formParams}}{{#bodyParams}}{{#isContainer}}{{#isArray}} + QJsonDocument doc(::{{cppNamespace}}::toJsonValue({{paramName}}).toArray());{{/isArray}}{{#isMap}} QJsonDocument doc(::{{cppNamespace}}::toJsonValue({{paramName}}).toObject());{{/isMap}} QByteArray bytes = doc.toJson(); input.request_body.append(bytes); @@ -168,7 +168,7 @@ void {{classname}}::{{nickname}}Callback({{prefix}}HttpRequestWorker *worker) { error_str = QString("%1, %2").arg(worker->error_str).arg(QString(worker->response)); } {{#returnType}} - {{#isListContainer}} + {{#isArray}} {{{returnType}}} output; QString json(worker->response); QByteArray array(json.toStdString().c_str()); @@ -179,8 +179,8 @@ void {{classname}}::{{nickname}}Callback({{prefix}}HttpRequestWorker *worker) { ::{{cppNamespace}}::fromJsonValue(val, obj); output.append(val); } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} {{^isMap}} {{#returnTypeIsPrimitive}} {{{returnType}}} output; @@ -204,7 +204,7 @@ void {{classname}}::{{nickname}}Callback({{prefix}}HttpRequestWorker *worker) { {{{returnType}}} output{{^isResponseFile}}(QString(worker->response)){{/isResponseFile}}{{#isResponseFile}} = worker->getHttpFileElement(){{/isResponseFile}}; {{/returnTypeIsPrimitive}} {{/isMap}} - {{/isListContainer}} + {{/isArray}} {{/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 c66c10b3da7..7eb6c0b5cb0 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 @@ -49,25 +49,25 @@ void {{classname}}::fromJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnu m_{{name}}_isValid = ::{{cppNamespace}}::fromJsonValue({{name}}, json[QString("{{baseName}}")]); m_{{name}}_isSet = !json[QString("{{baseName}}")].isNull() && m_{{name}}_isValid;{{/isContainer}}{{#isContainer}}{{^items.isContainer}} m_{{name}}_isValid = ::{{cppNamespace}}::fromJsonValue({{name}}, json[QString("{{baseName}}")]); - m_{{name}}_isSet = !json[QString("{{baseName}}")].isNull() && m_{{name}}_isValid;{{/items.isContainer}}{{#items.isContainer}}{{#isListContainer}} + m_{{name}}_isSet = !json[QString("{{baseName}}")].isNull() && m_{{name}}_isValid;{{/items.isContainer}}{{#items.isContainer}}{{#isArray}} if(json["{{baseName}}"].isArray()){ auto arr = json["{{baseName}}"].toArray(); 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.isMap}}QMap{{/items.isMap}} item; + {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isArray}}QList<{{items.items.baseType}}>{{/items.isArray}}{{#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}}{{#isMap}} + }{{/isArray}}{{#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.isMap}}QMap{{/items.isMap}} item; + {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isArray}}QList<{{items.items.baseType}}>{{/items.isArray}}{{#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; 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 1dc3cbb2d5a..60592526c39 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 @@ -48,7 +48,7 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} {{#queryParams}}{{queryParam}} {{{dataType}}} {{paramName}}; if(socket->queryString().keys().contains("{{paramName}}")){ - fromStringValue(socket->queryString().value{{#isListContainer}}s{{/isListContainer}}("{{paramName}}"), {{paramName}}); + fromStringValue(socket->queryString().value{{#isArray}}s{{/isArray}}("{{paramName}}"), {{paramName}}); } {{queryParam}}{{/queryParams}} {{#pathParams}} @@ -61,7 +61,7 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} } {{/headerParams}}{{#formParams}} {{{dataType}}} {{paramName}};{{/formParams}}{{#bodyParams}} {{#bodyParam}} - {{#isListContainer}} + {{#isArray}} QJsonDocument doc; {{{dataType}}} {{paramName}}; if(socket->readJson(doc)){ @@ -72,8 +72,8 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} {{paramName}}.append(o); } } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} {{^isMap}} {{#isPrimitiveType}}{{^isFreeFormObject}} {{{dataType}}} {{paramName}}; @@ -105,7 +105,7 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} ::{{cppNamespace}}::fromJsonValue({{paramName}}, obj); {{/isPrimitiveType}} {{/isMap}} - {{/isListContainer}} + {{/isArray}} {{/bodyParam}}{{/bodyParams}} emit {{nickname}}({{#allParams}}{{#isBodyParam}}{{/isBodyParam}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); @@ -117,10 +117,10 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} setSocketResponseHeaders();{{#returnType}}{{#isMap}} QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).toObject()); socket->writeJson(resDoc);{{/isMap}}{{^isMap}}{{^returnTypeIsPrimitive}}{{^vendorExtensions.x-returns-enum}} - QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isListContainer}}Object{{/isListContainer}}{{#isListContainer}}Array{{/isListContainer}}()); + QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isArray}}Object{{/isArray}}{{#isArray}}Array{{/isArray}}()); 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}}{{/isMap}}{{/returnType}}{{^returnType}} + socket->write({{#isArray}}QString("["+{{/isArray}}::{{cppNamespace}}::toStringValue(res){{#isArray}}+"]"){{/isArray}}.toUtf8());{{/returnTypeIsPrimitive}}{{/isMap}}{{/returnType}}{{^returnType}} socket->setStatusCode(QHttpEngine::Socket::OK); socket->writeHeaders();{{/returnType}} if(socket->isOpen()){ @@ -135,10 +135,10 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}} Q_UNUSED(error_str); // response will be used instead of error string{{#isMap}} QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).toObject()); socket->writeJson(resDoc);{{/isMap}}{{^isMap}}{{^returnTypeIsPrimitive}}{{^vendorExtensions.x-returns-enum}} - QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isListContainer}}Object{{/isListContainer}}{{#isListContainer}}Array{{/isListContainer}}()); + QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isArray}}Object{{/isArray}}{{#isArray}}Array{{/isArray}}()); 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}}{{/isMap}}{{/returnType}}{{^returnType}} + socket->write({{#isArray}}QString("["+{{/isArray}}::{{cppNamespace}}::toStringValue(res){{#isArray}}+"]"){{/isArray}}.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 c66c10b3da7..7eb6c0b5cb0 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 @@ -49,25 +49,25 @@ void {{classname}}::fromJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnu m_{{name}}_isValid = ::{{cppNamespace}}::fromJsonValue({{name}}, json[QString("{{baseName}}")]); m_{{name}}_isSet = !json[QString("{{baseName}}")].isNull() && m_{{name}}_isValid;{{/isContainer}}{{#isContainer}}{{^items.isContainer}} m_{{name}}_isValid = ::{{cppNamespace}}::fromJsonValue({{name}}, json[QString("{{baseName}}")]); - m_{{name}}_isSet = !json[QString("{{baseName}}")].isNull() && m_{{name}}_isValid;{{/items.isContainer}}{{#items.isContainer}}{{#isListContainer}} + m_{{name}}_isSet = !json[QString("{{baseName}}")].isNull() && m_{{name}}_isValid;{{/items.isContainer}}{{#items.isContainer}}{{#isArray}} if(json["{{baseName}}"].isArray()){ auto arr = json["{{baseName}}"].toArray(); 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.isMap}}QMap{{/items.isMap}} item; + {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isArray}}QList<{{items.items.baseType}}>{{/items.isArray}}{{#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}}{{#isMap}} + }{{/isArray}}{{#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.isMap}}QMap{{/items.isMap}} item; + {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isArray}}QList<{{items.items.baseType}}>{{/items.isArray}}{{#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; 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 5681becfa97..57a3c06526a 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 @@ -163,7 +163,7 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r localVarJson = ModelBase::toJson({{paramName}}{{^required}}.get(){{/required}}); {{/isPrimitiveType}} {{^isPrimitiveType}} - {{#isListContainer}} + {{#isArray}} { std::vector localVarJsonArray; for( auto& localVarItem : {{paramName}}{{^required}}.get(){{/required}} ) @@ -176,11 +176,11 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r } localVarJson = web::json::value::array(localVarJsonArray); } - {{/isListContainer}} - {{^isListContainer}}{{#required}}localVarJson = ModelBase::toJson({{paramName}}); + {{/isArray}} + {{^isArray}}{{#required}}localVarJson = ModelBase::toJson({{paramName}}); {{/required}}{{^required}}if ({{paramName}}) localVarJson = ModelBase::toJson(*{{paramName}});{{/required}} - {{/isListContainer}} + {{/isArray}} {{/isPrimitiveType}} localVarHttpBody = std::shared_ptr( new JsonBody( localVarJson ) ); @@ -194,7 +194,7 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r std::shared_ptr localVarMultipart(new MultipartFormData); {{#isPrimitiveType}} localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("{{paramName}}"), {{paramName}}{{^required}}.get(){{/required}})); - {{/isPrimitiveType}}{{^isPrimitiveType}}{{#isListContainer}} + {{/isPrimitiveType}}{{^isPrimitiveType}}{{#isArray}} { std::vector localVarJsonArray; for( auto& localVarItem : {{paramName}}{{^required}}.get(){{/required}} ) @@ -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}}{{#isMap}} + }{{/isArray}}{{#isMap}} { std::map localVarJsonMap; for( auto& localVarItem : {{paramName}}{{^required}}.get(){{/required}} ) @@ -212,13 +212,13 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r } localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("{{paramName}}"), localVarJsonMap, utility::conversions::to_string_t("application/json"))); }{{/isMap}} - {{^isListContainer}}{{^isMap}}{{#isString}}localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("{{paramName}}"), {{paramName}})); + {{^isArray}}{{^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}} - {{/isMap}}{{/isListContainer}}{{/isPrimitiveType}} + {{/isMap}}{{/isArray}}{{/isPrimitiveType}} localVarHttpBody = localVarMultipart; localVarRequestHttpContentType += utility::conversions::to_string_t("; boundary=") + localVarMultipart->getBoundary(); @@ -320,20 +320,20 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r if(localVarResponseHttpContentType == utility::conversions::to_string_t("application/json")) { web::json::value localVarJson = web::json::value::parse(localVarResponse); - {{#isListContainer}} + {{#isArray}} for( auto& localVarItem : localVarJson.as_array() ) { {{{vendorExtensions.x-codegen-response.items.datatype}}} localVarItemObj; ModelBase::fromJson(localVarItem, localVarItemObj); localVarResult.push_back(localVarItemObj); - }{{/isListContainer}}{{#isMap}} + }{{/isArray}}{{#isMap}} for( auto& localVarItem : localVarJson.as_object() ) { {{{vendorExtensions.x-codegen-response.items.datatype}}} localVarItemObj; ModelBase::fromJson(localVarItem.second, localVarItemObj); localVarResult[localVarItem.first] = localVarItemObj; - }{{/isMap}}{{^isListContainer}}{{^isMap}} - ModelBase::fromJson(localVarJson, localVarResult);{{/isMap}}{{/isListContainer}} + }{{/isMap}}{{^isArray}}{{^isMap}} + ModelBase::fromJson(localVarJson, localVarResult);{{/isMap}}{{/isArray}} }{{#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 81c822b2ad1..38f40a6f1d9 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}}{{#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)({{#returnContainer}}{{#isArray}}{{returnType}}<{{returnBaseType}}>{{/isArray}}{{#isMap}}{{returnType}}{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ) + = reinterpret_cast{{/isArray}}{{#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}}{{#isMap}}{{returnType}}{{/isMap}} out;{{/returnContainer}} + {{#returnType}}{{#returnContainer}}{{#isArray}}{{returnType}}<{{returnBaseType}}>{{/isArray}}{{#isMap}}{{returnType}}{{/isMap}} out;{{/returnContainer}} {{^returnContainer}}{{returnType}} out;{{/returnContainer}}{{/returnType}} if (code >= 200 && code < 300) { @@ -72,7 +72,7 @@ static bool {{nickname}}Processor(MemoryStruct_s p_chunk, long code, char* error {{/returnType}} {{#returnContainer}} - {{#isListContainer}} + {{#isArray}} pJson = json_from_string(data, NULL); JsonArray * jsonarray = json_node_get_array (pJson); guint length = json_array_get_length (jsonarray); @@ -87,7 +87,7 @@ static bool {{nickname}}Processor(MemoryStruct_s p_chunk, long code, char* error } json_array_unref (jsonarray); json_node_free(pJson); - {{/isListContainer}} + {{/isArray}} {{/returnContainer}} {{^returnContainer}} @@ -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}}{{#isMap}}{{returnType}}{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}} + {{#returnType}}void(* handler)({{#returnContainer}}{{#isArray}}{{returnType}}<{{returnBaseType}}>{{/isArray}}{{#isMap}}{{returnType}}{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}} {{^returnType}}void(* handler)(Error, void* ) {{/returnType}}, void* userData, bool isAsync) { @@ -208,7 +208,7 @@ static bool {{nickname}}Helper(char * accessToken, {{#isBodyParam}} {{#isContainer}} //TODO: Map Container - {{#isListContainer}} + {{#isArray}} if (isprimitive("{{baseType}}")) { node = converttoJson(&{{paramName}}, "{{baseType}}", "array"); } {{^isFloat}}{{^isInteger}}{{^isDate}}{{^isLong}}{{^isString}}{{^isDateTime}}{{^isDouble}}{{^isBoolean}}else { @@ -226,7 +226,7 @@ static bool {{nickname}}Helper(char * accessToken, json_array_unref(json_array); } {{/isBoolean}}{{/isDouble}}{{/isDateTime}}{{/isString}}{{/isLong}}{{/isDate}}{{/isInteger}}{{/isFloat}} - {{/isListContainer}} + {{/isArray}} @@ -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}}{{#isMap}}{{returnType}}{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}} + {{#returnType}}void(* handler)({{#returnContainer}}{{#isArray}}{{returnType}}<{{returnBaseType}}>{{/isArray}}{{#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}}{{#isMap}}{{returnType}}{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}} + {{#returnType}}void(* handler)({{#returnContainer}}{{#isArray}}{{returnType}}<{{returnBaseType}}>{{/isArray}}{{#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 79a7ed407ac..f89c8767004 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}}{{#isMap}}{{returnType}}{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}} + {{#returnType}}void(* handler)({{#returnContainer}}{{#isArray}}{{returnType}}<{{returnBaseType}}>{{/isArray}}{{#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}}{{#isMap}}{{returnType}}{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}} + {{#returnType}}void(* handler)({{#returnContainer}}{{#isArray}}{{returnType}}<{{returnBaseType}}>{{/isArray}}{{#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 cf6b0a97886..8b9fce9e70d 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 @@ -53,7 +53,7 @@ void const gchar *{{name}}Key = "{{baseName}}"; node = json_object_get_member(pJsonObject, {{name}}Key); if (node !=NULL) { - {{#isContainer}}{{#isListContainer}} + {{#isContainer}}{{#isArray}} { JsonArray* arr = json_node_get_array(node); JsonNode* temp_json; @@ -72,7 +72,7 @@ void } {{name}} = new_list; } - {{/isListContainer}}{{#isMap}} + {{/isArray}}{{#isMap}} { JsonObject* json_obj = json_node_get_object(node); map new_map; @@ -107,7 +107,7 @@ char* JsonNode *node; {{#vars}} {{#isContainer}} - {{#isListContainer}} + {{#isArray}} if (isprimitive("{{#items}}{{dataType}}{{/items}}")) { list<{{#items}}{{dataType}}{{/items}}> new_list = static_cast > ({{getter}}()); node = converttoJson(&new_list, "{{#items}}{{dataType}}{{/items}}", "{{containerType}}"); @@ -128,7 +128,7 @@ char* json_array_unref(json_array); {{/isFloat}}{{/isDouble}}{{/isDateTime}}{{/isString}}{{/isBoolean}}{{/isLong}}{{/isDate}}{{/isInteger}}{{/items}} } - {{/isListContainer}} + {{/isArray}} {{#isMap}}{ diff --git a/modules/openapi-generator/src/main/resources/csharp-nancyfx/api.mustache b/modules/openapi-generator/src/main/resources/csharp-nancyfx/api.mustache index 21ee6fd90e8..1c39da3e286 100644 --- a/modules/openapi-generator/src/main/resources/csharp-nancyfx/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-nancyfx/api.mustache @@ -31,7 +31,7 @@ namespace {{packageName}}.{{packageContext}}.Modules {{/hasMore}}{{/isBodyParam}}{{/allParams}}{{#allParams}}{{#required}} Preconditions.IsNotNull({{paramName}}, "Required parameter: '{{paramName}}' is missing at '{{operationId}}'"); {{/required}}{{/allParams}} - {{#returnType}}return {{/returnType}}{{#asyncServer}}await {{/asyncServer}}service.{{operationId}}(Context{{#allParams.0}}, {{/allParams.0}}{{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#returnType}}{{#isListContainer}}.ToArray(){{/isListContainer}}{{/returnType}};{{^returnType}} + {{#returnType}}return {{/returnType}}{{#asyncServer}}await {{/asyncServer}}service.{{operationId}}(Context{{#allParams.0}}, {{/allParams.0}}{{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#returnType}}{{#isArray}}.ToArray(){{/isArray}}{{/returnType}};{{^returnType}} return new Response { ContentType = "{{produces.0.mediaType}}"};{{/returnType}} }; {{/operation}} 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 668b86a2a2e..6849674ff52 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}}{{^isMap}}override {{/isMap}}{{/isArrayModel}}{{/parent}}{{^parent}}virtual {{/parent}}string ToJson() + public {{#parent}}{{^isArray}}{{^isMap}}override {{/isMap}}{{/isArray}}{{/parent}}{{^parent}}virtual {{/parent}}string ToJson() { return JsonConvert.SerializeObject(this, Formatting.Indented); } @@ -272,11 +272,11 @@ { {{/discriminator}} {{#parent}} - {{^isArrayModel}} + {{^isArray}} {{^isMap}} foreach(var x in BaseValidate(validationContext)) yield return x; {{/isMap}} - {{/isArrayModel}} + {{/isArray}} {{/parent}} {{#vars}} {{#hasValidation}} diff --git a/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache index bb6f8991b09..a8b3e221baf 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}}{{^isMap}}override {{/isMap}}{{/isArrayModel}}{{/parent}}{{^parent}}virtual {{/parent}}string ToJson() + public {{#parent}}{{^isArray}}{{^isMap}}override {{/isMap}}{{/isArray}}{{/parent}}{{^parent}}virtual {{/parent}}string ToJson() { return JsonConvert.SerializeObject(this, Formatting.Indented); } @@ -251,11 +251,11 @@ this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}; { {{/hasChildren}} {{#parent}} - {{^isArrayModel}} + {{^isArray}} {{^isMap}} foreach(var x in base.BaseValidate(validationContext)) yield return x; {{/isMap}} - {{/isArrayModel}} + {{/isArray}} {{/parent}} {{#vars}} {{#hasValidation}} diff --git a/modules/openapi-generator/src/main/resources/dart-dio/README.mustache b/modules/openapi-generator/src/main/resources/dart-dio/README.mustache index b304aca4228..fc8613136c5 100644 --- a/modules/openapi-generator/src/main/resources/dart-dio/README.mustache +++ b/modules/openapi-generator/src/main/resources/dart-dio/README.mustache @@ -53,7 +53,7 @@ import 'package:{{pubName}}/api.dart'; var api_instance = new {{classname}}(); {{#allParams}} -var {{paramName}} = {{#isListContainer}}[{{/isListContainer}}{{#isBodyParam}}new {{dataType}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}]{{/isListContainer}}; // {{{dataType}}} | {{{description}}} +var {{paramName}} = {{#isArray}}[{{/isArray}}{{#isBodyParam}}new {{dataType}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isArray}}]{{/isArray}}; // {{{dataType}}} | {{{description}}} {{/allParams}} try { diff --git a/modules/openapi-generator/src/main/resources/dart-dio/api.mustache b/modules/openapi-generator/src/main/resources/dart-dio/api.mustache index 5431834c9c1..30e66dde4e3 100644 --- a/modules/openapi-generator/src/main/resources/dart-dio/api.mustache +++ b/modules/openapi-generator/src/main/resources/dart-dio/api.mustache @@ -63,13 +63,13 @@ class {{classname}} { {{/hasFormParams}} {{#bodyParam}} - {{#isListContainer}} + {{#isArray}} final type = const FullType(BuiltList, const [const FullType({{baseType}})]); var serializedBody = _serializers.serialize(BuiltList<{{baseType}}>.from({{paramName}}), specifiedType: type); - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} var serializedBody = _serializers.serialize({{paramName}}); - {{/isListContainer}} + {{/isArray}} var json{{paramName}} = json.encode(serializedBody); bodyData = json{{paramName}}; {{/bodyParam}} @@ -98,15 +98,15 @@ class {{classname}} { var data = response.data; {{/isResponseFile}} {{^isResponseFile}} - {{#isListContainer}} + {{#isArray}} final FullType type = const FullType(BuiltList, const [const FullType({{returnBaseType}})]); BuiltList<{{returnBaseType}}> dataList = _serializers.deserialize(response.data is String ? jsonDecode(response.data) : response.data, specifiedType: type); var data = dataList.toList(); - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} var serializer = _serializers.serializerForType({{{returnType}}}); var data = _serializers.deserializeWith<{{{returnType}}}>(serializer, response.data is String ? jsonDecode(response.data) : response.data); - {{/isListContainer}} + {{/isArray}} {{/isResponseFile}} return Response<{{{returnType}}}>( diff --git a/modules/openapi-generator/src/main/resources/dart-dio/api_doc.mustache b/modules/openapi-generator/src/main/resources/dart-dio/api_doc.mustache index 773ee0d562e..7c880d730d1 100644 --- a/modules/openapi-generator/src/main/resources/dart-dio/api_doc.mustache +++ b/modules/openapi-generator/src/main/resources/dart-dio/api_doc.mustache @@ -47,7 +47,7 @@ import 'package:{{pubName}}/api.dart'; var api_instance = new {{classname}}(); {{#allParams}} -var {{paramName}} = {{#isListContainer}}[{{/isListContainer}}{{#isBodyParam}}new {{dataType}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}]{{/isListContainer}}; // {{{dataType}}} | {{{description}}} +var {{paramName}} = {{#isArray}}[{{/isArray}}{{#isBodyParam}}new {{dataType}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isArray}}]{{/isArray}}; // {{{dataType}}} | {{{description}}} {{/allParams}} try { diff --git a/modules/openapi-generator/src/main/resources/dart-jaguar/README.mustache b/modules/openapi-generator/src/main/resources/dart-jaguar/README.mustache index 10a11d931e5..1b6124a9e2f 100644 --- a/modules/openapi-generator/src/main/resources/dart-jaguar/README.mustache +++ b/modules/openapi-generator/src/main/resources/dart-jaguar/README.mustache @@ -85,7 +85,7 @@ import 'package:{{pubName}}/api.dart'; final jaguarApiGen = {{clientName}}(); var api_instance = jaguarApiGen.get{{classname}}(); {{#allParams}} -var {{paramName}} = {{#isListContainer}}[{{/isListContainer}}{{#isBodyParam}}new {{dataType}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}]{{/isListContainer}}; // {{{dataType}}} | {{{description}}} +var {{paramName}} = {{#isArray}}[{{/isArray}}{{#isBodyParam}}new {{dataType}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isArray}}]{{/isArray}}; // {{{dataType}}} | {{{description}}} {{/allParams}} try { diff --git a/modules/openapi-generator/src/main/resources/dart-jaguar/api_doc.mustache b/modules/openapi-generator/src/main/resources/dart-jaguar/api_doc.mustache index e723114f18c..97d56414e76 100644 --- a/modules/openapi-generator/src/main/resources/dart-jaguar/api_doc.mustache +++ b/modules/openapi-generator/src/main/resources/dart-jaguar/api_doc.mustache @@ -47,7 +47,7 @@ import 'package:{{pubName}}/api.dart'; var api_instance = new {{classname}}(); {{#allParams}} -var {{paramName}} = {{#isListContainer}}[{{/isListContainer}}{{#isBodyParam}}new {{dataType}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}]{{/isListContainer}}; // {{{dataType}}} | {{{description}}} +var {{paramName}} = {{#isArray}}[{{/isArray}}{{#isBodyParam}}new {{dataType}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isArray}}]{{/isArray}}; // {{{dataType}}} | {{{description}}} {{/allParams}} try { diff --git a/modules/openapi-generator/src/main/resources/dart/README.mustache b/modules/openapi-generator/src/main/resources/dart/README.mustache index c2052443896..99d5f8b98b7 100644 --- a/modules/openapi-generator/src/main/resources/dart/README.mustache +++ b/modules/openapi-generator/src/main/resources/dart/README.mustache @@ -76,7 +76,7 @@ import 'package:{{pubName}}/api.dart'; var api_instance = new {{classname}}(); {{#allParams}} -var {{paramName}} = {{#isListContainer}}[{{/isListContainer}}{{#isBodyParam}}new {{dataType}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}]{{/isListContainer}}; // {{{dataType}}} | {{{description}}} +var {{paramName}} = {{#isArray}}[{{/isArray}}{{#isBodyParam}}new {{dataType}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isArray}}]{{/isArray}}; // {{{dataType}}} | {{{description}}} {{/allParams}} try { diff --git a/modules/openapi-generator/src/main/resources/dart/api.mustache b/modules/openapi-generator/src/main/resources/dart/api.mustache index 184f90515e0..029d1097cf7 100644 --- a/modules/openapi-generator/src/main/resources/dart/api.mustache +++ b/modules/openapi-generator/src/main/resources/dart/api.mustache @@ -91,12 +91,12 @@ class {{classname}} { if(response.statusCode >= 400) { throw new ApiException(response.statusCode, _decodeBodyBytes(response)); } else if(response.body != null) { - {{#isListContainer}} + {{#isArray}} {{#returnType}} return (apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}') as List).map((item) => item as {{returnBaseType}}).toList(); {{/returnType}} - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} {{#isMap}} {{#returnType}} return new {{{returnType}}}.from(apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}')); @@ -107,7 +107,7 @@ class {{classname}} { return apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}') as {{{returnType}}}; {{/returnType}} {{/isMap}} - {{/isListContainer}} + {{/isArray}} } else { return{{#returnType}} null{{/returnType}}; } diff --git a/modules/openapi-generator/src/main/resources/dart/api_doc.mustache b/modules/openapi-generator/src/main/resources/dart/api_doc.mustache index c7c10a817a1..24da281a69c 100644 --- a/modules/openapi-generator/src/main/resources/dart/api_doc.mustache +++ b/modules/openapi-generator/src/main/resources/dart/api_doc.mustache @@ -47,7 +47,7 @@ import 'package:{{pubName}}/api.dart'; var api_instance = new {{classname}}(); {{#allParams}} -var {{paramName}} = {{#isListContainer}}[{{/isListContainer}}{{#isBodyParam}}new {{dataType}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}]{{/isListContainer}}; // {{{dataType}}} | {{{description}}} +var {{paramName}} = {{#isArray}}[{{/isArray}}{{#isBodyParam}}new {{dataType}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isArray}}]{{/isArray}}; // {{{dataType}}} | {{{description}}} {{/allParams}} try { diff --git a/modules/openapi-generator/src/main/resources/dart/class.mustache b/modules/openapi-generator/src/main/resources/dart/class.mustache index 132e3686c67..e2a99a92a5c 100644 --- a/modules/openapi-generator/src/main/resources/dart/class.mustache +++ b/modules/openapi-generator/src/main/resources/dart/class.mustache @@ -28,25 +28,25 @@ class {{classname}} { {{^isDateTime}} {{^isDate}} {{#complexType}} - {{#isListContainer}} + {{#isArray}} {{name}} = {{complexType}}.listFromJson(json['{{baseName}}']); - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} {{#isMap}} {{name}} = {{complexType}}.mapFromJson(json['{{baseName}}']); {{/isMap}} {{^isMap}} {{name}} = new {{complexType}}.fromJson(json['{{baseName}}']); {{/isMap}} - {{/isListContainer}} + {{/isArray}} {{/complexType}} {{^complexType}} - {{#isListContainer}} + {{#isArray}} {{name}} = (json['{{baseName}}'] as List).map((item) => item as {{items.datatype}}).toList(); - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} {{name}} = json['{{baseName}}']; - {{/isListContainer}} + {{/isArray}} {{/complexType}} {{/isDate}} {{/isDateTime}} @@ -66,12 +66,12 @@ class {{classname}} { {{^isDateTime}} {{^isDate}} {{#complexType}} - {{#isListContainer}} + {{#isArray}} '{{baseName}}': {{name}} == null ? null : {{name}}.map((item) => item.toJson()).toList(){{^-last}},{{/-last}} - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} '{{baseName}}': {{name}} == null ? null : {{name}}.toJson(){{^-last}},{{/-last}} - {{/isListContainer}} + {{/isArray}} {{/complexType}} {{^complexType}} '{{baseName}}': {{name}}{{^-last}},{{/-last}} diff --git a/modules/openapi-generator/src/main/resources/dart2/README.mustache b/modules/openapi-generator/src/main/resources/dart2/README.mustache index 161d22c66a7..ab0a7c38495 100644 --- a/modules/openapi-generator/src/main/resources/dart2/README.mustache +++ b/modules/openapi-generator/src/main/resources/dart2/README.mustache @@ -82,7 +82,7 @@ import 'package:{{{pubName}}}/api.dart'; final api_instance = {{{classname}}}(); {{#allParams}} -final {{{paramName}}} = {{#isListContainer}}[{{/isListContainer}}{{#isBodyParam}}{{{dataType}}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}]{{/isListContainer}}; // {{{dataType}}} | {{{description}}} +final {{{paramName}}} = {{#isArray}}[{{/isArray}}{{#isBodyParam}}{{{dataType}}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isArray}}]{{/isArray}}; // {{{dataType}}} | {{{description}}} {{/allParams}} try { diff --git a/modules/openapi-generator/src/main/resources/dart2/api.mustache b/modules/openapi-generator/src/main/resources/dart2/api.mustache index a7811afeb51..69be787287e 100644 --- a/modules/openapi-generator/src/main/resources/dart2/api.mustache +++ b/modules/openapi-generator/src/main/resources/dart2/api.mustache @@ -173,19 +173,19 @@ class {{{classname}}} { // At the time of writing this, `dart:convert` will throw an "Unexpected end of input" // FormatException when trying to decode an empty string. if (response.body != null && response.statusCode != HttpStatus.noContent) { - {{#isListContainer}} + {{#isArray}} return (apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}') as List) .map((item) => item as {{{returnBaseType}}}) .toList(growable: false); - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} {{#isMap}} return {{{returnType}}}.from(apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}')); {{/isMap}} {{^isMap}} return apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}') as {{{returnType}}}; {{/isMap}} - {{/isListContainer}} + {{/isArray}} } return null; {{/returnType}} diff --git a/modules/openapi-generator/src/main/resources/dart2/api_doc.mustache b/modules/openapi-generator/src/main/resources/dart2/api_doc.mustache index 32f034829cc..eede628be9a 100644 --- a/modules/openapi-generator/src/main/resources/dart2/api_doc.mustache +++ b/modules/openapi-generator/src/main/resources/dart2/api_doc.mustache @@ -57,7 +57,7 @@ import 'package:{{{pubName}}}/api.dart'; final api_instance = {{{classname}}}(); {{#allParams}} -final {{{paramName}}} = {{#isListContainer}}[{{/isListContainer}}{{#isBodyParam}}{{{dataType}}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}]{{/isListContainer}}; // {{{dataType}}} | {{{description}}} +final {{{paramName}}} = {{#isArray}}[{{/isArray}}{{#isBodyParam}}{{{dataType}}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isArray}}]{{/isArray}}; // {{{dataType}}} | {{{description}}} {{/allParams}} try { diff --git a/modules/openapi-generator/src/main/resources/dart2/class.mustache b/modules/openapi-generator/src/main/resources/dart2/class.mustache index 5e0d5e98b7d..cfd45cf3a2e 100644 --- a/modules/openapi-generator/src/main/resources/dart2/class.mustache +++ b/modules/openapi-generator/src/main/resources/dart2/class.mustache @@ -38,8 +38,8 @@ class {{{classname}}} { {{^isDateTime}} {{^isDate}} {{#complexType}} - {{#isListContainer}} - {{#items.isListContainer}} + {{#isArray}} + {{#items.isArray}} {{{name}}} = json['{{{baseName}}}'] == null ? null : (json['{{{baseName}}}'] as List).map( @@ -50,14 +50,14 @@ class {{{classname}}} { (e) => e == null ? null : (e as List).cast<{{items.items.dataType}}>() {{/items.complexType}} ).toList(growable: false); - {{/items.isListContainer}} - {{^items.isListContainer}} + {{/items.isArray}} + {{^items.isArray}} {{{name}}} = {{{complexType}}}.listFromJson(json['{{{baseName}}}']); - {{/items.isListContainer}} - {{/isListContainer}} - {{^isListContainer}} + {{/items.isArray}} + {{/isArray}} + {{^isArray}} {{#isMap}} - {{#items.isListContainer}} + {{#items.isArray}} {{{name}}} = json['{{{baseName}}}'] == null ? null {{#items.complexType}} @@ -66,20 +66,20 @@ class {{{classname}}} { {{^items.complexType}} : (json['{{{baseName}}}'] as Map).cast(); {{/items.complexType}} - {{/items.isListContainer}} - {{^items.isListContainer}} + {{/items.isArray}} + {{^items.isArray}} {{{name}}} = json['{{{baseName}}}'] == null ? null : {{{complexType}}}.mapFromJson(json['{{{baseName}}}']); - {{/items.isListContainer}} + {{/items.isArray}} {{/isMap}} {{^isMap}} {{{name}}} = {{{complexType}}}.fromJson(json['{{{baseName}}}']); {{/isMap}} - {{/isListContainer}} + {{/isArray}} {{/complexType}} {{^complexType}} - {{#isListContainer}} + {{#isArray}} {{#isEnum}} {{{name}}} = {{{classname}}}{{{items.datatypeWithEnum}}}.listFromJson(json['{{{baseName}}}']); {{/isEnum}} @@ -88,8 +88,8 @@ class {{{classname}}} { ? null : (json['{{{baseName}}}'] as List).cast<{{{items.datatype}}}>(); {{/isEnum}} - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} {{#isMap}} {{{name}}} = json['{{{baseName}}}'] == null ? null : @@ -110,7 +110,7 @@ class {{{classname}}} { {{/isEnum}} {{/isNumber}} {{/isMap}} - {{/isListContainer}} + {{/isArray}} {{/complexType}} {{/isDate}} {{/isDateTime}} @@ -125,9 +125,9 @@ class {{{classname}}} { {{/isEnum}} {{#isEnum}} {{#isContainer}} - {{#isListContainer}} + {{#isArray}} List<{{{classname}}}{{{enumName}}}> {{{name}}}; - {{/isListContainer}} + {{/isArray}} {{#isMap}} Map {{{name}}}; {{/isMap}} diff --git a/modules/openapi-generator/src/main/resources/elixir/api.mustache b/modules/openapi-generator/src/main/resources/elixir/api.mustache index fa783b57c11..1b2bacf7310 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}}{{#isMap}}%{}{{/isMap}}{{^returnType}}%{}{{/returnType}}{{#returnSimpleType}}%{{#returnType}}{{#isMap}}{{/isMap}}{{{moduleName}}}.Model.{{{returnType}}}{{/returnType}}{}{{/returnSimpleType}}} on success + {:ok, {{#isArray}}[%{{returnBaseType}}{}, ...]{{/isArray}}{{#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 c9a95580f49..7d059b5c42c 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}}{{#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}}|> deserialize(:"{{baseName}}", {{#isArray}}:list, {{moduleName}}.Model.{{items.datatype}}{{/isArray}}{{#isMap}}:map, {{moduleName}}.Model.{{items.datatype}}{{/isMap}}{{#isDate}}:date, nil{{/isDate}}{{#isDateTime}}:date, nil{{/isDateTime}}{{^isDate}}{{^isDateTime}}{{^isMap}}{{^isArray}}:struct, {{moduleName}}.Model.{{dataType}}{{/isArray}}{{/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 895d621e85a..0f4035a8188 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}}{{#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}}{{^required}}Maybe {{/required}}{{#isArray}}List {{/isArray}}{{#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}}{{#isArray}}(List {{/isArray}}{{^primitiveType}}{{^isUuid}}Api.Data.{{/isUuid}}{{/primitiveType}}{{#items}}{{#isModel}}Api.Data.{{/isModel}}{{/items}}{{dataType}}{{#isArray}}){{/isArray}}{{#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/paramToString.mustache b/modules/openapi-generator/src/main/resources/elm/paramToString.mustache index eb8fe145ef4..c887cc0c1ec 100644 --- a/modules/openapi-generator/src/main/resources/elm/paramToString.mustache +++ b/modules/openapi-generator/src/main/resources/elm/paramToString.mustache @@ -1 +1 @@ -{{#isListContainer}}String.join "," << List.map {{#items}}{{>paramToString}}{{/items}}{{/isListContainer}}{{^isListContainer}}{{^isEnum}}{{#isString}}identity{{/isString}}{{#isBinary}}identity{{/isBinary}}{{#isByteArray}}identity{{/isByteArray}}{{/isEnum}}{{#isBoolean}}(\val -> if val then "true" else "false"){{/isBoolean}}{{#isDateTime}}Api.Time.dateTimeToString{{/isDateTime}}{{#isDate}}Api.Time.dateToString{{/isDate}}{{#isInteger}}String.fromInt{{/isInteger}}{{#isLong}}String.fromInt{{/isLong}}{{#isNumber}}String.fromFloat{{/isNumber}}{{#isFloat}}String.fromFloat{{/isFloat}}{{#isDouble}}String.fromFloat{{/isDouble}}{{#isEnum}}stringFrom{{^paramName}}Api.Data.{{classname}}{{/paramName}}{{enumName}}{{/isEnum}}{{#isUuid}}Uuid.toString{{/isUuid}}{{/isListContainer}} \ No newline at end of file +{{#isArray}}String.join "," << List.map {{#items}}{{>paramToString}}{{/items}}{{/isArray}}{{^isArray}}{{^isEnum}}{{#isString}}identity{{/isString}}{{#isBinary}}identity{{/isBinary}}{{#isByteArray}}identity{{/isByteArray}}{{/isEnum}}{{#isBoolean}}(\val -> if val then "true" else "false"){{/isBoolean}}{{#isDateTime}}Api.Time.dateTimeToString{{/isDateTime}}{{#isDate}}Api.Time.dateToString{{/isDate}}{{#isInteger}}String.fromInt{{/isInteger}}{{#isLong}}String.fromInt{{/isLong}}{{#isNumber}}String.fromFloat{{/isNumber}}{{#isFloat}}String.fromFloat{{/isFloat}}{{#isDouble}}String.fromFloat{{/isDouble}}{{#isEnum}}stringFrom{{^paramName}}Api.Data.{{classname}}{{/paramName}}{{enumName}}{{/isEnum}}{{#isUuid}}Uuid.toString{{/isUuid}}{{/isArray}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/elm/recordField.mustache b/modules/openapi-generator/src/main/resources/elm/recordField.mustache index 064618e7231..692081a031d 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}}{{#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 +{{#isNullable}}Maybe {{#isContainer}}({{/isContainer}}{{/isNullable}}{{^isNullable}}{{^required}}Maybe {{#isContainer}}({{/isContainer}}{{/required}}{{/isNullable}}{{#isArray}}List {{/isArray}}{{#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 afd0b00ccd3..d182a19974e 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}}{{#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 +{{#isArray}}(Json.Decode.list {{/isArray}}{{#isMap}}(Json.Decode.dict {{/isMap}}{{#items}}{{>recordFieldValueDecoder}}{{/items}}{{^isContainer}}{{#isCircularReference}}(Json.Decode.lazy (\_ -> {{/isCircularReference}}{{>fieldDecoder}}{{#isCircularReference}})){{/isCircularReference}}{{/isContainer}}{{#isArray}}){{/isArray}}{{#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 98cb15e99c8..372e8790ed0 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}}{{#isMap}}Json.Encode.dict identity{{/isMap}} {{#items}}{{>recordFieldValueEncoder}}{{/items}}{{/isContainer}}{{^isContainer}}{{>fieldEncoder}}{{/isContainer}}{{#isContainer}}){{/isContainer}} \ No newline at end of file +{{#isContainer}}({{#isArray}}Json.Encode.list{{/isArray}}{{#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/erlang-proper/model.mustache b/modules/openapi-generator/src/main/resources/erlang-proper/model.mustache index 9ec89287ba8..6aecad001cf 100644 --- a/modules/openapi-generator/src/main/resources/erlang-proper/model.mustache +++ b/modules/openapi-generator/src/main/resources/erlang-proper/model.mustache @@ -5,27 +5,27 @@ -include("{{packageName}}.hrl"). -export([{{classname}}/0]). -{{^isEnum}}{{^isArrayModel}} +{{^isEnum}}{{^isArray}} -export([{{classname}}/1]). -{{/isArrayModel}}{{/isEnum}} +{{/isArray}}{{/isEnum}} -export_type([{{classname}}/0]). -type {{classname}}() ::{{#isEnum}} - binary().{{/isEnum}}{{^isEnum}}{{#isArrayModel}} - list({{arrayModelType}}).{{/isArrayModel}}{{^isArrayModel}} + binary().{{/isEnum}}{{^isEnum}}{{#isArray}} + list({{arrayModelType}}).{{/isArray}}{{^isArray}} [ {{#vars}}{{^-first}} | {{/-first}}{'{{name}}', {{dataType}} }{{/vars}} - ].{{/isArrayModel}}{{/isEnum}} + ].{{/isArray}}{{/isEnum}} {{#isEnum}} {{classname}}() -> elements([{{#allowableValues.values}}{{^-first}}, {{/-first}}<<"{{.}}">>{{/allowableValues.values}}]). {{/isEnum}} -{{#isArrayModel}} +{{#isArray}} {{classname}}() -> list({{arrayModelType}}{{#minItems}}, {{minItems}}{{#maxItems}}, {{maxItems}}{{/maxItems}}{{/minItems}}). -{{/isArrayModel}} -{{^isEnum}}{{^isArrayModel}} +{{/isArray}} +{{^isEnum}}{{^isArray}} {{classname}}() -> {{classname}}([]). @@ -34,6 +34,6 @@ , {{/-first}}{'{{baseName}}', {{#isString}}{{#isEnum}}elements([{{#allowableValues.values}}{{^-first}}, {{/-first}}<<"{{.}}">>{{/allowableValues.values}}]){{/isEnum}}{{^isEnum}}binary({{#minLength}}{{minLength}}{{#maxLength}}, {{maxLength}}{{/maxLength}}{{/minLength}}){{/isEnum}}{{/isString}}{{^isString}}{{baseType}}{{/isString}} }{{/vars}} ], lists:ukeymerge(1, lists:sort(Fields), lists:sort(Default)). -{{/isArrayModel}}{{/isEnum}} +{{/isArray}}{{/isEnum}} {{/model}} {{/models}} diff --git a/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache b/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache index 215b99a3038..7b8a0913030 100644 --- a/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache +++ b/modules/openapi-generator/src/main/resources/go-server/controller-api.mustache @@ -65,7 +65,7 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re return } {{/isInteger}}{{^isLong}}{{^isInteger}} - {{paramName}} := {{#isListContainer}}strings.Split({{/isListContainer}}query.Get("{{paramName}}"){{#isListContainer}}, ","){{/isListContainer}}{{/isInteger}}{{/isLong}}{{/isQueryParam}}{{#isFormParam}}{{#isFile}} + {{paramName}} := {{#isArray}}strings.Split({{/isArray}}query.Get("{{paramName}}"){{#isArray}}, ","){{/isArray}}{{/isInteger}}{{/isLong}}{{/isQueryParam}}{{#isFormParam}}{{#isFile}} {{paramName}}, err := ReadFormFileToTempFile(r, "{{paramName}}") if err != nil { w.WriteHeader(500) 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 a7187cfd603..54878e70147 100644 --- a/modules/openapi-generator/src/main/resources/go/model_simple.mustache +++ b/modules/openapi-generator/src/main/resources/go/model_simple.mustache @@ -2,13 +2,13 @@ type {{classname}} struct { {{#parent}} {{^isMap}} -{{^isArrayModel}} +{{^isArray}} {{{parent}}} -{{/isArrayModel}} +{{/isArray}} {{/isMap}} -{{#isArrayModel}} +{{#isArray}} Items {{{parent}}} -{{/isArrayModel}} +{{/isArray}} {{/parent}} {{#vars}} {{^-first}} @@ -223,10 +223,10 @@ func (o *{{classname}}) Unset{{name}}() { {{/required}} {{/vars}} func (o {{classname}}) MarshalJSON() ([]byte, error) { - toSerialize := {{#isArrayModel}}make([]interface{}, len(o.Items)){{/isArrayModel}}{{^isArrayModel}}map[string]interface{}{}{{/isArrayModel}} + toSerialize := {{#isArray}}make([]interface{}, len(o.Items)){{/isArray}}{{^isArray}}map[string]interface{}{}{{/isArray}} {{#parent}} {{^isMap}} - {{^isArrayModel}} + {{^isArray}} serialized{{parent}}, err{{parent}} := json.Marshal(o.{{parent}}) if err{{parent}} != nil { return []byte{}, err{{parent}} @@ -235,13 +235,13 @@ func (o {{classname}}) MarshalJSON() ([]byte, error) { if err{{parent}} != nil { return []byte{}, err{{parent}} } - {{/isArrayModel}} + {{/isArray}} {{/isMap}} - {{#isArrayModel}} + {{#isArray}} for i, item := range o.Items { toSerialize[i] = item } - {{/isArrayModel}} + {{/isArray}} {{/parent}} {{#vars}} {{! if argument is nullable, only serialize it if it is set}} @@ -382,10 +382,10 @@ func (o *{{{classname}}}) UnmarshalJSON(bytes []byte) (err error) { } {{/isAdditionalPropertiesTrue}} -{{#isArrayModel}} +{{#isArray}} func (o *{{{classname}}}) UnmarshalJSON(bytes []byte) (err error) { return json.Unmarshal(bytes, &o.Items) } -{{/isArrayModel}} +{{/isArray}} {{>nullable_model}} diff --git a/modules/openapi-generator/src/main/resources/graphql-nodejs-express-server/api.mustache b/modules/openapi-generator/src/main/resources/graphql-nodejs-express-server/api.mustache index 9e22616af92..fa99252dcc9 100644 --- a/modules/openapi-generator/src/main/resources/graphql-nodejs-express-server/api.mustache +++ b/modules/openapi-generator/src/main/resources/graphql-nodejs-express-server/api.mustache @@ -10,7 +10,7 @@ input {{operationId}}Input { {{#allParams}} {{#description}}# {{description}}{{/description}} - {{paramName}}: {{#isContainer}}[{{/isContainer}}{{dataType}}{{#isListContainer}}Input{{/isListContainer}}{{#isModel}}Input{{/isModel}}{{#isContainer}}]{{/isContainer}}{{#hasMore}}, {{/hasMore}} + {{paramName}}: {{#isContainer}}[{{/isContainer}}{{dataType}}{{#isArray}}Input{{/isArray}}{{#isModel}}Input{{/isModel}}{{#isContainer}}]{{/isContainer}}{{#hasMore}}, {{/hasMore}} {{/allParams}} }{{/hasParams}}{{/vendorExtensions.x-is-mutation}}{{/operation}} 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 72f708073f4..7ec86ee4ea0 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}}{{#isMap}}Nothing{{/isMap}}{{^isContainer}}Nothing{{/isContainer}}{{/required}}{{#hasMore}} + { {{#vars}}{{#required}}{{name}}{{/required}}{{^required}}{{name}} = {{#isArray}}Nothing{{/isArray}}{{#isMap}}Nothing{{/isMap}}{{^isContainer}}Nothing{{/isContainer}}{{/required}}{{#hasMore}} , {{/hasMore}}{{/vars}} } {{/generateModelConstructors}}{{/isAlias}}{{/isEnum}}{{/model}}{{/models}} diff --git a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_perl.mustache b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_perl.mustache index 81c4f425004..82a2574b1f1 100644 --- a/modules/openapi-generator/src/main/resources/htmlDocs2/sample_perl.mustache +++ b/modules/openapi-generator/src/main/resources/htmlDocs2/sample_perl.mustache @@ -20,7 +20,7 @@ ${{{perlModuleName}}}::Configuration::access_token = 'YOUR_ACCESS_TOKEN';{{/isOA # Create an instance of the API class my $api_instance = {{perlModuleName}}::{{classname}}->new(); -{{#allParams}}my ${{paramName}} = {{#isListContainer}}[{{/isListContainer}}{{#isBodyParam}}{{{perlModuleName}}}::Object::{{dataType}}->new(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}]{{/isListContainer}}; # {{{dataType}}} | {{{unescapedDescription}}} +{{#allParams}}my ${{paramName}} = {{#isArray}}[{{/isArray}}{{#isBodyParam}}{{{perlModuleName}}}::Object::{{dataType}}->new(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isArray}}]{{/isArray}}; # {{{dataType}}} | {{{unescapedDescription}}} {{/allParams}} eval { 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 5bf2578e840..12365da6007 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 @@ -35,7 +35,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali this.{{name}} = {{name}}; return this; } - {{#isListContainer}} + {{#isArray}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{^required}} @@ -46,7 +46,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali this.{{name}}.add({{name}}Item); return this; } - {{/isListContainer}} + {{/isArray}} {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { 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 1e8ec04d95e..433b7334785 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}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isArray}}{{{returnContainer}}}<{{{returnType}}}>{{/isArray}}{{/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 cb97c7a021b..442c40f781d 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}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isArray}}{{{returnContainer}}}{{/isArray}}{{/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 c5a7f68191d..792e9d8f891 100644 --- a/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache @@ -41,7 +41,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali this.{{name}} = {{name}}; return this; } - {{#isListContainer}} + {{#isArray}} public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{^required}} @@ -52,7 +52,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali this.{{name}}.add({{name}}Item); return this; } - {{/isListContainer}} + {{/isArray}} {{#isMap}} public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) { 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 1e8ec04d95e..433b7334785 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}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isArray}}{{{returnContainer}}}<{{{returnType}}}>{{/isArray}}{{/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 4bbbac52f75..3cf85565431 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}}}{{#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}} { +){{/discriminator}}{{#parent}}{{^serializableModel}}{{^parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArray}}(){{/isArray}}{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{#serializableModel}}{{^parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArray}}(){{/isArray}}, Serializable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{^serializableModel}}{{#parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArray}}(){{/isArray}}, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{#serializableModel}}{{#parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArray}}(){{/isArray}}, 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/data_class_opt_var.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache index cbf85029fca..b6d441ce4ab 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache @@ -15,4 +15,4 @@ {{#deprecated}} @Deprecated(message = "This property is deprecated.") {{/deprecated}} - {{#multiplatform}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}") {{/multiplatform}}{{#isInherited}}override {{/isInherited}}{{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isListContainer}}{{#isList}}kotlin.collections.List{{/isList}}{{^isList}}kotlin.Array{{/isList}}<{{classname}}.{{{nameInCamelCase}}}>{{/isListContainer}}{{^isListContainer}}{{classname}}.{{{nameInCamelCase}}}{{/isListContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}} \ No newline at end of file + {{#multiplatform}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}") {{/multiplatform}}{{#isInherited}}override {{/isInherited}}{{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isArray}}{{#isList}}kotlin.collections.List{{/isList}}{{^isList}}kotlin.Array{{/isList}}<{{classname}}.{{{nameInCamelCase}}}>{{/isArray}}{{^isArray}}{{classname}}.{{{nameInCamelCase}}}{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache index eb18e85c4ce..35c9dda65cf 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache @@ -15,4 +15,4 @@ {{#deprecated}} @Deprecated(message = "This property is deprecated.") {{/deprecated}} - {{#multiplatform}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}") @Required {{/multiplatform}}{{#isInherited}}override {{/isInherited}}{{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isListContainer}}{{#isList}}kotlin.collections.List{{/isList}}{{^isList}}kotlin.Array{{/isList}}<{{classname}}.{{{nameInCamelCase}}}>{{/isListContainer}}{{^isListContainer}}{{classname}}.{{{nameInCamelCase}}}{{/isListContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}}?{{/isNullable}} \ No newline at end of file + {{#multiplatform}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}") @Required {{/multiplatform}}{{#isInherited}}override {{/isInherited}}{{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isArray}}{{#isList}}kotlin.collections.List{{/isList}}{{^isList}}kotlin.Array{{/isList}}<{{classname}}.{{{nameInCamelCase}}}>{{/isArray}}{{^isArray}}{{classname}}.{{{nameInCamelCase}}}{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}}?{{/isNullable}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache index 8de73d46049..f1a8b67eeff 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache @@ -33,17 +33,17 @@ import kotlinx.serialization.internal.CommonEnumSerializer @JsonProperty(value = {{^isString}}"{{/isString}}{{{value}}}{{^isString}}"{{/isString}}) {{/jackson}} {{/multiplatform}} - {{#isListContainer}} + {{#isArray}} {{#isList}} {{&name}}(listOf({{{value}}})){{^-last}},{{/-last}}{{#-last}};{{/-last}} {{/isList}} {{^isList}} {{&name}}(arrayOf({{{value}}})){{^-last}},{{/-last}}{{#-last}};{{/-last}} {{/isList}} - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}} - {{/isListContainer}} + {{/isArray}} {{/enumVars}}{{/allowableValues}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/interface_opt_var.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/interface_opt_var.mustache index 3284d7b1db4..35cfae01e12 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/interface_opt_var.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/interface_opt_var.mustache @@ -12,4 +12,4 @@ @get:JsonProperty("{{{vendorExtensions.x-base-name-literal}}}") {{/jackson}} {{/multiplatform}} - {{#multiplatform}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}") {{/multiplatform}}{{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isListContainer}}{{#isList}}kotlin.collections.List{{/isList}}{{^isList}}kotlin.Array{{/isList}}<{{classname}}.{{{nameInCamelCase}}}>{{/isListContainer}}{{^isListContainer}}{{classname}}.{{{nameInCamelCase}}}{{/isListContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? \ No newline at end of file + {{#multiplatform}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}") {{/multiplatform}}{{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isArray}}{{#isList}}kotlin.collections.List{{/isList}}{{^isList}}kotlin.Array{{/isList}}<{{classname}}.{{{nameInCamelCase}}}>{{/isArray}}{{^isArray}}{{classname}}.{{{nameInCamelCase}}}{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/interface_req_var.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/interface_req_var.mustache index ee62fbb2d12..50a2a3d4fef 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/interface_req_var.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/interface_req_var.mustache @@ -12,4 +12,4 @@ @get:JsonProperty("{{{vendorExtensions.x-base-name-literal}}}") {{/jackson}} {{/multiplatform}} - {{#multiplatform}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}") @Required {{/multiplatform}}{{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isListContainer}}{{#isList}}kotlin.collections.List{{/isList}}{{^isList}}kotlin.Array{{/isList}}<{{classname}}.{{{nameInCamelCase}}}>{{/isListContainer}}{{^isListContainer}}{{classname}}.{{{nameInCamelCase}}}{{/isListContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}}?{{/isNullable}} \ No newline at end of file + {{#multiplatform}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}") @Required {{/multiplatform}}{{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isArray}}{{#isList}}kotlin.collections.List{{/isList}}{{^isList}}kotlin.Array{{/isList}}<{{classname}}.{{{nameInCamelCase}}}>{{/isArray}}{{^isArray}}{{classname}}.{{{nameInCamelCase}}}{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}}?{{/isNullable}} \ No newline at end of file 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 e7b7687272b..ba390611189 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}}{{#isMap}}{{operationIdCamelCase}}Request({{{paramName}}}){{/isMap}}{{^isMap}}{{{paramName}}}{{/isMap}}{{/isListContainer}}{{/bodyParam}}{{/hasBodyParam}} + val localVariableBody = {{#hasBodyParam}}{{#bodyParam}}{{#isArray}}{{operationIdCamelCase}}Request({{{paramName}}}{{^isList}}.asList(){{/isList}}){{/isArray}}{{^isArray}}{{#isMap}}{{operationIdCamelCase}}Request({{{paramName}}}){{/isMap}}{{^isMap}}{{{paramName}}}{{/isMap}}{{/isArray}}{{/bodyParam}}{{/hasBodyParam}} {{^hasBodyParam}} {{#hasFormParams}} {{#isMultipart}} @@ -87,17 +87,17 @@ import kotlinx.serialization.internal.StringDescriptor localVariableConfig, localVariableBody, localVariableAuthNames - ).{{#isListContainer}}wrap<{{operationIdCamelCase}}Response>().map { value{{^isList}}.toTypedArray(){{/isList}} }{{/isListContainer}}{{^isListContainer}}{{#isMap}}wrap<{{operationIdCamelCase}}Response>().map { value }{{/isMap}}{{^isMap}}wrap(){{/isMap}}{{/isListContainer}} + ).{{#isArray}}wrap<{{operationIdCamelCase}}Response>().map { value{{^isList}}.toTypedArray(){{/isList}} }{{/isArray}}{{^isArray}}{{#isMap}}wrap<{{operationIdCamelCase}}Response>().map { value }{{/isMap}}{{^isMap}}wrap(){{/isMap}}{{/isArray}} } {{#hasBodyParam}} {{#bodyParam}} -{{#isListContainer}}{{>serial_wrapper_request_list}}{{/isListContainer}}{{#isMap}}{{>serial_wrapper_request_map}}{{/isMap}} +{{#isArray}}{{>serial_wrapper_request_list}}{{/isArray}}{{#isMap}}{{>serial_wrapper_request_map}}{{/isMap}} {{/bodyParam}} {{/hasBodyParam}} -{{#isListContainer}} +{{#isArray}} {{>serial_wrapper_response_list}} -{{/isListContainer}} +{{/isArray}} {{#isMap}} {{>serial_wrapper_response_map}} {{/isMap}} @@ -109,12 +109,12 @@ import kotlinx.serialization.internal.StringDescriptor {{#operation}} {{#hasBodyParam}} {{#bodyParam}} - {{#isListContainer}}serializer.setMapper({{operationIdCamelCase}}Request::class, {{operationIdCamelCase}}Request.serializer()){{/isListContainer}}{{#isMap}}serializer.setMapper({{operationIdCamelCase}}Request::class, {{operationIdCamelCase}}Request.serializer()){{/isMap}} + {{#isArray}}serializer.setMapper({{operationIdCamelCase}}Request::class, {{operationIdCamelCase}}Request.serializer()){{/isArray}}{{#isMap}}serializer.setMapper({{operationIdCamelCase}}Request::class, {{operationIdCamelCase}}Request.serializer()){{/isMap}} {{/bodyParam}} {{/hasBodyParam}} - {{#isListContainer}} + {{#isArray}} serializer.setMapper({{operationIdCamelCase}}Response::class, {{operationIdCamelCase}}Response.serializer()) - {{/isListContainer}} + {{/isArray}} {{#isMap}} serializer.setMapper({{operationIdCamelCase}}Response::class, {{operationIdCamelCase}}Response.serializer()) {{/isMap}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache index 8e171d4cb20..dcef222a983 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache @@ -70,7 +70,7 @@ class {{classname}}Controller({{#serviceInterface}}@Autowired(required = true) v produces = [{{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}}]{{/hasProduces}}{{#hasConsumes}}, consumes = [{{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}]{{/hasConsumes}}{{/singleContentTypes}} ) - {{#reactive}}{{^isListContainer}}suspend {{/isListContainer}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}): ResponseEntity<{{>returnTypes}}> { + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}): ResponseEntity<{{>returnTypes}}> { return {{>returnValue}} } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache index a0f3113f20d..321803a35dc 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache @@ -78,7 +78,7 @@ interface {{classname}} { produces = [{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}]{{/hasProduces}}{{#hasConsumes}}, consumes = [{{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}]{{/hasConsumes}}{{/singleContentTypes}} ) - {{#reactive}}{{^isListContainer}}suspend {{/isListContainer}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}): ResponseEntity<{{>returnTypes}}> { + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}): ResponseEntity<{{>returnTypes}}> { {{^isDelegate}} return {{>returnValue}} {{/isDelegate}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/bodyParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/bodyParams.mustache index 9d51d6d8c04..e150b46be7e 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/bodyParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}{{#swaggerAnnotations}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{^isContainer}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{/isContainer}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{/swaggerAnnotations}} {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestBody {{paramName}}: {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isListContainer}}{{>optionalDataType}}{{/isListContainer}}{{#isListContainer}}Flow<{{{baseType}}}>{{/isListContainer}}{{/reactive}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}{{#swaggerAnnotations}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{^isContainer}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{/isContainer}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{/swaggerAnnotations}} {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestBody {{paramName}}: {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}Flow<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache index 43ce48eb56c..535f2b3564d 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache @@ -2,4 +2,4 @@ {{^isReadOnly}}@get:NotNull{{/isReadOnly}} {{/required}}{{>beanValidationModel}}{{/useBeanValidation}}{{#swaggerAnnotations}} @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}"){{/swaggerAnnotations}}{{#deprecated}} @Deprecated(message = ""){{/deprecated}} - @field:JsonProperty("{{{baseName}}}"){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isListContainer}}{{baseType}}<{{/isListContainer}}{{classname}}.{{nameInCamelCase}}{{#isListContainer}}>{{/isListContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}} \ No newline at end of file + @field:JsonProperty("{{{baseName}}}"){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isArray}}{{baseType}}<{{/isArray}}{{classname}}.{{nameInCamelCase}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache index 18bc12c7e41..3ad4e7f08ac 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache @@ -1,4 +1,4 @@ {{#useBeanValidation}}{{#required}} {{^isReadOnly}}@get:NotNull{{/isReadOnly}} {{/required}}{{>beanValidationModel}}{{/useBeanValidation}}{{#swaggerAnnotations}} @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}"){{/swaggerAnnotations}} - @field:JsonProperty("{{{baseName}}}"){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isListContainer}}{{baseType}}<{{/isListContainer}}{{classname}}.{{nameInCamelCase}}{{#isListContainer}}>{{/isListContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isReadOnly}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}}{{/isReadOnly}} \ No newline at end of file + @field:JsonProperty("{{{baseName}}}"){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isArray}}{{baseType}}<{{/isArray}}{{classname}}.{{nameInCamelCase}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isReadOnly}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}}{{/isReadOnly}} \ No newline at end of file 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 37a952389e6..12a74e5ad7a 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 @@ -{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{#reactive}}Flow{{/reactive}}{{^reactive}}{{{returnContainer}}}{{/reactive}}<{{{returnType}}}>{{/isListContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file +{{#isMap}}Map{{/isMap}}{{#isArray}}{{#reactive}}Flow{{/reactive}}{{^reactive}}{{{returnContainer}}}{{/reactive}}<{{{returnType}}}>{{/isArray}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/service.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/service.mustache index e9abca8eba2..0dc2967d051 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/service.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/service.mustache @@ -9,7 +9,7 @@ import kotlinx.coroutines.flow.Flow; interface {{classname}}Service { {{#operation}} - {{#reactive}}{{^isListContainer}}suspend {{/isListContainer}}{{/reactive}}fun {{operationId}}({{#allParams}}{{paramName}}: {{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isListContainer}}{{>optionalDataType}}{{/isListContainer}}{{#isListContainer}}Flow<{{{baseType}}}>{{/isListContainer}}{{/reactive}}{{/isBodyParam}}{{#hasMore}}, {{/hasMore}}{{/allParams}}): {{>returnTypes}} + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{paramName}}: {{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}Flow<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}}{{#hasMore}}, {{/hasMore}}{{/allParams}}): {{>returnTypes}} {{/operation}} } {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/serviceImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/serviceImpl.mustache index b110e81378f..60e131fc543 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/serviceImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/serviceImpl.mustache @@ -11,7 +11,7 @@ import org.springframework.stereotype.Service class {{classname}}ServiceImpl : {{classname}}Service { {{#operation}} - override {{#reactive}}{{^isListContainer}}suspend {{/isListContainer}}{{/reactive}}fun {{operationId}}({{#allParams}}{{paramName}}: {{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isListContainer}}{{>optionalDataType}}{{/isListContainer}}{{#isListContainer}}Flow<{{{baseType}}}>{{/isListContainer}}{{/reactive}}{{/isBodyParam}}{{#hasMore}}, {{/hasMore}}{{/allParams}}): {{>returnTypes}} { + override {{#reactive}}{{^isArray}}suspend {{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{paramName}}: {{^isBodyParam}}{{>optionalDataType}}{{/isBodyParam}}{{#isBodyParam}}{{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}Flow<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}}{{#hasMore}}, {{/hasMore}}{{/allParams}}): {{>returnTypes}} { TODO("Implement me") } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-vertx-server/apiProxy.mustache b/modules/openapi-generator/src/main/resources/kotlin-vertx-server/apiProxy.mustache index 8c6f81f1b43..039c912ca28 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-vertx-server/apiProxy.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-vertx-server/apiProxy.mustache @@ -69,7 +69,7 @@ class {{classname}}VertxProxyHandler(private val vertx: Vertx, private val servi {{#hasParams}} val params = context.params {{#allParams}} - {{#isListContainer}} + {{#isArray}} val {{paramName}}Param = ApiHandlerUtils.searchJsonArrayInJson(params,"{{#isBodyParam}}body{{/isBodyParam}}{{^isBodyParam}}{{baseName}}{{/isBodyParam}}") {{#required}} if({{paramName}}Param == null){ @@ -83,8 +83,8 @@ class {{classname}}VertxProxyHandler(private val vertx: Vertx, private val servi else Gson().fromJson({{paramName}}Param.encode(), , object : TypeToken>(){}.type) {{/required}} - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} {{#isFile}} val {{paramName}}Param = context.extra.getJsonArray("files") {{#required}} @@ -152,16 +152,16 @@ class {{classname}}VertxProxyHandler(private val vertx: Vertx, private val servi val {{paramName}} = if({{paramName}}Param ==null) null else Gson().fromJson({{paramName}}Param.encode(), {{{dataType}}}::class.java) {{/required}} {{/isPrimitiveType}} - {{/isListContainer}} + {{/isArray}} {{/allParams}} GlobalScope.launch(vertx.dispatcher()){ val result = service.{{operationId}}({{#hasParams}}{{#allParams}}{{paramName}},{{/allParams}}{{/hasParams}}context) - {{#isListContainer}} + {{#isArray}} val payload = JsonArray(Json.encode(result.payload)).toBuffer() - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} val payload = JsonObject(Json.encode(result.payload)).toBuffer() - {{/isListContainer}} + {{/isArray}} val res = OperationResponse(result.statusCode,result.statusMessage,payload,result.headers) msg.reply(res.toJson()) }.invokeOnCompletion{ diff --git a/modules/openapi-generator/src/main/resources/lua/api.mustache b/modules/openapi-generator/src/main/resources/lua/api.mustache index 4dc3879b867..631eb894d64 100644 --- a/modules/openapi-generator/src/main/resources/lua/api.mustache +++ b/modules/openapi-generator/src/main/resources/lua/api.mustache @@ -127,19 +127,19 @@ function {{classname}}:{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, return result, headers {{/returnTypeIsPrimitive}} {{^returnTypeIsPrimitive}} - {{#isListContainer}} + {{#isArray}} for _, ob in ipairs(result) do {{packageName}}_{{returnType}}.cast(ob) end return result, headers - {{/isListContainer}} + {{/isArray}} {{#isMap}} return result, headers {{/isMap}} {{^isMap}} - {{^isListContainer}} + {{^isArray}} return {{packageName}}_{{returnType}}.cast(result), headers - {{/isListContainer}} + {{/isArray}} {{/isMap}} {{/returnTypeIsPrimitive}} {{/returnType}} diff --git a/modules/openapi-generator/src/main/resources/mysql-schema/mysql_schema.mustache b/modules/openapi-generator/src/main/resources/mysql-schema/mysql_schema.mustache index e54dc6daf33..42810e0c6cc 100644 --- a/modules/openapi-generator/src/main/resources/mysql-schema/mysql_schema.mustache +++ b/modules/openapi-generator/src/main/resources/mysql-schema/mysql_schema.mustache @@ -11,7 +11,7 @@ CREATE DATABASE IF NOT EXISTS `{{{defaultDatabaseName}}}` DEFAULT CHARACTER SET -- -------------------------------------------------------- -{{#models}}{{#model}}{{#hasVars}}{{^isArrayModel}}-- +{{#models}}{{#model}}{{#hasVars}}{{^isArray}}-- -- Table structure{{#vendorExtensions}}{{#x-mysql-schema}}{{#tableDefinition}} for table `{{tblName}}`{{/tableDefinition}}{{/x-mysql-schema}}{{/vendorExtensions}} generated from model '{{classVarName}}' {{#description}} -- {{description}} @@ -42,7 +42,7 @@ CREATE TABLE IF NOT EXISTS {{#defaultDatabaseName}}`{{{defaultDatabaseName}}}`.{ {{/x-mysql-schema}} {{/vendorExtensions}} -{{/isArrayModel}}{{/hasVars}}{{/model}}{{/models}} +{{/isArray}}{{/hasVars}}{{/model}}{{/models}} {{#hasOAuthMethods}} -- -- OAuth2 framework tables diff --git a/modules/openapi-generator/src/main/resources/nim-client/api.mustache b/modules/openapi-generator/src/main/resources/nim-client/api.mustache index 1fcd06f7cfd..55e57bc4752 100644 --- a/modules/openapi-generator/src/main/resources/nim-client/api.mustache +++ b/modules/openapi-generator/src/main/resources/nim-client/api.mustache @@ -36,15 +36,15 @@ proc {{{operationId}}}*(httpClient: HttpClient{{#allParams}}, {{{paramName}}}: { httpClient.headers["Content-Type"] = "application/json"{{/hasBodyParam}}{{#hasFormParams}}{{^isMultipart}} httpClient.headers["Content-Type"] = "application/x-www-form-urlencoded"{{/isMultipart}}{{#isMultipart}} httpClient.headers["Content-Type"] = "multipart/form-data"{{/isMultipart}}{{/hasFormParams}}{{#hasHeaderParams}}{{#headerParams}} - httpClient.headers["{{{baseName}}}"] = {{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}{{/headerParams}}{{#description}} ## {{{description}}}{{/description}}{{/hasHeaderParams}}{{#hasQueryParams}} + httpClient.headers["{{{baseName}}}"] = {{{paramName}}}{{#isArray}}.join(","){{/isArray}}{{/headerParams}}{{#description}} ## {{{description}}}{{/description}}{{/hasHeaderParams}}{{#hasQueryParams}} let query_for_api_call = encodeQuery([{{#queryParams}} - ("{{{baseName}}}", ${{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}), # {{{description}}}{{/queryParams}} + ("{{{baseName}}}", ${{{paramName}}}{{#isArray}}.join(","){{/isArray}}), # {{{description}}}{{/queryParams}} ]){{/hasQueryParams}}{{#hasFormParams}}{{^isMultipart}} let query_for_api_call = encodeQuery([{{#formParams}} - ("{{{baseName}}}", ${{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}), # {{{description}}}{{/formParams}} + ("{{{baseName}}}", ${{{paramName}}}{{#isArray}}.join(","){{/isArray}}), # {{{description}}}{{/formParams}} ]){{/isMultipart}}{{#isMultipart}} let query_for_api_call = newMultipartData({ -{{#formParams}} "{{{baseName}}}": ${{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}, # {{{description}}} +{{#formParams}} "{{{baseName}}}": ${{{paramName}}}{{#isArray}}.join(","){{/isArray}}, # {{{description}}} {{/formParams}} }){{/isMultipart}}{{/hasFormParams}}{{#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 f433471f1fd..0e54cbfda85 100644 --- a/modules/openapi-generator/src/main/resources/objc/Model.xcdatamodel.mustache +++ b/modules/openapi-generator/src/main/resources/objc/Model.xcdatamodel.mustache @@ -2,11 +2,11 @@ {{#models}}{{#model}} -{{#isArrayModel}} -{{/isArrayModel}}{{^isArrayModel}}{{#vars}}{{#complexType}} {{/complexType}}{{^complexType}} {{/complexType}}{{#vendorExtensions.x-is-unique}} +{{#isArray}} +{{/isArray}}{{^isArray}}{{#vars}}{{#complexType}} {{/complexType}}{{^complexType}} {{/complexType}}{{#vendorExtensions.x-is-unique}} {{/vendorExtensions.x-is-unique}} {{/vars}} -{{/isArrayModel}} +{{/isArray}} {{/model}}{{/models}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/objc/NSManagedObject-body.mustache b/modules/openapi-generator/src/main/resources/objc/NSManagedObject-body.mustache index 78bd71afa8c..919983fd71a 100644 --- a/modules/openapi-generator/src/main/resources/objc/NSManagedObject-body.mustache +++ b/modules/openapi-generator/src/main/resources/objc/NSManagedObject-body.mustache @@ -8,13 +8,13 @@ * Do not edit the class manually. */ @implementation {{classname}}ManagedObject -{{#isArrayModel}} +{{#isArray}} @dynamic entries; -{{/isArrayModel}}{{^isArrayModel}}{{#vars}} +{{/isArray}}{{^isArray}}{{#vars}} @dynamic {{name}};{{/vars}} -{{/isArrayModel}} +{{/isArray}} {{/model}} @end {{/models}} 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 f873afe032a..cfc40a39fa2 100644 --- a/modules/openapi-generator/src/main/resources/objc/NSManagedObject-header.mustache +++ b/modules/openapi-generator/src/main/resources/objc/NSManagedObject-header.mustache @@ -10,37 +10,37 @@ {{#model}} NS_ASSUME_NONNULL_BEGIN -{{#isArrayModel}} +{{#isArray}} @interface {{classname}}ManagedObject : NSManagedObject @property (nullable, nonatomic, retain) NSOrderedSet<{{{arrayModelType}}}ManagedObject*>* entries; -{{/isArrayModel}}{{^isArrayModel}} +{{/isArray}}{{^isArray}} @interface {{classname}}ManagedObject : {{#parent}}{{{parent}}}ManagedObject{{/parent}}{{^parent}}NSManagedObject{{/parent}} {{#vars}} {{#description}}/* {{{description}}} {{^required}}[optional]{{/required}} */{{/description}} -@property (nullable, nonatomic, retain) {{^complexType}}{{{ datatype }}}{{/complexType}}{{#complexType}}{{#isListContainer}}NSOrderedSet<{{{complexType}}}ManagedObject*>*{{/isListContainer}}{{^isListContainer}}{{#isMap}}{{{ datatype }}}{{/isMap}}{{^isMap}}{{{complexType}}}ManagedObject*{{/isMap}}{{/isListContainer}}{{/complexType}} {{name}}; +@property (nullable, nonatomic, retain) {{^complexType}}{{{ datatype }}}{{/complexType}}{{#complexType}}{{#isArray}}NSOrderedSet<{{{complexType}}}ManagedObject*>*{{/isArray}}{{^isArray}}{{#isMap}}{{{ datatype }}}{{/isMap}}{{^isMap}}{{{complexType}}}ManagedObject*{{/isMap}}{{/isArray}}{{/complexType}} {{name}}; {{/vars}} -{{/isArrayModel}} +{{/isArray}} @end @interface {{classname}}ManagedObject (GeneratedAccessors) -{{#isArrayModel}} +{{#isArray}} - (void)addEntriesObject:({{arrayModelType}}ManagedObject *)value; - (void)removeEntriesObject:({{arrayModelType}}ManagedObject *)value; - (void)addEntries:(NSOrderedSet<{{{arrayModelType}}}ManagedObject*> *)values; - (void)removeEntries:(NSOrderedSet<{{{arrayModelType}}}ManagedObject*> *)values; -{{/isArrayModel}} -{{^isArrayModel}} -{{#vars}}{{#isListContainer}}{{#complexType}}- (void)add{{vendorExtensions.x-uppercase-name}}Object:({{complexType}}ManagedObject *)value; +{{/isArray}} +{{^isArray}} +{{#vars}}{{#isArray}}{{#complexType}}- (void)add{{vendorExtensions.x-uppercase-name}}Object:({{complexType}}ManagedObject *)value; - (void)remove{{vendorExtensions.x-uppercase-name}}Object:({{complexType}}ManagedObject *)value; - (void)add{{vendorExtensions.x-uppercase-name}}:(NSOrderedSet<{{{complexType}}}ManagedObject*> *)values; - (void)remove{{vendorExtensions.x-uppercase-name}}:(NSOrderedSet<{{{complexType}}}ManagedObject*> *)values; -{{/complexType}}{{/isListContainer}}{{/vars}} -{{/isArrayModel}} +{{/complexType}}{{/isArray}}{{/vars}} +{{/isArray}} @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 4dd4ba44001..fe43bff4002 100644 --- a/modules/openapi-generator/src/main/resources/objc/NSManagedObjectBuilder-body.mustache +++ b/modules/openapi-generator/src/main/resources/objc/NSManagedObjectBuilder-body.mustache @@ -13,8 +13,8 @@ -(instancetype)init { self = [super init]; if (self != nil) { -{{#isArrayModel}} _entriesBuilder = [[{{arrayModelType}}ManagedObjectBuilder alloc] init]; -{{/isArrayModel}}{{#vars}}{{#complexType}}{{^isMap}} _{{name}}Builder = [[{{complexType}}ManagedObjectBuilder alloc] init]; +{{#isArray}} _entriesBuilder = [[{{arrayModelType}}ManagedObjectBuilder alloc] init]; +{{/isArray}}{{#vars}}{{#complexType}}{{^isMap}} _{{name}}Builder = [[{{complexType}}ManagedObjectBuilder alloc] init]; {{/isMap}}{{/complexType}}{{/vars}} } return self; } @@ -35,7 +35,7 @@ return; } NSManagedObjectContext* context = managedObject.managedObjectContext; -{{#vars}}{{^complexType}} managedObject.{{name}} = [object.{{name}} copy];{{/complexType}}{{#complexType}}{{#isListContainer}} if(managedObject.{{name}}) { +{{#vars}}{{^complexType}} managedObject.{{name}} = [object.{{name}} copy];{{/complexType}}{{#complexType}}{{#isArray}} if(managedObject.{{name}}) { for (id object in managedObject.{{name}}) { [context deleteObject:object]; } @@ -47,18 +47,18 @@ [convertedObjs addObject:convertedObj]; } managedObject.{{name}} = convertedObjs; - }{{/isListContainer}}{{^isListContainer}}{{^isMap}} + }{{/isArray}}{{^isArray}}{{^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}}]; - }{{/isMap}}{{#isMap}}managedObject.{{name}} = [object.{{name}} copy];{{/isMap}}{{/isListContainer}}{{/complexType}} -{{/vars}}{{#isArrayModel}} NSMutableOrderedSet * convertedObjs = [NSMutableOrderedSet orderedSet]; + }{{/isMap}}{{#isMap}}managedObject.{{name}} = [object.{{name}} copy];{{/isMap}}{{/isArray}}{{/complexType}} +{{/vars}}{{#isArray}} NSMutableOrderedSet * convertedObjs = [NSMutableOrderedSet orderedSet]; for (id innerObject in object) { id convertedObj = [self.entriesBuilder {{arrayModelType}}ManagedObjectFrom{{arrayModelType}}:innerObject context:managedObject.managedObjectContext]; [convertedObjs addObject:convertedObj]; } - managedObject.entries = convertedObjs;{{/isArrayModel}} + managedObject.entries = convertedObjs;{{/isArray}} } -({{classname}}*){{classname}}From{{classname}}ManagedObject:({{classname}}ManagedObject*)obj { @@ -71,14 +71,14 @@ } -(void)update{{classname}}:({{classname}}*)new{{classname}} with{{classname}}ManagedObject:({{classname}}ManagedObject*)obj { -{{#isArrayModel}} [new{{classname}} removeAllObjects]; +{{#isArray}} [new{{classname}} removeAllObjects]; NSMutableArray* convertedObjs = [NSMutableArray array]; for (id innerObject in obj.entries) { id convertedObj = [self.entriesBuilder {{arrayModelType}}From{{arrayModelType}}ManagedObject:innerObject]; [convertedObjs addObject:convertedObj]; } [new{{classname}} addObjectsFromArray:convertedObjs]; -{{/isArrayModel}}{{#vars}}{{^complexType}} new{{classname}}.{{name}} = [obj.{{name}} copy];{{/complexType}}{{#complexType}}{{#isListContainer}} if(obj.{{name}} != nil) { +{{/isArray}}{{#vars}}{{^complexType}} new{{classname}}.{{name}} = [obj.{{name}} copy];{{/complexType}}{{#complexType}}{{#isArray}} if(obj.{{name}} != nil) { NSMutableArray* convertedObjs = [NSMutableArray array]; for (id innerObject in obj.{{name}}) { id convertedObj = [self.{{name}}Builder {{complexType}}From{{complexType}}ManagedObject:innerObject]; @@ -86,7 +86,7 @@ } new{{classname}}.{{name}} = ({{{ datatype }}})convertedObjs; } - {{/isListContainer}}{{^isListContainer}} new{{classname}}.{{name}} = [self.{{name}}Builder {{complexType}}From{{complexType}}ManagedObject:obj.{{name}}];{{/isListContainer}}{{/complexType}} + {{/isArray}}{{^isArray}} new{{classname}}.{{name}} = [self.{{name}}Builder {{complexType}}From{{complexType}}ManagedObject:obj.{{name}}];{{/isArray}}{{/complexType}} {{/vars}} } diff --git a/modules/openapi-generator/src/main/resources/objc/NSManagedObjectBuilder-header.mustache b/modules/openapi-generator/src/main/resources/objc/NSManagedObjectBuilder-header.mustache index 15778de3217..c21d3088448 100644 --- a/modules/openapi-generator/src/main/resources/objc/NSManagedObjectBuilder-header.mustache +++ b/modules/openapi-generator/src/main/resources/objc/NSManagedObjectBuilder-header.mustache @@ -13,7 +13,7 @@ @interface {{classname}}ManagedObjectBuilder : NSObject -{{#isArrayModel}}@property (nonatomic, strong) {{arrayModelType}}ManagedObjectBuilder * entriesBuilder;{{/isArrayModel}}{{#vars}}{{#complexType}}@property (nonatomic, strong) {{complexType}}ManagedObjectBuilder * {{name}}Builder; +{{#isArray}}@property (nonatomic, strong) {{arrayModelType}}ManagedObjectBuilder * entriesBuilder;{{/isArray}}{{#vars}}{{#complexType}}@property (nonatomic, strong) {{complexType}}ManagedObjectBuilder * {{name}}Builder; {{/complexType}}{{/vars}} -({{classname}}ManagedObject*)createNew{{classname}}ManagedObjectInContext:(NSManagedObjectContext*)context; 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 cf1834d914f..88e18d282db 100644 --- a/modules/openapi-generator/src/main/resources/ocaml/api-impl.mustache +++ b/modules/openapi-generator/src/main/resources/ocaml/api-impl.mustache @@ -30,7 +30,7 @@ let {{{operationId}}} {{^hasParams}}(){{/hasParams}}{{#allParams}}{{> to_param}} let uri = Request.{{> to_optional_prefix}}replace_path_param uri "{{{baseName}}}" {{> to_string}} {{{paramName}}} in {{/pathParams}} {{#queryParams}} - let uri = Request.{{> to_optional_prefix}}add_query_param{{#isListContainer}}_list{{/isListContainer}} uri "{{{baseName}}}" {{> to_string}} {{{paramName}}} in + let uri = Request.{{> to_optional_prefix}}add_query_param{{#isArray}}_list{{/isArray}} uri "{{{baseName}}}" {{> to_string}} {{{paramName}}} in {{/queryParams}} {{#hasAuthMethods}} {{#authMethods}} @@ -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}}{{#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 + Request.read_json_body{{#returnContainer}}{{#isArray}}_as_list{{/isArray}}{{#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/to_json.mustache b/modules/openapi-generator/src/main/resources/ocaml/to_json.mustache index 2f7b5103197..99e45aafb78 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}}{{#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 +{{#isArray}}{{#items}}(JsonSupport.of_list_of {{> to_json}}){{/items}}{{/isArray}}{{#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/perl/README.mustache b/modules/openapi-generator/src/main/resources/perl/README.mustache index 93707bd1b6e..45e4efb762b 100644 --- a/modules/openapi-generator/src/main/resources/perl/README.mustache +++ b/modules/openapi-generator/src/main/resources/perl/README.mustache @@ -268,7 +268,7 @@ my $api_instance = {{moduleName}}::{{classname}}->new( {{/hasAuthMethods}} ); -{{#allParams}}my ${{paramName}} = {{#isListContainer}}[{{/isListContainer}}{{#isBodyParam}}{{{moduleName}}}::Object::{{dataType}}->new(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}]{{/isListContainer}}; # {{{dataType}}} | {{{description}}} +{{#allParams}}my ${{paramName}} = {{#isArray}}[{{/isArray}}{{#isBodyParam}}{{{moduleName}}}::Object::{{dataType}}->new(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isArray}}]{{/isArray}}; # {{{dataType}}} | {{{description}}} {{/allParams}} eval { diff --git a/modules/openapi-generator/src/main/resources/perl/api_doc.mustache b/modules/openapi-generator/src/main/resources/perl/api_doc.mustache index d69dbde3316..01bfdf174d1 100644 --- a/modules/openapi-generator/src/main/resources/perl/api_doc.mustache +++ b/modules/openapi-generator/src/main/resources/perl/api_doc.mustache @@ -47,7 +47,7 @@ my $api_instance = {{moduleName}}::{{classname}}->new( {{/hasAuthMethods}} ); -{{#allParams}}my ${{paramName}} = {{#isListContainer}}[{{/isListContainer}}{{#isBodyParam}}{{{moduleName}}}::Object::{{dataType}}->new(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}]{{/isListContainer}}; # {{{dataType}}} | {{{description}}} +{{#allParams}}my ${{paramName}} = {{#isArray}}[{{/isArray}}{{#isBodyParam}}{{{moduleName}}}::Object::{{dataType}}->new(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isArray}}]{{/isArray}}; # {{{dataType}}} | {{{description}}} {{/allParams}} eval { 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 3db5061272e..3c6b4120b53 100644 --- a/modules/openapi-generator/src/main/resources/python-aiohttp/controller.mustache +++ b/modules/openapi-generator/src/main/resources/python-aiohttp/controller.mustache @@ -33,7 +33,7 @@ async def {{operationId}}(request: web.Request, {{#allParams}}{{paramName}}{{^re {{/isFile}} {{/isPrimitiveType}} {{/isContainer}} - {{#isListContainer}} + {{#isArray}} {{#items}} {{#isPrimitiveType}} :type {{paramName}}: List[{{>param_type}}] @@ -42,7 +42,7 @@ async def {{operationId}}(request: web.Request, {{#allParams}}{{paramName}}{{^re :type {{paramName}}: list | bytes {{/isPrimitiveType}} {{/items}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} {{#items}} {{#isPrimitiveType}} @@ -72,7 +72,7 @@ async def {{operationId}}(request: web.Request, {{#allParams}}{{paramName}}{{^re {{/isFile}} {{/isPrimitiveType}} {{/isContainer}} - {{#isListContainer}} + {{#isArray}} {{#items}} {{#isDate}} {{paramName}} = [util.deserialize_date(s) for s in {{paramName}}] @@ -84,7 +84,7 @@ async def {{operationId}}(request: web.Request, {{#allParams}}{{paramName}}{{^re {{paramName}} = [{{complexType}}.from_dict(d) for d in {{paramName}}] {{/complexType}} {{/items}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} {{#items}} {{#isDate}} 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 573264d16d1..7485a7b0211 100644 --- a/modules/openapi-generator/src/main/resources/python-aiohttp/model.mustache +++ b/modules/openapi-generator/src/main/resources/python-aiohttp/model.mustache @@ -91,14 +91,14 @@ class {{classname}}(Model): {{#isEnum}} {{#isContainer}} allowed_values = [{{#isNullable}}None,{{/isNullable}}{{#allowableValues}}{{#values}}{{#items.isString}}"{{/items.isString}}{{{this}}}{{#items.isString}}"{{/items.isString}}{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}] # noqa: E501 -{{#isListContainer}} +{{#isArray}} if not set({{{name}}}).issubset(set(allowed_values)): raise ValueError( "Invalid values for `{{{name}}}` [{0}], must be a subset of [{1}]" .format(", ".join(map(str, set({{{name}}}) - set(allowed_values))), ", ".join(map(str, allowed_values))) ) -{{/isListContainer}} +{{/isArray}} {{#isMap}} if not set({{{name}}}.keys()).issubset(set(allowed_values)): raise ValueError( 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 7c1911cc64c..a9278343e37 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 @@ -33,7 +33,7 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{ {{/isFile}} {{/isPrimitiveType}} {{/isContainer}} - {{#isListContainer}} + {{#isArray}} {{#items}} {{#isPrimitiveType}} :type {{paramName}}: List[{{#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}}] @@ -42,7 +42,7 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{ :type {{paramName}}: list | bytes {{/isPrimitiveType}} {{/items}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} {{#items}} {{#isPrimitiveType}} @@ -74,7 +74,7 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{ {{/isFile}} {{/isPrimitiveType}} {{/isContainer}} - {{#isListContainer}} + {{#isArray}} {{#items}} {{#isDate}} if connexion.request.is_json: @@ -89,7 +89,7 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{ {{paramName}} = [{{complexType}}.from_dict(d) for d in connexion.request.get_json()] # noqa: E501 {{/complexType}} {{/items}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} {{#items}} {{#isDate}} 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 c3eb12eecc1..38b9293c66c 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 @@ -90,14 +90,14 @@ class {{classname}}(Model): {{#isEnum}} allowed_values = [{{#allowableValues}}{{#values}}"{{{this}}}"{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}] # noqa: E501 {{#isContainer}} -{{#isListContainer}} +{{#isArray}} if not set({{{name}}}).issubset(set(allowed_values)): raise ValueError( "Invalid values for `{{{name}}}` [{0}], must be a subset of [{1}]" # noqa: E501 .format(", ".join(map(str, set({{{name}}}) - set(allowed_values))), # noqa: E501 ", ".join(map(str, allowed_values))) ) -{{/isListContainer}} +{{/isArray}} {{#isMap}} if not set({{{name}}}.keys()).issubset(set(allowed_values)): raise ValueError( 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 b9155499e53..7c4aa7489b5 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 @@ -30,7 +30,7 @@ resourceTypes { type = {{datatype}} {{/isPrimitiveType}} {{/isContainer}} - {{#isListContainer}} + {{#isArray}} type = array {{#items}} {{#isPrimitiveType}} @@ -40,7 +40,7 @@ resourceTypes { items.type = {{datatype}} {{/isPrimitiveType}} {{/items}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} # TODO {{/isMap}} 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 9b9c9593248..df909d3f4ae 100644 --- a/modules/openapi-generator/src/main/resources/python-flask/controller.mustache +++ b/modules/openapi-generator/src/main/resources/python-flask/controller.mustache @@ -33,7 +33,7 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{ {{/isFile}} {{/isPrimitiveType}} {{/isContainer}} - {{#isListContainer}} + {{#isArray}} {{#items}} {{#isPrimitiveType}} :type {{paramName}}: List[{{>param_type}}] @@ -42,7 +42,7 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{ :type {{paramName}}: list | bytes {{/isPrimitiveType}} {{/items}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} {{#items}} {{#isPrimitiveType}} @@ -74,7 +74,7 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{ {{/isFile}} {{/isPrimitiveType}} {{/isContainer}} - {{#isListContainer}} + {{#isArray}} {{#items}} {{#isDate}} if connexion.request.is_json: @@ -89,7 +89,7 @@ def {{operationId}}({{#allParams}}{{paramName}}{{^required}}=None{{/required}}{{ {{paramName}} = [{{complexType}}.from_dict(d) for d in connexion.request.get_json()] # noqa: E501 {{/complexType}} {{/items}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} {{#items}} {{#isDate}} 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 346e6f15f58..532113d24a9 100644 --- a/modules/openapi-generator/src/main/resources/python-flask/model.mustache +++ b/modules/openapi-generator/src/main/resources/python-flask/model.mustache @@ -100,14 +100,14 @@ class {{classname}}(Model): {{#isEnum}} {{#isContainer}} allowed_values = [{{#isNullable}}None,{{/isNullable}}{{#allowableValues}}{{#values}}{{#items.isString}}"{{/items.isString}}{{{this}}}{{#items.isString}}"{{/items.isString}}{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}] # noqa: E501 -{{#isListContainer}} +{{#isArray}} if not set({{{name}}}).issubset(set(allowed_values)): raise ValueError( "Invalid values for `{{{name}}}` [{0}], must be a subset of [{1}]" # noqa: E501 .format(", ".join(map(str, set({{{name}}}) - set(allowed_values))), # noqa: E501 ", ".join(map(str, allowed_values))) ) -{{/isListContainer}} +{{/isArray}} {{#isMap}} if not set({{{name}}}.keys()).issubset(set(allowed_values)): raise ValueError( diff --git a/modules/openapi-generator/src/main/resources/python/api.mustache b/modules/openapi-generator/src/main/resources/python/api.mustache index 7cbea8a8bd0..513738359c2 100644 --- a/modules/openapi-generator/src/main/resources/python/api.mustache +++ b/modules/openapi-generator/src/main/resources/python/api.mustache @@ -208,30 +208,30 @@ class {{classname}}(object): path_params = {} {{#pathParams}} if '{{paramName}}' in local_var_params: - path_params['{{baseName}}'] = local_var_params['{{paramName}}']{{#isListContainer}} # noqa: E501 - collection_formats['{{baseName}}'] = '{{collectionFormat}}'{{/isListContainer}} # noqa: E501 + path_params['{{baseName}}'] = local_var_params['{{paramName}}']{{#isArray}} # noqa: E501 + collection_formats['{{baseName}}'] = '{{collectionFormat}}'{{/isArray}} # noqa: E501 {{/pathParams}} query_params = [] {{#queryParams}} if '{{paramName}}' in local_var_params and local_var_params['{{paramName}}'] is not None: # noqa: E501 - query_params.append(('{{baseName}}', local_var_params['{{paramName}}'])){{#isListContainer}} # noqa: E501 - collection_formats['{{baseName}}'] = '{{collectionFormat}}'{{/isListContainer}} # noqa: E501 + query_params.append(('{{baseName}}', local_var_params['{{paramName}}'])){{#isArray}} # noqa: E501 + collection_formats['{{baseName}}'] = '{{collectionFormat}}'{{/isArray}} # noqa: E501 {{/queryParams}} header_params = {} {{#headerParams}} if '{{paramName}}' in local_var_params: - header_params['{{baseName}}'] = local_var_params['{{paramName}}']{{#isListContainer}} # noqa: E501 - collection_formats['{{baseName}}'] = '{{collectionFormat}}'{{/isListContainer}} # noqa: E501 + header_params['{{baseName}}'] = local_var_params['{{paramName}}']{{#isArray}} # noqa: E501 + collection_formats['{{baseName}}'] = '{{collectionFormat}}'{{/isArray}} # noqa: E501 {{/headerParams}} form_params = [] local_var_files = {} {{#formParams}} if '{{paramName}}' in local_var_params: - {{^isFile}}form_params.append(('{{baseName}}', local_var_params['{{paramName}}'])){{/isFile}}{{#isFile}}local_var_files['{{baseName}}'] = local_var_params['{{paramName}}']{{/isFile}}{{#isListContainer}} # noqa: E501 - collection_formats['{{baseName}}'] = '{{collectionFormat}}'{{/isListContainer}} # noqa: E501 + {{^isFile}}form_params.append(('{{baseName}}', local_var_params['{{paramName}}'])){{/isFile}}{{#isFile}}local_var_files['{{baseName}}'] = local_var_params['{{paramName}}']{{/isFile}}{{#isArray}} # noqa: E501 + collection_formats['{{baseName}}'] = '{{collectionFormat}}'{{/isArray}} # noqa: E501 {{/formParams}} body_params = None diff --git a/modules/openapi-generator/src/main/resources/python/model.mustache b/modules/openapi-generator/src/main/resources/python/model.mustache index 1696dc55bab..9760e7d5e87 100644 --- a/modules/openapi-generator/src/main/resources/python/model.mustache +++ b/modules/openapi-generator/src/main/resources/python/model.mustache @@ -118,7 +118,7 @@ class {{classname}}(object): {{#isEnum}} {{#isContainer}} allowed_values = [{{#isNullable}}None,{{/isNullable}}{{#allowableValues}}{{#values}}{{#items.isString}}"{{/items.isString}}{{{this}}}{{#items.isString}}"{{/items.isString}}{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}}] # noqa: E501 -{{#isListContainer}} +{{#isArray}} if (self.local_vars_configuration.client_side_validation and not set({{{name}}}).issubset(set(allowed_values))): # noqa: E501 raise ValueError( @@ -126,7 +126,7 @@ class {{classname}}(object): .format(", ".join(map(str, set({{{name}}}) - set(allowed_values))), # noqa: E501 ", ".join(map(str, allowed_values))) ) -{{/isListContainer}} +{{/isArray}} {{#isMap}} if (self.local_vars_configuration.client_side_validation and not set({{{name}}}.keys()).issubset(set(allowed_values))): # noqa: E501 diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model.mustache index 1a181b824d1..1fc47d90561 100644 --- a/modules/openapi-generator/src/main/resources/python/python-experimental/model.mustache +++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model.mustache @@ -33,22 +33,22 @@ def lazy_import(): {{^interfaces}} -{{#isArrayModel}} +{{#isArray}} {{> python-experimental/model_templates/model_simple }} -{{/isArrayModel}} +{{/isArray}} {{#isEnum}} {{> python-experimental/model_templates/model_simple }} {{/isEnum}} {{#isAlias}} {{> python-experimental/model_templates/model_simple }} {{/isAlias}} -{{^isArrayModel}} +{{^isArray}} {{^isEnum}} {{^isAlias}} {{> python-experimental/model_templates/model_normal }} {{/isAlias}} {{/isEnum}} -{{/isArrayModel}} +{{/isArray}} {{/interfaces}} {{#interfaces}} {{#-last}} diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model_doc.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model_doc.mustache index b5aa50c4323..7971d6c85f6 100644 --- a/modules/openapi-generator/src/main/resources/python/python-experimental/model_doc.mustache +++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model_doc.mustache @@ -11,9 +11,9 @@ Name | Type | Description | Notes {{#isAlias}} **value** | {{^arrayModelType}}**{{dataType}}**{{/arrayModelType}} | {{description}} | {{#defaultValue}}{{#hasRequired}} if omitted the server will use the default value of {{/hasRequired}}{{^hasRequired}}defaults to {{/hasRequired}}{{{.}}}{{/defaultValue}} {{/isAlias}} -{{#isArrayModel}} +{{#isArray}} **value** | {{^arrayModelType}}**{{dataType}}**{{/arrayModelType}}{{#arrayModelType}}[**{{dataType}}**]({{arrayModelType}}.md){{/arrayModelType}} | {{description}} | {{#defaultValue}}{{#hasRequired}} if omitted the server will use the default value of {{/hasRequired}}{{^hasRequired}}defaults to {{/hasRequired}}{{{.}}}{{/defaultValue}} -{{/isArrayModel}} +{{/isArray}} {{#requiredVars}} {{^defaultValue}} **{{name}}** | {{^complexType}}**{{dataType}}**{{/complexType}}{{#complexType}}[**{{dataType}}**]({{complexType}}.md){{/complexType}} | {{description}} | {{#isReadOnly}}[readonly] {{/isReadOnly}} diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/classvars.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/classvars.mustache index 3a789199485..f2ea42679a6 100644 --- a/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/classvars.mustache +++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/classvars.mustache @@ -102,9 +102,9 @@ {{#isEnum}} 'value': ({{{dataType}}},), {{/isEnum}} -{{#isArrayModel}} +{{#isArray}} 'value': ({{{dataType}}},), -{{/isArrayModel}} +{{/isArray}} {{#requiredVars}} '{{name}}': ({{{dataType}}},), # noqa: E501 {{/requiredVars}} diff --git a/modules/openapi-generator/src/main/resources/r/api.mustache b/modules/openapi-generator/src/main/resources/r/api.mustache index 778fcc61f40..cde903a4617 100644 --- a/modules/openapi-generator/src/main/resources/r/api.mustache +++ b/modules/openapi-generator/src/main/resources/r/api.mustache @@ -20,7 +20,7 @@ {{/isEnum}} {{^isEnum}} {{#isContainer}} -{{#isListContainer}} +{{#isArray}} {{#items}} {{#isPrimitiveType}} #' \item \emph{ @param } {{paramName}} list( {{dataType}} ) @@ -29,7 +29,7 @@ #' \item \emph{ @param } {{paramName}} list( \link{{=<% %>=}}{<%dataType%>}<%={{ }}=%> ) {{/isPrimitiveType}} {{/items}} -{{/isListContainer}} +{{/isArray}} {{#isMap}} {{#isPrimitiveType}} #' \item \emph{ @param } {{paramName}} named list( {{dataType}} ) @@ -51,7 +51,7 @@ {{/allParams}} {{#returnType}} {{^returnTypeIsPrimitive}} -#' \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 +#' \item \emph{ @returnType } {{#returnContainer}}{{#isArray}}list( {{/isArray}}{{#isMap}}named list( {{/isMap}}{{/returnContainer}}\link{{=<% %>=}}{<%#returnContainer%><%={{ }}=%>{{returnBaseType}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{=<% %>=}}<%/returnContainer%>}<%={{ }}=%>{{#returnContainer}}{{#isArray}} ){{/isArray}}{{#isMap}} ){{/isMap}}{{/returnContainer}} \cr {{/returnTypeIsPrimitive}} {{/returnType}} #' @@ -213,13 +213,13 @@ {{#hasBodyParam}} {{#bodyParams}} if (!missing(`{{paramName}}`)) { - {{#isListContainer}} + {{#isArray}} body.items = paste(unlist(lapply({{paramName}}, function(param){param$toJSONString()})), collapse = ",") body <- paste0('[', body.items, ']') - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} body <- `{{paramName}}`$toJSONString() - {{/isListContainer}} + {{/isArray}} } else { body <- NULL } 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 1d0198c16bb..d952e482685 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}}{{#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}} **{{paramName}}** | {{#isEnum}}Enum {{#allowableValues}}{{values}}{{/allowableValues}} {{/isEnum}}{{^isEnum}}{{#isContainer}}{{#isArray}}{{#items}}{{#isPrimitiveType}}list( **{{dataType}}** ){{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}list( [**{{dataType}}**]({{baseType}}.md) ){{/isFile}}{{/isPrimitiveType}}{{/items}}{{/isArray}}{{#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 d17b7d69be0..9ca4d560a8d 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}}{{#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}} +#' @field {{baseName}} {{title}} {{#isContainer}}{{#isArray}}list( {{/isArray}}{{#isMap}}named list( {{/isMap}}{{/isContainer}}{{^isPrimitiveType}}\link{{=<% %>=}}{<%/isPrimitiveType%><%={{ }}=%>{{#isContainer}}{{#items}}{{dataType}}{{/items}}{{/isContainer}}{{^isContainer}}{{dataType}}{{/isContainer}}{{=<% %>=}}<%^isPrimitiveType%>}<%={{ }}=%>{{/isPrimitiveType}}{{#isContainer}}{{#isArray}} ){{/isArray}}{{#isMap}} ){{/isMap}}{{/isContainer}} {{^required}}[optional]{{/required}} #' {{/vars}} #' @importFrom R6 R6Class @@ -118,14 +118,14 @@ if (!is.null(self$`{{baseName}}`)) { {{classname}}Object[['{{baseName}}']] <- {{#isContainer}} - {{#isListContainer}} + {{#isArray}} {{#isPrimitiveType}} self$`{{baseName}}` {{/isPrimitiveType}} {{^isPrimitiveType}} lapply(self$`{{baseName}}`, function(x) x$toJSON()) {{/isPrimitiveType}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} {{#isPrimitiveType}} self$`{{baseName}}` @@ -176,13 +176,13 @@ sprintf( '"{{baseName}}": {{#isContainer}} - {{#isListContainer}} + {{#isArray}} {{#isPrimitiveType}} {{#isNumeric}}[%d]{{/isNumeric}}{{^isNumeric}}[%s]{{/isNumeric}} {{/isPrimitiveType}} {{^isPrimitiveType}}[%s] {{/isPrimitiveType}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} {{#isPrimitiveType}} {{#isNumeric}}%d{{/isNumeric}}{{^isNumeric}}"%s"{{/isNumeric}} @@ -199,14 +199,14 @@ {{/isPrimitiveType}} {{/isContainer}}', {{#isContainer}} - {{#isListContainer}} + {{#isArray}} {{#isPrimitiveType}} paste(unlist(lapply(self$`{{{baseName}}}`, function(x) paste0('"', x, '"'))), collapse=",") {{/isPrimitiveType}} {{^isPrimitiveType}} paste(sapply(self$`{{{baseName}}}`, function(x) jsonlite::toJSON(x$toJSON(), auto_unbox=TRUE, digits = NA)), collapse=",") {{/isPrimitiveType}} - {{/isListContainer}} + {{/isArray}} {{#isMap}} {{#isPrimitiveType}} jsonlite::toJSON(lapply(self$`{{{baseName}}}`, function(x){ x }), auto_unbox = TRUE, digits=NA) 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 6cb3892ea3b..e5e491913e5 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 @@ -132,11 +132,11 @@ {{#vars}} if attributes.key?(:'{{{name}}}') - {{#isListContainer}} + {{#isArray}} if (value = attributes[:'{{{name}}}']).is_a?(Array) self.{{{name}}} = value end - {{/isListContainer}} + {{/isArray}} {{#isMap}} if (value = attributes[:'{{{name}}}']).is_a?(Hash) self.{{{name}}} = value 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 42fd1352e2c..acc10d640bd 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 @@ -6,7 +6,7 @@ class {{classname}} < ApplicationRecord {{#requiredVars}} validates_presence_of :{{name}} -{{/requiredVars}}{{#vars}}{{#isListContainer}} - serialize :{{name}}, Array{{/isListContainer}}{{#isMap}} +{{/requiredVars}}{{#vars}}{{#isArray}} + serialize :{{name}}, Array{{/isArray}}{{#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 a4ba4326fd9..a4720abcc51 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 @@ -6,7 +6,7 @@ {{/x-callback-params}} {{/vendorExtensions}} {{#allParams}} - param_{{{paramName}}}: {{^required}}Option<{{/required}}{{#isListContainer}}&{{/isListContainer}}{{{dataType}}}{{^required}}>{{/required}}, + param_{{{paramName}}}: {{^required}}Option<{{/required}}{{#isArray}}&{{/isArray}}{{{dataType}}}{{^required}}>{{/required}}, {{/allParams}} context: &C) -> Result<{{{operationId}}}Response, ApiError> { @@ -45,12 +45,12 @@ }); {{/x-consumes-json}} {{^x-consumes-json}} - {{#isListContainer}} + {{#isArray}} ¶m_{{{paramName}}}.iter().map(ToString::to_string).collect::>().join(",")); - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} ¶m_{{{paramName}}}.to_string()); - {{/isListContainer}} + {{/isArray}} {{/x-consumes-json}} {{/vendorExtensions}} {{^required}} diff --git a/modules/openapi-generator/src/main/resources/rust-server/example-server-operation.mustache b/modules/openapi-generator/src/main/resources/rust-server/example-server-operation.mustache index ea9a9ea16e8..34a726fb8aa 100644 --- a/modules/openapi-generator/src/main/resources/rust-server/example-server-operation.mustache +++ b/modules/openapi-generator/src/main/resources/rust-server/example-server-operation.mustache @@ -9,7 +9,7 @@ {{/x-callback-params}} {{/vendorExtensions}} {{#allParams}} - {{{paramName}}}: {{^required}}Option<{{/required}}{{#isListContainer}}&{{/isListContainer}}{{{dataType}}}{{^required}}>{{/required}}, + {{{paramName}}}: {{^required}}Option<{{/required}}{{#isArray}}&{{/isArray}}{{{dataType}}}{{^required}}>{{/required}}, {{/allParams}} context: &C) -> Result<{{{operationId}}}Response, ApiError> { diff --git a/modules/openapi-generator/src/main/resources/rust-server/lib.mustache b/modules/openapi-generator/src/main/resources/rust-server/lib.mustache index 51c94217a6f..1be0c7c2aad 100644 --- a/modules/openapi-generator/src/main/resources/rust-server/lib.mustache +++ b/modules/openapi-generator/src/main/resources/rust-server/lib.mustache @@ -39,7 +39,7 @@ pub trait Api { async fn {{#vendorExtensions}}{{{x-operation-id}}}{{/vendorExtensions}}( &self, {{#allParams}} - {{{paramName}}}: {{^required}}Option<{{/required}}{{#isListContainer}}&{{/isListContainer}}{{{dataType}}}{{^required}}>{{/required}}, + {{{paramName}}}: {{^required}}Option<{{/required}}{{#isArray}}&{{/isArray}}{{{dataType}}}{{^required}}>{{/required}}, {{/allParams}} context: &C) -> Result<{{{operationId}}}Response, ApiError>; @@ -67,7 +67,7 @@ pub trait ApiNoContext { async fn {{#vendorExtensions}}{{{x-operation-id}}}{{/vendorExtensions}}( &self, {{#allParams}} - {{{paramName}}}: {{^required}}Option<{{/required}}{{#isListContainer}}&{{/isListContainer}}{{{dataType}}}{{^required}}>{{/required}}, + {{{paramName}}}: {{^required}}Option<{{/required}}{{#isArray}}&{{/isArray}}{{{dataType}}}{{^required}}>{{/required}}, {{/allParams}} ) -> Result<{{{operationId}}}Response, ApiError>; @@ -110,7 +110,7 @@ impl + Send + Sync, C: Clone + Send + Sync> ApiNoContext for Contex async fn {{#vendorExtensions}}{{{x-operation-id}}}{{/vendorExtensions}}( &self, {{#allParams}} - {{{paramName}}}: {{^required}}Option<{{/required}}{{#isListContainer}}&{{/isListContainer}}{{{dataType}}}{{^required}}>{{/required}}, + {{{paramName}}}: {{^required}}Option<{{/required}}{{#isArray}}&{{/isArray}}{{{dataType}}}{{^required}}>{{/required}}, {{/allParams}} ) -> Result<{{{operationId}}}Response, ApiError> { @@ -167,7 +167,7 @@ pub trait CallbackApi { {{/x-callback-params}} {{/vendorExtensions}} {{#allParams}} - {{{paramName}}}: {{^required}}Option<{{/required}}{{#isListContainer}}&{{/isListContainer}}{{{dataType}}}{{^required}}>{{/required}}, + {{{paramName}}}: {{^required}}Option<{{/required}}{{#isArray}}&{{/isArray}}{{{dataType}}}{{^required}}>{{/required}}, {{/allParams}} context: &C) -> Result<{{{operationId}}}Response, ApiError>; @@ -205,7 +205,7 @@ pub trait CallbackApiNoContext { {{/x-callback-params}} {{/vendorExtensions}} {{#allParams}} - {{{paramName}}}: {{^required}}Option<{{/required}}{{#isListContainer}}&{{/isListContainer}}{{{dataType}}}{{^required}}>{{/required}}, + {{{paramName}}}: {{^required}}Option<{{/required}}{{#isArray}}&{{/isArray}}{{{dataType}}}{{^required}}>{{/required}}, {{/allParams}} ) -> Result<{{{operationId}}}Response, ApiError>; @@ -258,7 +258,7 @@ impl + Send + Sync, C: Clone + Send + Sync> CallbackApiNoConte {{/x-callback-params}} {{/vendorExtensions}} {{#allParams}} - {{{paramName}}}: {{^required}}Option<{{/required}}{{#isListContainer}}&{{/isListContainer}}{{{dataType}}}{{^required}}>{{/required}}, + {{{paramName}}}: {{^required}}Option<{{/required}}{{#isArray}}&{{/isArray}}{{{dataType}}}{{^required}}>{{/required}}, {{/allParams}} ) -> Result<{{{operationId}}}Response, ApiError> { 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 bdb4a6f2738..6b4f9ffbb84 100644 --- a/modules/openapi-generator/src/main/resources/rust-server/models.mustache +++ b/modules/openapi-generator/src/main/resources/rust-server/models.mustache @@ -327,42 +327,42 @@ impl std::string::ToString for {{{classname}}} { {{^isByteArray}}{{^isBinary}}{{^isMap}}{{#isPrimitiveType}} {{#required}} params.push("{{{baseName}}}".to_string()); -{{^isListContainer}} +{{^isArray}} {{#isNullable}} params.push(self.{{{name}}}.as_ref().map_or("null".to_string(), |x| x.to_string())); {{/isNullable}} {{^isNullable}} params.push(self.{{{name}}}.to_string()); {{/isNullable}} -{{/isListContainer}} -{{#isListContainer}} +{{/isArray}} +{{#isArray}} {{#isNullable}} params.push(self.{{{name}}}.as_ref().map_or(vec!["null".to_string()], |x| x.iter().map(|x| x.to_string()).collect::>().join(",").to_string())); {{/isNullable}} {{^isNullable}} params.push(self.{{{name}}}.iter().map(|x| x.to_string()).collect::>().join(",").to_string()); {{/isNullable}} -{{/isListContainer}} +{{/isArray}} {{/required}} {{^required}} if let Some(ref {{{name}}}) = self.{{{name}}} { params.push("{{{baseName}}}".to_string()); -{{^isListContainer}} +{{^isArray}} {{#isNullable}} params.push({{{name}}}.as_ref().map_or("null".to_string(), |x| x.to_string())); {{/isNullable}} {{^isNullable}} params.push({{{name}}}.to_string()); {{/isNullable}} -{{/isListContainer}} -{{#isListContainer}} +{{/isArray}} +{{#isArray}} {{#isNullable}} params.push({{{name}}}.as_ref().map_or("null".to_string(), |x| x.iter().map(|x| x.to_string()).collect::>().join(",").to_string())); {{/isNullable}} {{^isNullable}} params.push({{{name}}}.iter().map(|x| x.to_string()).collect::>().join(",").to_string()); {{/isNullable}} -{{/isListContainer}} +{{/isArray}} } {{/required}} {{/isPrimitiveType}}{{/isMap}}{{/isBinary}}{{/isByteArray}} 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 9d17fab2775..6399da844aa 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 @@ -126,7 +126,7 @@ let query_params = form_urlencoded::parse(uri.query().unwrap_or_default().as_bytes()).collect::>(); {{/-first}} let param_{{{paramName}}} = query_params.iter().filter(|e| e.0 == "{{{baseName}}}").map(|e| e.1.to_owned()) - {{#isListContainer}} + {{#isArray}} {{^vendorExtensions.x-consumes-json}} .filter_map(|param_{{{paramName}}}| param_{{{paramName}}}.parse().ok()) .collect::>(); @@ -165,8 +165,8 @@ }; {{/required}} {{/vendorExtensions.x-consumes-json}} - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} .nth(0); let param_{{{paramName}}} = match param_{{{paramName}}} { Some(param_{{{paramName}}}) => { @@ -197,7 +197,7 @@ .expect("Unable to create Bad Request response for missing query parameter {{{baseName}}}")), }; {{/required}} - {{/isListContainer}} + {{/isArray}} {{#-last}} {{/-last}} @@ -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}}{{#isMap}}None;{{/isMap}} + let param_{{{paramName}}} = {{^isContainer}}{{#vendorExtensions}}{{{x-example}}};{{/vendorExtensions}}{{/isContainer}}{{#isArray}}{{#required}}Vec::new();{{/required}}{{^required}}None;{{/required}}{{/isArray}}{{#isMap}}None;{{/isMap}} {{#-last}} {{/-last}} @@ -481,7 +481,7 @@ {{/x-callback-params}} {{/vendorExtensions}} {{#allParams}} - param_{{{paramName}}}{{#isListContainer}}.as_ref(){{/isListContainer}}, + param_{{{paramName}}}{{#isArray}}.as_ref(){{/isArray}}, {{/allParams}} &context ).await; diff --git a/modules/openapi-generator/src/main/resources/rust/hyper/api.mustache b/modules/openapi-generator/src/main/resources/rust/hyper/api.mustache index c7a228ecebc..337c9a8b029 100644 --- a/modules/openapi-generator/src/main/resources/rust/hyper/api.mustache +++ b/modules/openapi-generator/src/main/resources/rust/hyper/api.mustache @@ -57,36 +57,36 @@ impl{{{classname}}} for {{{classname}}}Client { {{#queryParams}} {{#required}} {{^isNullable}} - req = req.with_query_param("{{{baseName}}}".to_string(), {{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); + req = req.with_query_param("{{{baseName}}}".to_string(), {{{paramName}}}{{#isArray}}.join(","){{/isArray}}.to_string()); {{/isNullable}} {{#isNullable}} match {{{paramName}}} { - Some(param_value) => { req = req.with_query_param("{{{baseName}}}".to_string(), param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); }, + Some(param_value) => { req = req.with_query_param("{{{baseName}}}".to_string(), param_value{{#isArray}}.join(","){{/isArray}}.to_string()); }, None => { req = req.with_query_param("{{{baseName}}}".to_string(), "".to_string()); }, } {{/isNullable}} {{/required}} {{^required}} if let Some(ref s) = {{{paramName}}} { - req = req.with_query_param("{{{baseName}}}".to_string(), s{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); + req = req.with_query_param("{{{baseName}}}".to_string(), s{{#isArray}}.join(","){{/isArray}}.to_string()); } {{/required}} {{/queryParams}} {{#pathParams}} {{#required}} {{^isNullable}} - req = req.with_path_param("{{{baseName}}}".to_string(), {{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); + req = req.with_path_param("{{{baseName}}}".to_string(), {{{paramName}}}{{#isArray}}.join(","){{/isArray}}.to_string()); {{/isNullable}} {{#isNullable}} match {{{paramName}}} { - Some(param_value) => { req = req.with_path_param("{{{baseName}}}".to_string(), param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); }, + Some(param_value) => { req = req.with_path_param("{{{baseName}}}".to_string(), param_value{{#isArray}}.join(","){{/isArray}}.to_string()); }, None => { req = req.with_path_param("{{{baseName}}}".to_string(), "".to_string()); }, } {{/isNullable}} {{/required}} {{^required}} if let Some(param_value) = {{{paramName}}} { - req = req.with_path_param("{{{baseName}}}".to_string(), param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); + req = req.with_path_param("{{{baseName}}}".to_string(), param_value{{#isArray}}.join(","){{/isArray}}.to_string()); } {{/required}} {{/pathParams}} @@ -94,18 +94,18 @@ impl{{{classname}}} for {{{classname}}}Client { {{#headerParams}} {{#required}} {{^isNullable}} - req = req.with_header_param("{{{baseName}}}".to_string(), {{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); + req = req.with_header_param("{{{baseName}}}".to_string(), {{{paramName}}}{{#isArray}}.join(","){{/isArray}}.to_string()); {{/isNullable}} {{#isNullable}} match {{{paramName}}} { - Some(param_value) => { req = req.with_header_param("{{{baseName}}}".to_string(), param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); }, + Some(param_value) => { req = req.with_header_param("{{{baseName}}}".to_string(), param_value{{#isArray}}.join(","){{/isArray}}.to_string()); }, None => { req = req.with_header_param("{{{baseName}}}".to_string(), "".to_string()); }, } {{/isNullable}} {{/required}} {{^required}} if let Some(param_value) = {{{paramName}}} { - req = req.with_header_param("{{{baseName}}}".to_string(), param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); + req = req.with_header_param("{{{baseName}}}".to_string(), param_value{{#isArray}}.join(","){{/isArray}}.to_string()); } {{/required}} {{/headerParams}} @@ -133,18 +133,18 @@ impl{{{classname}}} for {{{classname}}}Client { {{^isFile}} {{#required}} {{^isNullable}} - req = req.with_form_param("{{{baseName}}}".to_string(), {{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); + req = req.with_form_param("{{{baseName}}}".to_string(), {{{paramName}}}{{#isArray}}.join(","){{/isArray}}.to_string()); {{/isNullable}} {{#isNullable}} match {{{paramName}}} { - Some(param_value) => { req = req.with_form_param("{{{baseName}}}".to_string(), param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); }, + Some(param_value) => { req = req.with_form_param("{{{baseName}}}".to_string(), param_value{{#isArray}}.join(","){{/isArray}}.to_string()); }, None => { req = req.with_form_param("{{{baseName}}}".to_string(), "".to_string()); }, } {{/isNullable}} {{/required}} {{^required}} if let Some(param_value) = {{{paramName}}} { - req = req.with_form_param("{{{baseName}}}".to_string(), param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); + req = req.with_form_param("{{{baseName}}}".to_string(), param_value{{#isArray}}.join(","){{/isArray}}.to_string()); } {{/required}} {{/isFile}} diff --git a/modules/openapi-generator/src/main/resources/rust/model.mustache b/modules/openapi-generator/src/main/resources/rust/model.mustache index cc21bda61a9..c836e76f02c 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}}{{#isMap}}: None{{/isMap}}{{^isContainer}}: None{{/isContainer}}{{/required}}, + {{{name}}}{{^required}}{{#isArray}}: None{{/isArray}}{{#isMap}}: None{{/isMap}}{{^isContainer}}: None{{/isContainer}}{{/required}}, {{/vars}} } } diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache index a369e2cb937..1c9370894eb 100644 --- a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache +++ b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache @@ -17,7 +17,7 @@ pub struct {{{operationIdCamelCase}}}Params { {{#description}} /// {{{.}}} {{/description}} - pub {{{paramName}}}: {{^required}}Option<{{/required}}{{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{#isString}}{{#isListContainer}}Vec<{{/isListContainer}}String{{#isListContainer}}>{{/isListContainer}}{{/isString}}{{#isUuid}}{{#isListContainer}}Vec<{{/isListContainer}}String{{#isListContainer}}>{{/isListContainer}}{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}crate::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{^required}}>{{/required}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}}{{#hasMore}},{{/hasMore}} + pub {{{paramName}}}: {{^required}}Option<{{/required}}{{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{#isString}}{{#isArray}}Vec<{{/isArray}}String{{#isArray}}>{{/isArray}}{{/isString}}{{#isUuid}}{{#isArray}}Vec<{{/isArray}}String{{#isArray}}>{{/isArray}}{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}crate::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{^required}}>{{/required}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}}{{#hasMore}},{{/hasMore}} {{#-last}} } @@ -88,21 +88,21 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: {{/vendorExtensions.x-group-parameters}} {{^vendorExtensions.x-group-parameters}} -pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: &configuration::Configuration, {{#allParams}}{{{paramName}}}: {{^required}}Option<{{/required}}{{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{#isString}}{{#isListContainer}}Vec<{{/isListContainer}}&str{{#isListContainer}}>{{/isListContainer}}{{/isString}}{{#isUuid}}{{#isListContainer}}Vec<{{/isListContainer}}&str{{#isListContainer}}>{{/isListContainer}}{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}crate::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{^required}}>{{/required}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Result<{{#supportMultipleResponses}}ResponseContent<{{{operationIdCamelCase}}}Success>{{/supportMultipleResponses}}{{^supportMultipleResponses}}{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}{{/supportMultipleResponses}}, Error<{{{operationIdCamelCase}}}Error>> { +pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: &configuration::Configuration, {{#allParams}}{{{paramName}}}: {{^required}}Option<{{/required}}{{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{#isString}}{{#isArray}}Vec<{{/isArray}}&str{{#isArray}}>{{/isArray}}{{/isString}}{{#isUuid}}{{#isArray}}Vec<{{/isArray}}&str{{#isArray}}>{{/isArray}}{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}crate::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{^required}}>{{/required}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Result<{{#supportMultipleResponses}}ResponseContent<{{{operationIdCamelCase}}}Success>{{/supportMultipleResponses}}{{^supportMultipleResponses}}{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}{{/supportMultipleResponses}}, Error<{{{operationIdCamelCase}}}Error>> { {{/vendorExtensions.x-group-parameters}} let local_var_client = &configuration.client; - let local_var_uri_str = format!("{}{{{path}}}", configuration.base_path{{#pathParams}}, {{{baseName}}}={{#isString}}crate::apis::urlencode({{/isString}}{{{paramName}}}{{^required}}.unwrap(){{/required}}{{#required}}{{#isNullable}}.unwrap(){{/isNullable}}{{/required}}{{#isListContainer}}.join(",").as_ref(){{/isListContainer}}{{#isString}}){{/isString}}{{/pathParams}}); + let local_var_uri_str = format!("{}{{{path}}}", configuration.base_path{{#pathParams}}, {{{baseName}}}={{#isString}}crate::apis::urlencode({{/isString}}{{{paramName}}}{{^required}}.unwrap(){{/required}}{{#required}}{{#isNullable}}.unwrap(){{/isNullable}}{{/required}}{{#isArray}}.join(",").as_ref(){{/isArray}}{{#isString}}){{/isString}}{{/pathParams}}); let mut local_var_req_builder = local_var_client.{{{httpMethod}}}(local_var_uri_str.as_str()); {{#queryParams}} {{#required}} - local_var_req_builder = local_var_req_builder.query(&[("{{{baseName}}}", &{{{paramName}}}{{#isListContainer}}.into_iter().map(|p| p.to_string()).collect::>().join(","){{/isListContainer}}.to_string())]); + local_var_req_builder = local_var_req_builder.query(&[("{{{baseName}}}", &{{{paramName}}}{{#isArray}}.into_iter().map(|p| p.to_string()).collect::>().join(","){{/isArray}}.to_string())]); {{/required}} {{^required}} if let Some(ref local_var_str) = {{{paramName}}} { - local_var_req_builder = local_var_req_builder.query(&[("{{{baseName}}}", &local_var_str{{#isListContainer}}.into_iter().map(|p| p.to_string()).collect::>().join(","){{/isListContainer}}.to_string())]); + local_var_req_builder = local_var_req_builder.query(&[("{{{baseName}}}", &local_var_str{{#isArray}}.into_iter().map(|p| p.to_string()).collect::>().join(","){{/isArray}}.to_string())]); } {{/required}} {{/queryParams}} @@ -129,18 +129,18 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: {{#headerParams}} {{#required}} {{^isNullable}} - local_var_req_builder = local_var_req_builder.header("{{{baseName}}}", {{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); + local_var_req_builder = local_var_req_builder.header("{{{baseName}}}", {{{paramName}}}{{#isArray}}.join(","){{/isArray}}.to_string()); {{/isNullable}} {{#isNullable}} match {{{paramName}}} { - Some(local_var_param_value) => { local_var_req_builder = local_var_req_builder.header("{{{baseName}}}", local_var_param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); }, + Some(local_var_param_value) => { local_var_req_builder = local_var_req_builder.header("{{{baseName}}}", local_var_param_value{{#isArray}}.join(","){{/isArray}}.to_string()); }, None => { local_var_req_builder = local_var_req_builder.header("{{{baseName}}}", ""); }, } {{/isNullable}} {{/required}} {{^required}} if let Some(local_var_param_value) = {{{paramName}}} { - local_var_req_builder = local_var_req_builder.header("{{{baseName}}}", local_var_param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); + local_var_req_builder = local_var_req_builder.header("{{{baseName}}}", local_var_param_value{{#isArray}}.join(","){{/isArray}}.to_string()); } {{/required}} {{/headerParams}} @@ -208,18 +208,18 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: {{^isFile}} {{#required}} {{^isNullable}} - local_var_form = local_var_form.text("{{{baseName}}}", {{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); + local_var_form = local_var_form.text("{{{baseName}}}", {{{paramName}}}{{#isArray}}.join(","){{/isArray}}.to_string()); {{/isNullable}} {{#isNullable}} match {{{paramName}}} { - Some(local_var_param_value) => { form = form.text("{{{baseName}}}", local_var_param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); }, + Some(local_var_param_value) => { form = form.text("{{{baseName}}}", local_var_param_value{{#isArray}}.join(","){{/isArray}}.to_string()); }, None => { local_var_form = local_var_form.text("{{{baseName}}}", ""); }, } {{/isNullable}} {{/required}} {{^required}} if let Some(local_var_param_value) = {{{paramName}}} { - local_var_form = local_var_form.text("{{{baseName}}}", local_var_param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); + local_var_form = local_var_form.text("{{{baseName}}}", local_var_param_value{{#isArray}}.join(","){{/isArray}}.to_string()); } {{/required}} {{/isFile}} @@ -252,18 +252,18 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: {{^isFile}} {{#required}} {{^isNullable}} - local_var_form_params.insert("{{{baseName}}}", {{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); + local_var_form_params.insert("{{{baseName}}}", {{{paramName}}}{{#isArray}}.join(","){{/isArray}}.to_string()); {{/isNullable}} {{#isNullable}} match {{{paramName}}} { - Some(local_var_param_value) => { local_var_form_params.insert("{{{baseName}}}", local_var_param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); }, + Some(local_var_param_value) => { local_var_form_params.insert("{{{baseName}}}", local_var_param_value{{#isArray}}.join(","){{/isArray}}.to_string()); }, None => { local_var_form_params.insert("{{{baseName}}}", ""); }, } {{/isNullable}} {{/required}} {{^required}} if let Some(local_var_param_value) = {{{paramName}}} { - local_var_form_params.insert("{{{baseName}}}", local_var_param_value{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); + local_var_form_params.insert("{{{baseName}}}", local_var_param_value{{#isArray}}.join(","){{/isArray}}.to_string()); } {{/required}} {{/isFile}} 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 9b9e6240977..61fc0fe3a9d 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 @@ -10,19 +10,19 @@ import {{import}} /** * {{#description}}{{&.}}{{/description}}{{^description}}Represents the Swagger definition for {{name}}.{{/description}}{{#vars}}{{#description}} * @param {{&name}} {{&description}}{{/description}}{{/vars}} - {{#isArrayModel}} + {{#isArray}} * @param items The items of this array-like object. - {{/isArrayModel}} + {{/isArray}} {{#isMap}} * @param additionalProperties Any additional properties this model may have. {{/isMap}} */ {{>generatedAnnotation}} -{{^isArrayModel}} +{{^isArray}} {{>caseClass}} -{{/isArrayModel}} -{{#isArrayModel}} +{{/isArray}} +{{#isArray}} {{>arrayCaseClass}} -{{/isArrayModel}} +{{/isArray}} {{/model}} {{/models}} 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 5cffef84aa8..7c680e8db05 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}}{{#isMap}}additionalProperties{{/isMap}} + {{classVarName}} => innerFormat.writes({{classVarName}}.{{#isArray}}items{{/isArray}}{{#isMap}}additionalProperties{{/isMap}} ) \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/swift4/model.mustache b/modules/openapi-generator/src/main/resources/swift4/model.mustache index 6534ca945f6..2f08e82be16 100644 --- a/modules/openapi-generator/src/main/resources/swift4/model.mustache +++ b/modules/openapi-generator/src/main/resources/swift4/model.mustache @@ -9,16 +9,16 @@ import Foundation {{#description}} /** {{description}} */{{/description}} -{{#isArrayModel}} +{{#isArray}} {{> modelArray}} -{{/isArrayModel}} -{{^isArrayModel}} +{{/isArray}} +{{^isArray}} {{#isEnum}} {{> modelEnum}} {{/isEnum}} {{^isEnum}} {{> modelObject}} {{/isEnum}} -{{/isArrayModel}} +{{/isArray}} {{/model}} {{/models}} diff --git a/modules/openapi-generator/src/main/resources/swift5/model.mustache b/modules/openapi-generator/src/main/resources/swift5/model.mustache index 58001cdc770..15befbc24b8 100644 --- a/modules/openapi-generator/src/main/resources/swift5/model.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/model.mustache @@ -12,16 +12,16 @@ import Foundation {{#isDeprecated}} @available(*, deprecated, message: "This schema is deprecated.") {{/isDeprecated}} -{{#isArrayModel}} +{{#isArray}} {{> modelArray}} -{{/isArrayModel}} -{{^isArrayModel}} +{{/isArray}} +{{^isArray}} {{#isEnum}} {{> modelEnum}} {{/isEnum}} {{^isEnum}} {{> modelObject}} {{/isEnum}} -{{/isArrayModel}} +{{/isArray}} {{/model}} {{/models}} diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache index 44194e1c73c..314a66200f6 100644 --- a/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache @@ -175,7 +175,7 @@ export class {{classname}} { {{#hasQueryParams}} let queryParameters = new HttpParams({encoder: this.encoder}); {{#queryParams}} - {{#isListContainer}} + {{#isArray}} if ({{paramName}}) { {{#isQueryParamObjectFormatJson}} queryParameters = this.addToHttpParams(queryParameters, @@ -194,28 +194,28 @@ export class {{classname}} { {{/isCollectionFormatMulti}} {{/isQueryParamObjectFormatJson}} } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if ({{paramName}} !== undefined && {{paramName}} !== null) { queryParameters = this.addToHttpParams(queryParameters, {{paramName}}, '{{baseName}}'); } - {{/isListContainer}} + {{/isArray}} {{/queryParams}} {{/hasQueryParams}} let headers = this.defaultHeaders; {{#headerParams}} - {{#isListContainer}} + {{#isArray}} if ({{paramName}}) { headers = headers.set('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}'])); } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if ({{paramName}} !== undefined && {{paramName}} !== null) { headers = headers.set('{{baseName}}', String({{paramName}})); } - {{/isListContainer}} + {{/isArray}} {{/headerParams}} {{#authMethods}} @@ -307,7 +307,7 @@ export class {{classname}} { } {{#formParams}} - {{#isListContainer}} + {{#isArray}} if ({{paramName}}) { {{#isCollectionFormatMulti}} {{paramName}}.forEach((element) => { @@ -324,12 +324,12 @@ export class {{classname}} { } {{/isCollectionFormatMulti}} } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if ({{paramName}} !== undefined) { formParams = formParams.append('{{baseName}}', {{^isModel}}{{paramName}}{{/isModel}}{{#isModel}}useForm ? new Blob([JSON.stringify({{paramName}})], {type: 'application/json'}) : {{paramName}}{{/isModel}}) as any || formParams; } - {{/isListContainer}} + {{/isArray}} {{/formParams}} {{/hasFormParams}} diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache index 44923d29e8a..5982d42ee9e 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache @@ -105,7 +105,7 @@ export const {{classname}}AxiosParamCreator = function (configuration?: Configur {{/authMethods}} {{#queryParams}} - {{#isListContainer}} + {{#isArray}} if ({{paramName}}) { {{#isCollectionFormatMulti}} localVarQueryParameter['{{baseName}}'] = {{paramName}}; @@ -114,8 +114,8 @@ export const {{classname}}AxiosParamCreator = function (configuration?: Configur localVarQueryParameter['{{baseName}}'] = {{paramName}}.join(COLLECTION_FORMATS.{{collectionFormat}}); {{/isCollectionFormatMulti}} } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if ({{paramName}} !== undefined) { {{#isDateTime}} localVarQueryParameter['{{baseName}}'] = ({{paramName}} as any instanceof Date) ? @@ -133,17 +133,17 @@ export const {{classname}}AxiosParamCreator = function (configuration?: Configur {{/isDate}} {{/isDateTime}} } - {{/isListContainer}} + {{/isArray}} {{/queryParams}} {{#headerParams}} - {{#isListContainer}} + {{#isArray}} if ({{paramName}}) { let mapped = {{paramName}}.map(value => ("{{{dataType}}}" !== "Array") ? JSON.stringify(value) : (value || "")); localVarHeaderParameter['{{baseName}}'] = mapped.join(COLLECTION_FORMATS["{{collectionFormat}}"]); } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if ({{paramName}} !== undefined && {{paramName}} !== null) { {{#isString}} localVarHeaderParameter['{{baseName}}'] = String({{paramName}}); @@ -152,12 +152,12 @@ export const {{classname}}AxiosParamCreator = function (configuration?: Configur localVarHeaderParameter['{{baseName}}'] = String(JSON.stringify({{paramName}})); {{/isString}} } - {{/isListContainer}} + {{/isArray}} {{/headerParams}} {{#vendorExtensions}} {{#formParams}} - {{#isListContainer}} + {{#isArray}} if ({{paramName}}) { {{#isCollectionFormatMulti}} {{paramName}}.forEach((element) => { @@ -168,13 +168,13 @@ export const {{classname}}AxiosParamCreator = function (configuration?: Configur localVarFormParams.set('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS.{{collectionFormat}}));{{/multipartFormData}}{{#multipartFormData}} localVarFormParams.append('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS.{{collectionFormat}}));{{/multipartFormData}} {{/isCollectionFormatMulti}} - }{{/isListContainer}} - {{^isListContainer}} + }{{/isArray}} + {{^isArray}} if ({{paramName}} !== undefined) { {{^multipartFormData}} localVarFormParams.set('{{baseName}}', {{paramName}} as any);{{/multipartFormData}}{{#multipartFormData}} localVarFormParams.append('{{baseName}}', {{paramName}} as any);{{/multipartFormData}} } - {{/isListContainer}} + {{/isArray}} {{/formParams}}{{/vendorExtensions}} {{#vendorExtensions}}{{#hasFormParams}}{{^multipartFormData}} localVarHeaderParameter['Content-Type'] = 'application/x-www-form-urlencoded';{{/multipartFormData}}{{#multipartFormData}} 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 f3df16ba5f7..a7eae282d87 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache @@ -101,7 +101,7 @@ export class {{classname}} extends runtime.BaseAPI { const queryParameters: any = {}; {{#queryParams}} - {{#isListContainer}} + {{#isArray}} if (requestParameters.{{paramName}}) { {{#isCollectionFormatMulti}} queryParameters['{{baseName}}'] = requestParameters.{{paramName}}; @@ -111,8 +111,8 @@ export class {{classname}} extends runtime.BaseAPI { {{/isCollectionFormatMulti}} } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if (requestParameters.{{paramName}} !== undefined) { {{#isDateTime}} queryParameters['{{baseName}}'] = (requestParameters.{{paramName}} as any).toISOString(); @@ -127,7 +127,7 @@ export class {{classname}} extends runtime.BaseAPI { {{/isDateTime}} } - {{/isListContainer}} + {{/isArray}} {{/queryParams}} const headerParameters: runtime.HTTPHeaders = {}; @@ -142,18 +142,18 @@ export class {{classname}} extends runtime.BaseAPI { {{/consumes.0}} {{/bodyParam}} {{#headerParams}} - {{#isListContainer}} + {{#isArray}} if (requestParameters.{{paramName}}) { headerParameters['{{baseName}}'] = requestParameters.{{paramName}}.join(runtime.COLLECTION_FORMATS["{{collectionFormat}}"]); } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if (requestParameters.{{paramName}} !== undefined && requestParameters.{{paramName}} !== null) { headerParameters['{{baseName}}'] = String(requestParameters.{{paramName}}); } - {{/isListContainer}} + {{/isArray}} {{/headerParams}} {{#authMethods}} {{#isBasic}} @@ -223,7 +223,7 @@ export class {{classname}} extends runtime.BaseAPI { } {{#formParams}} - {{#isListContainer}} + {{#isArray}} if (requestParameters.{{paramName}}) { {{#isCollectionFormatMulti}} requestParameters.{{paramName}}.forEach((element) => { @@ -235,13 +235,13 @@ export class {{classname}} extends runtime.BaseAPI { {{/isCollectionFormatMulti}} } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if (requestParameters.{{paramName}} !== undefined) { formParams.append('{{baseName}}', requestParameters.{{paramName}} as any); } - {{/isListContainer}} + {{/isArray}} {{/formParams}} {{/hasFormParams}} const response = await this.request({ @@ -252,7 +252,7 @@ export class {{classname}} extends runtime.BaseAPI { {{#hasBodyParam}} {{#bodyParam}} {{#isContainer}} - body: requestParameters.{{paramName}}{{#isListContainer}}{{#items}}{{^isPrimitiveType}}.map({{datatype}}ToJSON){{/isPrimitiveType}}{{/items}}{{/isListContainer}}, + body: requestParameters.{{paramName}}{{#isArray}}{{#items}}{{^isPrimitiveType}}.map({{datatype}}ToJSON){{/isPrimitiveType}}{{/items}}{{/isArray}}, {{/isContainer}} {{^isContainer}} {{^isPrimitiveType}} @@ -278,25 +278,25 @@ export class {{classname}} extends runtime.BaseAPI { {{#isMap}} return new runtime.JSONApiResponse(response); {{/isMap}} - {{#isListContainer}} + {{#isArray}} return new runtime.JSONApiResponse(response); - {{/isListContainer}} + {{/isArray}} {{#returnSimpleType}} return new runtime.TextApiResponse(response) as any; {{/returnSimpleType}} {{/returnTypeIsPrimitive}} {{^returnTypeIsPrimitive}} - {{#isListContainer}} + {{#isArray}} return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map({{returnBaseType}}FromJSON)); - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} {{#isMap}} return new runtime.JSONApiResponse(response, (jsonValue) => runtime.mapValues(jsonValue, {{returnBaseType}}FromJSON)); {{/isMap}} {{^isMap}} return new runtime.JSONApiResponse(response, (jsonValue) => {{returnBaseType}}FromJSON(jsonValue)); {{/isMap}} - {{/isListContainer}} + {{/isArray}} {{/returnTypeIsPrimitive}} {{/isResponseFile}} {{/returnType}} 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 f2e2ecc8043..4ce18a92b51 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache @@ -75,13 +75,13 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole {{/isDate}} {{/isPrimitiveType}} {{^isPrimitiveType}} - {{#isListContainer}} + {{#isArray}} '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}({{#isNullable}}json['{{baseName}}'] === null ? null : {{/isNullable}}(json['{{baseName}}'] as Array).map({{#items}}{{datatype}}{{/items}}FromJSON)), - {{/isListContainer}} + {{/isArray}} {{#isMap}} '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}({{#isNullable}}json['{{baseName}}'] === null ? null : {{/isNullable}}mapValues(json['{{baseName}}'], {{#items}}{{datatype}}{{/items}}FromJSON)), {{/isMap}} - {{^isListContainer}} + {{^isArray}} {{^isMap}} {{^isFreeFormObject}} '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}{{datatype}}FromJSON(json['{{baseName}}']), @@ -90,7 +90,7 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}json['{{baseName}}'], {{/isFreeFormObject}} {{/isMap}} - {{/isListContainer}} + {{/isArray}} {{/isPrimitiveType}} {{/vars}} }; @@ -119,13 +119,13 @@ export function {{classname}}ToJSON(value?: {{classname}} | null): any { '{{baseName}}': {{#isDate}}{{^required}}value.{{name}} === undefined ? undefined : {{/required}}({{#isNullable}}value.{{name}} === null ? null : {{/isNullable}}value.{{name}}.toISOString().substr(0,10)){{/isDate}}{{#isDateTime}}{{^required}}value.{{name}} === undefined ? undefined : {{/required}}({{#isNullable}}value.{{name}} === null ? null : {{/isNullable}}value.{{name}}.toISOString()){{/isDateTime}}{{^isDate}}{{^isDateTime}}value.{{name}}{{/isDateTime}}{{/isDate}}, {{/isPrimitiveType}} {{^isPrimitiveType}} - {{#isListContainer}} + {{#isArray}} '{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}({{#isNullable}}value.{{name}} === null ? null : {{/isNullable}}(value.{{name}} as Array).map({{#items}}{{datatype}}{{/items}}ToJSON)), - {{/isListContainer}} + {{/isArray}} {{#isMap}} '{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}({{#isNullable}}value.{{name}} === null ? null : {{/isNullable}}mapValues(value.{{name}}, {{#items}}{{datatype}}{{/items}}ToJSON)), {{/isMap}} - {{^isListContainer}} + {{^isArray}} {{^isMap}} {{^isFreeFormObject}} '{{baseName}}': {{datatype}}ToJSON(value.{{name}}), @@ -134,7 +134,7 @@ export function {{classname}}ToJSON(value?: {{classname}} | null): any { '{{baseName}}': value.{{name}}, {{/isFreeFormObject}} {{/isMap}} - {{/isListContainer}} + {{/isArray}} {{/isPrimitiveType}} {{/isReadOnly}} {{/vars}} diff --git a/modules/openapi-generator/src/main/resources/typescript-inversify/api.service.mustache b/modules/openapi-generator/src/main/resources/typescript-inversify/api.service.mustache index f6b21e6e937..f5bd5ebc76d 100644 --- a/modules/openapi-generator/src/main/resources/typescript-inversify/api.service.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-inversify/api.service.mustache @@ -69,7 +69,7 @@ export class {{classname}} { {{#hasQueryParams}} let queryParameters: string[] = []; {{#queryParams}} - {{#isListContainer}} + {{#isArray}} if ({{paramName}}) { {{#isCollectionFormatMulti}} {{paramName}}.forEach((element) => { @@ -80,8 +80,8 @@ export class {{classname}} { queryParameters.push('{{paramName}}='+encodeURIComponent({{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}']))); {{/isCollectionFormatMulti}} } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if ({{paramName}} !== undefined) { {{#isDateTime}} queryParameters.push('{{paramName}}='+encodeURIComponent(({{paramName}} as Date).toISOString())); @@ -90,21 +90,21 @@ export class {{classname}} { queryParameters.push('{{paramName}}='+encodeURIComponent(String({{paramName}}))); {{/isDateTime}} } - {{/isListContainer}} + {{/isArray}} {{/queryParams}} {{/hasQueryParams}} {{#headerParams}} - {{#isListContainer}} + {{#isArray}} if ({{paramName}}) { headers['{{baseName}}'] = {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}']); } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if ({{paramName}}) { headers['{{baseName}}'] = String({{paramName}}); } - {{/isListContainer}} + {{/isArray}} {{/headerParams}} {{#authMethods}} @@ -159,7 +159,7 @@ export class {{classname}} { headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'; {{/isMultipart}} {{#formParams}} - {{#isListContainer}} + {{#isArray}} if ({{paramName}}) { {{#isCollectionFormatMulti}} {{paramName}}.forEach((element) => { @@ -170,12 +170,12 @@ export class {{classname}} { formData.append('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}'])); {{/isCollectionFormatMulti}} } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if ({{paramName}} !== undefined) { formData.append('{{baseName}}', {{paramName}}); } - {{/isListContainer}} + {{/isArray}} {{/formParams}} {{/hasFormParams}} diff --git a/modules/openapi-generator/src/main/resources/typescript-jquery/api.mustache b/modules/openapi-generator/src/main/resources/typescript-jquery/api.mustache index 77345329ad4..11461c593a7 100644 --- a/modules/openapi-generator/src/main/resources/typescript-jquery/api.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-jquery/api.mustache @@ -79,7 +79,7 @@ export class {{classname}} { {{/required}} {{/allParams}} {{#queryParams}} - {{#isListContainer}} + {{#isArray}} if ({{paramName}}) { {{#isCollectionFormatMulti}} queryParameters['{{baseName}}'] = []; @@ -91,8 +91,8 @@ export class {{classname}} { queryParameters['{{baseName}}'] = {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}']); {{/isCollectionFormatMulti}} } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if ({{paramName}} !== null && {{paramName}} !== undefined) { {{#isDateTime}} queryParameters['{{baseName}}'] = {{paramName}}.toISOString(); @@ -106,7 +106,7 @@ export class {{classname}} { {{/isDate}} {{/isDateTime}} } - {{/isListContainer}} + {{/isArray}} {{/queryParams}} localVarPath = localVarPath + "?" + $.param(queryParameters); @@ -116,7 +116,7 @@ export class {{classname}} { formParams.append("{{baseName}}", {{paramName}}); {{/isFile}} {{^isFile}} - {{#isListContainer}} + {{#isArray}} if ({{paramName}}) { {{#isCollectionFormatMulti}} {{paramName}}.forEach((element: any) => { @@ -127,23 +127,23 @@ export class {{classname}} { formParams.append('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}'])); {{/isCollectionFormatMulti}} } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if ({{paramName}} !== null && {{paramName}} !== undefined) { formParams.append('{{baseName}}', {{paramName}}); } - {{/isListContainer}} + {{/isArray}} {{/isFile}} {{/formParams}} {{#headerParams}} - {{#isListContainer}} + {{#isArray}} if ({{paramName}}) { headerParams['{{baseName}}'] = {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}']); } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} headerParams['{{baseName}}'] = String({{paramName}}); - {{/isListContainer}} + {{/isArray}} {{/headerParams}} // to determine the Content-Type header diff --git a/modules/openapi-generator/src/main/resources/typescript-node/model.mustache b/modules/openapi-generator/src/main/resources/typescript-node/model.mustache index e728b68ac4c..2b141826889 100644 --- a/modules/openapi-generator/src/main/resources/typescript-node/model.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-node/model.mustache @@ -29,7 +29,7 @@ export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{ static discriminator: string | undefined = undefined; {{/discriminator}} - {{^isArrayModel}} + {{^isArray}} static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [ {{#vars}} { @@ -49,7 +49,7 @@ export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{ return {{classname}}.attributeTypeMap; {{/parent}} } - {{/isArrayModel}} + {{/isArray}} } {{#hasEnums}} diff --git a/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache index db6139cf646..f9c2b79dc2d 100644 --- a/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-redux-query/apis.mustache @@ -53,7 +53,7 @@ function {{nickname}}Raw({{#allParams.0}}requestParameters: {{operationIdCame {{#queryParams}} - {{#isListContainer}} + {{#isArray}} if (requestParameters.{{paramName}}) { {{#isCollectionFormatMulti}} queryParameters['{{baseName}}'] = requestParameters.{{paramName}}; @@ -63,8 +63,8 @@ function {{nickname}}Raw({{#allParams.0}}requestParameters: {{operationIdCame {{/isCollectionFormatMulti}} } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if (requestParameters.{{paramName}} !== undefined) { {{#isDateTime}} queryParameters['{{baseName}}'] = (requestParameters.{{paramName}} as any).toISOString(); @@ -79,7 +79,7 @@ function {{nickname}}Raw({{#allParams.0}}requestParameters: {{operationIdCame {{/isDateTime}} } - {{/isListContainer}} + {{/isArray}} {{/queryParams}} const headerParameters : runtime.HttpHeaders = {}; @@ -94,18 +94,18 @@ function {{nickname}}Raw({{#allParams.0}}requestParameters: {{operationIdCame {{/consumes.0}} {{/bodyParam}} {{#headerParams}} - {{#isListContainer}} + {{#isArray}} if (requestParameters.{{paramName}}) { headerParameters['{{baseName}}'] = requestParameters.{{paramName}}?.join(runtime.COLLECTION_FORMATS["{{collectionFormat}}"]); } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if (requestParameters.{{paramName}} !== undefined && requestParameters.{{paramName}} !== null) { headerParameters['{{baseName}}'] = String(requestParameters.{{paramName}}); } - {{/isListContainer}} + {{/isArray}} {{/headerParams}} const { meta = {} } = requestConfig; @@ -135,7 +135,7 @@ function {{nickname}}Raw({{#allParams.0}}requestParameters: {{operationIdCame const formData = new FormData(); {{/hasFormParams}} {{#formParams}} - {{#isListContainer}} + {{#isArray}} if (requestParameters.{{paramName}}) { {{#isCollectionFormatMulti}} requestParameters.{{paramName}}.forEach((element) => { @@ -147,13 +147,13 @@ function {{nickname}}Raw({{#allParams.0}}requestParameters: {{operationIdCame {{/isCollectionFormatMulti}} } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if (requestParameters.{{paramName}} !== undefined) { formData.append('{{baseName}}', requestParameters.{{paramName}} as any); } - {{/isListContainer}} + {{/isArray}} {{/formParams}} const config: QueryConfig = { url: `${runtime.Configuration.basePath}{{{path}}}`{{#pathParams}}.replace(`{${"{{baseName}}"}}`, encodeURIComponent(String(requestParameters.{{paramName}}))){{/pathParams}}, @@ -170,7 +170,7 @@ function {{nickname}}Raw({{#allParams.0}}requestParameters: {{operationIdCame {{#hasBodyParam}} {{#bodyParam}} {{#isContainer}} - body: queryParameters || requestParameters.{{paramName}}{{#isListContainer}}{{#items}}{{^isPrimitiveType}}?.map({{datatype}}ToJSON){{/isPrimitiveType}}{{/items}}{{/isListContainer}}, + body: queryParameters || requestParameters.{{paramName}}{{#isArray}}{{#items}}{{^isPrimitiveType}}?.map({{datatype}}ToJSON){{/isPrimitiveType}}{{/items}}{{/isArray}}, {{/isContainer}} {{^isContainer}} {{^isPrimitiveType}} @@ -201,12 +201,12 @@ function {{nickname}}Raw({{#allParams.0}}requestParameters: {{operationIdCame {{/returnSimpleType}} {{/returnTypeIsPrimitive}} {{^returnTypeIsPrimitive}} - {{#isListContainer}} + {{#isArray}} config.transform = (body: ResponseBody, text: ResponseBody) => requestTransform(body.map({{returnBaseType}}FromJSON), text); - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} config.transform = (body: ResponseBody, text: ResponseBody) => requestTransform({{returnBaseType}}FromJSON(body), text); - {{/isListContainer}} + {{/isArray}} {{/returnTypeIsPrimitive}} {{/returnType}} } 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 72b0a08bedb..22ff71e0789 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 @@ -52,13 +52,13 @@ export function {{classname}}FromJSON(json: any): {{classname}} { {{/isDate}} {{/isPrimitiveType}} {{^isPrimitiveType}} - {{#isListContainer}} + {{#isArray}} '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}(json['{{baseName}}'] as Array).map({{#items}}{{datatype}}{{/items}}FromJSON), - {{/isListContainer}} + {{/isArray}} {{#isMap}} '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}mapValues(json['{{baseName}}'], {{#items}}{{datatype}}{{/items}}FromJSON), {{/isMap}} - {{^isListContainer}} + {{^isArray}} {{^isMap}} {{^isFreeFormObject}} '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}{{datatype}}FromJSON(json['{{baseName}}']), @@ -67,7 +67,7 @@ export function {{classname}}FromJSON(json: any): {{classname}} { '{{name}}': {{^required}}!exists(json, '{{baseName}}') ? undefined : {{/required}}json['{{baseName}}'], {{/isFreeFormObject}} {{/isMap}} - {{/isListContainer}} + {{/isArray}} {{/isPrimitiveType}} {{/vars}} }; @@ -95,13 +95,13 @@ export function {{classname}}ToJSON(value?: {{classname}}): any { '{{baseName}}': {{#isDate}}{{^required}}value.{{name}} === undefined ? undefined : {{/required}}value.{{name}}.toISOString().substr(0,10){{/isDate}}{{#isDateTime}}{{^required}}value.{{name}} === undefined ? undefined : {{/required}}value.{{name}}.toISOString(){{/isDateTime}}{{^isDate}}{{^isDateTime}}value.{{name}}{{/isDateTime}}{{/isDate}}, {{/isPrimitiveType}} {{^isPrimitiveType}} - {{#isListContainer}} + {{#isArray}} '{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}(value.{{name}} as Array).map({{#items}}{{datatype}}{{/items}}ToJSON), - {{/isListContainer}} + {{/isArray}} {{#isMap}} '{{baseName}}': {{^required}}value.{{name}} === undefined ? undefined : {{/required}}mapValues(value.{{name}}, {{#items}}{{datatype}}{{/items}}ToJSON), {{/isMap}} - {{^isListContainer}} + {{^isArray}} {{^isMap}} {{^isFreeFormObject}} '{{baseName}}': {{datatype}}ToJSON(value.{{name}}), @@ -110,7 +110,7 @@ export function {{classname}}ToJSON(value?: {{classname}}): any { '{{baseName}}': value.{{name}}, {{/isFreeFormObject}} {{/isMap}} - {{/isListContainer}} + {{/isArray}} {{/isPrimitiveType}} {{/isReadOnly}} {{/vars}} diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache index ab1847d6703..a37b5309c60 100644 --- a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache @@ -62,12 +62,12 @@ export class {{classname}} extends BaseAPI { {{/consumes.0}} {{/bodyParam}} {{#headerParams}} - {{#isListContainer}} + {{#isArray}} ...({{> paramNamePartial}} != null ? { '{{baseName}}': {{> paramNamePartial}}.join(COLLECTION_FORMATS['{{collectionFormat}}'])) } : undefined), - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} ...({{> paramNamePartial}} != null ? { '{{baseName}}': String({{> paramNamePartial}}) } : undefined), - {{/isListContainer}} + {{/isArray}} {{/headerParams}} {{#authMethods}} {{#isBasic}} @@ -99,15 +99,15 @@ export class {{classname}} extends BaseAPI { const query: HttpQuery = { // required parameters are used directly since they are already checked by throwIfNullOrUndefined {{#queryParams}} {{#required}} - {{#isListContainer}} + {{#isArray}} {{#isCollectionFormatMulti}} '{{baseName}}': {{> paramNamePartial}}, {{/isCollectionFormatMulti}} {{^isCollectionFormatMulti}} '{{baseName}}': {{> paramNamePartial}}.join(COLLECTION_FORMATS['{{collectionFormat}}']), {{/isCollectionFormatMulti}} - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} {{#isDateTime}} '{{baseName}}': ({{> paramNamePartial}} as any).toISOString(), {{/isDateTime}} @@ -119,7 +119,7 @@ export class {{classname}} extends BaseAPI { '{{baseName}}': {{> paramNamePartial}}, {{/isDate}} {{/isDateTime}} - {{/isListContainer}} + {{/isArray}} {{/required}} {{/queryParams}} }; @@ -128,15 +128,15 @@ export class {{classname}} extends BaseAPI { {{#queryParams}} {{^required}} - {{#isListContainer}} + {{#isArray}} {{#isCollectionFormatMulti}} if ({{> paramNamePartial}} != null) { query['{{baseName}}'] = {{> paramNamePartial}}; } {{/isCollectionFormatMulti}} {{^isCollectionFormatMulti}} if ({{> paramNamePartial}} != null) { query['{{baseName}}'] = {{> paramNamePartial}}.join(COLLECTION_FORMATS['{{collectionFormat}}']); } {{/isCollectionFormatMulti}} - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} {{#isDateTime}} if ({{> paramNamePartial}} != null) { query['{{baseName}}'] = ({{> paramNamePartial}} as any).toISOString(); } {{/isDateTime}} @@ -148,7 +148,7 @@ export class {{classname}} extends BaseAPI { if ({{> paramNamePartial}} != null) { query['{{baseName}}'] = {{> paramNamePartial}}; } {{/isDate}} {{/isDateTime}} - {{/isListContainer}} + {{/isArray}} {{/required}} {{/queryParams}} {{/hasOptionalQueryParams}} @@ -164,7 +164,7 @@ export class {{classname}} extends BaseAPI { {{#hasFormParams}} const formData = new FormData(); {{#formParams}} - {{#isListContainer}} + {{#isArray}} if ({{> paramNamePartial}} !== undefined) { {{#isCollectionFormatMulti}} {{> paramNamePartial}}.forEach((element) => formData.append('{{baseName}}', element as any)) @@ -174,10 +174,10 @@ export class {{classname}} extends BaseAPI { {{/isCollectionFormatMulti}} } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if ({{> paramNamePartial}} !== undefined) { formData.append('{{baseName}}', {{> paramNamePartial}} as any); } - {{/isListContainer}} + {{/isArray}} {{/formParams}} {{/hasFormParams}} diff --git a/modules/openapi-generator/src/main/resources/typescript/api/api.mustache b/modules/openapi-generator/src/main/resources/typescript/api/api.mustache index 3bebe096502..7a6d2f2e76a 100644 --- a/modules/openapi-generator/src/main/resources/typescript/api/api.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/api/api.mustache @@ -78,7 +78,7 @@ export class {{classname}}RequestFactory extends BaseAPIRequestFactory { {{/hasFormParams}} {{#formParams}} - {{#isListContainer}} + {{#isArray}} if ({{paramName}}) { {{#isCollectionFormatMulti}} {{paramName}}.forEach((element) => { @@ -90,8 +90,8 @@ export class {{classname}}RequestFactory extends BaseAPIRequestFactory { localVarFormParams.append('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS["{{collectionFormat}}"])); {{/isCollectionFormatMulti}} } - {{/isListContainer}} - {{^isListContainer}} + {{/isArray}} + {{^isArray}} if ({{paramName}} !== undefined) { // TODO: replace .append with .set {{^isFile}} @@ -108,7 +108,7 @@ export class {{classname}}RequestFactory extends BaseAPIRequestFactory { {{/platforms}} {{/isFile}} } - {{/isListContainer}} + {{/isArray}} {{/formParams}} {{#hasFormParams}} requestContext.setBody(localVarFormParams); diff --git a/modules/openapi-generator/src/main/resources/typescript/model/model.mustache b/modules/openapi-generator/src/main/resources/typescript/model/model.mustache index 84201657b0f..83dc74c3449 100644 --- a/modules/openapi-generator/src/main/resources/typescript/model/model.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/model/model.mustache @@ -29,7 +29,7 @@ export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{ static readonly discriminator: string | undefined = undefined; {{/discriminator}} - {{^isArrayModel}} + {{^isArray}} static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [ {{#vars}} { @@ -50,7 +50,7 @@ export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{ return {{classname}}.attributeTypeMap; {{/parent}} } - {{/isArrayModel}} + {{/isArray}} public constructor() { {{#parent}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartModelTest.java index 6e1a9974fda..6148129b724 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartModelTest.java @@ -256,7 +256,7 @@ public class DartModelTest { Assert.assertEquals(cm.name, "sample"); Assert.assertEquals(cm.classname, "Sample"); - Assert.assertTrue(cm.isArrayModel); + Assert.assertTrue(cm.isArray); Assert.assertEquals(cm.description, "an array model"); Assert.assertEquals(cm.vars.size(), 0); // skip import test as import is not used by PHP codegen diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dartdio/DartDioModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dartdio/DartDioModelTest.java index aea9437cbfc..69d0b86a672 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dartdio/DartDioModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dartdio/DartDioModelTest.java @@ -334,7 +334,7 @@ public class DartDioModelTest { Assert.assertEquals(cm.name, "sample"); Assert.assertEquals(cm.classname, "Sample"); - Assert.assertTrue(cm.isArrayModel); + Assert.assertTrue(cm.isArray); Assert.assertEquals(cm.description, "an array model"); Assert.assertEquals(cm.vars.size(), 0); // skip import test as import is not used by PHP codegen 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 11eda071978..998267dc417 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 @@ -841,7 +841,7 @@ public class JavaClientCodegenTest { Assert.assertFalse(cp7.required); Assert.assertTrue(cp7.isPrimitiveType); Assert.assertTrue(cp7.isContainer); - Assert.assertTrue(cp7.isListContainer); + Assert.assertTrue(cp7.isArray); Assert.assertFalse(cp7.isFreeFormObject); Assert.assertFalse(cp7.isAnyType); @@ -852,7 +852,7 @@ public class JavaClientCodegenTest { Assert.assertFalse(cp8.required); Assert.assertTrue(cp8.isPrimitiveType); Assert.assertTrue(cp8.isContainer); - Assert.assertTrue(cp8.isListContainer); + Assert.assertTrue(cp8.isArray); Assert.assertFalse(cp8.isFreeFormObject); Assert.assertFalse(cp8.isAnyType); @@ -863,7 +863,7 @@ public class JavaClientCodegenTest { Assert.assertFalse(cp9.required); Assert.assertTrue(cp9.isPrimitiveType); Assert.assertTrue(cp9.isContainer); - Assert.assertTrue(cp9.isListContainer); + Assert.assertTrue(cp9.isArray); Assert.assertFalse(cp9.isFreeFormObject); Assert.assertFalse(cp9.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 6d1422716c4..025fb9d0707 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 @@ -1142,7 +1142,7 @@ public class JavaModelTest { Assert.assertEquals(cp1.name, "pets"); Assert.assertEquals(cp1.baseType, "List"); Assert.assertTrue(cp1.isContainer); - Assert.assertTrue(cp1.isListContainer); + Assert.assertTrue(cp1.isArray); Assert.assertFalse(cp1.isMap); Assert.assertEquals(cp1.getter, "getPets"); Assert.assertEquals(cp1.items.baseType, "Pet"); @@ -1172,7 +1172,7 @@ public class JavaModelTest { Assert.assertEquals(cp1.baseType, "Pet"); Assert.assertEquals(cp1.dataType, "List"); Assert.assertTrue(cp1.isContainer); - Assert.assertTrue(cp1.isListContainer); + Assert.assertTrue(cp1.isArray); Assert.assertFalse(cp1.isMap); Assert.assertEquals(cp1.items.baseType, "Pet"); Assert.assertEquals(cp1.items.complexType, "Pet"); @@ -1252,7 +1252,7 @@ public class JavaModelTest { Assert.assertEquals(cp1.baseType, "List"); Assert.assertEquals(cp1.dataType, "List>"); Assert.assertTrue(cp1.isContainer); - Assert.assertTrue(cp1.isListContainer); + Assert.assertTrue(cp1.isArray); Assert.assertFalse(cp1.isMap); Assert.assertEquals(cp1.items.baseType, "List"); Assert.assertEquals(cp1.items.complexType, "Pet"); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java index d2f3127d3a6..62e14d39b58 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java @@ -327,15 +327,15 @@ public class ObjcModelTest { Assert.assertEquals(prope.baseType, "NSDictionary"); } - @Test(description = "test isArrayModel") - public void isArrayModelModelTest() { + @Test(description = "test isArray") + public void isArrayModelTest() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml"); final DefaultCodegen codegen = new ObjcClientCodegen(); final Schema definition = openAPI.getComponents().getSchemas().get("AnimalFarm"); codegen.setOpenAPI(openAPI); final CodegenModel codegenModel = codegen.fromModel("AnimalFarm", definition); - Assert.assertEquals(codegenModel.isArrayModel, true); + Assert.assertEquals(codegenModel.isArray, true); Assert.assertEquals(codegenModel.arrayModelType,"OAIAnimal"); } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpModelTest.java index 989e0ca84b0..ebd689a7f6b 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpModelTest.java @@ -250,7 +250,7 @@ public class PhpModelTest { Assert.assertEquals(cm.name, "sample"); Assert.assertEquals(cm.classname, "Sample"); - Assert.assertTrue(cm.isArrayModel); + Assert.assertTrue(cm.isArray); Assert.assertEquals(cm.description, "an array model"); Assert.assertEquals(cm.vars.size(), 0); // skip import test as import is not used by PHP codegen diff --git a/samples/client/petstore/go/go-petstore/docs/PetApi.md b/samples/client/petstore/go/go-petstore/docs/PetApi.md index 0eee7dd8be7..c04b65b69ee 100644 --- a/samples/client/petstore/go/go-petstore/docs/PetApi.md +++ b/samples/client/petstore/go/go-petstore/docs/PetApi.md @@ -35,7 +35,7 @@ import ( ) func main() { - body := *openapiclient.NewPet("Name_example", []string{"PhotoUrls_example"}) // Pet | Pet object that needs to be added to the store + body := *openapiclient.NewPet("Name_example", []string{"PhotoUrls_example")) // Pet | Pet object that needs to be added to the store configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) @@ -367,7 +367,7 @@ import ( ) func main() { - body := *openapiclient.NewPet("Name_example", []string{"PhotoUrls_example"}) // Pet | Pet object that needs to be added to the store + body := *openapiclient.NewPet("Name_example", []string{"PhotoUrls_example")) // Pet | Pet object that needs to be added to the store configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) diff --git a/samples/client/petstore/javascript-apollo/src/model/Pet.js b/samples/client/petstore/javascript-apollo/src/model/Pet.js index ccc1138bbfe..c9f112d705b 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, isArray=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, isArray=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, isArray=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, isArray=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, isArray=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) { diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/PetApi.md b/samples/openapi3/client/petstore/go/go-petstore/docs/PetApi.md index 8e9728e0d2b..7f9d4fb826e 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/docs/PetApi.md +++ b/samples/openapi3/client/petstore/go/go-petstore/docs/PetApi.md @@ -35,7 +35,7 @@ import ( ) func main() { - pet := *openapiclient.NewPet("Name_example", []string{"PhotoUrls_example"}) // Pet | Pet object that needs to be added to the store + pet := *openapiclient.NewPet("Name_example", []string{"PhotoUrls_example")) // Pet | Pet object that needs to be added to the store configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) @@ -367,7 +367,7 @@ import ( ) func main() { - pet := *openapiclient.NewPet("Name_example", []string{"PhotoUrls_example"}) // Pet | Pet object that needs to be added to the store + pet := *openapiclient.NewPet("Name_example", []string{"PhotoUrls_example")) // Pet | Pet object that needs to be added to the store configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration)