This commit is contained in:
Tony Tam 2015-03-31 16:12:42 -07:00
parent cd2c8f6527
commit 6ac497d774
22 changed files with 151 additions and 122 deletions

View File

@ -28,4 +28,4 @@ fi
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/objc -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -o samples/client/petstore/objc" ags="$@ generate -t modules/swagger-codegen/src/main/resources/objc -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -o samples/client/petstore/objc"
java -DdebugModels -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags

13
pom.xml
View File

@ -278,6 +278,18 @@
</build> </build>
</profile> </profile>
<!-- Samples --> <!-- Samples -->
<profile>
<id>android-client</id>
<activation>
<property>
<name>env</name>
<value>java</value>
</property>
</activation>
<modules>
<module>samples/client/petstore/android-java</module>
</modules>
</profile>
<profile> <profile>
<id>java-client</id> <id>java-client</id>
<activation> <activation>
@ -335,6 +347,7 @@
</property> </property>
</activation> </activation>
<modules> <modules>
<module>samples/client/petstore/android-java</module>
<module>samples/client/petstore/java</module> <module>samples/client/petstore/java</module>
<module>samples/server/petstore/jaxrs</module> <module>samples/server/petstore/jaxrs</module>
<module>samples/client/petstore/objc</module> <module>samples/client/petstore/objc</module>

View File

