Fixes uuid properties in python-exp, changes maps to object data type…

…, adds uuid data type

modules/openapi-generator-core/src/main/java/org/openapitools/codegen/meta/features/DataTypeFeature.java

@@ -146,10 +146,10 @@ public enum DataTypeFeature {
     Array,
 
     /**
-     * Supports map of data
+     * An unordered set of properties mapping a string to an instance
      */
-    @ToolingExtension
-    Maps,
+    @OAS2 @OAS3
+    Object,
 
     /**
      * Supports specifying the format of the array if type array is used (one of: csv, ssv, tsv, pipes).
@@ -236,5 +236,10 @@ public enum DataTypeFeature {
      * Supports a map of arrays (enums)
      */
     @ToolingExtension
-    MapOfCollectionOfEnum
+    MapOfCollectionOfEnum,
+
+    /**
+     * String uuid data
+     */
+    Uuid
 }

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

@@ -862,9 +862,9 @@ public void setHasMultipleTypes(boolean hasMultipleTypes) {
         this.hasMultipleTypes = hasMultipleTypes;
     }
 
-    public boolean getisUuid() { return isUuid; }
+    public boolean getIsUuid() { return isUuid; }
 
-    public void setisUuid(boolean isUuid) { this.isUuid = isUuid; }
+    public void setIsUuid(boolean isUuid) { this.isUuid = isUuid; }
 
     @Override
     public String toString() {

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

@@ -96,7 +96,7 @@ public class DefaultCodegen implements CodegenConfig {
                         DataTypeFeature.Int32, DataTypeFeature.Int64, DataTypeFeature.Float, DataTypeFeature.Double,
                         DataTypeFeature.Decimal, DataTypeFeature.String, DataTypeFeature.Byte, DataTypeFeature.Binary,
                         DataTypeFeature.Boolean, DataTypeFeature.Date, DataTypeFeature.DateTime, DataTypeFeature.Password,
-                        DataTypeFeature.File, DataTypeFeature.Array, DataTypeFeature.Maps, DataTypeFeature.CollectionFormat,
+                        DataTypeFeature.File, DataTypeFeature.Array, DataTypeFeature.Object, DataTypeFeature.Maps, DataTypeFeature.CollectionFormat,
                         DataTypeFeature.CollectionFormatMulti, DataTypeFeature.Enum, DataTypeFeature.ArrayOfEnum, DataTypeFeature.ArrayOfModel,
                         DataTypeFeature.ArrayOfCollectionOfPrimitives, DataTypeFeature.ArrayOfCollectionOfModel, DataTypeFeature.ArrayOfCollectionOfEnum,
                         DataTypeFeature.MapOfEnum, DataTypeFeature.MapOfModel, DataTypeFeature.MapOfCollectionOfPrimitives,

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

@@ -108,6 +108,9 @@ public PythonExperimentalClientCodegen() {
                         SecurityFeature.ApiKey,
                         SecurityFeature.OAuth2_Implicit
                 ))
+                .includeDataTypeFeatures(
+                        DataTypeFeature.Uuid
+                )
                 .includeGlobalFeatures(
                         GlobalFeature.ParameterizedServer,
                         GlobalFeature.ParameterStyling
@@ -2006,7 +2009,7 @@ protected void updatePropertyForString(CodegenProperty property, Schema p) {
             property.isFile = true; // file = binary in OAS3
         } else if (ModelUtils.isUUIDSchema(p)) {
             property.setIsString(false); // so the templates only see isUuid
-            property.isUuid = true;
+            property.setIsUuid(true);
         } else if (ModelUtils.isURISchema(p)) {
             property.isUri = true;
         } else if (ModelUtils.isEmailSchema(p)) {

modules/openapi-generator/src/main/resources/python-experimental/model_templates/var_equals_cls.handlebars

@@ -1 +1 @@
-{{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}} = {{#if complexType}}{{complexType}}{{else}}{{#if isNullable}}Nullable{{/if}}{{#if getIsNull}}None{{/if}}{{#if isAnyType}}AnyType{{/if}}{{#if isMap}}Dict{{/if}}{{#if isArray}}List{{/if}}{{#if isString}}Str{{/if}}{{#if isByteArray}}Str{{/if}}{{#if isDate}}Date{{/if}}{{#if isDateTime}}DateTime{{/if}}{{#if isDecimal}}Decimal{{/if}}{{#if isUnboundedInteger}}Int{{/if}}{{#if isShort}}Int32{{/if}}{{#if isLong}}Int64{{/if}}{{#if isFloat}}Float32{{/if}}{{#if isDouble}}Float64{{/if}}{{#if isNumber}}Number{{/if}}{{#if isBoolean}}Bool{{/if}}{{#if isBinary}}Binary{{/if}}Schema{{/if}}
+{{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}} = {{#if complexType}}{{complexType}}{{else}}{{#if isNullable}}Nullable{{/if}}{{#if getIsNull}}None{{/if}}{{#if isAnyType}}AnyType{{/if}}{{#if isMap}}Dict{{/if}}{{#if isArray}}List{{/if}}{{#if isString}}Str{{/if}}{{#if isByteArray}}Str{{/if}}{{#if getIsUuid}}UUID{{/if}}{{#if isDate}}Date{{/if}}{{#if isDateTime}}DateTime{{/if}}{{#if isDecimal}}Decimal{{/if}}{{#if isUnboundedInteger}}Int{{/if}}{{#if isShort}}Int32{{/if}}{{#if isLong}}Int64{{/if}}{{#if isFloat}}Float32{{/if}}{{#if isDouble}}Float64{{/if}}{{#if isNumber}}Number{{/if}}{{#if isBoolean}}Bool{{/if}}{{#if isBinary}}Binary{{/if}}Schema{{/if}}

samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py

@@ -164,8 +164,8 @@ class string(
     binary = BinarySchema
     date = DateSchema
     dateTime = DateTimeSchema
-    uuid = Schema
-    uuidNoExample = Schema
+    uuid = UUIDSchema
+    uuidNoExample = UUIDSchema
 
 
     class password(

samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py

@@ -73,7 +73,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
 
     Do not edit the class manually.
     """
-    uuid = Schema
+    uuid = UUIDSchema
     dateTime = DateTimeSchema