Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds *args input to __init__ method to fix test testFruitNullValue #21

Merged
merged 1 commit into from
May 25, 2020
Merged

Adds *args input to __init__ method to fix test testFruitNullValue #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/openapi-generator/src/main/resources/python/python-experimental/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import six # noqa: F401
import nulltype # noqa: F401

from {{packageName}}.model_utils import ( # noqa: F401
ApiTypeError,
ModelComposed,
ModelNormal,
ModelSimple,
Expand Down
23 changes: 22 additions & 1 deletion ...src/main/resources/python/python-experimental/model_templates/method_init_shared.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@convert_js_args_to_python_args
def __init__(self{{#requiredVars}}{{^defaultValue}}, {{name}}{{/defaultValue}}{{/requiredVars}}{{#requiredVars}}{{#defaultValue}}, {{name}}={{{defaultValue}}}{{/defaultValue}}{{/requiredVars}}, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs): # noqa: E501
def __init__(self{{#requiredVars}}{{^defaultValue}}, {{name}}{{/defaultValue}}{{/requiredVars}}, *args, **kwargs): # noqa: E501
"""{{classname}} - a model defined in OpenAPI

{{#requiredVars}}
Expand Down Expand Up @@ -54,6 +54,27 @@
{{/optionalVars}}
"""

{{#requiredVars}}
{{#defaultValue}}
{{name}} = kwargs.get('{{name}}', {{{defaultValue}}})
{{/defaultValue}}
{{/requiredVars}}
_check_type = kwargs.pop('_check_type', True)
_spec_property_naming = kwargs.pop('_spec_property_naming', False)
_path_to_item = kwargs.pop('_path_to_item', ())
_configuration = kwargs.pop('_configuration', None)
_visited_composed_classes = kwargs.pop('_visited_composed_classes', ())

if args:
raise ApiTypeError(
"Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
args,
self.__class__.__name__,
),
path_to_item=_path_to_item,
valid_classes=(self.__class__,),
)

self._data_store = {}
self._check_type = _check_type
self._spec_property_naming = _spec_property_naming
Expand Down
19 changes: 18 additions & 1 deletion ...i3/client/petstore/python-experimental/petstore_api/models/additional_properties_class.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import nulltype # noqa: F401

from petstore_api.model_utils import ( # noqa: F401
ApiTypeError,
ModelComposed,
ModelNormal,
ModelSimple,
Expand Down Expand Up @@ -116,7 +117,7 @@ def discriminator():
])

@convert_js_args_to_python_args
def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs): # noqa: E501
def __init__(self, *args, **kwargs): # noqa: E501
"""additional_properties_class.AdditionalPropertiesClass - a model defined in OpenAPI

Keyword Args:
Expand Down Expand Up @@ -160,6 +161,22 @@ def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=
map_with_undeclared_properties_string ({str: (str,)}): [optional] # noqa: E501
"""

_check_type = kwargs.pop('_check_type', True)
_spec_property_naming = kwargs.pop('_spec_property_naming', False)
_path_to_item = kwargs.pop('_path_to_item', ())
_configuration = kwargs.pop('_configuration', None)
_visited_composed_classes = kwargs.pop('_visited_composed_classes', ())

if args:
raise ApiTypeError(
"Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
args,
self.__class__.__name__,
),
path_to_item=_path_to_item,
valid_classes=(self.__class__,),
)

self._data_store = {}
self._check_type = _check_type
self._spec_property_naming = _spec_property_naming
Expand Down
19 changes: 18 additions & 1 deletion samples/openapi3/client/petstore/python-experimental/petstore_api/models/address.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import nulltype # noqa: F401

from petstore_api.model_utils import ( # noqa: F401
ApiTypeError,
ModelComposed,
ModelNormal,
ModelSimple,
Expand Down Expand Up @@ -100,7 +101,7 @@ def discriminator():
])

@convert_js_args_to_python_args
def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs): # noqa: E501
def __init__(self, *args, **kwargs): # noqa: E501
"""address.Address - a model defined in OpenAPI

Keyword Args:
Expand Down Expand Up @@ -136,6 +137,22 @@ def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=
_visited_composed_classes = (Animal,)
"""

_check_type = kwargs.pop('_check_type', True)
_spec_property_naming = kwargs.pop('_spec_property_naming', False)
_path_to_item = kwargs.pop('_path_to_item', ())
_configuration = kwargs.pop('_configuration', None)
_visited_composed_classes = kwargs.pop('_visited_composed_classes', ())

if args:
raise ApiTypeError(
"Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
args,
self.__class__.__name__,
),
path_to_item=_path_to_item,
valid_classes=(self.__class__,),
)

self._data_store = {}
self._check_type = _check_type
self._spec_property_naming = _spec_property_naming
Expand Down
19 changes: 18 additions & 1 deletion samples/openapi3/client/petstore/python-experimental/petstore_api/models/animal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import nulltype # noqa: F401

from petstore_api.model_utils import ( # noqa: F401
ApiTypeError,
ModelComposed,
ModelNormal,
ModelSimple,
Expand Down Expand Up @@ -120,7 +121,7 @@ def discriminator():
])

@convert_js_args_to_python_args
def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs): # noqa: E501
def __init__(self, class_name, *args, **kwargs): # noqa: E501
"""animal.Animal - a model defined in OpenAPI

Args:
Expand Down Expand Up @@ -160,6 +161,22 @@ def __init__(self, class_name, _check_type=True, _spec_property_naming=False, _p
color (str): [optional] if omitted the server will use the default value of 'red' # noqa: E501
"""

_check_type = kwargs.pop('_check_type', True)
_spec_property_naming = kwargs.pop('_spec_property_naming', False)
_path_to_item = kwargs.pop('_path_to_item', ())
_configuration = kwargs.pop('_configuration', None)
_visited_composed_classes = kwargs.pop('_visited_composed_classes', ())

if args:
raise ApiTypeError(
"Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
args,
self.__class__.__name__,
),
path_to_item=_path_to_item,
valid_classes=(self.__class__,),
)

self._data_store = {}
self._check_type = _check_type
self._spec_property_naming = _spec_property_naming
Expand Down
19 changes: 18 additions & 1 deletion samples/openapi3/client/petstore/python-experimental/petstore_api/models/api_response.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import nulltype # noqa: F401

from petstore_api.model_utils import ( # noqa: F401
ApiTypeError,
ModelComposed,
ModelNormal,
ModelSimple,
Expand Down Expand Up @@ -106,7 +107,7 @@ def discriminator():
])

