Moves discriminator into discriminator() class method, adds test_dese…

…rialize_lizard, adds setting discriminator using allOf schema

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

@@ -1807,17 +1807,22 @@ public CodegenModel fromModel(String name, Schema schema) {
                 m.allVars = new ArrayList<CodegenProperty>();
                 if (composed.getAllOf() != null) {
                     int modelImplCnt = 0; // only one inline object allowed in a ComposedModel
+                    int modelDiscriminators = 0; // only one discriminator allowed in a ComposedModel
                     for (Schema innerSchema : composed.getAllOf()) { // TOOD need to work with anyOf, oneOf as well
-                        if (m.discriminator == null) {
+                        if (m.discriminator == null && innerSchema.getDiscriminator() != null) {
                             LOGGER.debug("discriminator is set to null (not correctly set earlier): {}", name);
-                            m.discriminator = createDiscriminator(name, schema);
+                            m.discriminator = createDiscriminator(name, innerSchema);
+                            modelDiscriminators++;
                         }
 
                         if (innerSchema.getXml() != null) {
                             m.xmlPrefix = innerSchema.getXml().getPrefix();
                             m.xmlNamespace = innerSchema.getXml().getNamespace();
                             m.xmlName = innerSchema.getXml().getName();
                         }
+                        if (modelDiscriminators > 1) {
+                            LOGGER.error("Allof composed schema is inherriting >1 descriminator. Only use one discriminator: {}", composed);
+                        }
 
                         if (modelImplCnt++ > 1) {
                             LOGGER.warn("More than one inline schema specified in allOf:. Only the first one is recognized. All others are ignored.");

modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/classvars.mustache

@@ -103,10 +103,17 @@
 
     additional_properties_type = {{#additionalPropertiesType}}({{{additionalPropertiesType}}},)  # noqa: E501{{/additionalPropertiesType}}{{^additionalPropertiesType}}None{{/additionalPropertiesType}}
 
-    discriminator = {{^discriminator}}None{{/discriminator}}{{#discriminator}}{
-      '{{{discriminatorName}}}': {
+    @staticmethod
+    def discriminator():
+        return {{^discriminator}}None{{/discriminator}}{{#discriminator}}{
+            '{{{discriminatorName}}}': {
 {{#children}}
-          '{{^vendorExtensions.x-discriminator-value}}{{name}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}': {{{classname}}},
+                '{{^vendorExtensions.x-discriminator-value}}{{name}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}': {{{classname}}},
 {{/children}}
-      },
-    }{{/discriminator}}
+{{^children}}
+{{#mappedModels}}
+                '{{mappingName}}': {{{modelName}}},
+{{/mappedModels}}
+{{/children}}
+            },
+        }{{/discriminator}}

modules/openapi-generator/src/main/resources/python/python-experimental/model_templates/method_discriminator.mustache

@@ -1,11 +1,12 @@
     @classmethod
     def get_discriminator_class(cls, from_server, data):
         """Returns the child class specified by the discriminator"""
-        discr_propertyname_py = list(cls.discriminator.keys())[0]
+        discriminator = cls.discriminator()
+        discr_propertyname_py = list(discriminator.keys())[0]
         discr_propertyname_js = cls.attribute_map[discr_propertyname_py]
         if from_server:
             class_name = data[discr_propertyname_js]
         else:
             class_name = data[discr_propertyname_py]
-        class_name_to_discr_class = cls.discriminator[discr_propertyname_py]
+        class_name_to_discr_class = discriminator[discr_propertyname_py]
         return class_name_to_discr_class.get(class_name)

modules/openapi-generator/src/main/resources/python/python-experimental/model_utils.mustache

@@ -591,7 +591,7 @@ def deserialize_model(model_data, model_class, path_to_item, check_type,
                    _from_server=from_server)
 
     used_model_class = model_class
-    if model_class.discriminator is not None:
+    if model_class.discriminator() is not None:
         used_model_class = model_class.get_discriminator_class(
             from_server, model_data)
 

modules/openapi-generator/src/test/resources/2_0/python-client-experimental/petstore-with-fake-endpoints-models-for-testing.yaml

@@ -2071,9 +2071,10 @@ definitions:
         type: string
   ParentPet:
     type: object
-    discriminator: pet_type
     allOf:
     - $ref: '#/definitions/GrandparentAnimal'
+    - type: object
+      discriminator: pet_type
   ChildCat:
     allOf:
     - $ref: '#/definitions/ParentPet'

samples/client/petstore/python-experimental/petstore_api/model_utils.py

@@ -844,7 +844,7 @@ def deserialize_model(model_data, model_class, path_to_item, check_type,
                    _from_server=from_server)
 
     used_model_class = model_class
-    if model_class.discriminator is not None:
+    if model_class.discriminator() is not None:
         used_model_class = model_class.get_discriminator_class(
             from_server, model_data)
 

samples/client/petstore/python-experimental/petstore_api/models/additional_properties_any_type.py

@@ -68,7 +68,9 @@ class AdditionalPropertiesAnyType(ModelNormal):
 
     additional_properties_type = (bool, date, datetime, dict, float, int, list, str,)  # noqa: E501
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'name': 'name',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/additional_properties_array.py

@@ -68,7 +68,9 @@ class AdditionalPropertiesArray(ModelNormal):
 
     additional_properties_type = ([bool, date, datetime, dict, float, int, list, str],)  # noqa: E501
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'name': 'name',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/additional_properties_boolean.py

@@ -68,7 +68,9 @@ class AdditionalPropertiesBoolean(ModelNormal):
 
     additional_properties_type = (bool,)  # noqa: E501
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'name': 'name',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py

@@ -78,7 +78,9 @@ class AdditionalPropertiesClass(ModelNormal):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'map_string': 'map_string',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/additional_properties_integer.py

@@ -68,7 +68,9 @@ class AdditionalPropertiesInteger(ModelNormal):
 
     additional_properties_type = (int,)  # noqa: E501
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'name': 'name',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/additional_properties_number.py

@@ -68,7 +68,9 @@ class AdditionalPropertiesNumber(ModelNormal):
 
     additional_properties_type = (float,)  # noqa: E501
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'name': 'name',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/additional_properties_object.py

@@ -68,7 +68,9 @@ class AdditionalPropertiesObject(ModelNormal):
 
     additional_properties_type = ({str: (bool, date, datetime, dict, float, int, list, str,)},)  # noqa: E501
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'name': 'name',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/additional_properties_string.py

@@ -68,7 +68,9 @@ class AdditionalPropertiesString(ModelNormal):
 
     additional_properties_type = (str,)  # noqa: E501
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'name': 'name',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/animal.py

@@ -77,12 +77,14 @@ class Animal(ModelNormal):
 
     additional_properties_type = None
 
-    discriminator = {
-      'class_name': {
-          'Cat': cat.Cat,
-          'Dog': dog.Dog,
-      },
-    }
+    @staticmethod
+    def discriminator():
+        return {
+            'class_name': {
+                'Cat': cat.Cat,
+                'Dog': dog.Dog,
+            },
+        }
 
     attribute_map = {
         'class_name': 'className',  # noqa: E501
@@ -137,11 +139,12 @@ def __init__(self, class_name, _check_type=True, _from_server=False, _path_to_it
     @classmethod
     def get_discriminator_class(cls, from_server, data):
         """Returns the child class specified by the discriminator"""
-        discr_propertyname_py = list(cls.discriminator.keys())[0]
+        discriminator = cls.discriminator()
+        discr_propertyname_py = list(discriminator.keys())[0]
         discr_propertyname_js = cls.attribute_map[discr_propertyname_py]
         if from_server:
             class_name = data[discr_propertyname_js]
         else:
             class_name = data[discr_propertyname_py]
-        class_name_to_discr_class = cls.discriminator[discr_propertyname_py]
+        class_name_to_discr_class = discriminator[discr_propertyname_py]
         return class_name_to_discr_class.get(class_name)

samples/client/petstore/python-experimental/petstore_api/models/api_response.py

@@ -70,7 +70,9 @@ class ApiResponse(ModelNormal):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'code': 'code',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py

@@ -68,7 +68,9 @@ class ArrayOfArrayOfNumberOnly(ModelNormal):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'array_array_number': 'ArrayArrayNumber',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py

@@ -68,7 +68,9 @@ class ArrayOfNumberOnly(ModelNormal):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'array_number': 'ArrayNumber',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/array_test.py

@@ -74,7 +74,9 @@ class ArrayTest(ModelNormal):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'array_of_string': 'array_of_string',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/capitalization.py

@@ -73,7 +73,9 @@ class Capitalization(ModelNormal):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'small_camel': 'smallCamel',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/cat.py

@@ -78,7 +78,9 @@ class Cat(ModelComposed):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'class_name': 'className',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/cat_all_of.py

@@ -68,7 +68,9 @@ class CatAllOf(ModelNormal):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'declawed': 'declawed',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/category.py

@@ -69,7 +69,9 @@ class Category(ModelNormal):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'name': 'name',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/child.py

@@ -78,7 +78,9 @@ class Child(ModelComposed):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'radio_waves': 'radioWaves',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/child_all_of.py

@@ -68,7 +68,9 @@ class ChildAllOf(ModelNormal):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'inter_net': 'interNet',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/child_cat.py

@@ -77,7 +77,9 @@ class ChildCat(ModelComposed):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'pet_type': 'pet_type',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/child_cat_all_of.py

@@ -68,7 +68,9 @@ class ChildCatAllOf(ModelNormal):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'name': 'name',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/child_dog.py

@@ -77,7 +77,9 @@ class ChildDog(ModelComposed):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'pet_type': 'pet_type',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/child_dog_all_of.py

@@ -68,7 +68,9 @@ class ChildDogAllOf(ModelNormal):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'bark': 'bark',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/child_lizard.py

@@ -77,7 +77,9 @@ class ChildLizard(ModelComposed):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'pet_type': 'pet_type',  # noqa: E501

samples/client/petstore/python-experimental/petstore_api/models/child_lizard_all_of.py

@@ -68,7 +68,9 @@ class ChildLizardAllOf(ModelNormal):
 
     additional_properties_type = None
 
-    discriminator = None
+    @staticmethod
+    def discriminator():
+        return None
 
     attribute_map = {
         'loves_rocks': 'lovesRocks',  # noqa: E501