inline parameter enhance with python-experimental fix

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

@@ -4581,9 +4581,14 @@ public CodegenParameter fromParameter(Parameter parameter, Set<String> imports)
         String parameterModelName = null;
 
         if (parameter.getSchema() != null) {
-            parameterModelName = getParameterDataType(parameter ,parameter.getSchema());
-            parameterSchema = ModelUtils.getReferencedSchema(openAPI, parameter.getSchema());
-            CodegenProperty prop = fromProperty(parameter.getName(), parameterSchema);
+            parameterSchema = parameter.getSchema();
+            parameterModelName = getParameterDataType(parameter, parameterSchema);
+            CodegenProperty prop;
+            if (getUseInlineModelResolver()) {
+                prop = fromProperty(parameter.getName(), ModelUtils.getReferencedSchema(openAPI, parameterSchema));
+            } else {
+                prop = fromProperty(parameter.getName(), parameterSchema);
+            }
             codegenParameter.setSchema(prop);
         } else if (parameter.getContent() != null) {
             Content content = parameter.getContent();
@@ -4592,8 +4597,8 @@ public CodegenParameter fromParameter(Parameter parameter, Set<String> imports)
             }
             Map.Entry<String, MediaType> entry = content.entrySet().iterator().next();
             codegenParameter.contentType = entry.getKey();
-            parameterModelName = getParameterDataType(parameter, entry.getValue().getSchema());
-            parameterSchema = ModelUtils.getReferencedSchema(openAPI, entry.getValue().getSchema());
+            parameterSchema = entry.getValue().getSchema();
+            parameterModelName = getParameterDataType(parameter, parameterSchema);
         } else {
             parameterSchema = null;
         }
@@ -4625,6 +4630,7 @@ public CodegenParameter fromParameter(Parameter parameter, Set<String> imports)
             finishUpdatingParameter(codegenParameter, parameter);
             return codegenParameter;
         }
+
         ModelUtils.syncValidationProperties(parameterSchema, codegenParameter);
         codegenParameter.setTypeProperties(parameterSchema);
         codegenParameter.setComposedSchemas(getComposedSchemas(parameterSchema));

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

