Merge pull request #9136 from swagger-api/feature/7722-liberate-defau…

…ltgenerator change DefaultGenerator members visibility - ref #7722
swagger-api · Jan 30, 2019 · 377174f · 377174f
2 parents f4d59b5 + 82176f1
commit 377174f
Show file tree

Hide file tree

Showing 13 changed files with 84 additions and 116 deletions.
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
diff --git a/modules/swagger-codegen/src/main/resources/python/api_client.mustache b/modules/swagger-codegen/src/main/resources/python/api_client.mustache
@@ -598,7 +598,7 @@ class ApiClient(object):
  )
 
  def __hasattr(self, object, name):
-  return name in object.__class__.__dict__
+ return name in object.__class__.__dict__
 
  def __deserialize_model(self, data, klass):
  """Deserializes list or dict to model.
@@ -608,7 +608,8 @@ class ApiClient(object):
  :return: model object.
  """
 
- if not klass.swagger_types and not self.__hasattr(klass, 'get_real_child_model'):
+ if (not klass.swagger_types and
+ not self.__hasattr(klass, 'get_real_child_model')):
  return data
 
  kwargs = {}

diff --git a/samples/client/petstore-security-test/python/petstore_api/api_client.py b/samples/client/petstore-security-test/python/petstore_api/api_client.py
@@ -602,7 +602,8 @@ def __deserialize_model(self, data, klass):
  :return: model object.
  """
 
- if not klass.swagger_types and not self.__hasattr(klass, 'get_real_child_model'):
+ if not klass.swagger_types and not \
+ self.__hasattr(klass, 'get_real_child_model'):
  return data
 
  kwargs = {}

diff --git a/samples/client/petstore/python-asyncio/.swagger-codegen/VERSION b/samples/client/petstore/python-asyncio/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.0-SNAPSHOT
+2.4.2-SNAPSHOT
diff --git a/samples/client/petstore/python-asyncio/petstore_api/api_client.py b/samples/client/petstore/python-asyncio/petstore_api/api_client.py
@@ -591,6 +591,9 @@ def __deserialize_datatime(self, string):
  )
  )
 
+ def __hasattr(self, object, name):
+ return name in object.__class__.__dict__
+
  def __deserialize_model(self, data, klass):
  """Deserializes list or dict to model.
 
@@ -599,8 +602,8 @@ def __deserialize_model(self, data, klass):
  :return: model object.
  """
 
- if not klass.swagger_types and not hasattr(klass,
-  'get_real_child_model'):
+ if (not klass.swagger_types and
+ not self.__hasattr(klass, 'get_real_child_model')):
  return data
 
  kwargs = {}
@@ -620,7 +623,7 @@ def __deserialize_model(self, data, klass):
  for key, value in data.items():
  if key not in klass.swagger_types:
  instance[key] = value
- if hasattr(instance, 'get_real_child_model'):
+ if self.__hasattr(instance, 'get_real_child_model'):
  klass_name = instance.get_real_child_model(data)
  if klass_name:
  instance = self.__deserialize(data, klass_name)

diff --git a/samples/client/petstore/python-tornado/.swagger-codegen/VERSION b/samples/client/petstore/python-tornado/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.0-SNAPSHOT
+2.4.2-SNAPSHOT
diff --git a/samples/client/petstore/python-tornado/petstore_api/api_client.py b/samples/client/petstore/python-tornado/petstore_api/api_client.py
@@ -593,6 +593,9 @@ def __deserialize_datatime(self, string):
  )
  )
 
+ def __hasattr(self, object, name):
+ return name in object.__class__.__dict__
+
  def __deserialize_model(self, data, klass):
  """Deserializes list or dict to model.
 
@@ -601,8 +604,8 @@ def __deserialize_model(self, data, klass):
  :return: model object.
  """
 
- if not klass.swagger_types and not hasattr(klass,
-  'get_real_child_model'):
+ if (not klass.swagger_types and
+ not self.__hasattr(klass, 'get_real_child_model')):
  return data
 
  kwargs = {}
@@ -622,7 +625,7 @@ def __deserialize_model(self, data, klass):
  for key, value in data.items():
  if key not in klass.swagger_types:
  instance[key] = value
- if hasattr(instance, 'get_real_child_model'):
+ if self.__hasattr(instance, 'get_real_child_model'):
  klass_name = instance.get_real_child_model(data)
  if klass_name:
  instance = self.__deserialize(data, klass_name)

diff --git a/samples/client/petstore/python/.swagger-codegen/VERSION b/samples/client/petstore/python/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.0-SNAPSHOT
+2.4.2-SNAPSHOT
diff --git a/samples/client/petstore/python/petstore_api/api_client.py b/samples/client/petstore/python/petstore_api/api_client.py
@@ -592,7 +592,7 @@ def __deserialize_datatime(self, string):
  )
 
  def __hasattr(self, object, name):
-  return name in object.__class__.__dict__
+ return name in object.__class__.__dict__
 
  def __deserialize_model(self, data, klass):
  """Deserializes list or dict to model.
