Unifies naming for isMap in Schema class properties (#7640)

* Updates isMapModel + isMapContainer -> isMap

* Removes git conflict characters

docs/templating.md

@@ -635,7 +635,7 @@ A `Pet` model with three properties will provide a _lot_ of information about th
       "isEmail" : false,
       "isFreeFormObject" : false,
       "isListContainer" : false,
-      "isMapContainer" : false,
+      "isMap" : false,
       "isEnum" : false,
       "isReadOnly" : false,
       "isWriteOnly" : false,
@@ -687,7 +687,7 @@ A `Pet` model with three properties will provide a _lot_ of information about th
       "isEmail" : false,
       "isFreeFormObject" : false,
       "isListContainer" : false,
-      "isMapContainer" : false,
+      "isMap" : false,
       "isEnum" : false,
       "isReadOnly" : false,
       "isWriteOnly" : false,
@@ -739,7 +739,7 @@ A `Pet` model with three properties will provide a _lot_ of information about th
       "isEmail" : false,
       "isFreeFormObject" : false,
       "isListContainer" : false,
-      "isMapContainer" : false,
+      "isMap" : false,
       "isEnum" : false,
       "isReadOnly" : false,
       "isWriteOnly" : false,
@@ -772,7 +772,7 @@ A `Pet` model with three properties will provide a _lot_ of information about th
     "hasOptional" : true,
     "isArrayModel" : false,
     "hasChildren" : false,
-    "isMapModel" : false,
+    "isMap" : false,
     "hasOnlyReadOnly" : false,
     "vendorExtensions" : { }
   }

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java

@@ -94,7 +94,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
     public boolean hasOptional;
     public boolean isArrayModel;
     public boolean hasChildren;
-    public boolean isMapModel;
+    public boolean isMap;
     /**
      * Indicates the OAS schema specifies "deprecated: true".
      */
@@ -586,6 +586,14 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
         this.isDateTime = isDateTime;
     }
 
+    @Override
+    public boolean getIsMap() { return isMap; }
+
+    @Override
+    public void setIsMap(boolean isMap)  {
+        this.isMap = isMap;
+    }
+
     // indicates if the model component has validation on the root level schema
     // this will be true when minItems or minProperties is set
     public boolean hasValidation() {
@@ -698,7 +706,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
                 hasOptional == that.hasOptional &&
                 isArrayModel == that.isArrayModel &&
                 hasChildren == that.hasChildren &&
-                isMapModel == that.isMapModel &&
+                isMap == that.isMap &&
                 isDeprecated == that.isDeprecated &&
                 hasOnlyReadOnly == that.hasOnlyReadOnly &&
                 getUniqueItems() == that.getUniqueItems() &&
@@ -768,7 +776,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
                 getVars(), getAllVars(), getRequiredVars(), getOptionalVars(), getReadOnlyVars(), getReadWriteVars(),
                 getParentVars(), getAllowableValues(), getMandatory(), getAllMandatory(), getImports(), hasVars,
                 isEmptyVars(), hasMoreModels, hasEnums, isEnum, isNullable, hasRequired, hasOptional, isArrayModel,
-                hasChildren, isMapModel, isDeprecated, hasOnlyReadOnly, getExternalDocumentation(), getVendorExtensions(),
+                hasChildren, isMap, isDeprecated, hasOnlyReadOnly, getExternalDocumentation(), getVendorExtensions(),
                 getAdditionalPropertiesType(), getMaxProperties(), getMinProperties(), getUniqueItems(), getMaxItems(),
                 getMinItems(), getMaxLength(), getMinLength(), getExclusiveMinimum(), getExclusiveMaximum(), getMinimum(),
                 getMaximum(), getPattern(), getMultipleOf(), getItems(), getIsModel());
@@ -833,7 +841,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
         sb.append(", hasOptional=").append(hasOptional);
         sb.append(", isArrayModel=").append(isArrayModel);
         sb.append(", hasChildren=").append(hasChildren);
-        sb.append(", isMapModel=").append(isMapModel);
+        sb.append(", isMap=").append(isMap);
         sb.append(", isDeprecated=").append(isDeprecated);
         sb.append(", hasOnlyReadOnly=").append(hasOnlyReadOnly);
         sb.append(", externalDocumentation=").append(externalDocumentation);

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java