@convert_js_args_to_python_args
def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs): # noqa: E501
def __init__(self, *args, **kwargs): # noqa: E501
"""api_response.ApiResponse - a model defined in OpenAPI

Keyword Args:
Expand Down Expand Up @@ -145,6 +146,22 @@ def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=
message (str): [optional] # noqa: E501
"""

_check_type = kwargs.pop('_check_type', True)
_spec_property_naming = kwargs.pop('_spec_property_naming', False)
_path_to_item = kwargs.pop('_path_to_item', ())
_configuration = kwargs.pop('_configuration', None)
_visited_composed_classes = kwargs.pop('_visited_composed_classes', ())

if args:
raise ApiTypeError(
"Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
args,
self.__class__.__name__,
),
path_to_item=_path_to_item,
valid_classes=(self.__class__,),
)

self._data_store = {}
self._check_type = _check_type
self._spec_property_naming = _spec_property_naming
Expand Down
19 changes: 18 additions & 1 deletion samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import nulltype # noqa: F401

from petstore_api.model_utils import ( # noqa: F401
ApiTypeError,
ModelComposed,
ModelNormal,
ModelSimple,
Expand Down Expand Up @@ -115,7 +116,7 @@ def discriminator():
])

@convert_js_args_to_python_args
def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs): # noqa: E501
def __init__(self, *args, **kwargs): # noqa: E501
"""apple.Apple - a model defined in OpenAPI

Keyword Args:
Expand Down Expand Up @@ -153,6 +154,22 @@ def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=
origin (str): [optional] # noqa: E501
"""

_check_type = kwargs.pop('_check_type', True)
_spec_property_naming = kwargs.pop('_spec_property_naming', False)
_path_to_item = kwargs.pop('_path_to_item', ())
_configuration = kwargs.pop('_configuration', None)
_visited_composed_classes = kwargs.pop('_visited_composed_classes', ())

if args:
raise ApiTypeError(
"Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
args,
self.__class__.__name__,
),
path_to_item=_path_to_item,
valid_classes=(self.__class__,),
)