@@ -602,7 +602,8 @@ def __deserialize_model(self, data, klass):
  :return: model object.
  """
 
- if not klass.swagger_types and not self.__hasattr(klass, 'get_real_child_model'):
+ if (not klass.swagger_types and
+ not self.__hasattr(klass, 'get_real_child_model')):
  return data
 
  kwargs = {}

diff --git a/samples/server/petstore/flaskConnexion-python2/.swagger-codegen/VERSION b/samples/server/petstore/flaskConnexion-python2/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.0-SNAPSHOT
+2.4.2-SNAPSHOT
diff --git a/samples/server/petstore/flaskConnexion-python2/swagger_server/swagger/swagger.yaml b/samples/server/petstore/flaskConnexion-python2/swagger_server/swagger/swagger.yaml
@@ -59,7 +59,6 @@ paths:
  - "write:pets"
  - "read:pets"
  x-swagger-router-controller: "swagger_server.controllers.pet_controller"
- x-is-post-method: true
  put:
  tags:
  - "pet"
@@ -91,7 +90,6 @@ paths:
  - "write:pets"
  - "read:pets"
  x-swagger-router-controller: "swagger_server.controllers.pet_controller"
- x-is-put-method: true
  /pet/findByStatus:
  get:
  tags:
@@ -130,7 +128,6 @@ paths:
  - "write:pets"
  - "read:pets"
  x-swagger-router-controller: "swagger_server.controllers.pet_controller"
- x-is-get-method: true
  /pet/findByTags:
  get:
  tags:
@@ -166,7 +163,6 @@ paths:
  - "read:pets"
  deprecated: true
  x-swagger-router-controller: "swagger_server.controllers.pet_controller"
- x-is-get-method: true
  /pet/{petId}:
  get:
  tags:
@@ -196,7 +192,6 @@ paths:
  security:
  - api_key: []
  x-swagger-router-controller: "swagger_server.controllers.pet_controller"
- x-is-get-method: true
  post:
  tags:
  - "pet"
@@ -233,7 +228,6 @@ paths:
  - "write:pets"
  - "read:pets"
  x-swagger-router-controller: "swagger_server.controllers.pet_controller"
- x-is-post-method: true
  delete:
  tags:
  - "pet"
@@ -262,7 +256,6 @@ paths:
  - "write:pets"
  - "read:pets"
  x-swagger-router-controller: "swagger_server.controllers.pet_controller"
- x-is-delete-method: true
  /pet/{petId}/uploadImage:
  post:
  tags:
@@ -301,7 +294,6 @@ paths:
  - "write:pets"
  - "read:pets"
  x-swagger-router-controller: "swagger_server.controllers.pet_controller"
- x-is-post-method: true
  /store/inventory:
  get:
  tags:
@@ -323,7 +315,6 @@ paths:
  security:
  - api_key: []
  x-swagger-router-controller: "swagger_server.controllers.store_controller"
- x-is-get-method: true
  /store/order:
  post:
  tags:
@@ -349,7 +340,6 @@ paths:
  400:
  description: "Invalid Order"
  x-swagger-router-controller: "swagger_server.controllers.store_controller"
- x-is-post-method: true
  /store/order/{orderId}:
  get:
  tags:
@@ -380,7 +370,6 @@ paths:
  404:
  description: "Order not found"
  x-swagger-router-controller: "swagger_server.controllers.store_controller"
- x-is-get-method: true
  delete:
  tags:
  - "store"
@@ -403,7 +392,6 @@ paths:
  404:
  description: "Order not found"
  x-swagger-router-controller: "swagger_server.controllers.store_controller"
- x-is-delete-method: true
  /user:
  post:
  tags:
@@ -425,7 +413,6 @@ paths:
  default:
  description: "successful operation"
  x-swagger-router-controller: "swagger_server.controllers.user_controller"
- x-is-post-method: true
  /user/createWithArray:
  post:
  tags:
@@ -449,7 +436,6 @@ paths:
  default:
  description: "successful operation"
  x-swagger-router-controller: "swagger_server.controllers.user_controller"
- x-is-post-method: true
  /user/createWithList:
  post:
  tags:
@@ -473,7 +459,6 @@ paths:
  default:
  description: "successful operation"
  x-swagger-router-controller: "swagger_server.controllers.user_controller"
- x-is-post-method: true
  /user/login:
  get:
  tags:
@@ -512,7 +497,6 @@ paths:
  400:
  description: "Invalid username/password supplied"
  x-swagger-router-controller: "swagger_server.controllers.user_controller"
- x-is-get-method: true
  /user/logout:
  get:
  tags:
@@ -528,7 +512,6 @@ paths:
  default:
  description: "successful operation"
  x-swagger-router-controller: "swagger_server.controllers.user_controller"
- x-is-get-method: true
  /user/{username}:
  get:
  tags:
@@ -555,7 +538,6 @@ paths:
  404:
  description: "User not found"
  x-swagger-router-controller: "swagger_server.controllers.user_controller"
- x-is-get-method: true
  put:
  tags:
  - "user"
@@ -583,7 +565,6 @@ paths:
  404:
  description: "User not found"
  x-swagger-router-controller: "swagger_server.controllers.user_controller"
- x-is-put-method: true
  delete:
  tags:
  - "user"
@@ -605,7 +586,6 @@ paths:
  404:
  description: "User not found"
  x-swagger-router-controller: "swagger_server.controllers.user_controller"
- x-is-delete-method: true
 securityDefinitions:
  petstore_auth:
  type: "oauth2"

diff --git a/samples/server/petstore/flaskConnexion/.swagger-codegen/VERSION b/samples/server/petstore/flaskConnexion/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.0-SNAPSHOT
+2.4.2-SNAPSHOT