loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge pull request #2418 from scottrw93/i2410

Browse Source 
Issue 2410: Suport HTTP body for DELETE operation
This commit is contained in:
wing328 2016-04-09 16:58:01 +08:00
commit e8c3b5e78c
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/swagger-codegen/src/main/resources/python/api_client.mustache
View File

@ -371,7 +371,8 @@ class ApiClient(object):
elif method == "DELETE": elif method == "DELETE":
return self.rest_client.DELETE(url, return self.rest_client.DELETE(url,
query_params=query_params, query_params=query_params,
headers=headers) headers=headers,
body=body)
else: else:
raise ValueError( raise ValueError(
"http method must be `GET`, `HEAD`," "http method must be `GET`, `HEAD`,"

11
modules/swagger-codegen/src/main/resources/python/rest.mustache
View File

@ -133,8 +133,8 @@ class RESTClientObject(object):
headers['Content-Type'] = 'application/json' headers['Content-Type'] = 'application/json'
try: try:
# For `POST`, `PUT`, `PATCH`, `OPTIONS` # For `POST`, `PUT`, `PATCH`, `OPTIONS`, `DELETE`
if method in ['POST', 'PUT', 'PATCH', 'OPTIONS']: if method in ['POST', 'PUT', 'PATCH', 'OPTIONS', 'DELETE']:
if query_params: if query_params:
url += '?' + urlencode(query_params) url += '?' + urlencode(query_params)
if headers['Content-Type'] == 'application/json': if headers['Content-Type'] == 'application/json':
@ -154,7 +154,7 @@ class RESTClientObject(object):
fields=post_params, fields=post_params,
encode_multipart=True, encode_multipart=True,
headers=headers) headers=headers)
# For `GET`, `HEAD`, `DELETE` # For `GET`, `HEAD`
else: else:
r = self.pool_manager.request(method, url, r = self.pool_manager.request(method, url,
fields=query_params, fields=query_params,
@ -195,10 +195,11 @@ class RESTClientObject(object):
post_params=post_params, post_params=post_params,
body=body) body=body)
def DELETE(self, url, headers=None, query_params=None): def DELETE(self, url, headers=None, query_params=None, body=None):
return self.request("DELETE", url, return self.request("DELETE", url,
headers=headers, headers=headers,
query_params=query_params) query_params=query_params,
body=body)
def POST(self, url, headers=None, query_params=None, post_params=None, body=None): def POST(self, url, headers=None, query_params=None, post_params=None, body=None):
return self.request("POST", url, return self.request("POST", url,

3
samples/client/petstore/python/swagger_client/api_client.py
View File

@ -371,7 +371,8 @@ class ApiClient(object):
elif method == "DELETE": elif method == "DELETE":
return self.rest_client.DELETE(url, return self.rest_client.DELETE(url,
query_params=query_params, query_params=query_params,
headers=headers) headers=headers,
body=body)
else: else:
raise ValueError( raise ValueError(
"http method must be `GET`, `HEAD`," "http method must be `GET`, `HEAD`,"

11
samples/client/petstore/python/swagger_client/rest.py
View File

@ -133,8 +133,8 @@ class RESTClientObject(object):
headers['Content-Type'] = 'application/json' headers['Content-Type'] = 'application/json'
try: try:
# For `POST`, `PUT`, `PATCH`, `OPTIONS` # For `POST`, `PUT`, `PATCH`, `OPTIONS`, `DELETE`
if method in ['POST', 'PUT', 'PATCH', 'OPTIONS']: if method in ['POST', 'PUT', 'PATCH', 'OPTIONS', 'DELETE']:
if query_params: if query_params:
url += '?' + urlencode(query_params) url += '?' + urlencode(query_params)
if headers['Content-Type'] == 'application/json': if headers['Content-Type'] == 'application/json':
@ -154,7 +154,7 @@ class RESTClientObject(object):
fields=post_params, fields=post_params,
encode_multipart=True, encode_multipart=True,
headers=headers) headers=headers)
# For `GET`, `HEAD`, `DELETE` # For `GET`, `HEAD`
else: else:
r = self.pool_manager.request(method, url, r = self.pool_manager.request(method, url,
fields=query_params, fields=query_params,
@ -195,10 +195,11 @@ class RESTClientObject(object):
post_params=post_params, post_params=post_params,
body=body) body=body)
def DELETE(self, url, headers=None, query_params=None): def DELETE(self, url, headers=None, query_params=None, body=None):
return self.request("DELETE", url, return self.request("DELETE", url,
headers=headers, headers=headers,
query_params=query_params) query_params=query_params,
body=body)
def POST(self, url, headers=None, query_params=None, post_params=None, body=None): def POST(self, url, headers=None, query_params=None, post_params=None, body=None):
return self.request("POST", url, return self.request("POST", url,