@@ -25,7 +25,7 @@ import java.util.*;
 public class CodegenOperation {
     public final List<CodegenProperty> responseHeaders = new ArrayList<CodegenProperty>();
     public boolean hasAuthMethods, hasConsumes, hasProduces, hasParams, hasOptionalParams, hasRequiredParams,
-            returnTypeIsPrimitive, returnSimpleType, subresourceOperation, isMapContainer,
+            returnTypeIsPrimitive, returnSimpleType, subresourceOperation, isMap,
             isListContainer, isMultipart, hasMore = true,
             isResponseBinary = false, isResponseFile = false, hasReference = false,
             isRestfulIndex, isRestfulShow, isRestfulCreate, isRestfulUpdate, isRestfulDestroy,
@@ -255,7 +255,7 @@ public class CodegenOperation {
         sb.append(", returnTypeIsPrimitive=").append(returnTypeIsPrimitive);
         sb.append(", returnSimpleType=").append(returnSimpleType);
         sb.append(", subresourceOperation=").append(subresourceOperation);
-        sb.append(", isMapContainer=").append(isMapContainer);
+        sb.append(", isMap=").append(isMap);
         sb.append(", isListContainer=").append(isListContainer);
         sb.append(", isMultipart=").append(isMultipart);
         sb.append(", hasMore=").append(hasMore);
@@ -329,7 +329,7 @@ public class CodegenOperation {
                 returnTypeIsPrimitive == that.returnTypeIsPrimitive &&
                 returnSimpleType == that.returnSimpleType &&
                 subresourceOperation == that.subresourceOperation &&
-                isMapContainer == that.isMapContainer &&
+                isMap == that.isMap &&
                 isListContainer == that.isListContainer &&
                 isMultipart == that.isMultipart &&
                 hasMore == that.hasMore &&
@@ -392,7 +392,7 @@ public class CodegenOperation {
     public int hashCode() {
 
         return Objects.hash(responseHeaders, hasAuthMethods, hasConsumes, hasProduces, hasParams, hasOptionalParams,
-                hasRequiredParams, returnTypeIsPrimitive, returnSimpleType, subresourceOperation, isMapContainer,
+                hasRequiredParams, returnTypeIsPrimitive, returnSimpleType, subresourceOperation, isMap,
                 isListContainer, isMultipart, hasMore, isResponseBinary, isResponseFile, hasReference, isRestfulIndex,
                 isRestfulShow, isRestfulCreate, isRestfulUpdate, isRestfulDestroy, isRestful, isDeprecated,
                 isCallbackRequest, uniqueItems, path, operationId, returnType, httpMethod, returnBaseType,

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java

@@ -36,7 +36,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties {
     public String jsonSchema;
     public boolean isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBinary,
             isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType;
-    public boolean isListContainer, isMapContainer;
+    public boolean isListContainer, isMap;
     public boolean isFile;
     public boolean isEnum;
     public List<String> _enum;
@@ -181,7 +181,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties {
         output.isFreeFormObject = this.isFreeFormObject;
         output.isAnyType = this.isAnyType;
         output.isListContainer = this.isListContainer;
-        output.isMapContainer = this.isMapContainer;
+        output.isMap = this.isMap;
         output.isExplode = this.isExplode;
         output.style = this.style;
         output.contentType = this.contentType;
@@ -191,7 +191,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties {
 
     @Override
     public int hashCode() {
-        return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, hasMore, isContainer, secondaryParam, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName, style, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isListContainer, isMapContainer, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf);
+        return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, hasMore, isContainer, secondaryParam, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName, style, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isListContainer, isMap, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf);
     }
 
     @Override
@@ -230,7 +230,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties {
                 isFreeFormObject == that.isFreeFormObject &&
                 isAnyType == that.isAnyType &&
                 isListContainer == that.isListContainer &&
-                isMapContainer == that.isMapContainer &&
+                isMap == that.isMap &&
                 isFile == that.isFile &&
                 isEnum == that.isEnum &&
                 hasValidation == that.hasValidation &&
@@ -319,7 +319,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties {
         sb.append(", isFreeFormObject=").append(isFreeFormObject);
         sb.append(", isAnyType=").append(isAnyType);
         sb.append(", isListContainer=").append(isListContainer);
-        sb.append(", isMapContainer=").append(isMapContainer);
+        sb.append(", isMap=").append(isMap);
         sb.append(", isFile=").append(isFile);
         sb.append(", isEnum=").append(isEnum);
         sb.append(", _enum=").append(_enum);
@@ -511,5 +511,13 @@ public class CodegenParameter implements IJsonSchemaValidationProperties {
     public void setIsDateTime(boolean isDateTime)   {
         this.isDateTime = isDateTime;
     }
+
+    @Override
+    public boolean getIsMap() { return isMap; }
+
+    @Override
+    public void setIsMap(boolean isMap)  {
+        this.isMap = isMap;
+    }
 }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java

@@ -145,7 +145,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
      */
     public boolean isAnyType;
     public boolean isListContainer;
-    public boolean isMapContainer;
+    public boolean isMap;
     public boolean isEnum;
     public boolean isReadOnly;
     public boolean isWriteOnly;
@@ -485,6 +485,14 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
         this.isDateTime = isDateTime;
     }
 
+    @Override
+    public boolean getIsMap() { return isMap; }
+
+    @Override
+    public void setIsMap(boolean isMap)  {
+        this.isMap = isMap;
+    }
+
     public Map<String, Object> getVendorExtensions() {
         return vendorExtensions;
     }
@@ -685,7 +693,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
         sb.append(", isEmail=").append(isEmail);
         sb.append(", isFreeFormObject=").append(isFreeFormObject);
         sb.append(", isListContainer=").append(isListContainer);
-        sb.append(", isMapContainer=").append(isMapContainer);
+        sb.append(", isMap=").append(isMap);
         sb.append(", isEnum=").append(isEnum);
         sb.append(", isReadOnly=").append(isReadOnly);
         sb.append(", isWriteOnly=").append(isWriteOnly);
@@ -752,7 +760,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
                 isEmail == that.isEmail &&
                 isFreeFormObject == that.isFreeFormObject &&
                 isListContainer == that.isListContainer &&
-                isMapContainer == that.isMapContainer &&
+                isMap == that.isMap &&
                 isEnum == that.isEnum &&
                 isReadOnly == that.isReadOnly &&
                 isWriteOnly == that.isWriteOnly &&
@@ -817,7 +825,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
                 hasMoreNonReadOnly, isPrimitiveType, isModel, isContainer, isString, isNumeric,
                 isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBinary, isFile,
                 isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject,
-                isListContainer, isMapContainer, isEnum, isReadOnly, isWriteOnly, isNullable,
+                isListContainer, isMap, isEnum, isReadOnly, isWriteOnly, isNullable,
                 isSelfReference, isCircularReference, isDiscriminator, _enum, allowableValues, items, mostInnerItems,
                 vendorExtensions, hasValidation, isInherited, discriminatorValue, nameInCamelCase,
                 nameInSnakeCase, enumName, maxItems, minItems, isXmlAttribute, xmlPrefix, xmlName,

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java

@@ -53,7 +53,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties {
     public boolean isDefault;
     public boolean simpleType;
     public boolean primitiveType;
-    public boolean isMapContainer;
+    public boolean isMap;
     public boolean isListContainer;
     public boolean isBinary = false;
     public boolean isFile = false;
@@ -80,7 +80,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties {
         return Objects.hash(headers, code, message, hasMore, examples, dataType, baseType, containerType, hasHeaders,
                 isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBoolean, isDate,
                 isDateTime, isUuid, isEmail, isModel, isFreeFormObject, isAnyType, isDefault, simpleType, primitiveType,
-                isMapContainer, isListContainer, isBinary, isFile, schema, jsonSchema, vendorExtensions, items,
+                isMap, isListContainer, isBinary, isFile, schema, jsonSchema, vendorExtensions, items,
                 getMaxProperties(), getMinProperties(), uniqueItems, getMaxItems(), getMinItems(), getMaxLength(),
                 getMinLength(), exclusiveMinimum, exclusiveMaximum, getMinimum(), getMaximum(), getPattern());
     }
@@ -111,7 +111,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties {
                 isDefault == that.isDefault &&
                 simpleType == that.simpleType &&
                 primitiveType == that.primitiveType &&
-                isMapContainer == that.isMapContainer &&
+                isMap == that.isMap &&
                 isListContainer == that.isListContainer &&
                 isBinary == that.isBinary &&
                 isFile == that.isFile &&
@@ -306,6 +306,14 @@ public class CodegenResponse implements IJsonSchemaValidationProperties {
         this.isDateTime = isDateTime;
     }
 
+    @Override
+    public boolean getIsMap() { return isMap; }
+
+    @Override
+    public void setIsMap(boolean isMap)  {
+        this.isMap = isMap;
+    }
+
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder("CodegenResponse{");
@@ -337,7 +345,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties {
         sb.append(", isDefault=").append(isDefault);
         sb.append(", simpleType=").append(simpleType);
         sb.append(", primitiveType=").append(primitiveType);
-        sb.append(", isMapContainer=").append(isMapContainer);
+        sb.append(", isMap=").append(isMap);
         sb.append(", isListContainer=").append(isListContainer);
         sb.append(", isBinary=").append(isBinary);
         sb.append(", isFile=").append(isFile);

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -2508,7 +2508,7 @@ public class DefaultCodegen implements CodegenConfig {
             }
             if (ModelUtils.isMapSchema(schema)) {
                 addAdditionPropertiesToCodeGenModel(m, schema);
-                m.isMapModel = true;
+                m.isMap = true;
             } else if (ModelUtils.isIntegerSchema(schema)) { // integer type
                 // NOTE: Integral schemas as CodegenModel is a rare use case and may be removed at a later date.
                 // Sync of properties is done for consistency with other data types like CodegenParameter/CodegenProperty.
@@ -3333,7 +3333,7 @@ public class DefaultCodegen implements CodegenConfig {
             updatePropertyForArray(property, cp);
         } else if (ModelUtils.isMapSchema(p)) {
             property.isContainer = true;
-            property.isMapContainer = true;
+            property.isMap = true;
             property.containerType = "map";
             property.baseType = getSchemaType(p);
             property.minItems = p.getMinProperties();
@@ -3451,7 +3451,7 @@ public class DefaultCodegen implements CodegenConfig {
 
     protected CodegenProperty getMostInnerItems(CodegenProperty property) {
         CodegenProperty currentProperty = property;
-        while (currentProperty != null && (Boolean.TRUE.equals(currentProperty.isMapContainer)
+        while (currentProperty != null && (Boolean.TRUE.equals(currentProperty.isMap)
                 || Boolean.TRUE.equals(currentProperty.isListContainer))) {
             currentProperty = currentProperty.items;
         }
@@ -3471,7 +3471,7 @@ public class DefaultCodegen implements CodegenConfig {
      */
     protected void updateDataTypeWithEnumForArray(CodegenProperty property) {
         CodegenProperty baseItem = property.items;
-        while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMapContainer)
+        while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMap)
                 || Boolean.TRUE.equals(baseItem.isListContainer))) {
             baseItem = baseItem.items;
         }
@@ -3499,7 +3499,7 @@ public class DefaultCodegen implements CodegenConfig {
      */
     protected void updateDataTypeWithEnumForMap(CodegenProperty property) {
         CodegenProperty baseItem = property.items;
-        while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMapContainer)
+        while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMap)
                 || Boolean.TRUE.equals(baseItem.isListContainer))) {
             baseItem = baseItem.items;
         }
@@ -3627,7 +3627,7 @@ public class DefaultCodegen implements CodegenConfig {
             if (cm.isContainer) {
                 op.returnContainer = cm.containerType;
                 if ("map".equals(cm.containerType)) {
-                    op.isMapContainer = true;
+                    op.isMap = true;
                 } else if ("list".equalsIgnoreCase(cm.containerType)) {
                     op.isListContainer = true;
                 } else if ("array".equalsIgnoreCase(cm.containerType)) {
@@ -4081,7 +4081,7 @@ public class DefaultCodegen implements CodegenConfig {
             if (cp.isContainer) {
                 r.simpleType = false;
                 r.containerType = cp.containerType;
-                r.isMapContainer = "map".equals(cp.containerType);
+                r.isMap = "map".equals(cp.containerType);
                 r.isListContainer = "list".equalsIgnoreCase(cp.containerType) ||
                         "array".equalsIgnoreCase(cp.containerType) ||
                         "set".equalsIgnoreCase(cp.containerType);
@@ -4093,7 +4093,7 @@ public class DefaultCodegen implements CodegenConfig {
         }
 
         if (r.baseType == null) {
-            r.isMapContainer = false;
+            r.isMap = false;
             r.isListContainer = false;
             r.primitiveType = true;
             r.simpleType = true;
@@ -4280,7 +4280,7 @@ public class DefaultCodegen implements CodegenConfig {
                 codegenParameter.mostInnerItems = codegenProperty.mostInnerItems;
                 codegenParameter.baseType = codegenProperty.dataType;
                 codegenParameter.isContainer = true;
-                codegenParameter.isMapContainer = true;
+                codegenParameter.isMap = true;
 
                 // recursively add import
                 while (codegenProperty != null) {
@@ -6064,7 +6064,7 @@ public class DefaultCodegen implements CodegenConfig {
                 codegenParameter.dataType = getTypeDeclaration(schema);
                 codegenParameter.baseType = getSchemaType(inner);
                 codegenParameter.isContainer = Boolean.TRUE;
-                codegenParameter.isMapContainer = Boolean.TRUE;
+                codegenParameter.isMap = Boolean.TRUE;
                 codegenParameter.isNullable = codegenProperty.isNullable;
 
                 setParameterBooleanFlagWithCodegenProperty(codegenParameter, codegenProperty);

modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java

@@ -68,4 +68,8 @@ public interface IJsonSchemaValidationProperties {
     boolean getIsDateTime();
 
     void setIsDateTime(boolean isDateTime);
+
+    boolean getIsMap();
+
+    void setIsMap(boolean isMap);
 }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java

@@ -288,7 +288,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
             if (p.items != null && p.items.example != null) {
                 p.example = "new " + p.dataType + "{" + p.items.example + "}";
             }
-        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+        } else if (Boolean.TRUE.equals(p.isMap)) {
             if (p.items != null && p.items.example != null) {
                 p.example = "new " + p.dataType + "{" + p.items.example + "}";
             }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java

@@ -654,7 +654,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
                             }
                         } else {
                             operation.returnContainer = operation.returnType;
-                            operation.isMapContainer = this.mapTypes.contains(typeMapping);
+                            operation.isMap = this.mapTypes.contains(typeMapping);
                         }
                     }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java

@@ -351,7 +351,7 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg
             Map<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.isMapModel ) && (cm.parentModel == null)) {
+            if((cm.isArrayModel || cm.isMap ) && (cm.parentModel == null)) {
                 cm.parent = null;
             }
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java

@@ -548,7 +548,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
                             }
                         } else {
                             operation.returnContainer = operation.returnType;
-                            operation.isMapContainer = this.mapTypes.contains(typeMapping);
+                            operation.isMap = this.mapTypes.contains(typeMapping);
                         }
                     }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

@@ -979,7 +979,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
             } else {
                 example = "Arrays.asList()";
             }
-        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+        } else if (Boolean.TRUE.equals(p.isMap)) {
             example = "new HashMap()";
         }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java

@@ -599,7 +599,7 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
             example = "NULL";
         } else if (Boolean.TRUE.equals(p.isListContainer)) {
             example = "array(" + example + ")";
-        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+        } else if (Boolean.TRUE.equals(p.isMap)) {
             example = "array('key' => " + example + ")";
         }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java

@@ -820,7 +820,7 @@ public abstract class AbstractPythonConnexionServerCodegen extends DefaultCodege
             if (Boolean.TRUE.equals(p.isBodyParam)) {
                 example = "[" + example + "]";
             }
-        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+        } else if (Boolean.TRUE.equals(p.isMap)) {
             example = "{'key': " + example + "}";
         }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java

@@ -367,7 +367,7 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
             example = "null";
         } else if (Boolean.TRUE.equals(p.isListContainer)) {
             example = "Arrays.asList(" + example + ")";
-        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+        } else if (Boolean.TRUE.equals(p.isMap)) {
             example = "new HashMap()";
         }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java

@@ -785,7 +785,7 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig {
             example = "NULL";
         } else if (Boolean.TRUE.equals(p.isListContainer)) {
             example = "[" + example + "]";
-        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+        } else if (Boolean.TRUE.equals(p.isMap)) {
             example = "{'key': " + example + "}";
         }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java

@@ -702,7 +702,7 @@ public class CLibcurlClientCodegen extends DefaultCodegen implements CodegenConf
             example = "nil";
         } else if (Boolean.TRUE.equals(p.isListContainer)) {
             example = "[" + example + "]";
-        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+        } else if (Boolean.TRUE.equals(p.isMap)) {
             example = "{'key' => " + example + "}";
         }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java

@@ -408,10 +408,10 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen {
 
         boolean isPrimitiveType = parameter.isPrimitiveType == Boolean.TRUE;
         boolean isListContainer = parameter.isListContainer == Boolean.TRUE;
-        boolean isMapContainer = parameter.isMapContainer == Boolean.TRUE;
+        boolean isMap = parameter.isMap == Boolean.TRUE;
         boolean isString = parameter.isString == Boolean.TRUE;
 
-        if (!isPrimitiveType && !isListContainer && !isMapContainer && !isString && !parameter.dataType.startsWith("std::shared_ptr")) {
+        if (!isPrimitiveType && !isListContainer && !isMap && !isString && !parameter.dataType.startsWith("std::shared_ptr")) {
             parameter.dataType = "std::shared_ptr<" + parameter.dataType + ">";
         }
     }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java

@@ -583,7 +583,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig
             this.isDefault = o.isDefault;
             this.simpleType = o.simpleType;
             this.primitiveType = o.primitiveType;
-            this.isMapContainer = o.isMapContainer;
+            this.isMap = o.isMap;
             this.isListContainer = o.isListContainer;
             this.isBinary = o.isBinary;
             this.isFile = o.isFile;
@@ -609,7 +609,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig
 
         public String decodedStruct() {
             // Let Poison decode the entire response into a generic blob
-            if (isMapContainer) {
+            if (isMap) {
                 return "%{}";
             }
             // Primitive return type, don't even try to decode
@@ -652,7 +652,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig
             this.returnTypeIsPrimitive = o.returnTypeIsPrimitive;
             this.returnSimpleType = o.returnSimpleType;
             this.subresourceOperation = o.subresourceOperation;
-            this.isMapContainer = o.isMapContainer;
+            this.isMap = o.isMap;
             this.isListContainer = o.isListContainer;
             this.isMultipart = o.isMultipart;
             this.hasMore = o.hasMore;
@@ -777,7 +777,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig
                 sb.append("list(");
                 buildTypespec(param.items, sb);
                 sb.append(")");
-            } else if (param.isMapContainer) {
+            } else if (param.isMap) {
                 // %{optional(String.t) => <subtype>}
                 sb.append("%{optional(String.t) => ");
                 buildTypespec(param.items, sb);
@@ -806,7 +806,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig
                 sb.append("list(");
                 buildTypespec(property.items, sb);
                 sb.append(")");
-            } else if (property.isMapContainer) {
+            } else if (property.isMap) {
                 sb.append("%{optional(String.t) => ");
                 buildTypespec(property.items, sb);
                 sb.append("}");

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java

@@ -403,7 +403,7 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig
             this.returnTypeIsPrimitive = o.returnTypeIsPrimitive;
             this.returnSimpleType = o.returnSimpleType;
             this.subresourceOperation = o.subresourceOperation;
-            this.isMapContainer = o.isMapContainer;
+            this.isMap = o.isMap;
             this.isListContainer = o.isListContainer;
             this.isMultipart = o.isMultipart;
             this.hasMore = o.hasMore;

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java

@@ -515,7 +515,7 @@ public class ErlangProperCodegen extends DefaultCodegen implements CodegenConfig
             this.returnTypeIsPrimitive = o.returnTypeIsPrimitive;
             this.returnSimpleType = o.returnSimpleType;
             this.subresourceOperation = o.subresourceOperation;
-            this.isMapContainer = o.isMapContainer;
+            this.isMap = o.isMap;
             this.isListContainer = o.isListContainer;
             this.isMultipart = o.isMultipart;
             this.hasMore = o.hasMore;

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java

@@ -392,7 +392,7 @@ public class GoClientCodegen extends AbstractGoCodegen {
 
                 for (CodegenProperty param : model.vars) {
                     param.vendorExtensions.put("x-go-base-type", param.dataType);
-                    if (!param.isNullable || param.isMapContainer || param.isListContainer ||
+                    if (!param.isNullable || param.isMap || param.isListContainer ||
                             param.isFreeFormObject || param.isAnyType) {
                         continue;
                     }
@@ -420,7 +420,7 @@ public class GoClientCodegen extends AbstractGoCodegen {
                 }
 
                 // additionalProperties: true and parent
-                if (model.isAdditionalPropertiesTrue && model.parent != null && Boolean.FALSE.equals(model.isMapModel)) {
+                if (model.isAdditionalPropertiesTrue && model.parent != null && Boolean.FALSE.equals(model.isMap)) {
                     imports.add(createMapping("import", "reflect"));
                     imports.add(createMapping("import", "strings"));
                 }
@@ -463,7 +463,7 @@ public class GoClientCodegen extends AbstractGoCodegen {
     private String constructExampleCode(CodegenParameter codegenParameter, HashMap<String, CodegenModel> modelMaps, HashMap<String, Integer> processedModelMap) {
         if (codegenParameter.isListContainer) { // array
             return codegenParameter.dataType + "{" + constructExampleCode(codegenParameter.items, modelMaps, processedModelMap) + "}";
-        } else if (codegenParameter.isMapContainer) {
+        } else if (codegenParameter.isMap) {
             return "map[string]string{ \"Key\" = \"Value\" }";
         } else if (codegenParameter.isPrimitiveType) { // primitive type
             if (codegenParameter.isString) {
@@ -503,7 +503,7 @@ public class GoClientCodegen extends AbstractGoCodegen {
     private String constructExampleCode(CodegenProperty codegenProperty, HashMap<String, CodegenModel> modelMaps, HashMap<String, Integer> processedModelMap) {
         if (codegenProperty.isListContainer) { // array
             return codegenProperty.dataType + "{" + constructExampleCode(codegenProperty.items, modelMaps, processedModelMap) + ")";
-        } else if (codegenProperty.isMapContainer) { // map
+        } else if (codegenProperty.isMap) { // map
             return "map[string]string{ \"Key\" = \"Value\" }";
         } else if (codegenProperty.isPrimitiveType) { // primitive type
             if (codegenProperty.isString) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java

@@ -728,7 +728,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
             }
 
             if (typeMapping.containsKey(param.dataType)
-                    || param.isMapContainer || param.isListContainer
+                    || param.isMap || param.isListContainer
                     || param.isPrimitiveType || param.isFile || (param.isEnum || param.allowableValues != null) || !param.isBodyParam) {
 
                 String dataType = genEnums && param.isEnum ? param.datatypeWithEnum : param.dataType;
@@ -1064,7 +1064,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
             unknownMimeTypes.add(m);
         }
         for (CodegenParameter param : op.allParams) {
-            if (param.isBodyParam || param.isFormParam && (!param.isPrimitiveType && !param.isListContainer && !param.isMapContainer)) {
+            if (param.isBodyParam || param.isFormParam && (!param.isPrimitiveType && !param.isListContainer && !param.isMap)) {
                 Set<String> mimeTypes = modelMimeTypes.containsKey(param.dataType) ? modelMimeTypes.get(param.dataType) : new HashSet();
                 mimeTypes.add(mimeType);
                 modelMimeTypes.put(param.dataType, mimeTypes);
@@ -1314,7 +1314,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
     @Override
     protected void updateDataTypeWithEnumForMap(CodegenProperty property) {
         CodegenProperty baseItem = property.items;
-        while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMapContainer) || Boolean.TRUE.equals(baseItem.isListContainer))) {
+        while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMap) || Boolean.TRUE.equals(baseItem.isListContainer))) {
             baseItem = baseItem.items;
         }
         if (baseItem != null) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java

@@ -65,7 +65,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF
         boolean isArray;
         boolean isContainer;
         boolean isListContainer;
-        boolean isMapContainer;
+        boolean isMap;
         boolean isPrimitiveType;
         CodegenVariable items;
         Integer minItems;
@@ -94,9 +94,9 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF
             dataType = op.returnType;
             enumName = null;// op.enumName;
             allowableValues = null;// op.allowableValues;
-            isContainer = op.isListContainer || op.isMapContainer;
+            isContainer = op.isListContainer || op.isMap;
             isListContainer = op.isListContainer;
-            isMapContainer = op.isMapContainer;
+            isMap = op.isMap;
             isPrimitiveType = op.returnTypeIsPrimitive;
             minItems = null;// op.minItems;
             minimum = null;// op.minimum;
@@ -110,7 +110,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF
             varVendorExtensions = op.vendorExtensions;
             init(parent, testDataPath, models);
 
-            if (op.isListContainer || op.isMapContainer) {
+            if (op.isListContainer || op.isMap) {
                 items = new CodegenVariable();
                 items.dataType = op.returnBaseType;
                 items.isPrimitiveType = op.returnTypeIsPrimitive;
@@ -131,7 +131,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF
             allowableValues = param.allowableValues;
             isContainer = param.isContainer;
             isListContainer = param.isListContainer;
-            isMapContainer = param.isMapContainer;
+            isMap = param.isMap;
             isPrimitiveType = param.isPrimitiveType;
             minItems = param.minItems;
             minimum = param.minimum;
@@ -158,7 +158,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF
             allowableValues = prop.allowableValues;
             isContainer = prop.isContainer;
             isListContainer = prop.isListContainer;
-            isMapContainer = prop.isMapContainer;
+            isMap = prop.isMap;
             isPrimitiveType = prop.isPrimitiveType;
             minItems = prop.minItems;
             minimum = prop.minimum;
@@ -216,10 +216,10 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF
             this.isArray = dataType.endsWith("[]");
             this.testDataPath = testDataPath;
             CodegenModel cm = models.get(dataType);
-            if (cm != null && (cm.isArrayModel || cm.isMapModel)) {
+            if (cm != null && (cm.isArrayModel || cm.isMap)) {
                 this.isContainer = true;
                 this.isListContainer = cm.isArrayModel;
-                this.isMapContainer = cm.isMapModel;
+                this.isMap = cm.isMap;
                 this.items = new CodegenVariable();
                 this.items.name = "item";
                 this.items.dataType = cm.additionalPropertiesType;
@@ -249,7 +249,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF
         public String toString() {
             return "CodegenVariable [name=" + name + ", dataType=" + dataType + ", dataFormat=" + dataFormat
                     + ", isArray=" + isArray + ", isContainer=" + isContainer + ", isListContainer=" + isListContainer
-                    + ", isMapContainer=" + isMapContainer + ", isPrimitiveType=" + isPrimitiveType + ", testDataPath="
+                    + ", isMap=" + isMap + ", isPrimitiveType=" + isPrimitiveType + ", testDataPath="
                     + testDataPath + ", enumName=" + enumName + ", allowableValues=" + allowableValues + ", minItems="
                     + minItems + ", itemCount=" + itemCount + ", minimum=" + minimum + ", maximum=" + maximum
                     + ", exclusiveMinimum=" + exclusiveMinimum + ", exclusiveMaximum=" + exclusiveMaximum
@@ -512,7 +512,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF
                                            CodegenVariable parent, String localVar, Collection<String> localVars, Map<String, CodegenModel> models) {
 
         CodegenModel cm = models.get(parent.dataType);
-        if (cm != null) { // TODO: handle isArrayModel and isMapModel
+        if (cm != null) { // TODO: handle isArrayModel and isMap
             for (CodegenProperty cp : cm.allVars) {
                 CodegenVariable var = new CodegenVariable(parent, cp, null, models);
                 if (var.isContainer || !var.isPrimitiveType) {
@@ -883,7 +883,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF
 
         if (var.isListContainer)
             appendListValue(buffer, indent, op, var, localVar, localVars, models);
-        else if (var.isMapContainer)
+        else if (var.isMap)
             appendMapValue(buffer, indent, op, var, localVar, localVars, models);
         else if (var.isArray)
             appendArrayValue(buffer, indent, op, var, localVar, localVars, models);
@@ -1204,7 +1204,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF
                                     .append(op.operationId).append('/').append(var.name).append('"');
                             if (var.isListContainer)
                                 buffer.append(", ").append(var.getComponentType()).append(".class");
-                            else if (var.isMapContainer)
+                            else if (var.isMap)
                                 buffer.append(", Map.class");
                             else if (!hasCacheMethod(var))
                                 buffer.append(", ").append(var.dataType).append(".class");
@@ -1229,7 +1229,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF
                                     .append(op.operationId).append('/').append(var.name).append('"');
                             if (var.isListContainer)
                                 buffer.append(", ").append(var.getComponentType()).append(".class");
-                            else if (var.isMapContainer)
+                            else if (var.isMap)
                                 buffer.append(", Map.class");
                             else if (!hasCacheMethod(var))
                                 buffer.append(", ").append(var.dataType).append(".class");

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java

@@ -682,7 +682,7 @@ public class JavascriptApolloClientCodegen extends DefaultCodegen implements Cod
         if (Boolean.TRUE.equals(p.isListContainer)) {
             example = setPropertyExampleValue(p.items);
             example = "[" + example + "]";
-        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+        } else if (Boolean.TRUE.equals(p.isMap)) {
             example = setPropertyExampleValue(p.items);
             example = "{key: " + example + "}";
         } else if (example == null) {
@@ -880,7 +880,7 @@ public class JavascriptApolloClientCodegen extends DefaultCodegen implements Cod
         String dataType = trimBrackets(cp.dataType);
         if (Boolean.TRUE.equals(cp.isListContainer)) {
             return "Array.<" + dataType + ">";
-        } else if (Boolean.TRUE.equals(cp.isMapContainer)) {
+        } else if (Boolean.TRUE.equals(cp.isMap)) {
             return "Object.<String, " + dataType + ">";
         }
         return dataType;
@@ -891,7 +891,7 @@ public class JavascriptApolloClientCodegen extends DefaultCodegen implements Cod
         if (returnType != null) {
             if (Boolean.TRUE.equals(co.isListContainer)) {
                 return "Array.<" + returnType + ">";
-            } else if (Boolean.TRUE.equals(co.isMapContainer)) {
+            } else if (Boolean.TRUE.equals(co.isMap)) {
                 return "Object.<String, " + returnType + ">";
             }
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java

@@ -733,7 +733,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         if (Boolean.TRUE.equals(p.isListContainer)) {
             example = setPropertyExampleValue(p.items);
             example = "[" + example + "]";
-        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+        } else if (Boolean.TRUE.equals(p.isMap)) {
             example = setPropertyExampleValue(p.items);
             example = "{key: " + example + "}";
         } else if (example == null) {
@@ -945,7 +945,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
             dataType = getModelledType(dataType);
         if (Boolean.TRUE.equals(cp.isListContainer)) {
             return "Array.<" + dataType + ">";
-        } else if (Boolean.TRUE.equals(cp.isMapContainer)) {
+        } else if (Boolean.TRUE.equals(cp.isMap)) {
             return "Object.<String, " + dataType + ">";
         }
         return dataType;
@@ -963,7 +963,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
                 returnType = getModelledType(returnType);
             if (Boolean.TRUE.equals(co.isListContainer)) {
                 return "Array.<" + returnType + ">";
-            } else if (Boolean.TRUE.equals(co.isMapContainer)) {
+            } else if (Boolean.TRUE.equals(co.isMap)) {
                 return "Object.<String, " + returnType + ">";
             }
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java

@@ -237,7 +237,7 @@ public class OCamlClientCodegen extends DefaultCodegen implements CodegenConfig
     @Override
     protected void updateDataTypeWithEnumForMap(CodegenProperty property) {
         CodegenProperty baseItem = property.items;
-        while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMapContainer)
+        while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMap)
                 || Boolean.TRUE.equals(baseItem.isListContainer))) {
             baseItem = baseItem.items;
         }
@@ -255,7 +255,7 @@ public class OCamlClientCodegen extends DefaultCodegen implements CodegenConfig
     @Override
     protected void updateDataTypeWithEnumForArray(CodegenProperty property) {
         CodegenProperty baseItem = property.items;
-        while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMapContainer)
+        while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMap)
                 || Boolean.TRUE.equals(baseItem.isListContainer))) {
             baseItem = baseItem.items;
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java

@@ -773,7 +773,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
             example = "NULL";
         } else if (Boolean.TRUE.equals(p.isListContainer)) {
             example = "@[" + example + "]";
-        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+        } else if (Boolean.TRUE.equals(p.isMap)) {
             example = "@{@\"key\" : " + example + "}";
         }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java

@@ -511,7 +511,7 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
         if (Boolean.TRUE.equals(p.isListContainer)) {
             example = setPropertyExampleValue(p.items);
             example = "(" + example + ")";
-        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+        } else if (Boolean.TRUE.equals(p.isMap)) {
             example = setPropertyExampleValue(p.items);
             example = "('key' =>  " + example + "}";
         } else if (example == null) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java

@@ -998,7 +998,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
     private String constructExampleCode(CodegenParameter codegenParameter, HashMap<String, CodegenModel> modelMaps, HashMap<String, Integer> processedModelMap) {
         if (codegenParameter.isListContainer) { // array
             return "@(" + constructExampleCode(codegenParameter.items, modelMaps, processedModelMap) + ")";
-        } else if (codegenParameter.isMapContainer) { // TODO: map, file type
+        } else if (codegenParameter.isMap) { // TODO: map, file type
             return "@{ \"Key\" = \"Value\" }";
         } else if (languageSpecificPrimitives.contains(codegenParameter.dataType) ||
                 nullablePrimitives.contains(codegenParameter.dataType)) { // primitive type
@@ -1040,7 +1040,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
     private String constructExampleCode(CodegenProperty codegenProperty, HashMap<String, CodegenModel> modelMaps, HashMap<String, Integer> processedModelMap) {
         if (codegenProperty.isListContainer) { // array
             return "@(" + constructExampleCode(codegenProperty.items, modelMaps, processedModelMap) + ")";
-        } else if (codegenProperty.isMapContainer) { // map
+        } else if (codegenProperty.isMap) { // map
             return "\"TODO\"";
         } else if (languageSpecificPrimitives.contains(codegenProperty.dataType) || // primitive type
                 nullablePrimitives.contains(codegenProperty.dataType)) { // nullable primitive type
@@ -1118,7 +1118,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
             return dataType;
         } else if (cp.isListContainer) { // array
             return getPSDataType(cp.items) + "[]";
-        } else if (cp.isMapContainer) { // map
+        } else if (cp.isMap) { // map
             return "System.Collections.Hashtable";
         } else { // model
             return "PSCustomObject";
@@ -1136,7 +1136,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
             return dataType;
         } else if (cp.isListContainer) { // array
             return getPSDataType(cp.items) + "[]";
-        } else if (cp.isMapContainer) { // map
+        } else if (cp.isMap) { // map
             return "System.Collections.Hashtable";
         } else { // model
             return "PSCustomObject";

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java

@@ -410,7 +410,7 @@ public class ProtobufSchemaCodegen extends DefaultCodegen implements CodegenConf
                 // add x-protobuf-type: repeated if it's an array
                 if (Boolean.TRUE.equals(p.isListContainer)) {
                     p.vendorExtensions.put("x-protobuf-type", "repeated");
-                } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+                } else if (Boolean.TRUE.equals(p.isMap)) {
                     LOGGER.warn("Map parameter (name: {}, operation ID: {}) not yet supported", p.paramName, op.operationId);
                 }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java

@@ -956,7 +956,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
             example = "None";
         } else if (Boolean.TRUE.equals(p.isListContainer)) {
             example = "[" + example + "]";
-        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+        } else if (Boolean.TRUE.equals(p.isMap)) {
             example = "{'key': " + example + "}";
         }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java

@@ -586,7 +586,7 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig {
             example = "NULL";
         } else if (Boolean.TRUE.equals(p.isListContainer)) {
             example = "[" + example + "]";
-        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+        } else if (Boolean.TRUE.equals(p.isMap)) {
             example = "{'key' => " + example + "}";
         }
 
@@ -707,7 +707,7 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig {
     public String constructExampleCode(CodegenParameter codegenParameter, HashMap<String, CodegenModel> modelMaps) {
         if (codegenParameter.isListContainer) { // array
             return "list(" + constructExampleCode(codegenParameter.items, modelMaps) + ")";
-        } else if (codegenParameter.isMapContainer) { // TODO: map
+        } else if (codegenParameter.isMap) { // TODO: map
             return "TODO";
         } else if (languageSpecificPrimitives.contains(codegenParameter.dataType)) { // primitive type
             return codegenParameter.example;
@@ -725,7 +725,7 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig {
     public String constructExampleCode(CodegenProperty codegenProperty, HashMap<String, CodegenModel> modelMaps) {
         if (codegenProperty.isListContainer) { // array
             return "list(" + constructExampleCode(codegenProperty.items, modelMaps) + ")";
-        } else if (codegenProperty.isMapContainer) { // TODO: map
+        } else if (codegenProperty.isMap) { // TODO: map
             return "TODO";
         } else if (languageSpecificPrimitives.contains(codegenProperty.dataType)) { // primitive type
             if ("character".equals(codegenProperty.dataType)) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java

@@ -584,7 +584,7 @@ public class RubyClientCodegen extends AbstractRubyCodegen {
             example = "nil";
         } else if (Boolean.TRUE.equals(p.isListContainer)) {
             example = "[" + example + "]";
-        } else if (Boolean.TRUE.equals(p.isMapContainer)) {
+        } else if (Boolean.TRUE.equals(p.isMap)) {
             example = "{'key' => " + example + "}";
         }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java

@@ -559,7 +559,7 @@ public class RustClientCodegen extends DefaultCodegen implements CodegenConfig {
                     if ( end > 0 ) {
                         p.dataType = "Vec<" + rt.substring("Vec<".length(), end).trim() + ">";
                     }
-                } else if (p.isMapContainer && !languageSpecificPrimitives.contains(p.dataType)) {
+                } else if (p.isMap && !languageSpecificPrimitives.contains(p.dataType)) {
                     // map of model
                     String rt = p.dataType;
                     int end = rt.lastIndexOf(">");

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java

@@ -444,7 +444,7 @@ class Marshaller {
     public Marshaller(CodegenParameter parameter) {
         if (parameter.isListContainer) {
             this.varName = parameter.baseType + "List";
-        } else if (parameter.isMapContainer) {
+        } else if (parameter.isMap) {
             this.varName = parameter.baseType + "Map";
         } else if (parameter.isContainer) {
             this.varName = parameter.baseType + "Container";

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java

@@ -440,7 +440,7 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem
             }
         }
 
-        if (cm.isMapModel) {
+        if (cm.isMap) {
             defaultValue.append(", Map.empty");
         }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java

@@ -1009,7 +1009,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {
     public String constructExampleCode(CodegenParameter codegenParameter, HashMap<String, CodegenModel> modelMaps) {
         if (codegenParameter.isListContainer) { // array
             return "[" + constructExampleCode(codegenParameter.items, modelMaps) + "]";
-        } else if (codegenParameter.isMapContainer) { // TODO: map, file type
+        } else if (codegenParameter.isMap) { // TODO: map, file type
             return "\"TODO\"";
         } else if (languageSpecificPrimitives.contains(codegenParameter.dataType)) { // primitive type
             if ("String".equals(codegenParameter.dataType) || "Character".equals(codegenParameter.dataType)) {
@@ -1049,7 +1049,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {
     public String constructExampleCode(CodegenProperty codegenProperty, HashMap<String, CodegenModel> modelMaps) {
         if (codegenProperty.isListContainer) { // array
             return "[" + constructExampleCode(codegenProperty.items, modelMaps) + "]";
-        } else if (codegenProperty.isMapContainer) { // TODO: map, file type
+        } else if (codegenProperty.isMap) { // TODO: map, file type
             return "\"TODO\"";
         } else if (languageSpecificPrimitives.contains(codegenProperty.dataType)) { // primitive type
             if ("String".equals(codegenProperty.dataType) || "Character".equals(codegenProperty.dataType)) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java

@@ -1012,7 +1012,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig
     public String constructExampleCode(CodegenParameter codegenParameter, HashMap<String, CodegenModel> modelMaps, ExampleCodeGenerationContext context) {
         if (codegenParameter.isListContainer) { // array
             return "[" + constructExampleCode(codegenParameter.items, modelMaps, context) + "]";
-        } else if (codegenParameter.isMapContainer) { // TODO: map, file type
+        } else if (codegenParameter.isMap) { // TODO: map, file type
             return "\"TODO\"";
         } else if (languageSpecificPrimitives.contains(codegenParameter.dataType)) { // primitive type
             if ("String".equals(codegenParameter.dataType) || "Character".equals(codegenParameter.dataType)) {
@@ -1052,7 +1052,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig
     private String constructExampleCode(CodegenProperty codegenProperty, HashMap<String, CodegenModel> modelMaps, ExampleCodeGenerationContext context) {
         if (codegenProperty.isListContainer) { // array
             return "[" + constructExampleCode(codegenProperty.items, modelMaps, context) + "]";
-        } else if (codegenProperty.isMapContainer) { // TODO: map, file type
+        } else if (codegenProperty.isMap) { // TODO: map, file type
             return "\"TODO\"";
         } else if (languageSpecificPrimitives.contains(codegenProperty.dataType)) { // primitive type
             if ("String".equals(codegenProperty.dataType) || "Character".equals(codegenProperty.dataType)) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java

@@ -301,7 +301,7 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
         List<CodegenOperation> operationList = (List<CodegenOperation>) _operations.get("operation");
         for (CodegenOperation op : operationList) {
             if("object".equals(op.returnType)) {
-                op.isMapContainer = true;
+                op.isMap = true;
                 op.returnSimpleType = false;
             }
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java

@@ -249,7 +249,7 @@ public class TypeScriptReduxQueryClientCodegen extends AbstractTypeScriptClientC
         List<CodegenOperation> operationList = (List<CodegenOperation>) _operations.get("operation");
         for (CodegenOperation op : operationList) {
             if("object".equals(op.returnType)) {
-                op.isMapContainer = true;
+                op.isMap = true;
                 op.returnSimpleType = false;
             }
         }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java

@@ -365,7 +365,7 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
             this.returnTypeIsPrimitive = o.returnTypeIsPrimitive;
             this.returnSimpleType = o.returnSimpleType;
             this.subresourceOperation = o.subresourceOperation;
-            this.isMapContainer = o.isMapContainer;
+            this.isMap = o.isMap;
             this.isListContainer = o.isListContainer;
             this.isMultipart = o.isMultipart;
             this.hasMore = o.hasMore;

modules/openapi-generator/src/main/resources/C-libcurl/api-body.mustache

@@ -98,8 +98,8 @@ end:
 // {{{notes}}}
 //
 {{/notes}}
-{{#returnType}}{{#returnTypeIsPrimitive}}{{#returnSimpleType}}{{{.}}}*{{/returnSimpleType}}{{^returnSimpleType}}{{#isListContainer}}{{{.}}}_t*{{/isListContainer}}{{#isMapContainer}}{{{.}}}{{/isMapContainer}}{{/returnSimpleType}}{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}{{{.}}}_t*{{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void{{/returnType}}
+{{#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}}{{#isMapContainer}}{{dataType}}{{/isMapContainer}}{{/isContainer}} {{{paramName}}} {{/allParams}})
+{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}}, {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isListContainer}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isListContainer}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMap}}{{dataType}}{{/isMap}}{{/isContainer}} {{{paramName}}} {{/allParams}})
 {
     list_t    *localVarQueryParameters = {{#hasQueryParams}}list_create();{{/hasQueryParams}}{{^hasQueryParams}}NULL;{{/hasQueryParams}}
     list_t    *localVarHeaderParameters = {{#hasHeaderParams}}list_create();{{/hasHeaderParams}}{{^hasHeaderParams}}NULL;{{/hasHeaderParams}}

modules/openapi-generator/src/main/resources/C-libcurl/api-header.mustache

@@ -32,8 +32,8 @@ typedef enum  { {{projectName}}_{{operationId}}_{{enumName}}_NULL = 0{{#enumVars
 // {{{notes}}}
 //
 {{/notes}}
-{{#returnType}}{{#returnTypeIsPrimitive}}{{#returnSimpleType}}{{{.}}}*{{/returnSimpleType}}{{^returnSimpleType}}{{#isListContainer}}{{{.}}}_t*{{/isListContainer}}{{#isMapContainer}}{{{.}}}{{/isMapContainer}}{{/returnSimpleType}}{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}{{{.}}}_t*{{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}void{{/returnType}}
+{{#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}}{{#isMapContainer}}{{dataType}}{{/isMapContainer}}{{/isContainer}} {{{paramName}}} {{/allParams}});
+{{{classname}}}_{{{operationId}}}(apiClient_t *apiClient{{#allParams}}, {{#isPrimitiveType}}{{#isNumber}}{{{dataType}}}{{/isNumber}}{{#isLong}}{{{dataType}}}{{/isLong}}{{#isInteger}}{{{dataType}}}{{/isInteger}}{{#isDouble}}{{{dataType}}}{{/isDouble}}{{#isFloat}}{{{dataType}}}{{/isFloat}}{{#isBoolean}}{{dataType}}{{/isBoolean}}{{#isEnum}}{{#isString}}{{projectName}}_{{operationId}}_{{baseName}}_e{{/isString}}{{/isEnum}}{{^isEnum}}{{#isString}}{{{dataType}}} *{{/isString}}{{/isEnum}}{{#isByteArray}}{{{dataType}}}{{/isByteArray}}{{#isDate}}{{{dataType}}}{{/isDate}}{{#isDateTime}}{{{dataType}}}{{/isDateTime}}{{#isFile}}{{{dataType}}}{{/isFile}}{{#isFreeFormObject}}{{dataType}}_t *{{/isFreeFormObject}}{{/isPrimitiveType}}{{^isListContainer}}{{^isPrimitiveType}}{{#isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{^isEnum}}{{{dataType}}}_t *{{/isEnum}}{{/isModel}}{{^isModel}}{{#isEnum}}{{datatypeWithEnum}}_e{{/isEnum}}{{/isModel}}{{#isUuid}}{{dataType}} *{{/isUuid}}{{#isEmail}}{{dataType}}{{/isEmail}}{{/isPrimitiveType}}{{/isListContainer}}{{#isContainer}}{{#isListContainer}}{{dataType}}_t *{{/isListContainer}}{{#isMap}}{{dataType}}{{/isMap}}{{/isContainer}} {{{paramName}}} {{/allParams}});
 
 
 {{/operation}}

modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache

@@ -186,9 +186,9 @@ char* {{name}}{{classname}}_ToString({{projectName}}_{{classVarName}}_{{enumName
     {{datatype}}_t *{{name}}{{#hasMore}},{{/hasMore}}
     {{/isPrimitiveType}}
     {{/isListContainer}}
-    {{#isMapContainer}}
+    {{#isMap}}
     {{datatype}} {{name}}{{#hasMore}},{{/hasMore}}
-    {{/isMapContainer}}
+    {{/isMap}}
     {{/isContainer}}
     {{/vars}}
     ) {
@@ -259,14 +259,14 @@ void {{classname}}_free({{classname}}_t *{{classname}}) {
     list_free({{classname}}->{{name}});
     {{/isPrimitiveType}}
     {{/isListContainer}}
-    {{#isMapContainer}}
+    {{#isMap}}
     list_ForEach(listEntry, {{classname}}->{{name}}) {
         keyValuePair_t *localKeyValue = (keyValuePair_t*) listEntry->data;
         free (localKeyValue->key);
         free (localKeyValue->value);
     }
     list_free({{classname}}->{{name}});
-    {{/isMapContainer}}
+    {{/isMap}}
     {{/isContainer}}
     {{/vars}}
     free({{classname}});
@@ -430,7 +430,7 @@ cJSON *{{classname}}_convertToJSON({{classname}}_t *{{classname}}) {
     }
     {{/isPrimitiveType}}
     {{/isListContainer}}
-    {{#isMapContainer}}
+    {{#isMap}}
     cJSON *{{{name}}} = cJSON_AddObjectToObject(item, "{{{baseName}}}");
     if({{{name}}} == NULL) {
         goto fail; //primitive map container
@@ -462,7 +462,7 @@ cJSON *{{classname}}_convertToJSON({{classname}}_t *{{classname}}) {
         {{/items}}
     }
     }
-    {{/isMapContainer}}
+    {{/isMap}}
     {{/isContainer}}
     {{^required}}
     {{^isEnum}} } {{/isEnum}}
@@ -653,7 +653,7 @@ fail:
     }
     {{/isPrimitiveType}}
     {{/isListContainer}}
-    {{#isMapContainer}}
+    {{#isMap}}
     list_t *{{{name}}}List;
     {{^required}}if ({{{name}}}) { {{/required}}
     cJSON *{{{name}}}_local_map;
@@ -690,7 +690,7 @@ fail:
 		{{/items}}
         list_addElement({{{name}}}List , localMapKeyPair);
     }
-    {{/isMapContainer}}
+    {{/isMap}}
     {{/isContainer}}
     {{^required}}
     }
@@ -760,9 +760,9 @@ fail:
         {{^required}}{{{name}}} ? {{/required}}{{{name}}}List{{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}}
         {{/isPrimitiveType}}
         {{/isListContainer}}
-        {{#isMapContainer}}
+        {{#isMap}}
         {{^required}}{{{name}}} ? {{/required}}{{{name}}}List{{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}}
-        {{/isMapContainer}}
+        {{/isMap}}
         {{/isContainer}}
         {{/vars}}
         );

modules/openapi-generator/src/main/resources/C-libcurl/model-header.mustache

@@ -136,9 +136,9 @@ typedef struct {{classname}}_t {
     {{datatype}}_t *{{name}}; //nonprimitive container
     {{/isPrimitiveType}}
     {{/isListContainer}}
-    {{#isMapContainer}}
+    {{#isMap}}
     {{datatype}} {{name}}; //map
-    {{/isMapContainer}}
+    {{/isMap}}
     {{/isContainer}}
     {{/vars}}
 
@@ -206,9 +206,9 @@ typedef struct {{classname}}_t {
     {{datatype}}_t *{{name}}{{#hasMore}},{{/hasMore}}
     {{/isPrimitiveType}}
     {{/isListContainer}}
-    {{#isMapContainer}}
+    {{#isMap}}
     {{datatype}} {{name}}{{#hasMore}},{{/hasMore}}
-    {{/isMapContainer}}
+    {{/isMap}}
     {{/isContainer}}
     {{/vars}}
 );

modules/openapi-generator/src/main/resources/Eiffel/model.mustache

@@ -80,7 +80,7 @@ feature -- Change Element
           end
         end 
         {{/isListContainer}}
-        {{#isMapContainer}}
+        {{#isMap}}
         if attached {{name}} as l_{{name}} then
           Result.append ("%N{{name}}:")
           across l_{{name}} as ic loop
@@ -93,7 +93,7 @@ feature -- Change Element
             Result.append ("%N")
           end
         end        
-        {{/isMapContainer}}
+        {{/isMap}}
         {{^isContainer}}
         if attached {{name}} as l_{{name}} then
           Result.append ("%N{{name}}:")

modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache

@@ -5,7 +5,7 @@
  * Else use custom behaviour, IOW use whatever is defined on the object mapper
  }}
   @JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}})
-  @JsonInclude({{#isMapContainer}}{{#items.isNullable}}content = JsonInclude.Include.ALWAYS, {{/items.isNullable}}{{/isMapContainer}}value = JsonInclude.Include.{{#required}}ALWAYS{{/required}}{{^required}}USE_DEFAULTS{{/required}})
+  @JsonInclude({{#isMap}}{{#items.isNullable}}content = JsonInclude.Include.ALWAYS, {{/items.isNullable}}{{/isMap}}value = JsonInclude.Include.{{#required}}ALWAYS{{/required}}{{^required}}USE_DEFAULTS{{/required}})
   {{#withXml}}
     {{^isContainer}}
   @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache

@@ -146,7 +146,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
     {{/vendorExtensions.x-is-jackson-optional-nullable}}
   }
   {{/isListContainer}}
-  {{#isMapContainer}}
+  {{#isMap}}
 
   public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
     {{#vendorExtensions.x-is-jackson-optional-nullable}}
@@ -170,7 +170,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
     return this;
     {{/vendorExtensions.x-is-jackson-optional-nullable}}
   }
-  {{/isMapContainer}}
+  {{/isMap}}
 
   {{/isReadOnly}}
    /**

modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache

@@ -76,18 +76,18 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ
 {{#vendorExtensions.x-extra-annotation}}
   {{{vendorExtensions.x-extra-annotation}}}
 {{/vendorExtensions.x-extra-annotation}}
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#withXml}}{{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{dataType}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#withXml}}{{#isEnum}}{{^isListContainer}}{{^isMap}}public {{dataType}} {{getter}}() {
     if ({{name}} == null) {
       return null;
     }
     return {{name}}.value();
-  }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{/withXml}}{{^withXml}}{{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{datatypeWithEnum}} {{getter}}() {
+  }{{/isMap}}{{/isListContainer}}{{/isEnum}}{{/withXml}}{{^withXml}}{{#isEnum}}{{^isListContainer}}{{^isMap}}public {{datatypeWithEnum}} {{getter}}() {
     return {{name}};
-  }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{/withXml}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
+  }{{/isMap}}{{/isListContainer}}{{/isEnum}}{{/withXml}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
-  }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMapContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
+  }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMap}}public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
-  }{{/isMapContainer}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() {
+  }{{/isMap}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
   }{{/isEnum}}
 
@@ -110,13 +110,13 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ
     return this;
   }
   {{/isListContainer}}
-  {{#isMapContainer}}
+  {{#isMap}}
 
   public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
     this.{{name}}.put(key, {{name}}Item);
     return this;
   }
-  {{/isMapContainer}}
+  {{/isMap}}
   {{/isReadOnly}}
 
   {{/vars}}

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache

@@ -166,7 +166,7 @@ public class {{classname}} {
             ExecutableValidator executableValidator = factory.getValidator().forExecutables();
 
             Object[] parameterValues = { {{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}} };
-            Method method = this.getClass().getMethod("{{operationId}}WithHttpInfo"{{#allParams}}, {{#isListContainer}}java.util.List{{/isListContainer}}{{#isMapContainer}}java.util.Map{{/isMapContainer}}{{^isListContainer}}{{^isMapContainer}}{{{dataType}}}{{/isMapContainer}}{{/isListContainer}}.class{{/allParams}});
+            Method method = this.getClass().getMethod("{{operationId}}WithHttpInfo"{{#allParams}}, {{#isListContainer}}java.util.List{{/isListContainer}}{{#isMap}}java.util.Map{{/isMap}}{{^isListContainer}}{{^isMap}}{{{dataType}}}{{/isMap}}{{/isListContainer}}.class{{/allParams}});
             Set<ConstraintViolation<{{classname}}>> violations = executableValidator.validateParameters(this, method,
                     parameterValues);
 

modules/openapi-generator/src/main/resources/Java/pojo.mustache

@@ -129,7 +129,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
     {{/vendorExtensions.x-is-jackson-optional-nullable}}
   }
   {{/isListContainer}}
-  {{#isMapContainer}}
+  {{#isMap}}
 
   public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
     {{#vendorExtensions.x-is-jackson-optional-nullable}}
@@ -153,7 +153,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
     return this;
     {{/vendorExtensions.x-is-jackson-optional-nullable}}
   }
-  {{/isMapContainer}}
+  {{/isMap}}
 
   {{/isReadOnly}}
    /**

modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache

@@ -56,7 +56,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   }
   {{/isListContainer}}
 
-  {{#isMapContainer}}
+  {{#isMap}}
 
   public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
     {{^required}}
@@ -67,7 +67,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
     this.{{name}}.put(key, {{name}}Item);
     return this;
   }
-  {{/isMapContainer}}
+  {{/isMap}}
 
   {{/vars}}
 

modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache

@@ -70,13 +70,13 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ
 {{#vendorExtensions.x-extra-annotation}}
   {{{vendorExtensions.x-extra-annotation}}}
 {{/vendorExtensions.x-extra-annotation}}
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{dataType}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#isEnum}}{{^isListContainer}}{{^isMap}}public {{dataType}} {{getter}}() {
     return {{name}} == null ? null : {{name}}.value();
-  }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
+  }{{/isMap}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
-  }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMapContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
+  }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMap}}public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
-  }{{/isMapContainer}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() {
+  }{{/isMap}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
   }{{/isEnum}}
 
@@ -113,7 +113,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ
     return this;
   }
   {{/isListContainer}}
-  {{#isMapContainer}}
+  {{#isMap}}
 
   /**
    * Puts a new item into the <code>{{name}}</code> map.
@@ -125,7 +125,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializ
     this.{{name}}.put(key, {{name}}Item);
     return this;
   }
-  {{/isMapContainer}}
+  {{/isMap}}
 
   {{/vars}}
 

modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache

@@ -55,16 +55,16 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 {{#vendorExtensions.x-extra-annotation}}
   {{{vendorExtensions.x-extra-annotation}}}
 {{/vendorExtensions.x-extra-annotation}}
-{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{dataType}} {{getter}}() {
+{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  {{#isEnum}}{{^isListContainer}}{{^isMap}}public {{dataType}} {{getter}}() {
     if ({{name}} == null) {
       return null;
     }
     return {{name}}.value();
-  }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
+  }{{/isMap}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
-  }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMapContainer}}public {{{datatypeWithEnum}}} {{getter}}() {
+  }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMap}}public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
-  }{{/isMapContainer}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() {
+  }{{/isMap}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
   }{{/isEnum}}
 
@@ -84,13 +84,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
     return this;
   }
   {{/isListContainer}}
-  {{#isMapContainer}}
+  {{#isMap}}
 
   public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
     this.{{name}}.put(key, {{name}}Item);
     return this;
   }
-  {{/isMapContainer}}
+  {{/isMap}}
   {{/isReadOnly}}
 
   {{/vars}}

modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache

@@ -55,7 +55,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
     return this;
   }
   {{/isListContainer}}
-  {{#isMapContainer}}
+  {{#isMap}}
 
   public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
     {{^required}}
@@ -66,7 +66,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
     this.{{name}}.put(key, {{name}}Item);
     return this;
   }
-  {{/isMapContainer}}
+  {{/isMap}}
 
   /**
   {{#description}}

modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/returnTypes.mustache

@@ -1 +1 @@
-{{#returnContainer}}{{#isMapContainer}}Map<String, {{{returnType}}}>{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
+{{#returnContainer}}{{#isMap}}Map<String, {{{returnType}}}>{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}

modules/openapi-generator/src/main/resources/JavaJaxRS/returnTypes.mustache

@@ -1 +1 @@
-{{#returnContainer}}{{#isMapContainer}}Map<String, {{{returnType}}}>{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
+{{#returnContainer}}{{#isMap}}Map<String, {{{returnType}}}>{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}

modules/openapi-generator/src/main/resources/JavaPlayFramework/exampleReturnTypes.mustache

@@ -1 +1 @@
-{{#returnContainer}}{{#isMapContainer}}Map{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
+{{#returnContainer}}{{#isMap}}Map{{/isMap}}{{#isListContainer}}{{{returnContainer}}}{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}

modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache

@@ -75,11 +75,11 @@ public class {{classname}}Controller extends Controller {
                     OpenAPIUtils.validate(curItem);
                 }
                 {{/isListContainer}}
-                {{#isMapContainer}}
+                {{#isMap}}
                 for (Map.Entry<String, {{{items.baseType}}}> entry : {{paramName}}.entrySet()) {
                     OpenAPIUtils.validate(entry.getValue());
                 }
-                {{/isMapContainer}}
+                {{/isMap}}
                 {{^isContainer}}
                 OpenAPIUtils.validate({{paramName}});
                 {{/isContainer}}
@@ -219,11 +219,11 @@ public class {{classname}}Controller extends Controller {
                 OpenAPIUtils.validate(curItem);
             }
             {{/isListContainer}}
-            {{#isMapContainer}}
+            {{#isMap}}
             for (Map.Entry<String, {{{returnType}}}> entry : obj.entrySet()) {
                 OpenAPIUtils.validate(entry.getValue());
             }
-            {{/isMapContainer}}
+            {{/isMap}}
             {{^returnContainer}}
             OpenAPIUtils.validate(obj);
             {{/returnContainer}}
@@ -236,11 +236,11 @@ public class {{classname}}Controller extends Controller {
                     OpenAPIUtils.validate(curItem);
                 }
                 {{/isListContainer}}
-                {{#isMapContainer}}
+                {{#isMap}}
                 for (Map.Entry<String, {{{returnType}}}> entry : obj.entrySet()) {
                     OpenAPIUtils.validate(entry.getValue());
                 }
-                {{/isMapContainer}}
+                {{/isMap}}
                 {{^returnContainer}}
                 OpenAPIUtils.validate(obj);
                 {{/returnContainer}}

modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache

@@ -50,7 +50,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
     return this;
   }
   {{/isListContainer}}
-  {{#isMapContainer}}
+  {{#isMap}}
 
   public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
     {{^required}}
@@ -61,7 +61,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
     this.{{name}}.put(key, {{name}}Item);
     return this;
   }
-  {{/isMapContainer}}
+  {{/isMap}}
 
    /**
   {{#description}}

modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypes.mustache

@@ -1 +1 @@
-{{#returnType}}{{#returnContainer}}{{#isMapContainer}}Map<String, {{{returnType}}}>{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}{{^returnType}}void{{/returnType}}
+{{#returnType}}{{#returnContainer}}{{#isMap}}Map<String, {{{returnType}}}>{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}{{^returnType}}void{{/returnType}}

modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoid.mustache

@@ -1 +1 @@
-{{#returnType}}{{#returnContainer}}{{#isMapContainer}}Map<String, {{{returnType}}}>{{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}
+{{#returnType}}{{#returnContainer}}{{#isMap}}Map<String, {{{returnType}}}>{{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}

modules/openapi-generator/src/main/resources/JavaPlayFramework/returnTypesNoVoidNoAbstract.mustache

@@ -1 +1 @@
-{{#returnType}}{{#returnContainer}}{{#isMapContainer}}HashMap<String, {{{returnType}}}>{{/isMapContainer}}{{#isListContainer}}{{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}
+{{#returnType}}{{#returnContainer}}{{#isMap}}HashMap<String, {{{returnType}}}>{{/isMap}}{{#isListContainer}}{{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}{{/returnType}}

modules/openapi-generator/src/main/resources/JavaSpring/exampleReturnTypes.mustache

@@ -1 +1 @@
-{{#returnContainer}}{{#isMapContainer}}Map<String, {{/isMapContainer}}{{#isListContainer}}{{{returnContainer}}}<{{/isListContainer}}{{{returnType}}}>{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
+{{#returnContainer}}{{#isMap}}Map<String, {{/isMap}}{{#isListContainer}}{{{returnContainer}}}<{{/isListContainer}}{{{returnType}}}>{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}

modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache

@@ -81,7 +81,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{^parent}}
     return this;
   }
   {{/isListContainer}}
-  {{#isMapContainer}}
+  {{#isMap}}
 
   public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
     {{^required}}
@@ -92,7 +92,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{^parent}}
     this.{{name}}.put(key, {{name}}Item);
     return this;
   }
-  {{/isMapContainer}}
+  {{/isMap}}
 
   /**
   {{#description}}

modules/openapi-generator/src/main/resources/JavaSpring/queryParams.mustache

@@ -1 +1 @@
-{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}) {{#useBeanValidation}}@Valid{{/useBeanValidation}}{{^isModel}} @RequestParam(value = {{#isMapContainer}}""{{/isMapContainer}}{{^isMapContainer}}"{{baseName}}"{{/isMapContainer}}{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{^isContainer}}{{#defaultValue}}, defaultValue={{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}){{/isModel}}{{#isDate}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE){{/isDate}}{{#isDateTime}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME){{/isDateTime}} {{>optionalDataType}} {{paramName}}{{/isQueryParam}}
+{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}) {{#useBeanValidation}}@Valid{{/useBeanValidation}}{{^isModel}} @RequestParam(value = {{#isMap}}""{{/isMap}}{{^isMap}}"{{baseName}}"{{/isMap}}{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{^isContainer}}{{#defaultValue}}, defaultValue={{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}){{/isModel}}{{#isDate}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE){{/isDate}}{{#isDateTime}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME){{/isDateTime}} {{>optionalDataType}} {{paramName}}{{/isQueryParam}}

modules/openapi-generator/src/main/resources/JavaSpring/returnTypes.mustache

@@ -1 +1 @@
-{{#isMapContainer}}Map<String, {{{returnType}}}>{{/isMapContainer}}{{#isListContainer}}{{#reactive}}Flux{{/reactive}}{{^reactive}}{{{returnContainer}}}{{/reactive}}<{{{returnType}}}>{{/isListContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
+{{#isMap}}Map<String, {{{returnType}}}>{{/isMap}}{{#isListContainer}}{{#reactive}}Flux{{/reactive}}{{^reactive}}{{{returnContainer}}}{{/reactive}}<{{{returnType}}}>{{/isListContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}

modules/openapi-generator/src/main/resources/aspnetcore/2.0/controller.mustache

@@ -44,7 +44,7 @@ namespace {{packageName}}.Controllers
             {{#examples}}
             exampleJson = "{{{example}}}";
             {{/examples}}
-            {{#isListCollection}}{{>listReturn}}{{/isListCollection}}{{^isListCollection}}{{#isMapContainer}}{{>mapReturn}}{{/isMapContainer}}{{^isMapContainer}}{{>objectReturn}}{{/isMapContainer}}{{/isListCollection}}
+            {{#isListCollection}}{{>listReturn}}{{/isListCollection}}{{^isListCollection}}{{#isMap}}{{>mapReturn}}{{/isMap}}{{^isMap}}{{>objectReturn}}{{/isMap}}{{/isListCollection}}
             {{!TODO: defaultResponse, examples, auth, consumes, produces, nickname, externalDocs, imports, security}}
             //TODO: Change the data returned
             return new ObjectResult(example);{{/returnType}}{{^returnType}}

modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache

@@ -70,7 +70,7 @@ namespace {{packageName}}.Models
         /// Returns the JSON string presentation of the object
         /// </summary>
         /// <returns>JSON string presentation of the object</returns>
-        public {{#parent}}{{^isMapModel}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMapModel}}{{/parent}}string ToJson()
+        public {{#parent}}{{^isMap}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMap}}{{/parent}}string ToJson()
         {
             return JsonConvert.SerializeObject(this, Formatting.Indented);
         }

modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache

@@ -68,7 +68,7 @@ namespace {{apiPackage}}
             {{#examples}}
             exampleJson = "{{{example}}}";
             {{/examples}}
-            {{#isListCollection}}{{>listReturn}}{{/isListCollection}}{{^isListCollection}}{{#isMapContainer}}{{>mapReturn}}{{/isMapContainer}}{{^isMapContainer}}{{>objectReturn}}{{/isMapContainer}}{{/isListCollection}}
+            {{#isListCollection}}{{>listReturn}}{{/isListCollection}}{{^isListCollection}}{{#isMap}}{{>mapReturn}}{{/isMap}}{{^isMap}}{{>objectReturn}}{{/isMap}}{{/isListCollection}}
             {{!TODO: defaultResponse, examples, auth, consumes, produces, nickname, externalDocs, imports, security}}
             //TODO: Change the data returned
             return {{#operationResultTask}}Task.FromResult<IActionResult>({{/operationResultTask}}new ObjectResult(example){{#operationResultTask}}){{/operationResultTask}};{{/returnType}}{{^returnType}}

modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache

@@ -73,7 +73,7 @@ namespace {{modelPackage}}
         /// Returns the JSON string presentation of the object
         /// </summary>
         /// <returns>JSON string presentation of the object</returns>
-        public {{#parent}}{{^isMapModel}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMapModel}}{{/parent}}string ToJson()
+        public {{#parent}}{{^isMap}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMap}}{{/parent}}string ToJson()
         {
             return JsonConvert.SerializeObject(this, Formatting.Indented);
         }

modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache

@@ -68,7 +68,7 @@ namespace {{apiPackage}}
             {{#examples}}
             exampleJson = "{{{example}}}";
             {{/examples}}
-            {{#isListCollection}}{{>listReturn}}{{/isListCollection}}{{^isListCollection}}{{#isMapContainer}}{{>mapReturn}}{{/isMapContainer}}{{^isMapContainer}}{{>objectReturn}}{{/isMapContainer}}{{/isListCollection}}
+            {{#isListCollection}}{{>listReturn}}{{/isListCollection}}{{^isListCollection}}{{#isMap}}{{>mapReturn}}{{/isMap}}{{^isMap}}{{>objectReturn}}{{/isMap}}{{/isListCollection}}
             {{!TODO: defaultResponse, examples, auth, consumes, produces, nickname, externalDocs, imports, security}}
             //TODO: Change the data returned
             return {{#operationResultTask}}Task.FromResult<IActionResult>({{/operationResultTask}}new ObjectResult(example){{#operationResultTask}}){{/operationResultTask}};{{/returnType}}{{^returnType}}

modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache

@@ -73,7 +73,7 @@ namespace {{modelPackage}}
         /// Returns the JSON string presentation of the object
         /// </summary>
         /// <returns>JSON string presentation of the object</returns>
-        public {{#parent}}{{^isMapModel}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMapModel}}{{/parent}}string ToJson()
+        public {{#parent}}{{^isMap}}{{^isArrayModel}}new {{/isArrayModel}}{{/isMap}}{{/parent}}string ToJson()
         {
             return JsonConvert.SerializeObject(this, Formatting.Indented);
         }

modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache

@@ -43,7 +43,7 @@ void {{classname}}::{{operationIdSnakeCase}}_handler(const Pistache::Rest::Reque
     // Getting the body param
     {{#bodyParam}}
     {{^isPrimitiveType}}{{^isContainer}}
-    {{baseType}} {{paramName}};{{/isContainer}}{{#isListContainer}}std::vector<{{items.baseType}}> {{paramName}};{{/isListContainer}}{{#isMapContainer}}std::map<std::string, {{items.baseType}}> {{paramName}};{{/isMapContainer}}{{/isPrimitiveType}}
+    {{baseType}} {{paramName}};{{/isContainer}}{{#isListContainer}}std::vector<{{items.baseType}}> {{paramName}};{{/isListContainer}}{{#isMap}}std::map<std::string, {{items.baseType}}> {{paramName}};{{/isMap}}{{/isPrimitiveType}}
     {{#isPrimitiveType}}
     {{dataType}} {{paramName}};
     {{/isPrimitiveType}}

modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache

@@ -134,8 +134,8 @@ void {{classname}}::{{nickname}}({{#allParams}}const {{{dataType}}} &{{paramName
 {{#formParams}}{{^isFile}}
     input.add_var("{{baseName}}", ::{{cppNamespace}}::toStringValue({{paramName}}));{{/isFile}}{{#isFile}}
     input.add_file("{{baseName}}", {{paramName}}.local_filename, {{paramName}}.request_filename, {{paramName}}.mime_type);{{/isFile}}{{/formParams}}{{#bodyParams}}{{#isContainer}}{{#isListContainer}}
-    QJsonDocument doc(::{{cppNamespace}}::toJsonValue({{paramName}}).toArray());{{/isListContainer}}{{#isMapContainer}}
+    QJsonDocument doc(::{{cppNamespace}}::toJsonValue({{paramName}}).toArray());{{/isListContainer}}{{#isMap}}
-    QJsonDocument doc(::{{cppNamespace}}::toJsonValue({{paramName}}).toObject());{{/isMapContainer}}
+    QJsonDocument doc(::{{cppNamespace}}::toJsonValue({{paramName}}).toObject());{{/isMap}}
     QByteArray bytes = doc.toJson();
     input.request_body.append(bytes);
 {{/isContainer}}{{^isContainer}}{{#isString}}
@@ -181,13 +181,13 @@ void {{classname}}::{{nickname}}Callback({{prefix}}HttpRequestWorker *worker) {
     }
     {{/isListContainer}}
     {{^isListContainer}}
-    {{^isMapContainer}}
+    {{^isMap}}
     {{#returnTypeIsPrimitive}}
     {{{returnType}}} output;
     ::{{cppNamespace}}::fromStringValue(QString(worker->response), output);
     {{/returnTypeIsPrimitive}}
-    {{/isMapContainer}}
+    {{/isMap}}
-    {{#isMapContainer}}
+    {{#isMap}}
     {{{returnType}}} output;
     QString json(worker->response);
     QByteArray array(json.toStdString().c_str());
@@ -198,12 +198,12 @@ void {{classname}}::{{nickname}}Callback({{prefix}}HttpRequestWorker *worker) {
         ::{{cppNamespace}}::fromJsonValue(val, obj[key]);
         output.insert(key, val);
     }
-    {{/isMapContainer}}
+    {{/isMap}}
-    {{^isMapContainer}}
+    {{^isMap}}
     {{^returnTypeIsPrimitive}}
     {{{returnType}}} output{{^isResponseFile}}(QString(worker->response)){{/isResponseFile}}{{#isResponseFile}} = worker->getHttpFileElement(){{/isResponseFile}};
     {{/returnTypeIsPrimitive}}
-    {{/isMapContainer}}
+    {{/isMap}}
     {{/isListContainer}}
     {{/returnType}}
     worker->deleteLater();

modules/openapi-generator/src/main/resources/cpp-qt5-client/model-body.mustache

@@ -55,26 +55,26 @@ void {{classname}}::fromJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnu
         m_{{name}}_isValid = true;
         if(arr.count() > 0) {
             for (const QJsonValue jval : arr) {
-                {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#items.isMapContainer}}QMap<QString, {{items.items.baseType}}>{{/items.isMapContainer}} item;
+                {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#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}}{{#isMapContainer}}
+    }{{/isListContainer}}{{#isMap}}
     if(json["{{baseName}}"].isObject()){
         auto varmap = json["{{baseName}}"].toObject().toVariantMap();
         m_{{name}}_isValid = true;
         if(varmap.count() > 0){
             for(auto val : varmap.keys()){
-                {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#items.isMapContainer}}QMap<QString, {{items.items.baseType}}>{{/items.isMapContainer}} item;
+                {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#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;
                 {{name}}.insert({{name}}.end(), val, item);
             }
         }
-    }{{/isMapContainer}}{{/items.isContainer}}{{/isContainer}}{{^-last}}
+    }{{/isMap}}{{/items.isContainer}}{{/isContainer}}{{^-last}}
 {{/-last}}
 {{/vars}}{{/isEnum}}{{#isEnum}}{{#allowableValues}}{{#enumVars}}{{#-first}}{{#isString}}fromJson(json.toString());{{/isString}}{{^isString}}m_value = static_cast<e{{classname}}>(json.toInt());{{/isString}}{{/-first}}{{/enumVars}}{{/allowableValues}}{{/isEnum}}
 }

modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/apirequest.cpp.mustache

@@ -74,7 +74,7 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}}
     }
     {{/isListContainer}}
     {{^isListContainer}}
-    {{^isMapContainer}}
+    {{^isMap}}
     {{#isPrimitiveType}}{{^isFreeFormObject}}
     {{{dataType}}} {{paramName}};
     ::{{cppNamespace}}::fromStringValue(QString(socket->readAll()), {{paramName}});
@@ -84,8 +84,8 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}}
     QJsonDocument resObject = QJsonDocument::fromJson(socket->readAll());
     ::{{cppNamespace}}::fromJsonValue({{paramName}}, resObject.object());
     {{/isFreeFormObject}}
-    {{/isMapContainer}}
+    {{/isMap}}
-    {{#isMapContainer}}
+    {{#isMap}}
     QJsonDocument doc;
     socket->readJson(doc);
     QJsonObject obj = doc.object();
@@ -95,8 +95,8 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}}
         ::{{cppNamespace}}::fromJsonValue(val, obj[key]);
         {{paramName}}.insert(key, val);
     }
-    {{/isMapContainer}}
+    {{/isMap}}
-    {{^isMapContainer}}
+    {{^isMap}}
     {{^isPrimitiveType}}
     QJsonDocument doc;
     socket->readJson(doc);
@@ -104,7 +104,7 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}}
     {{{dataType}}} {{paramName}};
     ::{{cppNamespace}}::fromJsonValue({{paramName}}, obj);
     {{/isPrimitiveType}}
-    {{/isMapContainer}}
+    {{/isMap}}
     {{/isListContainer}}
     {{/bodyParam}}{{/bodyParams}}
 
@@ -114,13 +114,13 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}}
 {{/operation}}{{/operations}}
 
 {{#operations}}{{#operation}}void {{classname}}Request::{{nickname}}Response({{#returnType}}const {{{returnType}}}& res{{/returnType}}){
-    setSocketResponseHeaders();{{#returnType}}{{#isMapContainer}}
+    setSocketResponseHeaders();{{#returnType}}{{#isMap}}
     QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).toObject());
-    socket->writeJson(resDoc);{{/isMapContainer}}{{^isMapContainer}}{{^returnTypeIsPrimitive}}{{^vendorExtensions.x-returns-enum}}
+    socket->writeJson(resDoc);{{/isMap}}{{^isMap}}{{^returnTypeIsPrimitive}}{{^vendorExtensions.x-returns-enum}}
     QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isListContainer}}Object{{/isListContainer}}{{#isListContainer}}Array{{/isListContainer}}());
     socket->writeJson(resDoc);{{/vendorExtensions.x-returns-enum}}{{#vendorExtensions.x-returns-enum}}
     socket->write(::{{cppNamespace}}::toStringValue(res).toUtf8());{{/vendorExtensions.x-returns-enum}}{{/returnTypeIsPrimitive}}{{#returnTypeIsPrimitive}}
-    socket->write({{#isListContainer}}QString("["+{{/isListContainer}}::{{cppNamespace}}::toStringValue(res){{#isListContainer}}+"]"){{/isListContainer}}.toUtf8());{{/returnTypeIsPrimitive}}{{/isMapContainer}}{{/returnType}}{{^returnType}}
+    socket->write({{#isListContainer}}QString("["+{{/isListContainer}}::{{cppNamespace}}::toStringValue(res){{#isListContainer}}+"]"){{/isListContainer}}.toUtf8());{{/returnTypeIsPrimitive}}{{/isMap}}{{/returnType}}{{^returnType}}
     socket->setStatusCode(QHttpEngine::Socket::OK);
     socket->writeHeaders();{{/returnType}}
     if(socket->isOpen()){
@@ -132,13 +132,13 @@ void {{classname}}Request::{{nickname}}Request({{#hasPathParams}}{{#pathParams}}
 {{#operations}}{{#operation}}void {{classname}}Request::{{nickname}}Error({{#returnType}}const {{{returnType}}}& res, {{/returnType}}QNetworkReply::NetworkError error_type, QString& error_str){
     Q_UNUSED(error_type); // TODO: Remap error_type to QHttpEngine::Socket errors
     setSocketResponseHeaders();{{#returnType}}
-    Q_UNUSED(error_str);  // response will be used instead of error string{{#isMapContainer}}
+    Q_UNUSED(error_str);  // response will be used instead of error string{{#isMap}}
     QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).toObject());
-    socket->writeJson(resDoc);{{/isMapContainer}}{{^isMapContainer}}{{^returnTypeIsPrimitive}}{{^vendorExtensions.x-returns-enum}}
+    socket->writeJson(resDoc);{{/isMap}}{{^isMap}}{{^returnTypeIsPrimitive}}{{^vendorExtensions.x-returns-enum}}
     QJsonDocument resDoc(::{{cppNamespace}}::toJsonValue(res).to{{^isListContainer}}Object{{/isListContainer}}{{#isListContainer}}Array{{/isListContainer}}());
     socket->writeJson(resDoc);{{/vendorExtensions.x-returns-enum}}{{#vendorExtensions.x-returns-enum}}
     socket->write(::{{cppNamespace}}::toStringValue(res).toUtf8());{{/vendorExtensions.x-returns-enum}}{{/returnTypeIsPrimitive}}{{#returnTypeIsPrimitive}}
-    socket->write({{#isListContainer}}QString("["+{{/isListContainer}}::{{cppNamespace}}::toStringValue(res){{#isListContainer}}+"]"){{/isListContainer}}.toUtf8());{{/returnTypeIsPrimitive}}{{/isMapContainer}}{{/returnType}}{{^returnType}}
+    socket->write({{#isListContainer}}QString("["+{{/isListContainer}}::{{cppNamespace}}::toStringValue(res){{#isListContainer}}+"]"){{/isListContainer}}.toUtf8());{{/returnTypeIsPrimitive}}{{/isMap}}{{/returnType}}{{^returnType}}
     socket->setStatusCode(QHttpEngine::Socket::NotFound);
     socket->write(error_str.toUtf8());{{/returnType}}
     if(socket->isOpen()){

modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/model-body.mustache

@@ -55,26 +55,26 @@ void {{classname}}::fromJson{{^isEnum}}Object{{/isEnum}}{{#isEnum}}Value{{/isEnu
         m_{{name}}_isValid = true;
         if(arr.count() > 0) {
             for (const QJsonValue jval : arr) {
-                {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#items.isMapContainer}}QMap<QString, {{items.items.baseType}}>{{/items.isMapContainer}} item;
+                {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#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}}{{#isMapContainer}}
+    }{{/isListContainer}}{{#isMap}}
     if(json["{{baseName}}"].isObject()){
         auto varmap = json["{{baseName}}"].toObject().toVariantMap();
         m_{{name}}_isValid = true;
         if(varmap.count() > 0){
             for(auto val : varmap.keys()){
-                {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#items.isMapContainer}}QMap<QString, {{items.items.baseType}}>{{/items.isMapContainer}} item;
+                {{^items.isContainer}}{{items.baseType}}{{/items.isContainer}}{{#items.isListContainer}}QList<{{items.items.baseType}}>{{/items.isListContainer}}{{#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;
                 {{name}}.insert({{name}}.end(), val, item);
             }
         }
-    }{{/isMapContainer}}{{/items.isContainer}}{{/isContainer}}{{^-last}}
+    }{{/isMap}}{{/items.isContainer}}{{/isContainer}}{{^-last}}
 {{/-last}}
 {{/vars}}{{/isEnum}}{{#isEnum}}{{#allowableValues}}{{#enumVars}}{{#-first}}{{#isString}}fromJson(json.toString());{{/isString}}{{^isString}}m_value = static_cast<e{{classname}}>(json.toInt());{{/isString}}{{/-first}}{{/enumVars}}{{/allowableValues}}{{/isEnum}}
 }

modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/api-source.mustache

@@ -202,7 +202,7 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
                 localVarJsonArray.push_back(ModelBase::toJson(localVarItem));
             }
             localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("{{paramName}}"), localVarJsonArray, utility::conversions::to_string_t("application/json")));
-        }{{/isListContainer}}{{#isMapContainer}}
+        }{{/isListContainer}}{{#isMap}}
         {
             std::map<utility::string_t, web::json::value> localVarJsonMap;
             for( auto& localVarItem : {{paramName}}{{^required}}.get(){{/required}} )
@@ -211,14 +211,14 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
                 localVarJsonMap.insert( std::pair<utility::string_t, web::json::value>(localVarItem.first, ModelBase::toJson(localVarItem.second) ));
             }
             localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("{{paramName}}"), localVarJsonMap, utility::conversions::to_string_t("application/json")));
-        }{{/isMapContainer}}
+        }{{/isMap}}
-        {{^isListContainer}}{{^isMapContainer}}{{#isString}}localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("{{paramName}}"), {{paramName}}));
+        {{^isListContainer}}{{^isMap}}{{#isString}}localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("{{paramName}}"), {{paramName}}));
         {{/isString}}{{^isString}}if({{^required}}{{paramName}} && (*{{paramName}}){{/required}}{{#required}}{{paramName}}{{/required}}.get())
         {
             {{^required}}(*{{/required}}{{paramName}}{{^required}}){{/required}}->toMultipart(localVarMultipart, utility::conversions::to_string_t("{{paramName}}"));
         }
         {{/isString}}
-        {{/isMapContainer}}{{/isListContainer}}{{/isPrimitiveType}}
+        {{/isMap}}{{/isListContainer}}{{/isPrimitiveType}}
 
         localVarHttpBody = localVarMultipart;
         localVarRequestHttpContentType += utility::conversions::to_string_t("; boundary=") + localVarMultipart->getBoundary();
@@ -326,14 +326,14 @@ pplx::task<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/r
                 {{{vendorExtensions.x-codegen-response.items.datatype}}} localVarItemObj;
                 ModelBase::fromJson(localVarItem, localVarItemObj);
                 localVarResult.push_back(localVarItemObj);
-            }{{/isListContainer}}{{#isMapContainer}}
+            }{{/isListContainer}}{{#isMap}}
             for( auto& localVarItem : localVarJson.as_object() )
             {
                 {{{vendorExtensions.x-codegen-response.items.datatype}}} localVarItemObj;
                 ModelBase::fromJson(localVarItem.second, localVarItemObj);
                 localVarResult[localVarItem.first] = localVarItemObj;
-            }{{/isMapContainer}}{{^isListContainer}}{{^isMapContainer}}
+            }{{/isMap}}{{^isListContainer}}{{^isMap}}
-            ModelBase::fromJson(localVarJson, localVarResult);{{/isMapContainer}}{{/isListContainer}}
+            ModelBase::fromJson(localVarJson, localVarResult);{{/isMap}}{{/isListContainer}}
         }{{#vendorExtensions.x-codegen-response.isString}}
         else if(localVarResponseHttpContentType == utility::conversions::to_string_t("text/plain"))
         {

modules/openapi-generator/src/main/resources/cpp-tizen-client/api-body.mustache

@@ -53,13 +53,13 @@ static gpointer __{{classname}}threadFunc(gpointer data)
 static bool {{nickname}}Processor(MemoryStruct_s p_chunk, long code, char* errormsg, void* userData,
 	void(* voidHandler)())
 {
-	{{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMapContainer}}{{returnType}}<string,string>{{/isMapContainer}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* )
+	{{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMap}}{{returnType}}<string,string>{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* )
-	= reinterpret_cast<void(*)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMapContainer}}{{returnType}}<string,string>{{/isMapContainer}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* )> (voidHandler);{{/returnType}}
+	= reinterpret_cast<void(*)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMap}}{{returnType}}<string,string>{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* )> (voidHandler);{{/returnType}}
 	{{^returnType}}void(* handler)(Error, void* ) = reinterpret_cast<void(*)(Error, void* )> (voidHandler);{{/returnType}}
 	JsonNode* pJson;
 	char * data = p_chunk.memory;
 
-	{{#returnType}}{{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMapContainer}}{{returnType}}<string,string>{{/isMapContainer}} out;{{/returnContainer}}
+	{{#returnType}}{{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMap}}{{returnType}}<string,string>{{/isMap}} out;{{/returnContainer}}
 	{{^returnContainer}}{{returnType}} out;{{/returnContainer}}{{/returnType}}
 
 	if (code >= 200 && code < 300) {
@@ -136,7 +136,7 @@ static bool {{nickname}}Processor(MemoryStruct_s p_chunk, long code, char* error
 
 static bool {{nickname}}Helper(char * accessToken,
 	{{#allParams}}{{#isContainer}}{{{dataType}}}<{{baseType}}> {{paramName}}{{/isContainer}}{{^isContainer}}{{{dataType}}} {{paramName}}{{/isContainer}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}}
-	{{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMapContainer}}{{returnType}}<string,string>{{/isMapContainer}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}}
+	{{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMap}}{{returnType}}<string,string>{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}}
 	{{^returnType}}void(* handler)(Error, void* ) {{/returnType}}, void* userData, bool isAsync)
 {
 
@@ -230,7 +230,7 @@ static bool {{nickname}}Helper(char * accessToken,
 
 
 
-	{{#isMapContainer}}
+	{{#isMap}}
 	//IF CODE IS HERE, SOMETHING IS SLIGHTLY WRONG!
 	if (isprimitive("{{baseType}}")) {
 		node = converttoJson(&{{paramName}}, "{{baseType}}", "array");
@@ -250,7 +250,7 @@ static bool {{nickname}}Helper(char * accessToken,
 		json_array_unref(json_array);
 	}
 	{{/isDouble}}{{/isDateTime}}{{/isString}}{{/isFloat}}{{/isBoolean}}{{/isLong}}{{/isDate}}{{/isInteger}}
-	{{/isMapContainer}}
+	{{/isMap}}
 	{{/isContainer}}
 
 	{{^isContainer}}
@@ -329,7 +329,7 @@ static bool {{nickname}}Helper(char * accessToken,
 
 bool {{classname}}::{{nickname}}Async(char * accessToken,
 	{{#allParams}}{{#isContainer}}{{{dataType}}}<{{baseType}}> {{paramName}}{{/isContainer}}{{^isContainer}}{{{dataType}}} {{paramName}}{{/isContainer}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}}
-	{{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMapContainer}}{{returnType}}<string,string>{{/isMapContainer}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}}
+	{{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMap}}{{returnType}}<string,string>{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}}
 	{{^returnType}}void(* handler)(Error, void* ) {{/returnType}}, void* userData)
 {
 	return {{nickname}}Helper(accessToken,
@@ -339,7 +339,7 @@ bool {{classname}}::{{nickname}}Async(char * accessToken,
 
 bool {{classname}}::{{nickname}}Sync(char * accessToken,
 	{{#allParams}}{{#isContainer}}{{{dataType}}}<{{baseType}}> {{paramName}}{{/isContainer}}{{^isContainer}}{{{dataType}}} {{paramName}}{{/isContainer}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}}
-	{{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMapContainer}}{{returnType}}<string,string>{{/isMapContainer}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}}
+	{{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMap}}{{returnType}}<string,string>{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}}
 	{{^returnType}}void(* handler)(Error, void* ) {{/returnType}}, void* userData)
 {
 	return {{nickname}}Helper(accessToken,

modules/openapi-generator/src/main/resources/cpp-tizen-client/api-header.mustache

@@ -38,7 +38,7 @@ public:
  */
 bool {{nickname}}Sync(char * accessToken,
 	{{#allParams}}{{#isContainer}}{{{dataType}}}<{{baseType}}> {{paramName}}{{/isContainer}}{{^isContainer}}{{{dataType}}} {{paramName}}{{/isContainer}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}}
-	{{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMapContainer}}{{returnType}}<std::string,std::string>{{/isMapContainer}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}}
+	{{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMap}}{{returnType}}<std::string,std::string>{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}}
 	{{^returnType}}void(* handler)(Error, void* ) {{/returnType}}, void* userData);
 
 /*! \brief {{{summary}}}. *Asynchronous*
@@ -51,7 +51,7 @@ bool {{nickname}}Sync(char * accessToken,
  */
 bool {{nickname}}Async(char * accessToken,
 	{{#allParams}}{{#isContainer}}{{{dataType}}}<{{baseType}}> {{paramName}}{{/isContainer}}{{^isContainer}}{{{dataType}}} {{paramName}}{{/isContainer}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{#hasParams}}, {{/hasParams}}
-	{{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMapContainer}}{{returnType}}<std::string,std::string>{{/isMapContainer}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}}
+	{{#returnType}}void(* handler)({{#returnContainer}}{{#isListContainer}}{{returnType}}<{{returnBaseType}}>{{/isListContainer}}{{#isMap}}{{returnType}}<std::string,std::string>{{/isMap}}{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}, Error, void* ){{/returnType}}
 	{{^returnType}}void(* handler)(Error, void* ) {{/returnType}}, void* userData);
 
 

modules/openapi-generator/src/main/resources/cpp-tizen-client/model-body.mustache

@@ -72,14 +72,14 @@ void
 			}
 			{{name}} = new_list;
 		}
-		{{/isListContainer}}{{#isMapContainer}}
+		{{/isListContainer}}{{#isMap}}
 		{
 			JsonObject* json_obj = json_node_get_object(node);
 			map<string,string> new_map;
 			json_object_foreach_member(json_obj,helper_func,&new_map);
 			{{name}} = new_map;
 		}
-		{{/isMapContainer}}{{/isContainer}}
+		{{/isMap}}{{/isContainer}}
 		{{^isContainer}}
 
 		if (isprimitive("{{baseType}}")) {
@@ -131,7 +131,7 @@ char*
 	{{/isListContainer}}
 
 
-	{{#isMapContainer}}{
+	{{#isMap}}{
 		JsonObject* json_obj;
 		map<string, string> new_list = static_cast<map <string, string> > ({{getter}}());
 		json_obj = json_object_new();
@@ -145,7 +145,7 @@ char*
 	json_node_init_object(node, json_obj);
 	json_object_unref(json_obj);
 	}
-	{{/isMapContainer}}
+	{{/isMap}}
 
 	{{/isContainer}}
 	{{^isContainer}}
@@ -174,14 +174,14 @@ char*
 }
 
 {{#vars}}
-{{dataType}}{{#isContainer}}{{#isMapContainer}}<string, string>{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{dataType}}{{/items}}>{{/isMapContainer}}{{/isContainer}}
+{{dataType}}{{#isContainer}}{{#isMap}}<string, string>{{/isMap}}{{^isMap}}<{{#items}}{{dataType}}{{/items}}>{{/isMap}}{{/isContainer}}
 {{classname}}::{{getter}}()
 {
 	return {{name}};
 }
 
 void
-{{classname}}::{{setter}}({{dataType}} {{#isContainer}}{{#isMapContainer}}<string, string>{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{dataType}}{{/items}}>{{/isMapContainer}}{{/isContainer}} {{name}})
+{{classname}}::{{setter}}({{dataType}} {{#isContainer}}{{#isMap}}<string, string>{{/isMap}}{{^isMap}}<{{#items}}{{dataType}}{{/items}}>{{/isMap}}{{/isContainer}} {{name}})
 {
 	this->{{name}} = {{name}};
 }

modules/openapi-generator/src/main/resources/cpp-tizen-client/model-header.mustache

@@ -51,16 +51,16 @@ public:
 	{{#vars}}
 	/*! \brief Get {{{description}}}
 	 */
-	{{dataType}}{{#isContainer}}{{#isMapContainer}}<std::string, std::string>{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{dataType}}{{/items}}>{{/isMapContainer}}{{/isContainer}} {{getter}}();
+	{{dataType}}{{#isContainer}}{{#isMap}}<std::string, std::string>{{/isMap}}{{^isMap}}<{{#items}}{{dataType}}{{/items}}>{{/isMap}}{{/isContainer}} {{getter}}();
 
 	/*! \brief Set {{{description}}}
 	 */
-	void {{setter}}({{dataType}} {{#isContainer}}{{#isMapContainer}}<std::string, std::string>{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{dataType}}{{/items}}>{{/isMapContainer}}{{/isContainer}} {{name}});
+	void {{setter}}({{dataType}} {{#isContainer}}{{#isMap}}<std::string, std::string>{{/isMap}}{{^isMap}}<{{#items}}{{dataType}}{{/items}}>{{/isMap}}{{/isContainer}} {{name}});
 	{{/vars}}
 
 private:
 	{{#vars}}
-	{{dataType}} {{#isContainer}}{{#isMapContainer}}<std::string, std::string>{{/isMapContainer}}{{^isMapContainer}}<{{#items}}{{dataType}}{{/items}}>{{/isMapContainer}}{{/isContainer}}{{name}};
+	{{dataType}} {{#isContainer}}{{#isMap}}<std::string, std::string>{{/isMap}}{{^isMap}}<{{#items}}{{dataType}}{{/items}}>{{/isMap}}{{/isContainer}}{{name}};
 	{{/vars}}
 	void __init();
 	void __cleanup();

modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache

@@ -154,7 +154,7 @@
         /// Returns the JSON string presentation of the object
         /// </summary>
         /// <returns>JSON string presentation of the object</returns>
-        public {{#parent}}{{^isArrayModel}}{{^isMapModel}}override {{/isMapModel}}{{/isArrayModel}}{{/parent}}{{^parent}}virtual {{/parent}}string ToJson()
+        public {{#parent}}{{^isArrayModel}}{{^isMap}}override {{/isMap}}{{/isArrayModel}}{{/parent}}{{^parent}}virtual {{/parent}}string ToJson()
         {
             return JsonConvert.SerializeObject(this, Formatting.Indented);
         }
@@ -273,9 +273,9 @@
 {{/discriminator}}
             {{#parent}}
             {{^isArrayModel}}
-            {{^isMapModel}}
+            {{^isMap}}
             foreach(var x in BaseValidate(validationContext)) yield return x;
-            {{/isMapModel}}
+            {{/isMap}}
             {{/isArrayModel}}
             {{/parent}}
             {{#vars}}

modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache

@@ -137,7 +137,7 @@ this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}};
         /// Returns the JSON string presentation of the object
         /// </summary>
         /// <returns>JSON string presentation of the object</returns>
-        public {{#parent}}{{^isArrayModel}}{{^isMapModel}}override {{/isMapModel}}{{/isArrayModel}}{{/parent}}{{^parent}}virtual {{/parent}}string ToJson()
+        public {{#parent}}{{^isArrayModel}}{{^isMap}}override {{/isMap}}{{/isArrayModel}}{{/parent}}{{^parent}}virtual {{/parent}}string ToJson()
         {
             return JsonConvert.SerializeObject(this, Formatting.Indented);
         }
@@ -252,9 +252,9 @@ this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}};
 {{/hasChildren}}
             {{#parent}}
             {{^isArrayModel}}
-            {{^isMapModel}}
+            {{^isMap}}
             foreach(var x in base.BaseValidate(validationContext)) yield return x;
-            {{/isMapModel}}
+            {{/isMap}}
             {{/isArrayModel}}
             {{/parent}}
             {{#vars}}

modules/openapi-generator/src/main/resources/dart/api.mustache

@@ -97,16 +97,16 @@ class {{classname}} {
         {{/returnType}}
       {{/isListContainer}}
       {{^isListContainer}}
-        {{#isMapContainer}}
+        {{#isMap}}
           {{#returnType}}
       return new {{{returnType}}}.from(apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}'));
           {{/returnType}};
-        {{/isMapContainer}}
+        {{/isMap}}
-        {{^isMapContainer}}
+        {{^isMap}}
           {{#returnType}}
       return apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}') as {{{returnType}}};
           {{/returnType}}
-        {{/isMapContainer}}
+        {{/isMap}}
       {{/isListContainer}}
     } else {
       return{{#returnType}} null{{/returnType}};

modules/openapi-generator/src/main/resources/dart/class.mustache

@@ -32,12 +32,12 @@ class {{classname}} {
       {{name}} = {{complexType}}.listFromJson(json['{{baseName}}']);
       {{/isListContainer}}
       {{^isListContainer}}
-      {{#isMapContainer}}
+      {{#isMap}}
       {{name}} = {{complexType}}.mapFromJson(json['{{baseName}}']);
-      {{/isMapContainer}}
+      {{/isMap}}
-      {{^isMapContainer}}
+      {{^isMap}}
       {{name}} = new {{complexType}}.fromJson(json['{{baseName}}']);
-      {{/isMapContainer}}
+      {{/isMap}}
       {{/isListContainer}}
     {{/complexType}}
     {{^complexType}}

modules/openapi-generator/src/main/resources/dart2/api.mustache

@@ -174,16 +174,16 @@ class {{{classname}}} {
         {{/returnType}}
       {{/isListContainer}}
       {{^isListContainer}}
-        {{#isMapContainer}}
+        {{#isMap}}
           {{#returnType}}
       return {{{returnType}}}.from(apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}'));
           {{/returnType}}
-        {{/isMapContainer}}
+        {{/isMap}}
-        {{^isMapContainer}}
+        {{^isMap}}
           {{#returnType}}
       return apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}') as {{{returnType}}};
           {{/returnType}}
-        {{/isMapContainer}}
+        {{/isMap}}
       {{/isListContainer}}
     }
     return{{#returnType}} null{{/returnType}};

modules/openapi-generator/src/main/resources/dart2/class.mustache

@@ -56,7 +56,7 @@ class {{{classname}}} {
         {{/items.isListContainer}}
       {{/isListContainer}}
       {{^isListContainer}}
-        {{#isMapContainer}}
+        {{#isMap}}
           {{#items.isListContainer}}
       {{{name}}} = json['{{{baseName}}}'] == null
         ? null
@@ -72,10 +72,10 @@ class {{{classname}}} {
         ? null
         : {{{complexType}}}.mapFromJson(json['{{{baseName}}}']);
           {{/items.isListContainer}}
-        {{/isMapContainer}}
+        {{/isMap}}
-        {{^isMapContainer}}
+        {{^isMap}}
       {{{name}}} = {{{complexType}}}.fromJson(json['{{{baseName}}}']);
-        {{/isMapContainer}}
+        {{/isMap}}
       {{/isListContainer}}
     {{/complexType}}
     {{^complexType}}
@@ -90,12 +90,12 @@ class {{{classname}}} {
         {{/isEnum}}
       {{/isListContainer}}
       {{^isListContainer}}
-        {{#isMapContainer}}
+        {{#isMap}}
       {{{name}}} = json['{{{baseName}}}'] == null ?
         null :
         (json['{{{baseName}}}'] as Map).cast<String, {{{items.datatype}}}>();
-        {{/isMapContainer}}
+        {{/isMap}}
-        {{^isMapContainer}}
+        {{^isMap}}
           {{#isNumber}}
       {{{name}}} = json['{{{baseName}}}'] == null ?
         null :
@@ -109,7 +109,7 @@ class {{{classname}}} {
       {{{name}}} = {{{classname}}}{{{enumName}}}.fromJson(json['{{{baseName}}}']);
     {{/isEnum}}
           {{/isNumber}}
-        {{/isMapContainer}}
+        {{/isMap}}
       {{/isListContainer}}
     {{/complexType}}
   {{/isDate}}
@@ -128,9 +128,9 @@ class {{{classname}}} {
       {{#isListContainer}}
   List<{{{classname}}}{{{enumName}}}> {{{name}}};
       {{/isListContainer}}
-      {{#isMapContainer}}
+      {{#isMap}}
   Map<String, dynamic> {{{name}}};
-      {{/isMapContainer}}
+      {{/isMap}}
     {{/isContainer}}
     {{^isContainer}}
       {{#allowableValues}}

modules/openapi-generator/src/main/resources/elixir/api.mustache

@@ -35,7 +35,7 @@ defmodule {{moduleName}}.Api.{{classname}} do
 {{/optionalParams}}
   ## Returns
 
-  {:ok, {{#isListContainer}}[%{{returnBaseType}}{}, ...]{{/isListContainer}}{{#isMapContainer}}%{}{{/isMapContainer}}{{^returnType}}%{}{{/returnType}}{{#returnSimpleType}}%{{#returnType}}{{#isMapContainer}}{{/isMapContainer}}{{{moduleName}}}.Model.{{{returnType}}}{{/returnType}}{}{{/returnSimpleType}}} on success
+  {:ok, {{#isListContainer}}[%{{returnBaseType}}{}, ...]{{/isListContainer}}{{#isMap}}%{}{{/isMap}}{{^returnType}}%{}{{/returnType}}{{#returnSimpleType}}%{{#returnType}}{{#isMap}}{{/isMap}}{{{moduleName}}}.Model.{{{returnType}}}{{/returnType}}{}{{/returnSimpleType}}} on success
   {:error, info} on failure
   """
   {{{typespec}}}

modules/openapi-generator/src/main/resources/elixir/model.mustache

@@ -23,7 +23,7 @@ defimpl Poison.Decoder, for: {{moduleName}}.Model.{{classname}} do
     value
     {{#vars}}
     {{^isPrimitiveType}}
-    {{#datatype}}|> deserialize(:"{{baseName}}", {{#isListContainer}}:list, {{moduleName}}.Model.{{items.datatype}}{{/isListContainer}}{{#isMapContainer}}:map, {{moduleName}}.Model.{{items.datatype}}{{/isMapContainer}}{{#isDate}}:date, nil{{/isDate}}{{#isDateTime}}:date, nil{{/isDateTime}}{{^isDate}}{{^isDateTime}}{{^isMapContainer}}{{^isListContainer}}:struct, {{moduleName}}.Model.{{dataType}}{{/isListContainer}}{{/isMapContainer}}{{/isDateTime}}{{/isDate}}, options)
+    {{#datatype}}|> deserialize(:"{{baseName}}", {{#isListContainer}}:list, {{moduleName}}.Model.{{items.datatype}}{{/isListContainer}}{{#isMap}}:map, {{moduleName}}.Model.{{items.datatype}}{{/isMap}}{{#isDate}}:date, nil{{/isDate}}{{#isDateTime}}:date, nil{{/isDateTime}}{{^isDate}}{{^isDateTime}}{{^isMap}}{{^isListContainer}}:struct, {{moduleName}}.Model.{{dataType}}{{/isListContainer}}{{/isMap}}{{/isDateTime}}{{/isDate}}, options)
     {{/datatype}}
     {{/isPrimitiveType}}
     {{/vars}}

modules/openapi-generator/src/main/resources/elm/operation.mustache

@@ -33,7 +33,7 @@ import Uuid exposing (Uuid){{/includeUuid}}
 {-| {{{notes}}}
 -}
 {{/notes}}
-{{operationId}} : {{#allParams}}{{^required}}Maybe {{/required}}{{#isListContainer}}List {{/isListContainer}}{{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{#isModel}}Api.Data.{{/isModel}}{{dataType}}{{/datatypeWithEnum}} -> {{/allParams}}{{#authMethods}}{{#isBasicBearer}}String -> {{/isBasicBearer}}{{/authMethods}}Api.Request {{^responses}}(){{/responses}}{{#responses}}{{#is2xx}}{{^dataType}}(){{/dataType}}{{#isMapContainer}}(Dict.Dict String {{/isMapContainer}}{{#isListContainer}}(List {{/isListContainer}}{{^primitiveType}}{{^isUuid}}Api.Data.{{/isUuid}}{{/primitiveType}}{{#items}}{{#isModel}}Api.Data.{{/isModel}}{{/items}}{{dataType}}{{#isListContainer}}){{/isListContainer}}{{#isMapContainer}}){{/isMapContainer}}{{/is2xx}}{{/responses}}
+{{operationId}} : {{#allParams}}{{^required}}Maybe {{/required}}{{#isListContainer}}List {{/isListContainer}}{{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{#isModel}}Api.Data.{{/isModel}}{{dataType}}{{/datatypeWithEnum}} -> {{/allParams}}{{#authMethods}}{{#isBasicBearer}}String -> {{/isBasicBearer}}{{/authMethods}}Api.Request {{^responses}}(){{/responses}}{{#responses}}{{#is2xx}}{{^dataType}}(){{/dataType}}{{#isMap}}(Dict.Dict String {{/isMap}}{{#isListContainer}}(List {{/isListContainer}}{{^primitiveType}}{{^isUuid}}Api.Data.{{/isUuid}}{{/primitiveType}}{{#items}}{{#isModel}}Api.Data.{{/isModel}}{{/items}}{{dataType}}{{#isListContainer}}){{/isListContainer}}{{#isMap}}){{/isMap}}{{/is2xx}}{{/responses}}
 {{operationId}}{{#allParams}} {{>paramName}}{{/allParams}}{{#authMethods}}{{#isBasicBearer}} auth_token{{/isBasicBearer}}{{/authMethods}} =
     Api.request
         "{{httpMethod}}"

modules/openapi-generator/src/main/resources/elm/recordField.mustache

@@ -1 +1 @@
-{{#isNullable}}Maybe {{#isContainer}}({{/isContainer}}{{/isNullable}}{{^isNullable}}{{^required}}Maybe {{#isContainer}}({{/isContainer}}{{/required}}{{/isNullable}}{{#isListContainer}}List {{/isListContainer}}{{#isMapContainer}}Dict.Dict String {{/isMapContainer}}{{#isEnum}}{{classname}}{{enumName}}{{/isEnum}}{{^isEnum}}{{#items}}({{>recordField}}){{/items}}{{^isContainer}}{{dataType}}{{/isContainer}}{{/isEnum}}{{#isContainer}}{{#isNullable}}){{/isNullable}}{{^isNullable}}{{^required}}){{/required}}{{/isNullable}}{{/isContainer}}
+{{#isNullable}}Maybe {{#isContainer}}({{/isContainer}}{{/isNullable}}{{^isNullable}}{{^required}}Maybe {{#isContainer}}({{/isContainer}}{{/required}}{{/isNullable}}{{#isListContainer}}List {{/isListContainer}}{{#isMap}}Dict.Dict String {{/isMap}}{{#isEnum}}{{classname}}{{enumName}}{{/isEnum}}{{^isEnum}}{{#items}}({{>recordField}}){{/items}}{{^isContainer}}{{dataType}}{{/isContainer}}{{/isEnum}}{{#isContainer}}{{#isNullable}}){{/isNullable}}{{^isNullable}}{{^required}}){{/required}}{{/isNullable}}{{/isContainer}}

modules/openapi-generator/src/main/resources/elm/recordFieldValueDecoder.mustache

@@ -1 +1 @@
-{{#isListContainer}}(Json.Decode.list {{/isListContainer}}{{#isMapContainer}}(Json.Decode.dict {{/isMapContainer}}{{#items}}{{>recordFieldValueDecoder}}{{/items}}{{^isContainer}}{{#isCircularReference}}(Json.Decode.lazy (\_ -> {{/isCircularReference}}{{>fieldDecoder}}{{#isCircularReference}})){{/isCircularReference}}{{/isContainer}}{{#isListContainer}}){{/isListContainer}}{{#isMapContainer}}){{/isMapContainer}}
+{{#isListContainer}}(Json.Decode.list {{/isListContainer}}{{#isMap}}(Json.Decode.dict {{/isMap}}{{#items}}{{>recordFieldValueDecoder}}{{/items}}{{^isContainer}}{{#isCircularReference}}(Json.Decode.lazy (\_ -> {{/isCircularReference}}{{>fieldDecoder}}{{#isCircularReference}})){{/isCircularReference}}{{/isContainer}}{{#isListContainer}}){{/isListContainer}}{{#isMap}}){{/isMap}}

modules/openapi-generator/src/main/resources/elm/recordFieldValueEncoder.mustache

@@ -1 +1 @@
-{{#isContainer}}({{#isListContainer}}Json.Encode.list{{/isListContainer}}{{#isMapContainer}}Json.Encode.dict identity{{/isMapContainer}} {{#items}}{{>recordFieldValueEncoder}}{{/items}}{{/isContainer}}{{^isContainer}}{{>fieldEncoder}}{{/isContainer}}{{#isContainer}}){{/isContainer}}
+{{#isContainer}}({{#isListContainer}}Json.Encode.list{{/isListContainer}}{{#isMap}}Json.Encode.dict identity{{/isMap}} {{#items}}{{>recordFieldValueEncoder}}{{/items}}{{/isContainer}}{{^isContainer}}{{>fieldEncoder}}{{/isContainer}}{{#isContainer}}){{/isContainer}}

modules/openapi-generator/src/main/resources/fsharp-giraffe-server/Handler.mustache

@@ -55,7 +55,7 @@ module {{classname}}Handler =
           return! (match result with 
                       {{#responses}}
                       | {{operationId}}{{#isDefault}}Default{{/isDefault}}StatusCode{{^isDefault}}{{code}}{{/isDefault}} resolved ->
-                            setStatusCode {{code}} >=> {{#primitiveType}}{{^isMapContainer}}text{{/isMapContainer}}{{/primitiveType}}{{^primitiveType}}json{{/primitiveType}} resolved.content 
+                            setStatusCode {{code}} >=> {{#primitiveType}}{{^isMap}}text{{/isMap}}{{/primitiveType}}{{^primitiveType}}json{{/primitiveType}} resolved.content
                       {{/responses}}
           ) next ctx
         }

modules/openapi-generator/src/main/resources/go/model_simple.mustache

@@ -1,11 +1,11 @@
 // {{classname}}{{#description}} {{{description}}}{{/description}}{{^description}} struct for {{{classname}}}{{/description}}
 type {{classname}} struct {
 {{#parent}}
-{{^isMapModel}}
+{{^isMap}}
 {{^isArrayModel}}
 	{{{parent}}}
 {{/isArrayModel}}
-{{/isMapModel}}
+{{/isMap}}
 {{#isArrayModel}}
 	Items {{{parent}}}
 {{/isArrayModel}}
@@ -225,7 +225,7 @@ func (o *{{classname}}) Unset{{name}}() {
 func (o {{classname}}) MarshalJSON() ([]byte, error) {
 	toSerialize := {{#isArrayModel}}make([]interface{}, len(o.Items)){{/isArrayModel}}{{^isArrayModel}}map[string]interface{}{}{{/isArrayModel}}
 	{{#parent}}
-	{{^isMapModel}}
+	{{^isMap}}
 	{{^isArrayModel}}
 	serialized{{parent}}, err{{parent}} := json.Marshal(o.{{parent}})
 	if err{{parent}} != nil {
@@ -236,7 +236,7 @@ func (o {{classname}}) MarshalJSON() ([]byte, error) {
 		return []byte{}, err{{parent}}
 	}
 	{{/isArrayModel}}
-	{{/isMapModel}}
+	{{/isMap}}
 	{{#isArrayModel}}
 	for i, item := range o.Items {
 		toSerialize[i] = item
@@ -278,7 +278,7 @@ func (o {{classname}}) MarshalJSON() ([]byte, error) {
 {{#isAdditionalPropertiesTrue}}
 func (o *{{{classname}}}) UnmarshalJSON(bytes []byte) (err error) {
 {{#parent}}
-{{^isMapModel}}
+{{^isMap}}
 	type {{classname}}WithoutEmbeddedStruct struct {
 	{{#vars}}
 	{{^-first}}
@@ -341,8 +341,8 @@ func (o *{{{classname}}}) UnmarshalJSON(bytes []byte) (err error) {
 	}
 
 	return err
-{{/isMapModel}}
+{{/isMap}}
-{{#isMapModel}}
+{{#isMap}}
 	var{{{classname}}} := _{{{classname}}}{}
 
 	if err = json.Unmarshal(bytes, &var{{{classname}}}); err == nil {
@@ -359,7 +359,7 @@ func (o *{{{classname}}}) UnmarshalJSON(bytes []byte) (err error) {
 	}
 
 	return err
-{{/isMapModel}}
+{{/isMap}}
 {{/parent}}
 {{^parent}}
 	var{{{classname}}} := _{{{classname}}}{}

modules/openapi-generator/src/main/resources/haskell-http-client/Model.mustache

@@ -117,7 +117,7 @@ mk{{classname}}
   -> {{/required}}{{/vars}}{{classname}}
 mk{{classname}} {{#vars}}{{#required}}{{name}} {{/required}}{{/vars}}=
   {{classname}}
-  { {{#vars}}{{#required}}{{name}}{{/required}}{{^required}}{{name}} = {{#isListContainer}}Nothing{{/isListContainer}}{{#isMapContainer}}Nothing{{/isMapContainer}}{{^isContainer}}Nothing{{/isContainer}}{{/required}}{{#hasMore}}
+  { {{#vars}}{{#required}}{{name}}{{/required}}{{^required}}{{name}} = {{#isListContainer}}Nothing{{/isListContainer}}{{#isMap}}Nothing{{/isMap}}{{^isContainer}}Nothing{{/isContainer}}{{/required}}{{#hasMore}}
   , {{/hasMore}}{{/vars}}
   }
 {{/generateModelConstructors}}{{/isAlias}}{{/isEnum}}{{/model}}{{/models}}