Skip to content

Commit 377174f

Browse files
frantumafrantuma
authored
Merge pull request #9136 from swagger-api/feature/7722-liberate-defaultgenerator
change DefaultGenerator members visibility - ref #7722
2 parents f4d59b5 + 82176f1 commit 377174f

File tree

13 files changed

+84
-116
lines changed

13 files changed

+84
-116
lines changed

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java

Lines changed: 59 additions & 60 deletions
Large diffs are not rendered by default.

‎modules/swagger-codegen/src/main/resources/python/api_client.mustache

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ class ApiClient(object):
598598
)
599599

600600
def __hasattr(self, object, name):
601-
return name in object.__class__.__dict__
601+
return name in object.__class__.__dict__
602602

603603
def __deserialize_model(self, data, klass):
604604
"""Deserializes list or dict to model.
@@ -608,7 +608,8 @@ class ApiClient(object):
608608
:return: model object.
609609
"""
610610

611-
if not klass.swagger_types and not self.__hasattr(klass, 'get_real_child_model'):
611+
if (not klass.swagger_types and
612+
not self.__hasattr(klass, 'get_real_child_model')):
612613
return data
613614

614615
kwargs = {}

‎samples/client/petstore-security-test/python/petstore_api/api_client.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,8 @@ def __deserialize_model(self, data, klass):
602602
:return: model object.
603603
"""
604604

605-
if not klass.swagger_types and not self.__hasattr(klass, 'get_real_child_model'):
605+
if not klass.swagger_types and not \
606+
self.__hasattr(klass, 'get_real_child_model'):
606607
return data
607608

608609
kwargs = {}

‎samples/client/petstore/python-asyncio/.swagger-codegen/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.0-SNAPSHOT
1+
2.4.2-SNAPSHOT

‎samples/client/petstore/python-asyncio/petstore_api/api_client.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,9 @@ def __deserialize_datatime(self, string):
591591
)
592592
)
593593

594+
def __hasattr(self, object, name):
595+
return name in object.__class__.__dict__
596+
594597
def __deserialize_model(self, data, klass):
595598
"""Deserializes list or dict to model.
596599
@@ -599,8 +602,8 @@ def __deserialize_model(self, data, klass):
599602
:return: model object.
600603
"""
601604

602-
if not klass.swagger_types and not hasattr(klass,
603-
'get_real_child_model'):
605+
if (not klass.swagger_types and
606+
not self.__hasattr(klass, 'get_real_child_model')):
604607
return data
605608

606609
kwargs = {}
@@ -620,7 +623,7 @@ def __deserialize_model(self, data, klass):
620623
for key, value in data.items():
621624
if key not in klass.swagger_types:
622625
instance[key] = value
623-
if hasattr(instance, 'get_real_child_model'):
626+
if self.__hasattr(instance, 'get_real_child_model'):
624627
klass_name = instance.get_real_child_model(data)
625628
if klass_name:
626629
instance = self.__deserialize(data, klass_name)

‎samples/client/petstore/python-tornado/.swagger-codegen/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.0-SNAPSHOT
1+
2.4.2-SNAPSHOT

‎samples/client/petstore/python-tornado/petstore_api/api_client.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,9 @@ def __deserialize_datatime(self, string):
593593
)
594594
)
595595

596+
def __hasattr(self, object, name):
597+
return name in object.__class__.__dict__
598+
596599
def __deserialize_model(self, data, klass):
597600
"""Deserializes list or dict to model.
598601
@@ -601,8 +604,8 @@ def __deserialize_model(self, data, klass):
601604
:return: model object.
602605
"""
603606

604-
if not klass.swagger_types and not hasattr(klass,
605-
'get_real_child_model'):
607+
if (not klass.swagger_types and
608+
not self.__hasattr(klass, 'get_real_child_model')):
606609
return data
607610

608611
kwargs = {}
@@ -622,7 +625,7 @@ def __deserialize_model(self, data, klass):
622625
for key, value in data.items():
623626
if key not in klass.swagger_types:
624627
instance[key] = value
625-
if hasattr(instance, 'get_real_child_model'):
628+
if self.__hasattr(instance, 'get_real_child_model'):
626629
klass_name = instance.get_real_child_model(data)
627630
if klass_name:
628631
instance = self.__deserialize(data, klass_name)

‎samples/client/petstore/python/.swagger-codegen/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.0-SNAPSHOT
1+
2.4.2-SNAPSHOT

‎samples/client/petstore/python/petstore_api/api_client.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ def __deserialize_datatime(self, string):
592592
)
593593

594594
def __hasattr(self, object, name):
595-
return name in object.__class__.__dict__
595+
return name in object.__class__.__dict__
596596

597597
def __deserialize_model(self, data, klass):
598598
"""Deserializes list or dict to model.
@@ -602,7 +602,8 @@ def __deserialize_model(self, data, klass):
602602
:return: model object.
603603
"""
604604

605-
if not klass.swagger_types and not self.__hasattr(klass, 'get_real_child_model'):
605+
if (not klass.swagger_types and
606+
not self.__hasattr(klass, 'get_real_child_model')):
606607
return data
607608

608609
kwargs = {}

‎samples/server/petstore/flaskConnexion-python2/.swagger-codegen/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.0-SNAPSHOT
1+
2.4.2-SNAPSHOT

0 commit comments

Comments
 (0)