@ -14,7 +14,7 @@ public class Category {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("id") @JsonProperty("id")
public Long getId() { public Long getId() {
return id; return id;
@ -26,7 +26,7 @@ public class Category {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("name") @JsonProperty("name")
public String getName() { public String getName() {
return name; return name;

View File

@ -22,7 +22,7 @@ public class Order {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("id") @JsonProperty("id")
public Long getId() { public Long getId() {
return id; return id;
@ -34,7 +34,7 @@ public class Order {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("petId") @JsonProperty("petId")
public Long getPetId() { public Long getPetId() {
return petId; return petId;
@ -46,7 +46,7 @@ public class Order {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("quantity") @JsonProperty("quantity")
public Integer getQuantity() { public Integer getQuantity() {
return quantity; return quantity;
@ -58,7 +58,7 @@ public class Order {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("shipDate") @JsonProperty("shipDate")
public Date getShipDate() { public Date getShipDate() {
return shipDate; return shipDate;
@ -71,7 +71,7 @@ public class Order {
/** /**
* Order Status * Order Status
**/ **/
@ApiModelProperty(required = false, value = "Order Status") @ApiModelProperty(value = "Order Status")
@JsonProperty("status") @JsonProperty("status")
public StatusEnum getStatus() { public StatusEnum getStatus() {
return status; return status;
@ -83,7 +83,7 @@ public class Order {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("complete") @JsonProperty("complete")
public Boolean getComplete() { public Boolean getComplete() {
return complete; return complete;

View File

@ -24,7 +24,7 @@ public class Pet {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("id") @JsonProperty("id")
public Long getId() { public Long getId() {
return id; return id;
@ -36,7 +36,7 @@ public class Pet {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("category") @JsonProperty("category")
public Category getCategory() { public Category getCategory() {
return category; return category;
@ -72,7 +72,7 @@ public class Pet {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("tags") @JsonProperty("tags")
public List<Tag> getTags() { public List<Tag> getTags() {
return tags; return tags;
@ -85,7 +85,7 @@ public class Pet {
/** /**
* pet status in the store * pet status in the store
**/ **/
@ApiModelProperty(required = false, value = "pet status in the store") @ApiModelProperty(value = "pet status in the store")
@JsonProperty("status") @JsonProperty("status")
public StatusEnum getStatus() { public StatusEnum getStatus() {
return status; return status;

View File

@ -14,7 +14,7 @@ public class Tag {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("id") @JsonProperty("id")
public Long getId() { public Long getId() {
return id; return id;
@ -26,7 +26,7 @@ public class Tag {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("name") @JsonProperty("name")
public String getName() { public String getName() {
return name; return name;

View File

@ -20,7 +20,7 @@ public class User {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("id") @JsonProperty("id")
public Long getId() { public Long getId() {
return id; return id;
@ -32,7 +32,7 @@ public class User {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("username") @JsonProperty("username")
public String getUsername() { public String getUsername() {
return username; return username;
@ -44,7 +44,7 @@ public class User {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("firstName") @JsonProperty("firstName")
public String getFirstName() { public String getFirstName() {
return firstName; return firstName;
@ -56,7 +56,7 @@ public class User {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("lastName") @JsonProperty("lastName")
public String getLastName() { public String getLastName() {
return lastName; return lastName;
@ -68,7 +68,7 @@ public class User {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("email") @JsonProperty("email")
public String getEmail() { public String getEmail() {
return email; return email;
@ -80,7 +80,7 @@ public class User {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("password") @JsonProperty("password")
public String getPassword() { public String getPassword() {
return password; return password;
@ -92,7 +92,7 @@ public class User {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("phone") @JsonProperty("phone")
public String getPhone() { public String getPhone() {
return phone; return phone;
@ -105,7 +105,7 @@ public class User {
/** /**
* User Status * User Status
**/ **/
@ApiModelProperty(required = false, value = "User Status") @ApiModelProperty(value = "User Status")
@JsonProperty("userStatus") @JsonProperty("userStatus")
public Integer getUserStatus() { public Integer getUserStatus() {
return userStatus; return userStatus;

View File

@ -14,7 +14,7 @@ public class Category {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("id") @JsonProperty("id")
public Long getId() { public Long getId() {
return id; return id;
@ -26,7 +26,7 @@ public class Category {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("name") @JsonProperty("name")
public String getName() { public String getName() {
return name; return name;

View File

@ -22,7 +22,7 @@ public class Order {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("id") @JsonProperty("id")
public Long getId() { public Long getId() {
return id; return id;
@ -34,7 +34,7 @@ public class Order {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("petId") @JsonProperty("petId")
public Long getPetId() { public Long getPetId() {
return petId; return petId;
@ -46,7 +46,7 @@ public class Order {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("quantity") @JsonProperty("quantity")
public Integer getQuantity() { public Integer getQuantity() {
return quantity; return quantity;
@ -58,7 +58,7 @@ public class Order {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("shipDate") @JsonProperty("shipDate")
public Date getShipDate() { public Date getShipDate() {
return shipDate; return shipDate;
@ -71,7 +71,7 @@ public class Order {
/** /**
* Order Status * Order Status
**/ **/
@ApiModelProperty(required = false, value = "Order Status") @ApiModelProperty(value = "Order Status")
@JsonProperty("status") @JsonProperty("status")
public StatusEnum getStatus() { public StatusEnum getStatus() {
return status; return status;
@ -83,7 +83,7 @@ public class Order {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("complete") @JsonProperty("complete")
public Boolean getComplete() { public Boolean getComplete() {
return complete; return complete;

View File

@ -24,7 +24,7 @@ public class Pet {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("id") @JsonProperty("id")
public Long getId() { public Long getId() {
return id; return id;
@ -36,7 +36,7 @@ public class Pet {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("category") @JsonProperty("category")
public Category getCategory() { public Category getCategory() {
return category; return category;
@ -72,7 +72,7 @@ public class Pet {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("tags") @JsonProperty("tags")
public List<Tag> getTags() { public List<Tag> getTags() {
return tags; return tags;
@ -85,7 +85,7 @@ public class Pet {
/** /**
* pet status in the store * pet status in the store
**/ **/
@ApiModelProperty(required = false, value = "pet status in the store") @ApiModelProperty(value = "pet status in the store")
@JsonProperty("status") @JsonProperty("status")
public StatusEnum getStatus() { public StatusEnum getStatus() {
return status; return status;

View File

@ -14,7 +14,7 @@ public class Tag {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("id") @JsonProperty("id")
public Long getId() { public Long getId() {
return id; return id;
@ -26,7 +26,7 @@ public class Tag {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("name") @JsonProperty("name")
public String getName() { public String getName() {
return name; return name;

View File

@ -20,7 +20,7 @@ public class User {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("id") @JsonProperty("id")
public Long getId() { public Long getId() {
return id; return id;
@ -32,7 +32,7 @@ public class User {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("username") @JsonProperty("username")
public String getUsername() { public String getUsername() {
return username; return username;
@ -44,7 +44,7 @@ public class User {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("firstName") @JsonProperty("firstName")
public String getFirstName() { public String getFirstName() {
return firstName; return firstName;
@ -56,7 +56,7 @@ public class User {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("lastName") @JsonProperty("lastName")
public String getLastName() { public String getLastName() {
return lastName; return lastName;
@ -68,7 +68,7 @@ public class User {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("email") @JsonProperty("email")
public String getEmail() { public String getEmail() {
return email; return email;
@ -80,7 +80,7 @@ public class User {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("password") @JsonProperty("password")
public String getPassword() { public String getPassword() {
return password; return password;
@ -92,7 +92,7 @@ public class User {
/** /**
**/ **/
@ApiModelProperty(required = false, value = "") @ApiModelProperty(value = "")
@JsonProperty("phone") @JsonProperty("phone")
public String getPhone() { public String getPhone() {
return phone; return phone;
@ -105,7 +105,7 @@ public class User {
/** /**
* User Status * User Status
**/ **/
@ApiModelProperty(required = false, value = "User Status") @ApiModelProperty(value = "User Status")
@JsonProperty("userStatus") @JsonProperty("userStatus")
public Integer getUserStatus() { public Integer getUserStatus() {
return userStatus; return userStatus;

View File

@ -19,6 +19,7 @@ NOTE: This class is auto generated by the swagger code generator program. Do not
""" """
import sys import sys
import os import os
import urllib
from models import * from models import *
@ -61,8 +62,8 @@ class PetApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = 'application/json,application/xml'; headerParams['Content-Type'] = 'application/json,application/xml'
@ -117,8 +118,8 @@ class PetApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = 'application/json,application/xml'; headerParams['Content-Type'] = 'application/json,application/xml'
@ -173,8 +174,8 @@ class PetApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = ''; headerParams['Content-Type'] = ''
if ('status' in params): if ('status' in params):
@ -235,8 +236,8 @@ class PetApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = ''; headerParams['Content-Type'] = ''
if ('tags' in params): if ('tags' in params):
@ -297,8 +298,8 @@ class PetApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = ''; headerParams['Content-Type'] = ''
@ -307,6 +308,7 @@ class PetApi(object):
if ('petId' in params): if ('petId' in params):
replacement = str(self.apiClient.toPathValue(params['petId'])) replacement = str(self.apiClient.toPathValue(params['petId']))
replacement = urllib.quote(replacement)
resourcePath = resourcePath.replace('{' + 'petId' + '}', resourcePath = resourcePath.replace('{' + 'petId' + '}',
replacement) replacement)
@ -367,8 +369,8 @@ class PetApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = 'application/x-www-form-urlencoded'; headerParams['Content-Type'] = 'application/x-www-form-urlencoded'
@ -377,6 +379,7 @@ class PetApi(object):
if ('petId' in params): if ('petId' in params):
replacement = str(self.apiClient.toPathValue(params['petId'])) replacement = str(self.apiClient.toPathValue(params['petId']))
replacement = urllib.quote(replacement)
resourcePath = resourcePath.replace('{' + 'petId' + '}', resourcePath = resourcePath.replace('{' + 'petId' + '}',
replacement) replacement)
@ -434,8 +437,8 @@ class PetApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = ''; headerParams['Content-Type'] = ''
@ -447,6 +450,7 @@ class PetApi(object):
if ('petId' in params): if ('petId' in params):
replacement = str(self.apiClient.toPathValue(params['petId'])) replacement = str(self.apiClient.toPathValue(params['petId']))
replacement = urllib.quote(replacement)
resourcePath = resourcePath.replace('{' + 'petId' + '}', resourcePath = resourcePath.replace('{' + 'petId' + '}',
replacement) replacement)
@ -501,8 +505,8 @@ class PetApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = 'multipart/form-data'; headerParams['Content-Type'] = 'multipart/form-data'
@ -511,6 +515,7 @@ class PetApi(object):
if ('petId' in params): if ('petId' in params):
replacement = str(self.apiClient.toPathValue(params['petId'])) replacement = str(self.apiClient.toPathValue(params['petId']))
replacement = urllib.quote(replacement)
resourcePath = resourcePath.replace('{' + 'petId' + '}', resourcePath = resourcePath.replace('{' + 'petId' + '}',
replacement) replacement)

View File

@ -19,6 +19,7 @@ NOTE: This class is auto generated by the swagger code generator program. Do not
""" """
import sys import sys
import os import os
import urllib
from models import * from models import *
@ -58,8 +59,8 @@ class StoreApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = ''; headerParams['Content-Type'] = ''
@ -117,8 +118,8 @@ class StoreApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = ''; headerParams['Content-Type'] = ''
@ -179,8 +180,8 @@ class StoreApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = ''; headerParams['Content-Type'] = ''
@ -189,6 +190,7 @@ class StoreApi(object):
if ('orderId' in params): if ('orderId' in params):
replacement = str(self.apiClient.toPathValue(params['orderId'])) replacement = str(self.apiClient.toPathValue(params['orderId']))
replacement = urllib.quote(replacement)
resourcePath = resourcePath.replace('{' + 'orderId' + '}', resourcePath = resourcePath.replace('{' + 'orderId' + '}',
replacement) replacement)
@ -243,8 +245,8 @@ class StoreApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = ''; headerParams['Content-Type'] = ''
@ -253,6 +255,7 @@ class StoreApi(object):
if ('orderId' in params): if ('orderId' in params):
replacement = str(self.apiClient.toPathValue(params['orderId'])) replacement = str(self.apiClient.toPathValue(params['orderId']))
replacement = urllib.quote(replacement)
resourcePath = resourcePath.replace('{' + 'orderId' + '}', resourcePath = resourcePath.replace('{' + 'orderId' + '}',
replacement) replacement)

View File

@ -19,6 +19,7 @@ NOTE: This class is auto generated by the swagger code generator program. Do not
""" """
import sys import sys
import os import os
import urllib
from models import * from models import *
@ -61,8 +62,8 @@ class UserApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = ''; headerParams['Content-Type'] = ''
@ -117,8 +118,8 @@ class UserApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = ''; headerParams['Content-Type'] = ''
@ -173,8 +174,8 @@ class UserApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = ''; headerParams['Content-Type'] = ''
@ -232,8 +233,8 @@ class UserApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = ''; headerParams['Content-Type'] = ''
if ('username' in params): if ('username' in params):
@ -294,8 +295,8 @@ class UserApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = ''; headerParams['Content-Type'] = ''
@ -347,8 +348,8 @@ class UserApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = ''; headerParams['Content-Type'] = ''
@ -357,6 +358,7 @@ class UserApi(object):
if ('username' in params): if ('username' in params):
replacement = str(self.apiClient.toPathValue(params['username'])) replacement = str(self.apiClient.toPathValue(params['username']))
replacement = urllib.quote(replacement)
resourcePath = resourcePath.replace('{' + 'username' + '}', resourcePath = resourcePath.replace('{' + 'username' + '}',
replacement) replacement)
@ -414,8 +416,8 @@ class UserApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = ''; headerParams['Content-Type'] = ''
@ -424,6 +426,7 @@ class UserApi(object):
if ('username' in params): if ('username' in params):
replacement = str(self.apiClient.toPathValue(params['username'])) replacement = str(self.apiClient.toPathValue(params['username']))
replacement = urllib.quote(replacement)
resourcePath = resourcePath.replace('{' + 'username' + '}', resourcePath = resourcePath.replace('{' + 'username' + '}',
replacement) replacement)
@ -475,8 +478,8 @@ class UserApi(object):
files = {} files = {}
bodyParam = None bodyParam = None
headerParams['Accept'] = 'application/json,application/xml'; headerParams['Accept'] = 'application/json,application/xml'
headerParams['Content-Type'] = ''; headerParams['Content-Type'] = ''
@ -485,6 +488,7 @@ class UserApi(object):
if ('username' in params): if ('username' in params):
replacement = str(self.apiClient.toPathValue(params['username'])) replacement = str(self.apiClient.toPathValue(params['username']))
replacement = urllib.quote(replacement)
resourcePath = resourcePath.replace('{' + 'username' + '}', resourcePath = resourcePath.replace('{' + 'username' + '}',
replacement) replacement)

View File

@ -28,23 +28,27 @@ class ApiClient(object):
headerValue: a header value to pass when making calls to the API headerValue: a header value to pass when making calls to the API
""" """
def __init__(self, host=None, headerName=None, headerValue=None): def __init__(self, host=None, headerName=None, headerValue=None):
self.headerName = headerName self.defaultHeaders = {}
self.headerValue = headerValue if (headerName is not None):
self.defaultHeaders[headerName] = headerValue
self.host = host self.host = host
self.cookie = None self.cookie = None
self.boundary = ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(30)) self.boundary = ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(30))
def setDefaultHeader(self, headerName, headerValue):
self.defaultHeaders[headerName] = headerValue
def callAPI(self, resourcePath, method, queryParams, postData, def callAPI(self, resourcePath, method, queryParams, postData,
headerParams=None, files=None): headerParams=None, files=None):
url = self.host + resourcePath url = self.host + resourcePath
headers = {}
if headerParams:
for param, value in headerParams.iteritems():
headers[param] = ApiClient.sanitizeForSerialization(value)
if self.headerName: mergedHeaderParams = self.defaultHeaders.copy()
headers[self.headerName] = ApiClient.sanitizeForSerialization(self.headerValue) mergedHeaderParams.update(headerParams)
headers = {}
if mergedHeaderParams:
for param, value in mergedHeaderParams.iteritems():
headers[param] = ApiClient.sanitizeForSerialization(value)
if self.cookie: if self.cookie:
headers['Cookie'] = ApiClient.sanitizeForSerialization(self.cookie) headers['Cookie'] = ApiClient.sanitizeForSerialization(self.cookie)
@ -103,9 +107,9 @@ class ApiClient(object):
string -- quoted value string -- quoted value
""" """
if type(obj) == list: if type(obj) == list:
return urllib.quote(','.join(obj)) return ','.join(obj)
else: else:
return urllib.quote(str(obj)) return str(obj)
@staticmethod @staticmethod
def sanitizeForSerialization(obj): def sanitizeForSerialization(obj):

View File

@ -2,13 +2,13 @@
<h2>Category</h2> <h2>Category</h2>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">id : Long <li class="param-required-">id : Long
<br/> <br/>
</li> </li>
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">name : String <li class="param-required-">name : String
<br/> <br/>
</li> </li>
</ul> </ul>

View File

@ -2,37 +2,37 @@
<h2>Order</h2> <h2>Order</h2>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">id : Long <li class="param-required-">id : Long
<br/> <br/>
</li> </li>
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">petId : Long <li class="param-required-">petId : Long
<br/> <br/>
</li> </li>
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">quantity : Integer <li class="param-required-">quantity : Integer
<br/> <br/>
</li> </li>
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">shipDate : Date <li class="param-required-">shipDate : Date
<br/> <br/>
</li> </li>
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">status : String <li class="param-required-">status : String
<br/>Order Status <br/>Order Status
</li> </li>
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">complete : Boolean <li class="param-required-">complete : Boolean
<br/> <br/>
</li> </li>
</ul> </ul>

View File

@ -2,13 +2,13 @@
<h2>Pet</h2> <h2>Pet</h2>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">id : Long <li class="param-required-">id : Long
<br/> <br/>
</li> </li>
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">category : Category <li class="param-required-">category : Category
<br/> <br/>
</li> </li>
</ul> </ul>
@ -26,13 +26,13 @@
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">tags : List <li class="param-required-">tags : List
<br/> <br/>
</li> </li>
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">status : String <li class="param-required-">status : String
<br/>pet status in the store <br/>pet status in the store
</li> </li>
</ul> </ul>

View File

@ -2,13 +2,13 @@
<h2>Tag</h2> <h2>Tag</h2>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">id : Long <li class="param-required-">id : Long
<br/> <br/>
</li> </li>
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">name : String <li class="param-required-">name : String
<br/> <br/>
</li> </li>
</ul> </ul>

View File

@ -2,49 +2,49 @@
<h2>User</h2> <h2>User</h2>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">id : Long <li class="param-required-">id : Long
<br/> <br/>
</li> </li>
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">username : String <li class="param-required-">username : String
<br/> <br/>
</li> </li>
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">firstName : String <li class="param-required-">firstName : String
<br/> <br/>
</li> </li>
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">lastName : String <li class="param-required-">lastName : String
<br/> <br/>
</li> </li>
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">email : String <li class="param-required-">email : String
<br/> <br/>
</li> </li>
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">password : String <li class="param-required-">password : String
<br/> <br/>
</li> </li>
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">phone : String <li class="param-required-">phone : String
<br/> <br/>
</li> </li>
</ul> </ul>
<ul class="parameter"> <ul class="parameter">
<li class="param-required-false">userStatus : Integer <li class="param-required-">userStatus : Integer
<br/>User Status <br/>User Status
</li> </li>
</ul> </ul>

View File

@ -420,7 +420,7 @@
<h3 class="field-label">Example data</h3> <h3 class="field-label">Example data</h3>
<div class="example-data-content-type">Content-Type: application/xml</div> <div class="example-data-content-type">Content-Type: application/xml</div>
<pre class="example"><code>not implemented com.wordnik.swagger.models.properties.MapProperty@64e17c9c</code></pre> <pre class="example"><code>not implemented com.wordnik.swagger.models.properties.MapProperty@12e335ef</code></pre>
</div> <!-- method --> </div> <!-- method -->
<hr> <hr>
@ -444,11 +444,11 @@
<h3 class="field-label">Example data</h3> <h3 class="field-label">Example data</h3>
<div class="example-data-content-type">Content-Type: application/json</div> <div class="example-data-content-type">Content-Type: application/json</div>
<pre class="example"><code>{\n "id" : 123456789,\n "petId" : 123456789,\n "complete" : true,\n "status" : "aeiou",\n "quantity" : 123,\n "shipDate" : "2015-03-30T01:51:23.181+0000"\n}</code></pre> <pre class="example"><code>{\n "id" : 123456789,\n "petId" : 123456789,\n "complete" : true,\n "status" : "aeiou",\n "quantity" : 123,\n "shipDate" : "2015-03-31T23:09:59.239+0000"\n}</code></pre>
<h3 class="field-label">Example data</h3> <h3 class="field-label">Example data</h3>
<div class="example-data-content-type">Content-Type: application/xml</div> <div class="example-data-content-type">Content-Type: application/xml</div>
<pre class="example"><code><Order>\n <id>123456</id>\n <petId>123456</petId>\n <quantity>0</quantity>\n <shipDate>2015-03-29T18:51:23.183Z</shipDate>\n <status>string</status>\n <complete>true</complete>\n</Order></code></pre> <pre class="example"><code><Order>\n <id>123456</id>\n <petId>123456</petId>\n <quantity>0</quantity>\n <shipDate>2015-03-31T16:09:59.242Z</shipDate>\n <status>string</status>\n <complete>true</complete>\n</Order></code></pre>
</div> <!-- method --> </div> <!-- method -->
<hr> <hr>
@ -472,11 +472,11 @@
<h3 class="field-label">Example data</h3> <h3 class="field-label">Example data</h3>
<div class="example-data-content-type">Content-Type: application/json</div> <div class="example-data-content-type">Content-Type: application/json</div>
<pre class="example"><code>{\n "id" : 123456789,\n "petId" : 123456789,\n "complete" : true,\n "status" : "aeiou",\n "quantity" : 123,\n "shipDate" : "2015-03-30T01:51:23.184+0000"\n}</code></pre> <pre class="example"><code>{\n "id" : 123456789,\n "petId" : 123456789,\n "complete" : true,\n "status" : "aeiou",\n "quantity" : 123,\n "shipDate" : "2015-03-31T23:09:59.243+0000"\n}</code></pre>
<h3 class="field-label">Example data</h3> <h3 class="field-label">Example data</h3>
<div class="example-data-content-type">Content-Type: application/xml</div> <div class="example-data-content-type">Content-Type: application/xml</div>
<pre class="example"><code><Order>\n <id>123456</id>\n <petId>123456</petId>\n <quantity>0</quantity>\n <shipDate>2015-03-29T18:51:23.185Z</shipDate>\n <status>string</status>\n <complete>true</complete>\n</Order></code></pre> <pre class="example"><code><Order>\n <id>123456</id>\n <petId>123456</petId>\n <quantity>0</quantity>\n <shipDate>2015-03-31T16:09:59.243Z</shipDate>\n <status>string</status>\n <complete>true</complete>\n</Order></code></pre>
</div> <!-- method --> </div> <!-- method -->
<hr> <hr>