self._data_store = {}
self._check_type = _check_type
self._spec_property_naming = _spec_property_naming
Expand Down
19 changes: 18 additions & 1 deletion samples/openapi3/client/petstore/python-experimental/petstore_api/models/apple_req.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import nulltype # noqa: F401

from petstore_api.model_utils import ( # noqa: F401
ApiTypeError,
ModelComposed,
ModelNormal,
ModelSimple,
Expand Down Expand Up @@ -104,7 +105,7 @@ def discriminator():
])

@convert_js_args_to_python_args
def __init__(self, cultivar, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs): # noqa: E501
def __init__(self, cultivar, *args, **kwargs): # noqa: E501
"""apple_req.AppleReq - a model defined in OpenAPI

Args:
Expand Down Expand Up @@ -144,6 +145,22 @@ def __init__(self, cultivar, _check_type=True, _spec_property_naming=False, _pat
mealy (bool): [optional] # noqa: E501
"""

_check_type = kwargs.pop('_check_type', True)
_spec_property_naming = kwargs.pop('_spec_property_naming', False)
_path_to_item = kwargs.pop('_path_to_item', ())
_configuration = kwargs.pop('_configuration', None)
_visited_composed_classes = kwargs.pop('_visited_composed_classes', ())

if args:
raise ApiTypeError(
"Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
args,
self.__class__.__name__,
),
path_to_item=_path_to_item,
valid_classes=(self.__class__,),
)

self._data_store = {}
self._check_type = _check_type
self._spec_property_naming = _spec_property_naming
Expand Down
19 changes: 18 additions & 1 deletion .../client/petstore/python-experimental/petstore_api/models/array_of_array_of_number_only.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import nulltype # noqa: F401

from petstore_api.model_utils import ( # noqa: F401
ApiTypeError,
ModelComposed,
ModelNormal,
ModelSimple,
Expand Down Expand Up @@ -102,7 +103,7 @@ def discriminator():
])

@convert_js_args_to_python_args
def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs): # noqa: E501
def __init__(self, *args, **kwargs): # noqa: E501
"""array_of_array_of_number_only.ArrayOfArrayOfNumberOnly - a model defined in OpenAPI

Keyword Args:
Expand Down Expand Up @@ -139,6 +140,22 @@ def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=
array_array_number ([[float]]): [optional] # noqa: E501
"""

_check_type = kwargs.pop('_check_type', True)
_spec_property_naming = kwargs.pop('_spec_property_naming', False)
_path_to_item = kwargs.pop('_path_to_item', ())
_configuration = kwargs.pop('_configuration', None)
_visited_composed_classes = kwargs.pop('_visited_composed_classes', ())

if args:
raise ApiTypeError(
"Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
args,
self.__class__.__name__,
),
path_to_item=_path_to_item,
valid_classes=(self.__class__,),
)

self._data_store = {}
self._check_type = _check_type
self._spec_property_naming = _spec_property_naming
Expand Down
19 changes: 18 additions & 1 deletion .../openapi3/client/petstore/python-experimental/petstore_api/models/array_of_number_only.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import nulltype # noqa: F401

from petstore_api.model_utils import ( # noqa: F401
ApiTypeError,
ModelComposed,
ModelNormal,
ModelSimple,
Expand Down Expand Up @@ -102,7 +103,7 @@ def discriminator():
])

@convert_js_args_to_python_args
def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=(), _configuration=None, _visited_composed_classes=(), **kwargs): # noqa: E501
def __init__(self, *args, **kwargs): # noqa: E501
"""array_of_number_only.ArrayOfNumberOnly - a model defined in OpenAPI

Keyword Args:
Expand Down Expand Up @@ -139,6 +140,22 @@ def __init__(self, _check_type=True, _spec_property_naming=False, _path_to_item=
array_number ([float]): [optional] # noqa: E501
"""

_check_type = kwargs.pop('_check_type', True)
_spec_property_naming = kwargs.pop('_spec_property_naming', False)
_path_to_item = kwargs.pop('_path_to_item', ())
_configuration = kwargs.pop('_configuration', None)
_visited_composed_classes = kwargs.pop('_visited_composed_classes', ())

if args:
raise ApiTypeError(
"Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
args,
self.__class__.__name__,
),
path_to_item=_path_to_item,
valid_classes=(self.__class__,),
)

self._data_store = {}
self._check_type = _check_type
self._spec_property_naming = _spec_property_naming
Expand Down
Loading