[Rust][Client] Code format (#2042)

Rust clients code format cleanup (with some breaking changes for model structures):

* Application of Rust style in client files (4 spaces padding). Remove useless blank lines.
* Replace getters/setters in models by public fields.
* Add a trailing comma in struct fields.
* Sample Rust clients regeneration.
This commit is contained in:
Benoît Courtine 2019-02-13 01:51:16 +01:00 committed by Benjamin Gill
parent ea08106c80
commit b6c2266a14
33 changed files with 402 additions and 1526 deletions

View File

@ -4,14 +4,14 @@ use hyper;
use super::configuration::Configuration; use super::configuration::Configuration;
pub struct APIClient<C: hyper::client::Connect> { pub struct APIClient<C: hyper::client::Connect> {
configuration: Rc<Configuration<C>>, configuration: Rc<Configuration<C>>,
{{#apiInfo}} {{#apiInfo}}
{{#apis}} {{#apis}}
{{#operations}} {{#operations}}
{{#operation}} {{#operation}}
{{#-last}} {{#-last}}
{{{classFilename}}}: Box<::apis::{{{classname}}}>, {{{classFilename}}}: Box<::apis::{{{classname}}}>,
{{/-last}} {{/-last}}
{{/operation}} {{/operation}}
{{/operations}} {{/operations}}
{{/apis}} {{/apis}}
@ -19,38 +19,37 @@ pub struct APIClient<C: hyper::client::Connect> {
} }
impl<C: hyper::client::Connect> APIClient<C> { impl<C: hyper::client::Connect> APIClient<C> {
pub fn new(configuration: Configuration<C>) -> APIClient<C> { pub fn new(configuration: Configuration<C>) -> APIClient<C> {
let rc = Rc::new(configuration); let rc = Rc::new(configuration);
APIClient { APIClient {
configuration: rc.clone(), configuration: rc.clone(),
{{#apiInfo}} {{#apiInfo}}
{{#apis}} {{#apis}}
{{#operations}} {{#operations}}
{{#operation}} {{#operation}}
{{#-last}} {{#-last}}
{{{classFilename}}}: Box::new(::apis::{{{classname}}}Client::new(rc.clone())), {{{classFilename}}}: Box::new(::apis::{{{classname}}}Client::new(rc.clone())),
{{/-last}} {{/-last}}
{{/operation}} {{/operation}}
{{/operations}} {{/operations}}
{{/apis}} {{/apis}}
{{/apiInfo}} {{/apiInfo}}
}
} }
}
{{#apiInfo}} {{#apiInfo}}
{{#apis}} {{#apis}}
{{#operations}} {{#operations}}
{{#operation}} {{#operation}}
{{#-last}} {{#-last}}
pub fn {{{classFilename}}}(&self) -> &::apis::{{{classname}}}{ pub fn {{{classFilename}}}(&self) -> &::apis::{{{classname}}}{
self.{{{classFilename}}}.as_ref() self.{{{classFilename}}}.as_ref()
} }
{{/-last}} {{/-last}}
{{/operation}} {{/operation}}
{{/operations}} {{/operations}}
{{/apis}} {{/apis}}
{{/apiInfo}} {{/apiInfo}}
} }

View File

@ -3,31 +3,31 @@ use hyper;
use std::collections::HashMap; use std::collections::HashMap;
pub struct Configuration<C: hyper::client::Connect> { pub struct Configuration<C: hyper::client::Connect> {
pub base_path: String, pub base_path: String,
pub user_agent: Option<String>, pub user_agent: Option<String>,
pub client: hyper::client::Client<C>, pub client: hyper::client::Client<C>,
pub basic_auth: Option<BasicAuth>, pub basic_auth: Option<BasicAuth>,
pub oauth_access_token: Option<String>, pub oauth_access_token: Option<String>,
pub api_key: Option<ApiKey>, pub api_key: Option<ApiKey>,
// TODO: take an oauth2 token source, similar to the go one // TODO: take an oauth2 token source, similar to the go one
} }
pub type BasicAuth = (String, Option<String>); pub type BasicAuth = (String, Option<String>);
pub struct ApiKey { pub struct ApiKey {
pub prefix: Option<String>, pub prefix: Option<String>,
pub key: String, pub key: String,
} }
impl<C: hyper::client::Connect> Configuration<C> { impl<C: hyper::client::Connect> Configuration<C> {
pub fn new(client: hyper::client::Client<C>) -> Configuration<C> { pub fn new(client: hyper::client::Client<C>) -> Configuration<C> {
Configuration { Configuration {
base_path: "{{{basePath}}}".to_owned(), base_path: "{{{basePath}}}".to_owned(),
user_agent: {{#httpUserAgent}}Some("{{{.}}}".to_owned()){{/httpUserAgent}}{{^httpUserAgent}}Some("OpenAPI-Generator/{{{version}}}/rust".to_owned()){{/httpUserAgent}}, user_agent: {{#httpUserAgent}}Some("{{{.}}}".to_owned()){{/httpUserAgent}}{{^httpUserAgent}}Some("OpenAPI-Generator/{{{version}}}/rust".to_owned()){{/httpUserAgent}},
client: client, client: client,
basic_auth: None, basic_auth: None,
oauth_access_token: None, oauth_access_token: None,
api_key: None, api_key: None,
}
} }
}
} }

View File

@ -11,61 +11,36 @@ use serde_json::Value;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct {{{classname}}} { pub struct {{{classname}}} {
{{#vars}} {{#vars}}
{{#description}} {{#description}}
/// {{{description}}} /// {{{description}}}
{{/description}} {{/description}}
#[serde(rename = "{{{baseName}}}")] #[serde(rename = "{{{baseName}}}")]
{{{name}}}: {{^required}}Option<{{/required}}{{{dataType}}}{{^required}}>{{/required}}{{#hasMore}},{{/hasMore}} pub {{{name}}}: {{^required}}Option<{{/required}}{{{dataType}}}{{^required}}>{{/required}},
{{/vars}} {{/vars}}
} }
impl {{{classname}}} { impl {{{classname}}} {
{{#description}} {{#description}}
/// {{{description}}} /// {{{description}}}
{{/description}} {{/description}}
pub fn new({{#requiredVars}}{{{name}}}: {{{dataType}}}{{^-last}}, {{/-last}}{{/requiredVars}}) -> {{{classname}}} { pub fn new({{#requiredVars}}{{{name}}}: {{{dataType}}}{{^-last}}, {{/-last}}{{/requiredVars}}) -> {{{classname}}} {
{{{classname}}} { {{{classname}}} {
{{#vars}} {{#vars}}
{{{name}}}: {{#required}}{{{name}}}{{/required}}{{^required}}{{#isListContainer}}None{{/isListContainer}}{{#isMapContainer}}None{{/isMapContainer}}{{^isContainer}}None{{/isContainer}}{{/required}}{{#hasMore}},{{/hasMore}} {{{name}}}: {{#required}}{{{name}}}{{/required}}{{^required}}{{#isListContainer}}None{{/isListContainer}}{{#isMapContainer}}None{{/isMapContainer}}{{^isContainer}}None{{/isContainer}}{{/required}},
{{/vars}} {{/vars}}
}
} }
}
{{#vars}}
pub fn set_{{{name}}}(&mut self, {{{name}}}: {{{dataType}}}) {
self.{{{name}}} = {{^required}}Some({{{name}}}){{/required}}{{#required}}{{{name}}}{{/required}};
}
pub fn with_{{{name}}}(mut self, {{{name}}}: {{{dataType}}}) -> {{{classname}}} {
self.{{{name}}} = {{^required}}Some({{{name}}}){{/required}}{{#required}}{{{name}}}{{/required}};
self
}
pub fn {{{name}}}(&self) -> {{^required}}Option<{{/required}}&{{{dataType}}}{{^required}}>{{/required}} {
{{#required}}&{{/required}}self.{{{name}}}{{^required}}.as_ref(){{/required}}
}
{{^required}}
pub fn reset_{{{name}}}(&mut self) {
self.{{{name}}} = None;
}
{{/required}}
{{/vars}}
} }
{{#isEnum}} {{#isEnum}}
// TODO enum // TODO enum
// List of {{{name}}} // List of {{{name}}}
//const ( //const (
// {{#allowableValues}} // {{#allowableValues}}
// {{#enumVars}} // {{#enumVars}}
// {{{name}}} {{{classname}}} = "{{{value}}}" // {{{name}}} {{{classname}}} = "{{{value}}}"
// {{/enumVars}} // {{/enumVars}}
// {{/allowableValues}} // {{/allowableValues}}
//) //)
{{/isEnum}} {{/isEnum}}
{{/model}} {{/model}}
{{/models}} {{/models}}

View File

@ -4,6 +4,3 @@ mod {{{classFilename}}};
pub use self::{{{classFilename}}}::{{{classname}}}; pub use self::{{{classFilename}}}::{{{classname}}};
{{/model}} {{/model}}
{{/models}} {{/models}}
// TODO(farcaller): sort out files
pub struct File;

View File

@ -39,7 +39,10 @@ impl {{{classname}}} for {{{classname}}}Client {
{{#queryParams}} {{#queryParams}}
req_builder = req_builder.query(&[("{{{baseName}}}", &{{{paramName}}}{{#isListContainer}}.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(","){{/isListContainer}}.to_string())]); req_builder = req_builder.query(&[("{{{baseName}}}", &{{{paramName}}}{{#isListContainer}}.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(","){{/isListContainer}}.to_string())]);
{{/queryParams}} {{/queryParams}}
{{#hasAuthMethods}}{{#authMethods}}{{#isApiKey}}{{#isKeyInQuery}} {{#hasAuthMethods}}
{{#authMethods}}
{{#isApiKey}}
{{#isKeyInQuery}}
if let Some(ref apikey) = configuration.api_key { if let Some(ref apikey) = configuration.api_key {
let key = apikey.key.clone(); let key = apikey.key.clone();
let val = match apikey.prefix { let val = match apikey.prefix {
@ -48,15 +51,22 @@ impl {{{classname}}} for {{{classname}}}Client {
}; };
req_builder = req_builder.query(&[("{{{keyParamName}}}", val)]); req_builder = req_builder.query(&[("{{{keyParamName}}}", val)]);
} }
{{/isKeyInQuery}}{{/isApiKey}}{{/authMethods}}{{/hasAuthMethods}} {{/isKeyInQuery}}
{{/isApiKey}}
{{/authMethods}}
{{/hasAuthMethods}}
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
{{#hasHeaderParams}}{{#headerParams}} {{#hasHeaderParams}}
{{#headerParams}}
req_builder = req_builder.header("{{{baseName}}}", {{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}.to_string()); req_builder = req_builder.header("{{{baseName}}}", {{{paramName}}}{{#isListContainer}}.join(","){{/isListContainer}}.to_string());
{{/headerParams}}{{/hasHeaderParams}} {{/headerParams}}
{{#hasAuthMethods}}{{#authMethods}} {{/hasHeaderParams}}
{{#isApiKey}}{{#isKeyInHeader}} {{#hasAuthMethods}}
{{#authMethods}}
{{#isApiKey}}
{{#isKeyInHeader}}
if let Some(ref apikey) = configuration.api_key { if let Some(ref apikey) = configuration.api_key {
let key = apikey.key.clone(); let key = apikey.key.clone();
let val = match apikey.prefix { let val = match apikey.prefix {
@ -65,7 +75,8 @@ impl {{{classname}}} for {{{classname}}}Client {
}; };
req_builder = req_builder.header("{{{keyParamName}}}", val); req_builder = req_builder.header("{{{keyParamName}}}", val);
}; };
{{/isKeyInHeader}}{{/isApiKey}} {{/isKeyInHeader}}
{{/isApiKey}}
{{#isBasic}} {{#isBasic}}
if let Some(ref auth_conf) = configuration.basic_auth { if let Some(ref auth_conf) = configuration.basic_auth {
req_builder = req_builder.basic_auth(auth_conf.0.to_owned(), auth_conf.1.to_owned()); req_builder = req_builder.basic_auth(auth_conf.0.to_owned(), auth_conf.1.to_owned());
@ -76,8 +87,10 @@ impl {{{classname}}} for {{{classname}}}Client {
req_builder = req_builder.bearer_auth(token.to_owned()); req_builder = req_builder.bearer_auth(token.to_owned());
}; };
{{/isOAuth}} {{/isOAuth}}
{{/authMethods}}{{/hasAuthMethods}} {{/authMethods}}
{{#isMultipart}}{{#hasFormParams}} {{/hasAuthMethods}}
{{#isMultipart}}
{{#hasFormParams}}
let form = reqwest::multipart::Form::new() let form = reqwest::multipart::Form::new()
{{#formParams}} {{#formParams}}
{{#isFile}} {{#isFile}}
@ -88,8 +101,10 @@ impl {{{classname}}} for {{{classname}}}Client {
{{/isFile}} {{/isFile}}
{{/formParams}} {{/formParams}}
req_builder = req_builder.multipart(form); req_builder = req_builder.multipart(form);
{{/hasFormParams}}{{/isMultipart}} {{/hasFormParams}}
{{^isMultipart}}{{#hasFormParams}} {{/isMultipart}}
{{^isMultipart}}
{{#hasFormParams}}
let mut form_params = std::collections::HashMap::new(); let mut form_params = std::collections::HashMap::new();
{{#formParams}} {{#formParams}}
{{#isFile}} {{#isFile}}
@ -100,10 +115,13 @@ impl {{{classname}}} for {{{classname}}}Client {
{{/isFile}} {{/isFile}}
{{/formParams}} {{/formParams}}
req_builder = req_builder.form(&form_params); req_builder = req_builder.form(&form_params);
{{/hasFormParams}}{{/isMultipart}} {{/hasFormParams}}
{{#hasBodyParam}}{{#bodyParams}} {{/isMultipart}}
{{#hasBodyParam}}
{{#bodyParams}}
req_builder = req_builder.json(&{{{paramName}}}); req_builder = req_builder.json(&{{{paramName}}});
{{/bodyParams}}{{/hasBodyParam}} {{/bodyParams}}
{{/hasBodyParam}}
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;

View File

@ -3,14 +3,14 @@ use std::rc::Rc;
use super::configuration::Configuration; use super::configuration::Configuration;
pub struct APIClient { pub struct APIClient {
configuration: Rc<Configuration>, configuration: Rc<Configuration>,
{{#apiInfo}} {{#apiInfo}}
{{#apis}} {{#apis}}
{{#operations}} {{#operations}}
{{#operation}} {{#operation}}
{{#-last}} {{#-last}}
{{{classFilename}}}: Box<::apis::{{{classname}}}>, {{{classFilename}}}: Box<::apis::{{{classname}}}>,
{{/-last}} {{/-last}}
{{/operation}} {{/operation}}
{{/operations}} {{/operations}}
{{/apis}} {{/apis}}
@ -18,38 +18,37 @@ pub struct APIClient {
} }
impl APIClient { impl APIClient {
pub fn new(configuration: Configuration) -> APIClient { pub fn new(configuration: Configuration) -> APIClient {
let rc = Rc::new(configuration); let rc = Rc::new(configuration);
APIClient { APIClient {
configuration: rc.clone(), configuration: rc.clone(),
{{#apiInfo}} {{#apiInfo}}
{{#apis}} {{#apis}}
{{#operations}} {{#operations}}
{{#operation}} {{#operation}}
{{#-last}} {{#-last}}
{{{classFilename}}}: Box::new(::apis::{{{classname}}}Client::new(rc.clone())), {{{classFilename}}}: Box::new(::apis::{{{classname}}}Client::new(rc.clone())),
{{/-last}} {{/-last}}
{{/operation}} {{/operation}}
{{/operations}} {{/operations}}
{{/apis}} {{/apis}}
{{/apiInfo}} {{/apiInfo}}
}
} }
}
{{#apiInfo}} {{#apiInfo}}
{{#apis}} {{#apis}}
{{#operations}} {{#operations}}
{{#operation}} {{#operation}}
{{#-last}} {{#-last}}
pub fn {{{classFilename}}}(&self) -> &::apis::{{{classname}}}{ pub fn {{{classFilename}}}(&self) -> &::apis::{{{classname}}}{
self.{{{classFilename}}}.as_ref() self.{{{classFilename}}}.as_ref()
} }
{{/-last}} {{/-last}}
{{/operation}} {{/operation}}
{{/operations}} {{/operations}}
{{/apis}} {{/apis}}
{{/apiInfo}} {{/apiInfo}}
} }

View File

@ -15,8 +15,8 @@ pub struct Configuration {
pub type BasicAuth = (String, Option<String>); pub type BasicAuth = (String, Option<String>);
pub struct ApiKey { pub struct ApiKey {
pub prefix: Option<String>, pub prefix: Option<String>,
pub key: String, pub key: String,
} }
impl Configuration { impl Configuration {

View File

@ -3,35 +3,34 @@ use std::rc::Rc;
use super::configuration::Configuration; use super::configuration::Configuration;
pub struct APIClient { pub struct APIClient {
configuration: Rc<Configuration>, configuration: Rc<Configuration>,
pet_api: Box<::apis::PetApi>, pet_api: Box<::apis::PetApi>,
store_api: Box<::apis::StoreApi>, store_api: Box<::apis::StoreApi>,
user_api: Box<::apis::UserApi>, user_api: Box<::apis::UserApi>,
} }
impl APIClient { impl APIClient {
pub fn new(configuration: Configuration) -> APIClient { pub fn new(configuration: Configuration) -> APIClient {
let rc = Rc::new(configuration); let rc = Rc::new(configuration);
APIClient { APIClient {
configuration: rc.clone(), configuration: rc.clone(),
pet_api: Box::new(::apis::PetApiClient::new(rc.clone())), pet_api: Box::new(::apis::PetApiClient::new(rc.clone())),
store_api: Box::new(::apis::StoreApiClient::new(rc.clone())), store_api: Box::new(::apis::StoreApiClient::new(rc.clone())),
user_api: Box::new(::apis::UserApiClient::new(rc.clone())), user_api: Box::new(::apis::UserApiClient::new(rc.clone())),
}
} }
}
pub fn pet_api(&self) -> &::apis::PetApi{ pub fn pet_api(&self) -> &::apis::PetApi{
self.pet_api.as_ref() self.pet_api.as_ref()
} }
pub fn store_api(&self) -> &::apis::StoreApi{ pub fn store_api(&self) -> &::apis::StoreApi{
self.store_api.as_ref() self.store_api.as_ref()
} }
pub fn user_api(&self) -> &::apis::UserApi{
self.user_api.as_ref()
}
pub fn user_api(&self) -> &::apis::UserApi{
self.user_api.as_ref()
}
} }

View File

@ -24,8 +24,8 @@ pub struct Configuration {
pub type BasicAuth = (String, Option<String>); pub type BasicAuth = (String, Option<String>);
pub struct ApiKey { pub struct ApiKey {
pub prefix: Option<String>, pub prefix: Option<String>,
pub key: String, pub key: String,
} }
impl Configuration { impl Configuration {

View File

@ -46,23 +46,14 @@ impl PetApi for PetApiClient {
let uri_str = format!("{}/pet", configuration.base_path); let uri_str = format!("{}/pet", configuration.base_path);
let mut req_builder = client.post(uri_str.as_str()); let mut req_builder = client.post(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
if let Some(ref token) = configuration.oauth_access_token { if let Some(ref token) = configuration.oauth_access_token {
req_builder = req_builder.bearer_auth(token.to_owned()); req_builder = req_builder.bearer_auth(token.to_owned());
}; };
req_builder = req_builder.json(&body); req_builder = req_builder.json(&body);
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -77,23 +68,14 @@ impl PetApi for PetApiClient {
let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id); let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id);
let mut req_builder = client.delete(uri_str.as_str()); let mut req_builder = client.delete(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
req_builder = req_builder.header("api_key", api_key.to_string()); req_builder = req_builder.header("api_key", api_key.to_string());
if let Some(ref token) = configuration.oauth_access_token { if let Some(ref token) = configuration.oauth_access_token {
req_builder = req_builder.bearer_auth(token.to_owned()); req_builder = req_builder.bearer_auth(token.to_owned());
}; };
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -109,21 +91,13 @@ impl PetApi for PetApiClient {
let mut req_builder = client.get(uri_str.as_str()); let mut req_builder = client.get(uri_str.as_str());
req_builder = req_builder.query(&[("status", &status.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]); req_builder = req_builder.query(&[("status", &status.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]);
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
if let Some(ref token) = configuration.oauth_access_token { if let Some(ref token) = configuration.oauth_access_token {
req_builder = req_builder.bearer_auth(token.to_owned()); req_builder = req_builder.bearer_auth(token.to_owned());
}; };
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -138,21 +112,13 @@ impl PetApi for PetApiClient {
let mut req_builder = client.get(uri_str.as_str()); let mut req_builder = client.get(uri_str.as_str());
req_builder = req_builder.query(&[("tags", &tags.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]); req_builder = req_builder.query(&[("tags", &tags.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(",").to_string())]);
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
if let Some(ref token) = configuration.oauth_access_token { if let Some(ref token) = configuration.oauth_access_token {
req_builder = req_builder.bearer_auth(token.to_owned()); req_builder = req_builder.bearer_auth(token.to_owned());
}; };
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -166,13 +132,9 @@ impl PetApi for PetApiClient {
let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id); let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id);
let mut req_builder = client.get(uri_str.as_str()); let mut req_builder = client.get(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
if let Some(ref apikey) = configuration.api_key { if let Some(ref apikey) = configuration.api_key {
let key = apikey.key.clone(); let key = apikey.key.clone();
let val = match apikey.prefix { let val = match apikey.prefix {
@ -182,11 +144,6 @@ impl PetApi for PetApiClient {
req_builder = req_builder.header("api_key", val); req_builder = req_builder.header("api_key", val);
}; };
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -200,23 +157,14 @@ impl PetApi for PetApiClient {
let uri_str = format!("{}/pet", configuration.base_path); let uri_str = format!("{}/pet", configuration.base_path);
let mut req_builder = client.put(uri_str.as_str()); let mut req_builder = client.put(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
if let Some(ref token) = configuration.oauth_access_token { if let Some(ref token) = configuration.oauth_access_token {
req_builder = req_builder.bearer_auth(token.to_owned()); req_builder = req_builder.bearer_auth(token.to_owned());
}; };
req_builder = req_builder.json(&body); req_builder = req_builder.json(&body);
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -231,26 +179,17 @@ impl PetApi for PetApiClient {
let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id); let uri_str = format!("{}/pet/{petId}", configuration.base_path, petId=pet_id);
let mut req_builder = client.post(uri_str.as_str()); let mut req_builder = client.post(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
if let Some(ref token) = configuration.oauth_access_token { if let Some(ref token) = configuration.oauth_access_token {
req_builder = req_builder.bearer_auth(token.to_owned()); req_builder = req_builder.bearer_auth(token.to_owned());
}; };
let mut form_params = std::collections::HashMap::new(); let mut form_params = std::collections::HashMap::new();
form_params.insert("name", name.to_string()); form_params.insert("name", name.to_string());
form_params.insert("status", status.to_string()); form_params.insert("status", status.to_string());
req_builder = req_builder.form(&form_params); req_builder = req_builder.form(&form_params);
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -265,26 +204,17 @@ impl PetApi for PetApiClient {
let uri_str = format!("{}/pet/{petId}/uploadImage", configuration.base_path, petId=pet_id); let uri_str = format!("{}/pet/{petId}/uploadImage", configuration.base_path, petId=pet_id);
let mut req_builder = client.post(uri_str.as_str()); let mut req_builder = client.post(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
if let Some(ref token) = configuration.oauth_access_token { if let Some(ref token) = configuration.oauth_access_token {
req_builder = req_builder.bearer_auth(token.to_owned()); req_builder = req_builder.bearer_auth(token.to_owned());
}; };
let mut form_params = std::collections::HashMap::new(); let mut form_params = std::collections::HashMap::new();
form_params.insert("additionalMetadata", additional_metadata.to_string()); form_params.insert("additionalMetadata", additional_metadata.to_string());
form_params.insert("file", unimplemented!("File form param not supported with x-www-form-urlencoded content")); form_params.insert("file", unimplemented!("File form param not supported with x-www-form-urlencoded content"));
req_builder = req_builder.form(&form_params); req_builder = req_builder.form(&form_params);
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;

View File

@ -42,16 +42,10 @@ impl StoreApi for StoreApiClient {
let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=urlencode(order_id)); let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=urlencode(order_id));
let mut req_builder = client.delete(uri_str.as_str()); let mut req_builder = client.delete(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -66,13 +60,9 @@ impl StoreApi for StoreApiClient {
let uri_str = format!("{}/store/inventory", configuration.base_path); let uri_str = format!("{}/store/inventory", configuration.base_path);
let mut req_builder = client.get(uri_str.as_str()); let mut req_builder = client.get(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
if let Some(ref apikey) = configuration.api_key { if let Some(ref apikey) = configuration.api_key {
let key = apikey.key.clone(); let key = apikey.key.clone();
let val = match apikey.prefix { let val = match apikey.prefix {
@ -82,11 +72,6 @@ impl StoreApi for StoreApiClient {
req_builder = req_builder.header("api_key", val); req_builder = req_builder.header("api_key", val);
}; };
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -100,16 +85,10 @@ impl StoreApi for StoreApiClient {
let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=order_id); let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=order_id);
let mut req_builder = client.get(uri_str.as_str()); let mut req_builder = client.get(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -123,18 +102,11 @@ impl StoreApi for StoreApiClient {
let uri_str = format!("{}/store/order", configuration.base_path); let uri_str = format!("{}/store/order", configuration.base_path);
let mut req_builder = client.post(uri_str.as_str()); let mut req_builder = client.post(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
req_builder = req_builder.json(&body); req_builder = req_builder.json(&body);
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;

View File

@ -46,18 +46,11 @@ impl UserApi for UserApiClient {
let uri_str = format!("{}/user", configuration.base_path); let uri_str = format!("{}/user", configuration.base_path);
let mut req_builder = client.post(uri_str.as_str()); let mut req_builder = client.post(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
req_builder = req_builder.json(&body); req_builder = req_builder.json(&body);
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -72,18 +65,11 @@ impl UserApi for UserApiClient {
let uri_str = format!("{}/user/createWithArray", configuration.base_path); let uri_str = format!("{}/user/createWithArray", configuration.base_path);
let mut req_builder = client.post(uri_str.as_str()); let mut req_builder = client.post(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
req_builder = req_builder.json(&body); req_builder = req_builder.json(&body);
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -98,18 +84,11 @@ impl UserApi for UserApiClient {
let uri_str = format!("{}/user/createWithList", configuration.base_path); let uri_str = format!("{}/user/createWithList", configuration.base_path);
let mut req_builder = client.post(uri_str.as_str()); let mut req_builder = client.post(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
req_builder = req_builder.json(&body); req_builder = req_builder.json(&body);
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -124,16 +103,10 @@ impl UserApi for UserApiClient {
let uri_str = format!("{}/user/{username}", configuration.base_path, username=urlencode(username)); let uri_str = format!("{}/user/{username}", configuration.base_path, username=urlencode(username));
let mut req_builder = client.delete(uri_str.as_str()); let mut req_builder = client.delete(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -148,16 +121,10 @@ impl UserApi for UserApiClient {
let uri_str = format!("{}/user/{username}", configuration.base_path, username=urlencode(username)); let uri_str = format!("{}/user/{username}", configuration.base_path, username=urlencode(username));
let mut req_builder = client.get(uri_str.as_str()); let mut req_builder = client.get(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -173,16 +140,10 @@ impl UserApi for UserApiClient {
req_builder = req_builder.query(&[("username", &username.to_string())]); req_builder = req_builder.query(&[("username", &username.to_string())]);
req_builder = req_builder.query(&[("password", &password.to_string())]); req_builder = req_builder.query(&[("password", &password.to_string())]);
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -196,16 +157,10 @@ impl UserApi for UserApiClient {
let uri_str = format!("{}/user/logout", configuration.base_path); let uri_str = format!("{}/user/logout", configuration.base_path);
let mut req_builder = client.get(uri_str.as_str()); let mut req_builder = client.get(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;
@ -220,18 +175,11 @@ impl UserApi for UserApiClient {
let uri_str = format!("{}/user/{username}", configuration.base_path, username=urlencode(username)); let uri_str = format!("{}/user/{username}", configuration.base_path, username=urlencode(username));
let mut req_builder = client.put(uri_str.as_str()); let mut req_builder = client.put(uri_str.as_str());
if let Some(ref user_agent) = configuration.user_agent { if let Some(ref user_agent) = configuration.user_agent {
req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone()); req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
} }
req_builder = req_builder.json(&body); req_builder = req_builder.json(&body);
// send request // send request
let req = req_builder.build()?; let req = req_builder.build()?;

View File

@ -15,76 +15,21 @@ use serde_json::Value;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct ApiResponse { pub struct ApiResponse {
#[serde(rename = "code")] #[serde(rename = "code")]
code: Option<i32>, pub code: Option<i32>,
#[serde(rename = "type")] #[serde(rename = "type")]
_type: Option<String>, pub _type: Option<String>,
#[serde(rename = "message")] #[serde(rename = "message")]
message: Option<String> pub message: Option<String>,
} }
impl ApiResponse { impl ApiResponse {
/// Describes the result of uploading an image resource /// Describes the result of uploading an image resource
pub fn new() -> ApiResponse { pub fn new() -> ApiResponse {
ApiResponse { ApiResponse {
code: None, code: None,
_type: None, _type: None,
message: None message: None,
}
} }
}
pub fn set_code(&mut self, code: i32) {
self.code = Some(code);
}
pub fn with_code(mut self, code: i32) -> ApiResponse {
self.code = Some(code);
self
}
pub fn code(&self) -> Option<&i32> {
self.code.as_ref()
}
pub fn reset_code(&mut self) {
self.code = None;
}
pub fn set__type(&mut self, _type: String) {
self._type = Some(_type);
}
pub fn with__type(mut self, _type: String) -> ApiResponse {
self._type = Some(_type);
self
}
pub fn _type(&self) -> Option<&String> {
self._type.as_ref()
}
pub fn reset__type(&mut self) {
self._type = None;
}
pub fn set_message(&mut self, message: String) {
self.message = Some(message);
}
pub fn with_message(mut self, message: String) -> ApiResponse {
self.message = Some(message);
self
}
pub fn message(&self) -> Option<&String> {
self.message.as_ref()
}
pub fn reset_message(&mut self) {
self.message = None;
}
} }

View File

@ -15,56 +15,18 @@ use serde_json::Value;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct Category { pub struct Category {
#[serde(rename = "id")] #[serde(rename = "id")]
id: Option<i64>, pub id: Option<i64>,
#[serde(rename = "name")] #[serde(rename = "name")]
name: Option<String> pub name: Option<String>,
} }
impl Category { impl Category {
/// A category for a pet /// A category for a pet
pub fn new() -> Category { pub fn new() -> Category {
Category { Category {
id: None, id: None,
name: None name: None,
}
} }
}
pub fn set_id(&mut self, id: i64) {
self.id = Some(id);
}
pub fn with_id(mut self, id: i64) -> Category {
self.id = Some(id);
self
}
pub fn id(&self) -> Option<&i64> {
self.id.as_ref()
}
pub fn reset_id(&mut self) {
self.id = None;
}
pub fn set_name(&mut self, name: String) {
self.name = Some(name);
}
pub fn with_name(mut self, name: String) -> Category {
self.name = Some(name);
self
}
pub fn name(&self) -> Option<&String> {
self.name.as_ref()
}
pub fn reset_name(&mut self) {
self.name = None;
}
} }

View File

@ -10,6 +10,3 @@ mod tag;
pub use self::tag::Tag; pub use self::tag::Tag;
mod user; mod user;
pub use self::user::User; pub use self::user::User;
// TODO(farcaller): sort out files
pub struct File;

View File

@ -15,137 +15,31 @@ use serde_json::Value;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct Order { pub struct Order {
#[serde(rename = "id")] #[serde(rename = "id")]
id: Option<i64>, pub id: Option<i64>,
#[serde(rename = "petId")] #[serde(rename = "petId")]
pet_id: Option<i64>, pub pet_id: Option<i64>,
#[serde(rename = "quantity")] #[serde(rename = "quantity")]
quantity: Option<i32>, pub quantity: Option<i32>,
#[serde(rename = "shipDate")] #[serde(rename = "shipDate")]
ship_date: Option<String>, pub ship_date: Option<String>,
/// Order Status /// Order Status
#[serde(rename = "status")] #[serde(rename = "status")]
status: Option<String>, pub status: Option<String>,
#[serde(rename = "complete")] #[serde(rename = "complete")]
complete: Option<bool> pub complete: Option<bool>,
} }
impl Order { impl Order {
/// An order for a pets from the pet store /// An order for a pets from the pet store
pub fn new() -> Order { pub fn new() -> Order {
Order { Order {
id: None, id: None,
pet_id: None, pet_id: None,
quantity: None, quantity: None,
ship_date: None, ship_date: None,
status: None, status: None,
complete: None complete: None,
}
} }
}
pub fn set_id(&mut self, id: i64) {
self.id = Some(id);
}
pub fn with_id(mut self, id: i64) -> Order {
self.id = Some(id);
self
}
pub fn id(&self) -> Option<&i64> {
self.id.as_ref()
}
pub fn reset_id(&mut self) {
self.id = None;
}
pub fn set_pet_id(&mut self, pet_id: i64) {
self.pet_id = Some(pet_id);
}
pub fn with_pet_id(mut self, pet_id: i64) -> Order {
self.pet_id = Some(pet_id);
self
}
pub fn pet_id(&self) -> Option<&i64> {
self.pet_id.as_ref()
}
pub fn reset_pet_id(&mut self) {
self.pet_id = None;
}
pub fn set_quantity(&mut self, quantity: i32) {
self.quantity = Some(quantity);
}
pub fn with_quantity(mut self, quantity: i32) -> Order {
self.quantity = Some(quantity);
self
}
pub fn quantity(&self) -> Option<&i32> {
self.quantity.as_ref()
}
pub fn reset_quantity(&mut self) {
self.quantity = None;
}
pub fn set_ship_date(&mut self, ship_date: String) {
self.ship_date = Some(ship_date);
}
pub fn with_ship_date(mut self, ship_date: String) -> Order {
self.ship_date = Some(ship_date);
self
}
pub fn ship_date(&self) -> Option<&String> {
self.ship_date.as_ref()
}
pub fn reset_ship_date(&mut self) {
self.ship_date = None;
}
pub fn set_status(&mut self, status: String) {
self.status = Some(status);
}
pub fn with_status(mut self, status: String) -> Order {
self.status = Some(status);
self
}
pub fn status(&self) -> Option<&String> {
self.status.as_ref()
}
pub fn reset_status(&mut self) {
self.status = None;
}
pub fn set_complete(&mut self, complete: bool) {
self.complete = Some(complete);
}
pub fn with_complete(mut self, complete: bool) -> Order {
self.complete = Some(complete);
self
}
pub fn complete(&self) -> Option<&bool> {
self.complete.as_ref()
}
pub fn reset_complete(&mut self) {
self.complete = None;
}
} }

View File

@ -15,131 +15,31 @@ use serde_json::Value;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct Pet { pub struct Pet {
#[serde(rename = "id")] #[serde(rename = "id")]
id: Option<i64>, pub id: Option<i64>,
#[serde(rename = "category")] #[serde(rename = "category")]
category: Option<::models::Category>, pub category: Option<::models::Category>,
#[serde(rename = "name")] #[serde(rename = "name")]
name: String, pub name: String,
#[serde(rename = "photoUrls")] #[serde(rename = "photoUrls")]
photo_urls: Vec<String>, pub photo_urls: Vec<String>,
#[serde(rename = "tags")] #[serde(rename = "tags")]
tags: Option<Vec<::models::Tag>>, pub tags: Option<Vec<::models::Tag>>,
/// pet status in the store /// pet status in the store
#[serde(rename = "status")] #[serde(rename = "status")]
status: Option<String> pub status: Option<String>,
} }
impl Pet { impl Pet {
/// A pet for sale in the pet store /// A pet for sale in the pet store
pub fn new(name: String, photo_urls: Vec<String>) -> Pet { pub fn new(name: String, photo_urls: Vec<String>) -> Pet {
Pet { Pet {
id: None, id: None,
category: None, category: None,
name: name, name: name,
photo_urls: photo_urls, photo_urls: photo_urls,
tags: None, tags: None,
status: None status: None,
}
} }
}
pub fn set_id(&mut self, id: i64) {
self.id = Some(id);
}
pub fn with_id(mut self, id: i64) -> Pet {
self.id = Some(id);
self
}
pub fn id(&self) -> Option<&i64> {
self.id.as_ref()
}
pub fn reset_id(&mut self) {
self.id = None;
}
pub fn set_category(&mut self, category: ::models::Category) {
self.category = Some(category);
}
pub fn with_category(mut self, category: ::models::Category) -> Pet {
self.category = Some(category);
self
}
pub fn category(&self) -> Option<&::models::Category> {
self.category.as_ref()
}
pub fn reset_category(&mut self) {
self.category = None;
}
pub fn set_name(&mut self, name: String) {
self.name = name;
}
pub fn with_name(mut self, name: String) -> Pet {
self.name = name;
self
}
pub fn name(&self) -> &String {
&self.name
}
pub fn set_photo_urls(&mut self, photo_urls: Vec<String>) {
self.photo_urls = photo_urls;
}
pub fn with_photo_urls(mut self, photo_urls: Vec<String>) -> Pet {
self.photo_urls = photo_urls;
self
}
pub fn photo_urls(&self) -> &Vec<String> {
&self.photo_urls
}
pub fn set_tags(&mut self, tags: Vec<::models::Tag>) {
self.tags = Some(tags);
}
pub fn with_tags(mut self, tags: Vec<::models::Tag>) -> Pet {
self.tags = Some(tags);
self
}
pub fn tags(&self) -> Option<&Vec<::models::Tag>> {
self.tags.as_ref()
}
pub fn reset_tags(&mut self) {
self.tags = None;
}
pub fn set_status(&mut self, status: String) {
self.status = Some(status);
}
pub fn with_status(mut self, status: String) -> Pet {
self.status = Some(status);
self
}
pub fn status(&self) -> Option<&String> {
self.status.as_ref()
}
pub fn reset_status(&mut self) {
self.status = None;
}
} }

View File

@ -15,56 +15,18 @@ use serde_json::Value;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct Tag { pub struct Tag {
#[serde(rename = "id")] #[serde(rename = "id")]
id: Option<i64>, pub id: Option<i64>,
#[serde(rename = "name")] #[serde(rename = "name")]
name: Option<String> pub name: Option<String>,
} }
impl Tag { impl Tag {
/// A tag for a pet /// A tag for a pet
pub fn new() -> Tag { pub fn new() -> Tag {
Tag { Tag {
id: None, id: None,
name: None name: None,
}
} }
}
pub fn set_id(&mut self, id: i64) {
self.id = Some(id);
}
pub fn with_id(mut self, id: i64) -> Tag {
self.id = Some(id);
self
}
pub fn id(&self) -> Option<&i64> {
self.id.as_ref()
}
pub fn reset_id(&mut self) {
self.id = None;
}
pub fn set_name(&mut self, name: String) {
self.name = Some(name);
}
pub fn with_name(mut self, name: String) -> Tag {
self.name = Some(name);
self
}
pub fn name(&self) -> Option<&String> {
self.name.as_ref()
}
pub fn reset_name(&mut self) {
self.name = None;
}
} }

View File

@ -15,177 +15,37 @@ use serde_json::Value;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct User { pub struct User {
#[serde(rename = "id")] #[serde(rename = "id")]
id: Option<i64>, pub id: Option<i64>,
#[serde(rename = "username")] #[serde(rename = "username")]
username: Option<String>, pub username: Option<String>,
#[serde(rename = "firstName")] #[serde(rename = "firstName")]
first_name: Option<String>, pub first_name: Option<String>,
#[serde(rename = "lastName")] #[serde(rename = "lastName")]
last_name: Option<String>, pub last_name: Option<String>,
#[serde(rename = "email")] #[serde(rename = "email")]
email: Option<String>, pub email: Option<String>,
#[serde(rename = "password")] #[serde(rename = "password")]
password: Option<String>, pub password: Option<String>,
#[serde(rename = "phone")] #[serde(rename = "phone")]
phone: Option<String>, pub phone: Option<String>,
/// User Status /// User Status
#[serde(rename = "userStatus")] #[serde(rename = "userStatus")]
user_status: Option<i32> pub user_status: Option<i32>,
} }
impl User { impl User {
/// A User who is purchasing from the pet store /// A User who is purchasing from the pet store
pub fn new() -> User { pub fn new() -> User {
User { User {
id: None, id: None,
username: None, username: None,
first_name: None, first_name: None,
last_name: None, last_name: None,
email: None, email: None,
password: None, password: None,
phone: None, phone: None,
user_status: None user_status: None,
}
} }
}
pub fn set_id(&mut self, id: i64) {
self.id = Some(id);
}
pub fn with_id(mut self, id: i64) -> User {
self.id = Some(id);
self
}
pub fn id(&self) -> Option<&i64> {
self.id.as_ref()
}
pub fn reset_id(&mut self) {
self.id = None;
}
pub fn set_username(&mut self, username: String) {
self.username = Some(username);
}
pub fn with_username(mut self, username: String) -> User {
self.username = Some(username);
self
}
pub fn username(&self) -> Option<&String> {
self.username.as_ref()
}
pub fn reset_username(&mut self) {
self.username = None;
}
pub fn set_first_name(&mut self, first_name: String) {
self.first_name = Some(first_name);
}
pub fn with_first_name(mut self, first_name: String) -> User {
self.first_name = Some(first_name);
self
}
pub fn first_name(&self) -> Option<&String> {
self.first_name.as_ref()
}
pub fn reset_first_name(&mut self) {
self.first_name = None;
}
pub fn set_last_name(&mut self, last_name: String) {
self.last_name = Some(last_name);
}
pub fn with_last_name(mut self, last_name: String) -> User {
self.last_name = Some(last_name);
self
}
pub fn last_name(&self) -> Option<&String> {
self.last_name.as_ref()
}
pub fn reset_last_name(&mut self) {
self.last_name = None;
}
pub fn set_email(&mut self, email: String) {
self.email = Some(email);
}
pub fn with_email(mut self, email: String) -> User {
self.email = Some(email);
self
}
pub fn email(&self) -> Option<&String> {
self.email.as_ref()
}
pub fn reset_email(&mut self) {
self.email = None;
}
pub fn set_password(&mut self, password: String) {
self.password = Some(password);
}
pub fn with_password(mut self, password: String) -> User {
self.password = Some(password);
self
}
pub fn password(&self) -> Option<&String> {
self.password.as_ref()
}
pub fn reset_password(&mut self) {
self.password = None;
}
pub fn set_phone(&mut self, phone: String) {
self.phone = Some(phone);
}
pub fn with_phone(mut self, phone: String) -> User {
self.phone = Some(phone);
self
}
pub fn phone(&self) -> Option<&String> {
self.phone.as_ref()
}
pub fn reset_phone(&mut self) {
self.phone = None;
}
pub fn set_user_status(&mut self, user_status: i32) {
self.user_status = Some(user_status);
}
pub fn with_user_status(mut self, user_status: i32) -> User {
self.user_status = Some(user_status);
self
}
pub fn user_status(&self) -> Option<&i32> {
self.user_status.as_ref()
}
pub fn reset_user_status(&mut self) {
self.user_status = None;
}
} }

View File

@ -4,35 +4,34 @@ use hyper;
use super::configuration::Configuration; use super::configuration::Configuration;
pub struct APIClient<C: hyper::client::Connect> { pub struct APIClient<C: hyper::client::Connect> {
configuration: Rc<Configuration<C>>, configuration: Rc<Configuration<C>>,
pet_api: Box<::apis::PetApi>, pet_api: Box<::apis::PetApi>,
store_api: Box<::apis::StoreApi>, store_api: Box<::apis::StoreApi>,
user_api: Box<::apis::UserApi>, user_api: Box<::apis::UserApi>,
} }
impl<C: hyper::client::Connect> APIClient<C> { impl<C: hyper::client::Connect> APIClient<C> {
pub fn new(configuration: Configuration<C>) -> APIClient<C> { pub fn new(configuration: Configuration<C>) -> APIClient<C> {
let rc = Rc::new(configuration); let rc = Rc::new(configuration);
APIClient { APIClient {
configuration: rc.clone(), configuration: rc.clone(),
pet_api: Box::new(::apis::PetApiClient::new(rc.clone())), pet_api: Box::new(::apis::PetApiClient::new(rc.clone())),
store_api: Box::new(::apis::StoreApiClient::new(rc.clone())), store_api: Box::new(::apis::StoreApiClient::new(rc.clone())),
user_api: Box::new(::apis::UserApiClient::new(rc.clone())), user_api: Box::new(::apis::UserApiClient::new(rc.clone())),
}
} }
}
pub fn pet_api(&self) -> &::apis::PetApi{ pub fn pet_api(&self) -> &::apis::PetApi{
self.pet_api.as_ref() self.pet_api.as_ref()
} }
pub fn store_api(&self) -> &::apis::StoreApi{ pub fn store_api(&self) -> &::apis::StoreApi{
self.store_api.as_ref() self.store_api.as_ref()
} }
pub fn user_api(&self) -> &::apis::UserApi{
self.user_api.as_ref()
}
pub fn user_api(&self) -> &::apis::UserApi{
self.user_api.as_ref()
}
} }

View File

@ -12,31 +12,31 @@ use hyper;
use std::collections::HashMap; use std::collections::HashMap;
pub struct Configuration<C: hyper::client::Connect> { pub struct Configuration<C: hyper::client::Connect> {
pub base_path: String, pub base_path: String,
pub user_agent: Option<String>, pub user_agent: Option<String>,
pub client: hyper::client::Client<C>, pub client: hyper::client::Client<C>,
pub basic_auth: Option<BasicAuth>, pub basic_auth: Option<BasicAuth>,
pub oauth_access_token: Option<String>, pub oauth_access_token: Option<String>,
pub api_key: Option<ApiKey>, pub api_key: Option<ApiKey>,
// TODO: take an oauth2 token source, similar to the go one // TODO: take an oauth2 token source, similar to the go one
} }
pub type BasicAuth = (String, Option<String>); pub type BasicAuth = (String, Option<String>);
pub struct ApiKey { pub struct ApiKey {
pub prefix: Option<String>, pub prefix: Option<String>,
pub key: String, pub key: String,
} }
impl<C: hyper::client::Connect> Configuration<C> { impl<C: hyper::client::Connect> Configuration<C> {
pub fn new(client: hyper::client::Client<C>) -> Configuration<C> { pub fn new(client: hyper::client::Client<C>) -> Configuration<C> {
Configuration { Configuration {
base_path: "http://petstore.swagger.io/v2".to_owned(), base_path: "http://petstore.swagger.io/v2".to_owned(),
user_agent: Some("OpenAPI-Generator/1.0.0/rust".to_owned()), user_agent: Some("OpenAPI-Generator/1.0.0/rust".to_owned()),
client: client, client: client,
basic_auth: None, basic_auth: None,
oauth_access_token: None, oauth_access_token: None,
api_key: None, api_key: None,
}
} }
}
} }

View File

@ -15,76 +15,21 @@ use serde_json::Value;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct ApiResponse { pub struct ApiResponse {
#[serde(rename = "code")] #[serde(rename = "code")]
code: Option<i32>, pub code: Option<i32>,
#[serde(rename = "type")] #[serde(rename = "type")]
_type: Option<String>, pub _type: Option<String>,
#[serde(rename = "message")] #[serde(rename = "message")]
message: Option<String> pub message: Option<String>,
} }
impl ApiResponse { impl ApiResponse {
/// Describes the result of uploading an image resource /// Describes the result of uploading an image resource
pub fn new() -> ApiResponse { pub fn new() -> ApiResponse {
ApiResponse { ApiResponse {
code: None, code: None,
_type: None, _type: None,
message: None message: None,
}
} }
}
pub fn set_code(&mut self, code: i32) {
self.code = Some(code);
}
pub fn with_code(mut self, code: i32) -> ApiResponse {
self.code = Some(code);
self
}
pub fn code(&self) -> Option<&i32> {
self.code.as_ref()
}
pub fn reset_code(&mut self) {
self.code = None;
}
pub fn set__type(&mut self, _type: String) {
self._type = Some(_type);
}
pub fn with__type(mut self, _type: String) -> ApiResponse {
self._type = Some(_type);
self
}
pub fn _type(&self) -> Option<&String> {
self._type.as_ref()
}
pub fn reset__type(&mut self) {
self._type = None;
}
pub fn set_message(&mut self, message: String) {
self.message = Some(message);
}
pub fn with_message(mut self, message: String) -> ApiResponse {
self.message = Some(message);
self
}
pub fn message(&self) -> Option<&String> {
self.message.as_ref()
}
pub fn reset_message(&mut self) {
self.message = None;
}
} }

View File

@ -15,56 +15,18 @@ use serde_json::Value;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct Category { pub struct Category {
#[serde(rename = "id")] #[serde(rename = "id")]
id: Option<i64>, pub id: Option<i64>,
#[serde(rename = "name")] #[serde(rename = "name")]
name: Option<String> pub name: Option<String>,
} }
impl Category { impl Category {
/// A category for a pet /// A category for a pet
pub fn new() -> Category { pub fn new() -> Category {
Category { Category {
id: None, id: None,
name: None name: None,
}
} }
}
pub fn set_id(&mut self, id: i64) {
self.id = Some(id);
}
pub fn with_id(mut self, id: i64) -> Category {
self.id = Some(id);
self
}
pub fn id(&self) -> Option<&i64> {
self.id.as_ref()
}
pub fn reset_id(&mut self) {
self.id = None;
}
pub fn set_name(&mut self, name: String) {
self.name = Some(name);
}
pub fn with_name(mut self, name: String) -> Category {
self.name = Some(name);
self
}
pub fn name(&self) -> Option<&String> {
self.name.as_ref()
}
pub fn reset_name(&mut self) {
self.name = None;
}
} }

View File

@ -10,6 +10,3 @@ mod tag;
pub use self::tag::Tag; pub use self::tag::Tag;
mod user; mod user;
pub use self::user::User; pub use self::user::User;
// TODO(farcaller): sort out files
pub struct File;

View File

@ -15,137 +15,31 @@ use serde_json::Value;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct Order { pub struct Order {
#[serde(rename = "id")] #[serde(rename = "id")]
id: Option<i64>, pub id: Option<i64>,
#[serde(rename = "petId")] #[serde(rename = "petId")]
pet_id: Option<i64>, pub pet_id: Option<i64>,
#[serde(rename = "quantity")] #[serde(rename = "quantity")]
quantity: Option<i32>, pub quantity: Option<i32>,
#[serde(rename = "shipDate")] #[serde(rename = "shipDate")]
ship_date: Option<String>, pub ship_date: Option<String>,
/// Order Status /// Order Status
#[serde(rename = "status")] #[serde(rename = "status")]
status: Option<String>, pub status: Option<String>,
#[serde(rename = "complete")] #[serde(rename = "complete")]
complete: Option<bool> pub complete: Option<bool>,
} }
impl Order { impl Order {
/// An order for a pets from the pet store /// An order for a pets from the pet store
pub fn new() -> Order { pub fn new() -> Order {
Order { Order {
id: None, id: None,
pet_id: None, pet_id: None,
quantity: None, quantity: None,
ship_date: None, ship_date: None,
status: None, status: None,
complete: None complete: None,
}
} }
}
pub fn set_id(&mut self, id: i64) {
self.id = Some(id);
}
pub fn with_id(mut self, id: i64) -> Order {
self.id = Some(id);
self
}
pub fn id(&self) -> Option<&i64> {
self.id.as_ref()
}
pub fn reset_id(&mut self) {
self.id = None;
}
pub fn set_pet_id(&mut self, pet_id: i64) {
self.pet_id = Some(pet_id);
}
pub fn with_pet_id(mut self, pet_id: i64) -> Order {
self.pet_id = Some(pet_id);
self
}
pub fn pet_id(&self) -> Option<&i64> {
self.pet_id.as_ref()
}
pub fn reset_pet_id(&mut self) {
self.pet_id = None;
}
pub fn set_quantity(&mut self, quantity: i32) {
self.quantity = Some(quantity);
}
pub fn with_quantity(mut self, quantity: i32) -> Order {
self.quantity = Some(quantity);
self
}
pub fn quantity(&self) -> Option<&i32> {
self.quantity.as_ref()
}
pub fn reset_quantity(&mut self) {
self.quantity = None;
}
pub fn set_ship_date(&mut self, ship_date: String) {
self.ship_date = Some(ship_date);
}
pub fn with_ship_date(mut self, ship_date: String) -> Order {
self.ship_date = Some(ship_date);
self
}
pub fn ship_date(&self) -> Option<&String> {
self.ship_date.as_ref()
}
pub fn reset_ship_date(&mut self) {
self.ship_date = None;
}
pub fn set_status(&mut self, status: String) {
self.status = Some(status);
}
pub fn with_status(mut self, status: String) -> Order {
self.status = Some(status);
self
}
pub fn status(&self) -> Option<&String> {
self.status.as_ref()
}
pub fn reset_status(&mut self) {
self.status = None;
}
pub fn set_complete(&mut self, complete: bool) {
self.complete = Some(complete);
}
pub fn with_complete(mut self, complete: bool) -> Order {
self.complete = Some(complete);
self
}
pub fn complete(&self) -> Option<&bool> {
self.complete.as_ref()
}
pub fn reset_complete(&mut self) {
self.complete = None;
}
} }

View File

@ -15,131 +15,31 @@ use serde_json::Value;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct Pet { pub struct Pet {
#[serde(rename = "id")] #[serde(rename = "id")]
id: Option<i64>, pub id: Option<i64>,
#[serde(rename = "category")] #[serde(rename = "category")]
category: Option<::models::Category>, pub category: Option<::models::Category>,
#[serde(rename = "name")] #[serde(rename = "name")]
name: String, pub name: String,
#[serde(rename = "photoUrls")] #[serde(rename = "photoUrls")]
photo_urls: Vec<String>, pub photo_urls: Vec<String>,
#[serde(rename = "tags")] #[serde(rename = "tags")]
tags: Option<Vec<::models::Tag>>, pub tags: Option<Vec<::models::Tag>>,
/// pet status in the store /// pet status in the store
#[serde(rename = "status")] #[serde(rename = "status")]
status: Option<String> pub status: Option<String>,
} }
impl Pet { impl Pet {
/// A pet for sale in the pet store /// A pet for sale in the pet store
pub fn new(name: String, photo_urls: Vec<String>) -> Pet { pub fn new(name: String, photo_urls: Vec<String>) -> Pet {
Pet { Pet {
id: None, id: None,
category: None, category: None,
name: name, name: name,
photo_urls: photo_urls, photo_urls: photo_urls,
tags: None, tags: None,
status: None status: None,
}
} }
}
pub fn set_id(&mut self, id: i64) {
self.id = Some(id);
}
pub fn with_id(mut self, id: i64) -> Pet {
self.id = Some(id);
self
}
pub fn id(&self) -> Option<&i64> {
self.id.as_ref()
}
pub fn reset_id(&mut self) {
self.id = None;
}
pub fn set_category(&mut self, category: ::models::Category) {
self.category = Some(category);
}
pub fn with_category(mut self, category: ::models::Category) -> Pet {
self.category = Some(category);
self
}
pub fn category(&self) -> Option<&::models::Category> {
self.category.as_ref()
}
pub fn reset_category(&mut self) {
self.category = None;
}
pub fn set_name(&mut self, name: String) {
self.name = name;
}
pub fn with_name(mut self, name: String) -> Pet {
self.name = name;
self
}
pub fn name(&self) -> &String {
&self.name
}
pub fn set_photo_urls(&mut self, photo_urls: Vec<String>) {
self.photo_urls = photo_urls;
}
pub fn with_photo_urls(mut self, photo_urls: Vec<String>) -> Pet {
self.photo_urls = photo_urls;
self
}
pub fn photo_urls(&self) -> &Vec<String> {
&self.photo_urls
}
pub fn set_tags(&mut self, tags: Vec<::models::Tag>) {
self.tags = Some(tags);
}
pub fn with_tags(mut self, tags: Vec<::models::Tag>) -> Pet {
self.tags = Some(tags);
self
}
pub fn tags(&self) -> Option<&Vec<::models::Tag>> {
self.tags.as_ref()
}
pub fn reset_tags(&mut self) {
self.tags = None;
}
pub fn set_status(&mut self, status: String) {
self.status = Some(status);
}
pub fn with_status(mut self, status: String) -> Pet {
self.status = Some(status);
self
}
pub fn status(&self) -> Option<&String> {
self.status.as_ref()
}
pub fn reset_status(&mut self) {
self.status = None;
}
} }

View File

@ -15,56 +15,18 @@ use serde_json::Value;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct Tag { pub struct Tag {
#[serde(rename = "id")] #[serde(rename = "id")]
id: Option<i64>, pub id: Option<i64>,
#[serde(rename = "name")] #[serde(rename = "name")]
name: Option<String> pub name: Option<String>,
} }
impl Tag { impl Tag {
/// A tag for a pet /// A tag for a pet
pub fn new() -> Tag { pub fn new() -> Tag {
Tag { Tag {
id: None, id: None,
name: None name: None,
}
} }
}
pub fn set_id(&mut self, id: i64) {
self.id = Some(id);
}
pub fn with_id(mut self, id: i64) -> Tag {
self.id = Some(id);
self
}
pub fn id(&self) -> Option<&i64> {
self.id.as_ref()
}
pub fn reset_id(&mut self) {
self.id = None;
}
pub fn set_name(&mut self, name: String) {
self.name = Some(name);
}
pub fn with_name(mut self, name: String) -> Tag {
self.name = Some(name);
self
}
pub fn name(&self) -> Option<&String> {
self.name.as_ref()
}
pub fn reset_name(&mut self) {
self.name = None;
}
} }

View File

@ -15,177 +15,37 @@ use serde_json::Value;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct User { pub struct User {
#[serde(rename = "id")] #[serde(rename = "id")]
id: Option<i64>, pub id: Option<i64>,
#[serde(rename = "username")] #[serde(rename = "username")]
username: Option<String>, pub username: Option<String>,
#[serde(rename = "firstName")] #[serde(rename = "firstName")]
first_name: Option<String>, pub first_name: Option<String>,
#[serde(rename = "lastName")] #[serde(rename = "lastName")]
last_name: Option<String>, pub last_name: Option<String>,
#[serde(rename = "email")] #[serde(rename = "email")]
email: Option<String>, pub email: Option<String>,
#[serde(rename = "password")] #[serde(rename = "password")]
password: Option<String>, pub password: Option<String>,
#[serde(rename = "phone")] #[serde(rename = "phone")]
phone: Option<String>, pub phone: Option<String>,
/// User Status /// User Status
#[serde(rename = "userStatus")] #[serde(rename = "userStatus")]
user_status: Option<i32> pub user_status: Option<i32>,
} }
impl User { impl User {
/// A User who is purchasing from the pet store /// A User who is purchasing from the pet store
pub fn new() -> User { pub fn new() -> User {
User { User {
id: None, id: None,
username: None, username: None,
first_name: None, first_name: None,
last_name: None, last_name: None,
email: None, email: None,
password: None, password: None,
phone: None, phone: None,
user_status: None user_status: None,
}
} }
}
pub fn set_id(&mut self, id: i64) {
self.id = Some(id);
}
pub fn with_id(mut self, id: i64) -> User {
self.id = Some(id);
self
}
pub fn id(&self) -> Option<&i64> {
self.id.as_ref()
}
pub fn reset_id(&mut self) {
self.id = None;
}
pub fn set_username(&mut self, username: String) {
self.username = Some(username);
}
pub fn with_username(mut self, username: String) -> User {
self.username = Some(username);
self
}
pub fn username(&self) -> Option<&String> {
self.username.as_ref()
}
pub fn reset_username(&mut self) {
self.username = None;
}
pub fn set_first_name(&mut self, first_name: String) {
self.first_name = Some(first_name);
}
pub fn with_first_name(mut self, first_name: String) -> User {
self.first_name = Some(first_name);
self
}
pub fn first_name(&self) -> Option<&String> {
self.first_name.as_ref()
}
pub fn reset_first_name(&mut self) {
self.first_name = None;
}
pub fn set_last_name(&mut self, last_name: String) {
self.last_name = Some(last_name);
}
pub fn with_last_name(mut self, last_name: String) -> User {
self.last_name = Some(last_name);
self
}
pub fn last_name(&self) -> Option<&String> {
self.last_name.as_ref()
}
pub fn reset_last_name(&mut self) {
self.last_name = None;
}
pub fn set_email(&mut self, email: String) {
self.email = Some(email);
}
pub fn with_email(mut self, email: String) -> User {
self.email = Some(email);
self
}
pub fn email(&self) -> Option<&String> {
self.email.as_ref()
}
pub fn reset_email(&mut self) {
self.email = None;
}
pub fn set_password(&mut self, password: String) {
self.password = Some(password);
}
pub fn with_password(mut self, password: String) -> User {
self.password = Some(password);
self
}
pub fn password(&self) -> Option<&String> {
self.password.as_ref()
}
pub fn reset_password(&mut self) {
self.password = None;
}
pub fn set_phone(&mut self, phone: String) {
self.phone = Some(phone);
}
pub fn with_phone(mut self, phone: String) -> User {
self.phone = Some(phone);
self
}
pub fn phone(&self) -> Option<&String> {
self.phone.as_ref()
}
pub fn reset_phone(&mut self) {
self.phone = None;
}
pub fn set_user_status(&mut self, user_status: i32) {
self.user_status = Some(user_status);
}
pub fn with_user_status(mut self, user_status: i32) -> User {
self.user_status = Some(user_status);
self
}
pub fn user_status(&self) -> Option<&i32> {
self.user_status.as_ref()
}
pub fn reset_user_status(&mut self) {
self.user_status = None;
}
} }