@@ -168,10 +168,11 @@ public interface IJsonSchemaValidationProperties {
      * @param p the schema which contains the type info
      */
     default void setTypeProperties(Schema p) {
-        if (ModelUtils.isModelWithPropertiesOnly(p)) {
-            setIsModel(true);
-        } else if (ModelUtils.isTypeObjectSchema(p)) {
+        if (ModelUtils.isTypeObjectSchema(p)) {
             setIsMap(true);
+            if (ModelUtils.isModelWithPropertiesOnly(p)) {
+                setIsModel(true);
+            }
         } else if (ModelUtils.isArraySchema(p)) {
             setIsArray(true);
         } else if (ModelUtils.isFileSchema(p) && !ModelUtils.isStringSchema(p)) {
@@ -221,6 +222,9 @@ default void setTypeProperties(Schema p) {
             setIsNull(true);
         } else if (ModelUtils.isAnyType(p)) {
             setIsAnyType(true);
+            if (ModelUtils.isModelWithPropertiesOnly(p)) {
+                setIsModel(true);
+            }
         }
     }
 

samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts

@@ -37,9 +37,9 @@ export interface FakeEnumRequestGetInlineRequest {
 }
 
 export interface FakeEnumRequestGetRefRequest {
-    stringEnum?: FakeEnumRequestGetRefStringEnumEnum;
+    stringEnum?: StringEnum;
     nullableStringEnum?: StringEnum | null;
-    numberEnum?: FakeEnumRequestGetRefNumberEnumEnum;
+    numberEnum?: NumberEnum;
     nullableNumberEnum?: NumberEnum | null;
 }
 
@@ -210,21 +210,3 @@ export const FakeEnumRequestGetInlineNumberEnumEnum = {
     NUMBER_3: 3
 } as const;
 export type FakeEnumRequestGetInlineNumberEnumEnum = typeof FakeEnumRequestGetInlineNumberEnumEnum[keyof typeof FakeEnumRequestGetInlineNumberEnumEnum];
-/**
- * @export
- */
-export const FakeEnumRequestGetRefStringEnumEnum = {
-    One: 'one',
-    Two: 'two',
-    Three: 'three'
-} as const;
-export type FakeEnumRequestGetRefStringEnumEnum = typeof FakeEnumRequestGetRefStringEnumEnum[keyof typeof FakeEnumRequestGetRefStringEnumEnum];
-/**
- * @export
- */
-export const FakeEnumRequestGetRefNumberEnumEnum = {
-    NUMBER_1: 1,
-    NUMBER_2: 2,
-    NUMBER_3: 3
-} as const;
-export type FakeEnumRequestGetRefNumberEnumEnum = typeof FakeEnumRequestGetRefNumberEnumEnum[keyof typeof FakeEnumRequestGetRefNumberEnumEnum];

samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts

@@ -37,9 +37,9 @@ export interface FakeEnumRequestGetInlineRequest {
 }
 
 export interface FakeEnumRequestGetRefRequest {
-    stringEnum?: FakeEnumRequestGetRefStringEnumEnum;
+    stringEnum?: StringEnum;
     nullableStringEnum?: StringEnum | null;
-    numberEnum?: FakeEnumRequestGetRefNumberEnumEnum;
+    numberEnum?: NumberEnum;
     nullableNumberEnum?: NumberEnum | null;
 }
 
@@ -210,21 +210,3 @@ export enum FakeEnumRequestGetInlineNumberEnumEnum {
     NUMBER_2 = 2,
     NUMBER_3 = 3
 }
-/**
-  * @export
-  * @enum {string}
-  */
-export enum FakeEnumRequestGetRefStringEnumEnum {
-    One = 'one',
-    Two = 'two',
-    Three = 'three'
-}
-/**
-  * @export
-  * @enum {string}
-  */
-export enum FakeEnumRequestGetRefNumberEnumEnum {
-    NUMBER_1 = 1,
-    NUMBER_2 = 2,
-    NUMBER_3 = 3
-}

samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md

@@ -2446,6 +2446,7 @@ To test the collection format in query parameters
 ```python
 import petstore_api
 from petstore_api.api import fake_api
+from petstore_api.model.string_with_validation import StringWithValidation
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -2537,10 +2538,10 @@ Type | Description | Notes
 **[str]** |  | 
 
 #### RefParamSchema
-
-Type | Description | Notes
+Type | Description  | Notes
 ------------- | ------------- | -------------
-**str** |  | 
+[**StringWithValidation**](StringWithValidation.md) |  | 
+
 
 ### Return Types, Responses
 
@@ -2622,7 +2623,7 @@ mapBean | MapBeanSchema | | optional
 #### MapBeanSchema
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**{str: (bool, date, datetime, dict, float, int, list, str, none_type)}**](Foo.md) |  | 
+[**Foo**](Foo.md) |  | 
 
 
 ### Return Types, Responses

samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api_endpoints/foo_get.py

@@ -68,7 +68,32 @@
 
 _path = '/foo'
 _method = 'GET'
-SchemaFor0ResponseBodyApplicationJson = Schema
+
+
+class SchemaFor0ResponseBodyApplicationJson(
+    DictSchema
+):
+
+    @classmethod
+    @property
+    def string(cls) -> typing.Type['Foo']:
+        return Foo
+
+
+    def __new__(
+        cls,
+        *args: typing.Union[dict, frozendict, ],
+        string: typing.Union['Foo', Unset] = unset,
+        _configuration: typing.Optional[Configuration] = None,
+        **kwargs: typing.Type[Schema],
+    ) -> 'SchemaFor0ResponseBodyApplicationJson':
+        return super().__new__(
+            cls,
+            *args,
+            string=string,
+            _configuration=_configuration,
+            **kwargs,
+        )
 
 
 @dataclass

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/endpoint_parameters.py

@@ -65,7 +65,137 @@
 )
 
 # body param
-SchemaForRequestBodyApplicationXWwwFormUrlencoded = Schema
+
+
+class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
+    DictSchema
+):
+    _required_property_names = set((
+    ))
+
+
+    class integer(
+        _SchemaValidator(
+            inclusive_maximum=100,
+            inclusive_minimum=10,
+        ),
+        IntSchema
+    ):
+        pass
+
+
+    class int32(
+        _SchemaValidator(
+            inclusive_maximum=200,
+            inclusive_minimum=20,
+        ),
+        Int32Schema
+    ):
+        pass
+    int64 = Int64Schema
+
+
+    class number(
+        _SchemaValidator(
+            inclusive_maximum=543.2,
+            inclusive_minimum=32.1,
+        ),
+        NumberSchema
+    ):
+        pass
+
+
+    class _float(
+        _SchemaValidator(
+            inclusive_maximum=987.6,
+        ),
+        Float32Schema
+    ):
+        pass
+    locals()['float'] = _float
+    del locals()['_float']
+
+
+    class double(
+        _SchemaValidator(
+            inclusive_maximum=123.4,
+            inclusive_minimum=67.8,
+        ),
+        Float64Schema
+    ):
+        pass
+
+
+    class string(
+        _SchemaValidator(
+            regex=[{
+                'pattern': r'[a-z]',  # noqa: E501
+                'flags': (
+                    re.IGNORECASE
+                )
+            }],
+        ),
+        StrSchema
+    ):
+        pass
+
+
+    class pattern_without_delimiter(
+        _SchemaValidator(
+            regex=[{
+                'pattern': r'^[A-Z].*',  # noqa: E501
+            }],
+        ),
+        StrSchema
+    ):
+        pass
+    byte = StrSchema
+    binary = BinarySchema
+    date = DateSchema
+    dateTime = DateTimeSchema
+
+
+    class password(
+        _SchemaValidator(
+            max_length=64,
+            min_length=10,
+        ),
+        StrSchema
+    ):
+        pass
+    callback = StrSchema
+
+
+    def __new__(
+        cls,
+        *args: typing.Union[dict, frozendict, ],
+        integer: typing.Union[integer, Unset] = unset,
+        int32: typing.Union[int32, Unset] = unset,
+        int64: typing.Union[int64, Unset] = unset,
+        string: typing.Union[string, Unset] = unset,
+        binary: typing.Union[binary, Unset] = unset,
+        date: typing.Union[date, Unset] = unset,
+        dateTime: typing.Union[dateTime, Unset] = unset,
+        password: typing.Union[password, Unset] = unset,
+        callback: typing.Union[callback, Unset] = unset,
+        _configuration: typing.Optional[Configuration] = None,
+        **kwargs: typing.Type[Schema],
+    ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
+        return super().__new__(
+            cls,
+            *args,
+            integer=integer,
+            int32=int32,
+            int64=int64,
+            string=string,
+            binary=binary,
+            date=date,
+            dateTime=dateTime,
+            password=password,
+            callback=callback,
+            _configuration=_configuration,
+            **kwargs,
+        )
 
 
 request_body_body = api_client.RequestBody(