Temporarily stop using discriminator logics for the inheritance

It may be re-enable when we pull updates from openapi-generator project

Author: Zafer Genckaya

docs/TeamResponder.md

@@ -3,6 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**type** | **str** |  | 
+**id** | **str** |  | 
 **name** | **str** |  | [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)

docs/UserResponder.md

@@ -3,7 +3,8 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**id** | **str** |  | [optional] 
+**type** | **str** |  | 
+**id** | **str** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

opsgenie-oas.json

@@ -4518,7 +4518,6 @@
     "Responder": {
       "x-opsgenie-domain": "common",
       "type": "object",
-      "discriminator": "type",
       "required": [
         "type",
         "id"
@@ -4538,7 +4537,6 @@
     },
     "UserResponder": {
       "x-opsgenie-domain": "common",
-      "x-discriminator-value": "user",
       "description": "User responder",
       "allOf": [
         {
@@ -4556,7 +4554,6 @@
     },
     "TeamResponder": {
       "x-opsgenie-domain": "common",
-      "x-discriminator-value": "team",
       "description": "Team responder",
       "allOf": [
         {

opsgenie-oas.yml

@@ -9217,8 +9217,6 @@ components:
           - team
         id:
           type: string
-      discriminator:
-        propertyName: type
       x-opsgenie-domain: common
     AssignAlertPayload:
       allOf:
@@ -9239,7 +9237,6 @@ components:
           id:
             type: string
       x-opsgenie-domain: common
-      x-discriminator-value: user
     AddTagsToAlertPayload:
       allOf:
       - $ref: '#/components/schemas/AlertActionPayload'
@@ -9337,7 +9334,6 @@ components:
           name:
             type: string
       x-opsgenie-domain: common
-      x-discriminator-value: team
     WeekdayTimeRestrictionInterval:
       description: Weekday time restriction interval
       allOf:

opsgenie_sdk/models/responder.py

@@ -41,17 +41,12 @@ class Responder(object):
         'id': 'id'
     }
 
-    discriminator_value_class_map = {
-        'user': 'UserResponder',
-        'team': 'TeamResponder'
-    }
-
     def __init__(self, type=None, id=None):  # noqa: E501
         """Responder - a model defined in OpenAPI"""  # noqa: E501
 
         self._type = None
         self._id = None
-        self.discriminator = 'type'
+        self.discriminator = None
 
         self.type = type
         self.id = id
@@ -108,12 +103,6 @@ def id(self, id):
 
         self._id = id
 
-    def get_real_child_model(self, data):
-        """Returns the real base class specified by the discriminator"""
-        discriminator_key = self.attribute_map[self.discriminator]
-        discriminator_value = data[discriminator_key]
-        return self.discriminator_value_class_map.get(discriminator_value)
-
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

opsgenie_sdk/models/team_responder.py

@@ -32,22 +32,82 @@ class TeamResponder(object):
                             and the value is json key in definition.
     """
     openapi_types = {
+        'type': 'str',
+        'id': 'str',
         'name': 'str'
     }
 
     attribute_map = {
+        'type': 'type',
+        'id': 'id',
         'name': 'name'
     }
 
-    def __init__(self, name=None):  # noqa: E501
+    def __init__(self, type=None, id=None, name=None):  # noqa: E501
         """TeamResponder - a model defined in OpenAPI"""  # noqa: E501
 
+        self._type = None
+        self._id = None
         self._name = None
         self.discriminator = None
 
+        self.type = type
+        self.id = id
         if name is not None:
             self.name = name
 
+    @property
+    def type(self):
+        """Gets the type of this TeamResponder.  # noqa: E501
+
+
+        :return: The type of this TeamResponder.  # noqa: E501
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this TeamResponder.
+
+
+        :param type: The type of this TeamResponder.  # noqa: E501
+        :type: str
+        """
+        if type is None:
+            raise ValueError("Invalid value for `type`, must not be `None`")  # noqa: E501
+        allowed_values = ["user", "team"]  # noqa: E501
+        if type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `type` ({0}), must be one of {1}"  # noqa: E501
+                .format(type, allowed_values)
+            )
+
+        self._type = type
+
+    @property
+    def id(self):
+        """Gets the id of this TeamResponder.  # noqa: E501
+
+
+        :return: The id of this TeamResponder.  # noqa: E501
+        :rtype: str
+        """
+        return self._id
+
+    @id.setter
+    def id(self, id):
+        """Sets the id of this TeamResponder.
+
+
+        :param id: The id of this TeamResponder.  # noqa: E501
+        :type: str
+        """
+        if id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
+
+        self._id = id
+
     @property
     def name(self):
         """Gets the name of this TeamResponder.  # noqa: E501

opsgenie_sdk/models/user_responder.py

@@ -32,21 +32,53 @@ class UserResponder(object):
                             and the value is json key in definition.
     """
     openapi_types = {
+        'type': 'str',
         'id': 'str'
     }
 
     attribute_map = {
+        'type': 'type',
         'id': 'id'
     }
 
-    def __init__(self, id=None):  # noqa: E501
+    def __init__(self, type=None, id=None):  # noqa: E501
         """UserResponder - a model defined in OpenAPI"""  # noqa: E501
 
+        self._type = None
         self._id = None
         self.discriminator = None
 
-        if id is not None:
-            self.id = id
+        self.type = type
+        self.id = id
+
+    @property
+    def type(self):
+        """Gets the type of this UserResponder.  # noqa: E501
+
+
+        :return: The type of this UserResponder.  # noqa: E501
+        :rtype: str
+        """
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        """Sets the type of this UserResponder.
+
+
+        :param type: The type of this UserResponder.  # noqa: E501
+        :type: str
+        """
+        if type is None:
+            raise ValueError("Invalid value for `type`, must not be `None`")  # noqa: E501
+        allowed_values = ["user", "team"]  # noqa: E501
+        if type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `type` ({0}), must be one of {1}"  # noqa: E501
+                .format(type, allowed_values)
+            )
+
+        self._type = type
 
     @property
     def id(self):
@@ -66,6 +98,8 @@ def id(self, id):
         :param id: The id of this UserResponder.  # noqa: E501
         :type: str
         """
+        if id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
 
         self._id = id