Updated model generation, addProps handling moved into type object and anyType handling (#10505)

* Updates fromModel helpers

* Samples regenerated

* updateModelForComposedSchema made protected so it can be overridden

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

@@ -2381,7 +2381,7 @@ public class DefaultCodegen implements CodegenConfig {
 
     Map<NamedSchema, CodegenProperty> schemaCodegenPropertyCache = new HashMap<NamedSchema, CodegenProperty>();
 
-    private void updateModelForComposedSchema(CodegenModel m, Schema schema, Map<String, Schema> allDefinitions) {
+    protected void updateModelForComposedSchema(CodegenModel m, Schema schema, Map<String, Schema> allDefinitions) {
         final ComposedSchema composed = (ComposedSchema) schema;
         Map<String, Schema> properties = new LinkedHashMap<String, Schema>();
         List<String> required = new ArrayList<String>();
@@ -2596,6 +2596,8 @@ public class DefaultCodegen implements CodegenConfig {
             // additionalProperties must be null, ObjectSchema, or empty Schema
             addAdditionPropertiesToCodeGenModel(m, schema);
         }
+        // process 'additionalProperties'
+        setAddProps(schema, m);
     }
 
     protected void updateModelForAnyType(CodegenModel m, Schema schema) {
@@ -2614,6 +2616,8 @@ public class DefaultCodegen implements CodegenConfig {
             // passing null to allProperties and allRequired as there's no parent
             addVars(m, unaliasPropertySchema(schema.getProperties()), schema.getRequired(), null, null);
         }
+        // process 'additionalProperties'
+        setAddProps(schema, m);
     }
 
 
@@ -2776,9 +2780,6 @@ public class DefaultCodegen implements CodegenConfig {
             Collections.sort(m.allVars, comparator);
         }
 
-        // process 'additionalProperties'
-        setAddProps(schema, m);
-
         // post process model properties
         if (m.vars != null) {
             for (CodegenProperty prop : m.vars) {
@@ -2794,7 +2795,7 @@ public class DefaultCodegen implements CodegenConfig {
         return m;
     }
 
-    private void setAddProps(Schema schema, IJsonSchemaValidationProperties property){
+    protected void setAddProps(Schema schema, IJsonSchemaValidationProperties property){
         if (schema.equals(new Schema())) {
             // if we are trying to set additionalProperties on an empty schema stop recursing
             return;

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

@@ -1152,5 +1152,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
                 addAdditionPropertiesToCodeGenModel(m, schema);
             }
         }
+        // process 'additionalProperties'
+        setAddProps(schema, m);
     }
 }

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

@@ -385,5 +385,7 @@ public class GoServerCodegen extends AbstractGoCodegen {
                 addAdditionPropertiesToCodeGenModel(m, schema);
             }
         }
+        // process 'additionalProperties'
+        setAddProps(schema, m);
     }
 }

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

@@ -354,5 +354,7 @@ public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen
                 addAdditionPropertiesToCodeGenModel(m, schema);
             }
         }
+        // process 'additionalProperties'
+        setAddProps(schema, m);
     }
 }

samples/client/petstore/python/docs/AnimalFarm.md

@@ -5,7 +5,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **value** | [**[Animal]**](Animal.md) |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/client/petstore/python/docs/EnumClass.md

@@ -5,7 +5,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **value** | **str** |  | defaults to "-efg",  must be one of ["_abc", "-efg", "(xyz)", ]
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/client/petstore/python/docs/NumberWithValidations.md

@@ -5,7 +5,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **value** | **float** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/client/petstore/python/docs/StringEnum.md

@@ -5,7 +5,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **value** | **str** |  |  must be one of ["placed", "approved", "delivered", ]
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/client/petstore/python/petstore_api/model/animal_farm.py

@@ -60,14 +60,7 @@ class AnimalFarm(ModelSimple):
     validations = {
     }
 
-    @cached_property
+    additional_properties_type = None
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        lazy_import()
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = False
 

samples/client/petstore/python/petstore_api/model/enum_class.py

@@ -61,13 +61,7 @@ class EnumClass(ModelSimple):
     validations = {
     }
 
-    @cached_property
+    additional_properties_type = None
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = False
 

samples/client/petstore/python/petstore_api/model/number_with_validations.py

@@ -60,13 +60,7 @@ class NumberWithValidations(ModelSimple):
         },
     }
 
-    @cached_property
+    additional_properties_type = None
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = False
 

samples/client/petstore/python/petstore_api/model/string_enum.py

@@ -61,13 +61,7 @@ class StringEnum(ModelSimple):
     validations = {
     }
 
-    @cached_property
+    additional_properties_type = None
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = False
 

