loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Unifies naming for isArray in Schema class properties (#7691)

Browse Source 
* Updates key java files

* Adds all lingering isArray fixes

* Adds two files

* Reverts two cs files

* Fixes lingering isListContainer + isArrayModel references

* Some ensure up to date updates
This commit is contained in:
Justin Black
2020-10-18 21:58:59 -07:00
committed by GitHub
parent 2ee0913d4a
commit 3d337db207
215 changed files with 851 additions and 815 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/templating.md
+4 -4
View File
@@ -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,
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java
+12 -4
View File
@@ -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);
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java
+4 -4
View File
@@ -26,7 +26,7 @@ public class CodegenOperation {
public final List<CodegenProperty> responseHeaders = new ArrayList<CodegenProperty>();
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,
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java
+13 -5
View File
@@ -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<String> _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;
}
}
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java
+12 -4
View File
@@ -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<String, Object> 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,
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java
+12 -4
View File
@@ -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);
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+13 -13
View File
@@ -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);
modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java
+4
View File
@@ -72,4 +72,8 @@ public interface IJsonSchemaValidationProperties {
boolean getIsMap();
void setIsMap(boolean isMap);
boolean getIsArray();
void setIsArray(boolean isArray);
}
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java
+2 -2
View File
@@ -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);
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
+1 -1
View File
@@ -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") ||
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
+1 -1
View File
@@ -351,7 +351,7 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg
Map<String, Object> mo = (Map<String, Object>) _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;
}
}
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java
+1 -1
View File
@@ -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") ||
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
+1 -1
View File
@@ -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;
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
+1 -1
View File
@@ -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 + ")";
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java
+2 -2
View File
@@ -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 + "]";
}
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java
+1 -1
View File
@@ -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()";
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java
+1 -1
View File
@@ -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 + "}";
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java
+1 -1
View File
@@ -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 + "}";
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java
+2 -2
View File
@@ -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 + ">";
}
}
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java
+2 -2
View File
@@ -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 + ">()";
}
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartJaguarClientCodegen.java
+1 -1
View File
@@ -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);
}
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java
+8 -8
View File
@@ -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(<subtype>)
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;
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java
+3 -3
View File
@@ -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;
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java
+4 -4
View File
@@ -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;
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java
+4 -4
View File
@@ -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<String, CodegenModel> modelMaps, HashMap<String, Integer> 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<String, CodegenModel> modelMaps, HashMap<String, Integer> 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
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java
+5 -5
View File
@@ -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<String> 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) {
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java
+2 -2
View File
@@ -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";
}
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java
+7 -7
View File
@@ -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";
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java
+3 -3
View File
@@ -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.<String, " + dataType + ">";
@@ -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.<String, " + returnType + ">";
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
+3 -3
View File
@@ -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.<String, " + dataType + ">";
@@ -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.<String, " + returnType + ">";
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java
+2 -2
View File
@@ -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) {
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java
+1 -1
View File
@@ -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 + "}";
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java
+1 -1
View File
@@ -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)) {
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PlantumlDocumentationCodegen.java
+3 -3
View File
@@ -128,10 +128,10 @@ public class PlantumlDocumentationCodegen extends DefaultCodegen implements Code
Map<String, Object> 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()));
}
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
+4 -4
View File
@@ -996,7 +996,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
}
private String constructExampleCode(CodegenParameter codegenParameter, HashMap<String, CodegenModel> modelMaps, HashMap<String, Integer> 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<String, CodegenModel> modelMaps, HashMap<String, Integer> 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";
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java
+4 -4
View File
@@ -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);
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
+1 -1
View File
@@ -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 + "}";
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java
+2 -2
View File
@@ -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;
}
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java
+3 -3
View File
@@ -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<String, CodegenModel> 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<String, CodegenModel> modelMaps) {
if (codegenProperty.isListContainer) { // array
if (codegenProperty.isArray) { // array
return "list(" + constructExampleCode(codegenProperty.items, modelMaps) + ")";
} else if (codegenProperty.isMap) { // TODO: map
return "TODO";
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java
+1 -1
View File
@@ -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 + "}";
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
+1 -1
View File
@@ -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(">");
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
+3 -3
View File
@@ -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 {
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java
+1 -1
View File
@@ -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";
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java
+1 -1
View File
@@ -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) {
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java
+2 -2
View File
@@ -1008,7 +1008,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {
}
public String constructExampleCode(CodegenParameter codegenParameter, HashMap<String, CodegenModel> 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<String, CodegenModel> modelMaps) {
if (codegenProperty.isListContainer) { // array
if (codegenProperty.isArray) { // array
return "[" + constructExampleCode(codegenProperty.items, modelMaps) + "]";
} else if (codegenProperty.isMap) { // TODO: map, file type
return "\"TODO\"";
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java
+2 -2
View File
@@ -1011,7 +1011,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig
}
public String constructExampleCode(CodegenParameter codegenParameter, HashMap<String, CodegenModel> 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<String, CodegenModel> 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\"";
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java
+1 -1
View File
@@ -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);
}
}
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
+4 -4
View File
@@ -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;
modules/openapi-generator/src/main/resources/Ada/model-body.mustache
Vendored
+2 -2
View File
@@ -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;
modules/openapi-generator/src/main/resources/Ada/model-spec.mustache
Vendored
+3 -3
View File
@@ -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;
modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache
Vendored
+24 -24
View File
@@ -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}}
modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache
Vendored
+2 -2
View File
@@ -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}}
modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache
Vendored
+10 -10
View File
@@ -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}}
modules/openapi-generator/src/main/resources/C-libcurl/model-header.mustache
Vendored
+4 -4
View File
@@ -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}}
modules/openapi-generator/src/main/resources/Eiffel/model.mustache
Vendored
+2 -2
View File
@@ -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}}:")
modules/openapi-generator/src/main/resources/Eiffel/test/api_test.mustache
Vendored
+2 -2
View File
@@ -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}}
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache
Vendored
+14 -14
View File
@@ -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) {
modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache
Vendored
+6 -6
View File
@@ -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) {
modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache
Vendored
+14 -14
View File
@@ -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) {
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache
Vendored
+1 -1
View File
@@ -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<ConstraintViolation<{{classname}}>> violations = executableValidator.validateParameters(this, method,
parameterValues);
modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache
Vendored
+3 -3
View File
@@ -62,7 +62,7 @@ public class {{classname}} {
* @see <a href="{{url}}">{{summary}} Documentation</a>
{{/externalDocs}}
*/
public {{#returnType}}{{#isListContainer}}Flux<{{{returnBaseType}}}>{{/isListContainer}}{{^isListContainer}}Mono<{{{returnType}}}>{{/isListContainer}} {{/returnType}}{{^returnType}}Mono<Void> {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws WebClientResponseException {
public {{#returnType}}{{#isArray}}Flux<{{{returnBaseType}}}>{{/isArray}}{{^isArray}}Mono<{{{returnType}}}>{{/isArray}} {{/returnType}}{{^returnType}}Mono<Void> {{/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<Void> localVarReturnType = new ParameterizedTypeReference<Void>() {};{{/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<Void> localVarReturnType = new ParameterizedTypeReference<Void>() {};{{/returnType}}
return apiClient.{{#isArray}}invokeFluxAPI{{/isArray}}{{^isArray}}invokeAPI{{/isArray}}("{{{path}}}", HttpMethod.{{httpMethod}}, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType);
}
{{/operation}}
}
modules/openapi-generator/src/main/resources/Java/libraries/webclient/api_test.mustache
Vendored
+1 -1
View File
@@ -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
}
modules/openapi-generator/src/main/resources/Java/pojo.mustache
Vendored
+14 -14
View File
@@ -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) {
modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache
Vendored
+2 -2
View File
@@ -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}}
modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache
Vendored
+5 -5
View File
@@ -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 <code>{{name}}</code> list.
@@ -112,7 +112,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ
this.{{name}}.add({{name}}Item);
return this;
}
{{/isListContainer}}
{{/isArray}}
{{#isMap}}
/**
modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache
Vendored
+5 -5
View File
@@ -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) {
modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache
Vendored
+2 -2
View File
@@ -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) {
modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/returnTypes.mustache
Vendored
+1 -1
View File
@@ -1 +1 @@
{{#returnContainer}}{{#isMap}}Map<String, {{{returnType}}}>{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
{{#returnContainer}}{{#isMap}}Map<String, {{{returnType}}}>{{/isMap}}{{#isArray}}{{{returnContainer}}}<{{{returnType}}}>{{/isArray}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
modules/openapi-generator/src/main/resources/JavaJaxRS/returnTypes.mustache
Vendored
+1 -1
View File
@@ -1 +1 @@
{{#returnContainer}}{{#isMap}}Map<String, {{{returnType}}}>{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
{{#returnContainer}}{{#isMap}}Map<String, {{{returnType}}}>{{/isMap}}{{#isArray}}{{{returnContainer}}}<{{{returnType}}}>{{/isArray}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
modules/openapi-generator/src/main/resources/JavaPlayFramework/exampleReturnTypes.mustache
Vendored
+1 -1
View File
@@ -1 +1 @@
{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isArray}}{{{returnContainer}}}{{/isArray}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache
Vendored
+6 -6
View File
@@ -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<String, {{{items.baseType}}}> 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<String, {{{returnType}}}> 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<String, {{{returnType}}}> entry : obj.entrySet()) {
OpenAPIUtils.validate(entry.getValue());
modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache
Vendored
+2 -2
View File
@@ -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) {
modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypes.mustache
Vendored
+1 -1
View File
@@ -1 +1 @@
{{#returnType}}{{#returnContainer}}{{#isMap}}Map<String, {{{returnType}}}>{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}{{^returnType}}void{{/returnType}}
{{#returnType}}{{#returnContainer}}{{#isMap}}Map<String, {{{returnType}}}>{{/isMap}}{{#isArray}}{{{returnContainer}}}<{{{returnType}}}>{{/isArray}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}{{^returnType}}void{{/returnType}}
modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoid.mustache
Vendored
+1 -1
View File
@@ -1 +1 @@
{{#returnType}}{{#returnContainer}}{{#isMap}}Map<String, {{{returnType}}}>{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}
{{#returnType}}{{#returnContainer}}{{#isMap}}Map<String, {{{returnType}}}>{{/isMap}}{{#isArray}}{{{returnContainer}}}<{{{returnType}}}>{{/isArray}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}
modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoidNoAbstract.mustache
Vendored
+1 -1
View File
@@ -1 +1 @@
{{#returnType}}{{#returnContainer}}{{#isMap}}HashMap<String, {{{returnType}}}>{{/isMap}}{{#isListContainer}}{{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}
{{#returnType}}{{#returnContainer}}{{#isMap}}HashMap<String, {{{returnType}}}>{{/isMap}}{{#isArray}}{{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<{{{returnType}}}>{{/isArray}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}
modules/openapi-generator/src/main/resources/JavaSpring/api.mustache
Vendored
+1 -1
View File
@@ -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<Part>{{/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<Part>{{/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}}
modules/openapi-generator/src/main/resources/JavaSpring/apiDelegate.mustache
Vendored
+1 -1
View File
@@ -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<Part>{{/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<Part>{{/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}}
modules/openapi-generator/src/main/resources/JavaSpring/bodyParams.mustache
Vendored
+1 -1
View File
@@ -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}}
{{#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}}
modules/openapi-generator/src/main/resources/JavaSpring/exampleReturnTypes.mustache
Vendored
+1 -1
View File
@@ -1 +1 @@
{{#returnContainer}}{{#isMap}}Map<String, {{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{/isListContainer}}{{{returnType}}}>{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
{{#returnContainer}}{{#isMap}}Map<String, {{/isMap}}{{#isArray}}{{{returnContainer}}}<{{/isArray}}{{{returnType}}}>{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
modules/openapi-generator/src/main/resources/JavaSpring/formParams.mustache
Vendored
+1 -1
View File
@@ -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<Part>{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isListContainer}}>{{/isListContainer}} {{baseName}}{{/isFile}}{{/isFormParam}}
{{#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<Part>{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isArray}}>{{/isArray}} {{baseName}}{{/isFile}}{{/isFormParam}}
modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/formParams.mustache
Vendored
+1 -1
View File
@@ -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<Part>{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isListContainer}}>{{/isListContainer}} {{paramName}}{{/isFile}}{{/isFormParam}}
{{#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<Part>{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isArray}}>{{/isArray}} {{paramName}}{{/isFile}}{{/isFormParam}}
modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
Vendored
+2 -2
View File
@@ -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) {
modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache
Vendored
+1 -1
View File
@@ -1 +1 @@
{{#isMap}}Map<String, {{{returnType}}}>{{/isMap}}{{#isListContainer}}{{#reactive}}Flux{{/reactive}}{{^reactive}}{{{returnContainer}}}{{/reactive}}<{{{returnType}}}>{{/isListContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
{{#isMap}}Map<String, {{{returnType}}}>{{/isMap}}{{#isArray}}{{#reactive}}Flux{{/reactive}}{{^reactive}}{{{returnContainer}}}{{/reactive}}<{{{returnType}}}>{{/isArray}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
modules/openapi-generator/src/main/resources/JavaVertXServer/AsyncCall.mustache
Vendored
+4 -4
View File
@@ -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);
modules/openapi-generator/src/main/resources/JavaVertXServer/RxCall.mustache
Vendored
+4 -4
View File
@@ -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}}
() -> {
modules/openapi-generator/src/main/resources/JavaVertXServer/apiVerticle.mustache
Vendored
+4 -4
View File
@@ -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}}
modules/openapi-generator/src/main/resources/JavaVertXWebServer/headerParams.mustache
Vendored
+4 -4
View File
@@ -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}}
modules/openapi-generator/src/main/resources/JavaVertXWebServer/pathParams.mustache
Vendored
+4 -4
View File
@@ -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}}
modules/openapi-generator/src/main/resources/JavaVertXWebServer/queryParams.mustache
Vendored
+4 -4
View File
@@ -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}}
modules/openapi-generator/src/main/resources/Javascript-Flowtyped/api.mustache
Vendored
+12 -12
View File
@@ -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}}
modules/openapi-generator/src/main/resources/apex/api.mustache
Vendored
+8 -8
View File
@@ -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(
modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache
Vendored
+1 -1
View File
@@ -70,7 +70,7 @@ namespace {{packageName}}.Models
/// Returns the JSON string presentation of the object
/// </summary>
/// <returns>JSON string presentation of the object</returns>
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);
}
modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache
Vendored
+1 -1
View File
@@ -73,7 +73,7 @@ namespace {{modelPackage}}
/// Returns the JSON string presentation of the object
/// </summary>
/// <returns>JSON string presentation of the object</returns>
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);
}
modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache
Vendored
+1 -1
View File
@@ -73,7 +73,7 @@ namespace {{modelPackage}}
/// Returns the JSON string presentation of the object
/// </summary>
/// <returns>JSON string presentation of the object</returns>
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);
}
modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache
Vendored
+3 -3
View File
@@ -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<std::string, {{items.baseType}}> {{paramName}};{{/isMap}}{{/isPrimitiveType}}
{{baseType}} {{paramName}};{{/isContainer}}{{#isArray}}std::vector<{{items.baseType}}> {{paramName}};{{/isArray}}{{#isMap}}std::map<std::string, {{items.baseType}}> {{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);
}
modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache
Vendored
+6 -6
View File
@@ -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();
modules/openapi-generator/src/main/resources/cpp-qt5-client/model-body.mustache
Vendored
+4 -4
View File
@@ -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<QString, {{items.items.baseType}}>{{/items.isMap}} item;
{{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isArray}}QList<{{items.items.baseType}}>{{/items.isArray}}{{#items.isMap}}QMap<QString, {{items.items.baseType}}>{{/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<QString, {{items.items.baseType}}>{{/items.isMap}} item;
{{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isArray}}QList<{{items.items.baseType}}>{{/items.isArray}}{{#items.isMap}}QMap<QString, {{items.items.baseType}}>{{/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;
modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache
Vendored
+9 -9
View File
@@ -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()){
modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-body.mustache
Vendored
+4 -4
View File
@@ -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<QString, {{items.items.baseType}}>{{/items.isMap}} item;
{{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isArray}}QList<{{items.items.baseType}}>{{/items.isArray}}{{#items.isMap}}QMap<QString, {{items.items.baseType}}>{{/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<QString, {{items.items.baseType}}>{{/items.isMap}} item;
{{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isArray}}QList<{{items.items.baseType}}>{{/items.isArray}}{{#items.isMap}}QMap<QString, {{items.items.baseType}}>{{/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;
modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache
Vendored
+12 -12
View File
@@ -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<web::json::value> 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<IHttpBody>( new JsonBody( localVarJson ) );
@@ -194,7 +194,7 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
std::shared_ptr<MultipartFormData> 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<web::json::value> 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<utility::string_t, web::json::value> 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"))
{

Some files were not shown because too many files have changed in this diff Show More