samples/openapi3/client/petstore/python/docs/AnimalFarm.md

@@ -5,7 +5,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **value** | [**[Animal]**](Animal.md) |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/openapi3/client/petstore/python/docs/ArrayOfEnums.md

@@ -5,7 +5,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **value** | [**[StringEnum]**](StringEnum.md) |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/openapi3/client/petstore/python/docs/BooleanEnum.md

@@ -5,7 +5,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **value** | **bool** |  | defaults to True,  must be one of [True, ]
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/openapi3/client/petstore/python/docs/EnumClass.md

@@ -5,7 +5,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **value** | **str** |  | defaults to "-efg",  must be one of ["_abc", "-efg", "(xyz)", ]
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/openapi3/client/petstore/python/docs/IntegerEnum.md

@@ -5,7 +5,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **value** | **int** |  |  must be one of [0, 1, 2, ]
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/openapi3/client/petstore/python/docs/IntegerEnumOneValue.md

@@ -5,7 +5,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **value** | **int** |  | defaults to 0,  must be one of [0, ]
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/openapi3/client/petstore/python/docs/IntegerEnumWithDefaultValue.md

@@ -5,7 +5,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **value** | **int** |  | defaults to 0,  must be one of [0, 1, 2, ]
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/openapi3/client/petstore/python/docs/NumberWithValidations.md

@@ -5,7 +5,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **value** | **float** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/openapi3/client/petstore/python/docs/StringEnum.md

@@ -7,7 +7,6 @@ Name | Type | Description | Notes
 **value** | **str** |  |  must be one of ["placed", "approved", "delivered", "single quoted", '''multiple
 lines''', '''double quote 
  with newline''', ]
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/openapi3/client/petstore/python/docs/StringEnumWithDefaultValue.md

@@ -5,7 +5,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **value** | **str** |  | defaults to "placed",  must be one of ["placed", "approved", "delivered", ]
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

samples/openapi3/client/petstore/python/petstore_api/model/animal_farm.py

@@ -60,14 +60,7 @@ class AnimalFarm(ModelSimple):
     validations = {
     }
 
-    @cached_property
+    additional_properties_type = None
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        lazy_import()
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = False
 

samples/openapi3/client/petstore/python/petstore_api/model/array_of_enums.py

@@ -60,14 +60,7 @@ class ArrayOfEnums(ModelSimple):
     validations = {
     }
 
-    @cached_property
+    additional_properties_type = None
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        lazy_import()
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = False
 

samples/openapi3/client/petstore/python/petstore_api/model/boolean_enum.py

@@ -59,13 +59,7 @@ class BooleanEnum(ModelSimple):
     validations = {
     }
 
-    @cached_property
+    additional_properties_type = None
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = False
 

samples/openapi3/client/petstore/python/petstore_api/model/enum_class.py

@@ -61,13 +61,7 @@ class EnumClass(ModelSimple):
     validations = {
     }
 
-    @cached_property
+    additional_properties_type = None
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = False
 

samples/openapi3/client/petstore/python/petstore_api/model/integer_enum.py

@@ -61,13 +61,7 @@ class IntegerEnum(ModelSimple):
     validations = {
     }
 
-    @cached_property
+    additional_properties_type = None
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = False
 

samples/openapi3/client/petstore/python/petstore_api/model/integer_enum_one_value.py

@@ -59,13 +59,7 @@ class IntegerEnumOneValue(ModelSimple):
     validations = {
     }
 
-    @cached_property
+    additional_properties_type = None
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = False
 

samples/openapi3/client/petstore/python/petstore_api/model/integer_enum_with_default_value.py

@@ -61,13 +61,7 @@ class IntegerEnumWithDefaultValue(ModelSimple):
     validations = {
     }
 
-    @cached_property
+    additional_properties_type = None
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = False
 

samples/openapi3/client/petstore/python/petstore_api/model/number_with_validations.py

@@ -60,13 +60,7 @@ class NumberWithValidations(ModelSimple):
         },
     }
 
-    @cached_property
+    additional_properties_type = None
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = False
 

samples/openapi3/client/petstore/python/petstore_api/model/string_enum.py

@@ -67,13 +67,7 @@ lines''',
     validations = {
     }
 
-    @cached_property
+    additional_properties_type = None
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = True
 

samples/openapi3/client/petstore/python/petstore_api/model/string_enum_with_default_value.py

@@ -61,13 +61,7 @@ class StringEnumWithDefaultValue(ModelSimple):
     validations = {
     }
 
-    @cached_property
+    additional_properties_type = None
-    def additional_properties_type():
-        """
-        This must be a method because a model may have properties that are
-        of type self, this must run after the class is loaded
-        """
-        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
 
     _nullable = False