From 69cb39f2c5d4012abff23af5b0e1aba5f9f899df Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Wed, 25 Jul 2018 23:55:07 -0700 Subject: expand, not expend --- rust/fatcat-api/README.md | 2 +- rust/fatcat-api/api.yaml | 10 +++---- rust/fatcat-api/api/swagger.yaml | 20 +++++++------- rust/fatcat-api/examples/client.rs | 10 +++---- rust/fatcat-api/examples/server_lib/server.rs | 20 +++++++------- rust/fatcat-api/src/client.rs | 40 +++++++++++++-------------- rust/fatcat-api/src/lib.rs | 40 +++++++++++++-------------- rust/fatcat-api/src/server.rs | 20 +++++++------- 8 files changed, 81 insertions(+), 81 deletions(-) (limited to 'rust') diff --git a/rust/fatcat-api/README.md b/rust/fatcat-api/README.md index ba1f13f9..0a86800f 100644 --- a/rust/fatcat-api/README.md +++ b/rust/fatcat-api/README.md @@ -13,7 +13,7 @@ To see how to make this your own, look here: [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md) - API version: 0.1.0 -- Build date: 2018-07-26T06:37:35.353Z +- Build date: 2018-07-26T06:49:34.978Z This autogenerated project defines an API crate `fatcat` which contains: * An `Api` trait defining the API in Rust. diff --git a/rust/fatcat-api/api.yaml b/rust/fatcat-api/api.yaml index 1a20c024..fd12d943 100644 --- a/rust/fatcat-api/api.yaml +++ b/rust/fatcat-api/api.yaml @@ -456,7 +456,7 @@ paths: in: path type: string required: true - - name: expend + - name: expand in: query type: string required: false @@ -544,7 +544,7 @@ paths: in: path type: string required: true - - name: expend + - name: expand in: query type: string required: false @@ -648,7 +648,7 @@ paths: in: path type: string required: true - - name: expend + - name: expand in: query type: string required: false @@ -736,7 +736,7 @@ paths: in: path type: string required: true - - name: expend + - name: expand in: query type: string required: false @@ -840,7 +840,7 @@ paths: in: path type: string required: true - - name: expend + - name: expand in: query type: string required: false diff --git a/rust/fatcat-api/api/swagger.yaml b/rust/fatcat-api/api/swagger.yaml index a3e43170..15ebfa81 100644 --- a/rust/fatcat-api/api/swagger.yaml +++ b/rust/fatcat-api/api/swagger.yaml @@ -142,14 +142,14 @@ paths: type: "string" formatString: "\\\"{}\\\"" example: "\"id_example\".to_string()" - - name: "expend" + - name: "expand" in: "query" description: "List of sub-entities to expand in response. For now, only 'all'\ \ accepted." required: false type: "string" formatString: "{:?}" - example: "Some(\"expend_example\".to_string())" + example: "Some(\"expand_example\".to_string())" responses: 200: description: "Found Entity" @@ -437,14 +437,14 @@ paths: type: "string" formatString: "\\\"{}\\\"" example: "\"id_example\".to_string()" - - name: "expend" + - name: "expand" in: "query" description: "List of sub-entities to expand in response. For now, only 'all'\ \ accepted." required: false type: "string" formatString: "{:?}" - example: "Some(\"expend_example\".to_string())" + example: "Some(\"expand_example\".to_string())" responses: 200: description: "Found Entity" @@ -786,14 +786,14 @@ paths: type: "string" formatString: "\\\"{}\\\"" example: "\"id_example\".to_string()" - - name: "expend" + - name: "expand" in: "query" description: "List of sub-entities to expand in response. For now, only 'all'\ \ accepted." required: false type: "string" formatString: "{:?}" - example: "Some(\"expend_example\".to_string())" + example: "Some(\"expand_example\".to_string())" responses: 200: description: "Found Entity" @@ -1078,14 +1078,14 @@ paths: type: "string" formatString: "\\\"{}\\\"" example: "\"id_example\".to_string()" - - name: "expend" + - name: "expand" in: "query" description: "List of sub-entities to expand in response. For now, only 'all'\ \ accepted." required: false type: "string" formatString: "{:?}" - example: "Some(\"expend_example\".to_string())" + example: "Some(\"expand_example\".to_string())" responses: 200: description: "Found Entity" @@ -1424,14 +1424,14 @@ paths: type: "string" formatString: "\\\"{}\\\"" example: "\"id_example\".to_string()" - - name: "expend" + - name: "expand" in: "query" description: "List of sub-entities to expand in response. For now, only 'all'\ \ accepted." required: false type: "string" formatString: "{:?}" - example: "Some(\"expend_example\".to_string())" + example: "Some(\"expand_example\".to_string())" responses: 200: description: "Found Entity" diff --git a/rust/fatcat-api/examples/client.rs b/rust/fatcat-api/examples/client.rs index 3cfcd965..f98518cc 100644 --- a/rust/fatcat-api/examples/client.rs +++ b/rust/fatcat-api/examples/client.rs @@ -156,7 +156,7 @@ fn main() { } Some("GetContainer") => { - let result = client.get_container("id_example".to_string(), Some("expend_example".to_string())).wait(); + let result = client.get_container("id_example".to_string(), Some("expand_example".to_string())).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -166,7 +166,7 @@ fn main() { } Some("GetCreator") => { - let result = client.get_creator("id_example".to_string(), Some("expend_example".to_string())).wait(); + let result = client.get_creator("id_example".to_string(), Some("expand_example".to_string())).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -196,7 +196,7 @@ fn main() { } Some("GetFile") => { - let result = client.get_file("id_example".to_string(), Some("expend_example".to_string())).wait(); + let result = client.get_file("id_example".to_string(), Some("expand_example".to_string())).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -206,7 +206,7 @@ fn main() { } Some("GetRelease") => { - let result = client.get_release("id_example".to_string(), Some("expend_example".to_string())).wait(); + let result = client.get_release("id_example".to_string(), Some("expand_example".to_string())).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -226,7 +226,7 @@ fn main() { } Some("GetWork") => { - let result = client.get_work("id_example".to_string(), Some("expend_example".to_string())).wait(); + let result = client.get_work("id_example".to_string(), Some("expand_example".to_string())).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } diff --git a/rust/fatcat-api/examples/server_lib/server.rs b/rust/fatcat-api/examples/server_lib/server.rs index bd18d8fb..572025f0 100644 --- a/rust/fatcat-api/examples/server_lib/server.rs +++ b/rust/fatcat-api/examples/server_lib/server.rs @@ -110,9 +110,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn get_container(&self, id: String, expend: Option, context: &Context) -> Box + Send> { + fn get_container(&self, id: String, expand: Option, context: &Context) -> Box + Send> { let context = context.clone(); - println!("get_container(\"{}\", {:?}) - X-Span-ID: {:?}", id, expend, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("get_container(\"{}\", {:?}) - X-Span-ID: {:?}", id, expand, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -127,9 +127,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn get_creator(&self, id: String, expend: Option, context: &Context) -> Box + Send> { + fn get_creator(&self, id: String, expand: Option, context: &Context) -> Box + Send> { let context = context.clone(); - println!("get_creator(\"{}\", {:?}) - X-Span-ID: {:?}", id, expend, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("get_creator(\"{}\", {:?}) - X-Span-ID: {:?}", id, expand, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -168,9 +168,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn get_file(&self, id: String, expend: Option, context: &Context) -> Box + Send> { + fn get_file(&self, id: String, expand: Option, context: &Context) -> Box + Send> { let context = context.clone(); - println!("get_file(\"{}\", {:?}) - X-Span-ID: {:?}", id, expend, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("get_file(\"{}\", {:?}) - X-Span-ID: {:?}", id, expand, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -185,9 +185,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn get_release(&self, id: String, expend: Option, context: &Context) -> Box + Send> { + fn get_release(&self, id: String, expand: Option, context: &Context) -> Box + Send> { let context = context.clone(); - println!("get_release(\"{}\", {:?}) - X-Span-ID: {:?}", id, expend, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("get_release(\"{}\", {:?}) - X-Span-ID: {:?}", id, expand, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -214,9 +214,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn get_work(&self, id: String, expend: Option, context: &Context) -> Box + Send> { + fn get_work(&self, id: String, expand: Option, context: &Context) -> Box + Send> { let context = context.clone(); - println!("get_work(\"{}\", {:?}) - X-Span-ID: {:?}", id, expend, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("get_work(\"{}\", {:?}) - X-Span-ID: {:?}", id, expand, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } diff --git a/rust/fatcat-api/src/client.rs b/rust/fatcat-api/src/client.rs index 10d4287d..bc1992de 100644 --- a/rust/fatcat-api/src/client.rs +++ b/rust/fatcat-api/src/client.rs @@ -1035,15 +1035,15 @@ impl Api for Client { Box::new(futures::done(result)) } - fn get_container(&self, param_id: String, param_expend: Option, context: &Context) -> Box + Send> { + fn get_container(&self, param_id: String, param_expand: Option, context: &Context) -> Box + Send> { // Query parameters - let query_expend = param_expend.map_or_else(String::new, |query| format!("expend={expend}&", expend = query.to_string())); + let query_expand = param_expand.map_or_else(String::new, |query| format!("expand={expand}&", expand = query.to_string())); let url = format!( - "{}/v0/container/{id}?{expend}", + "{}/v0/container/{id}?{expand}", self.base_path, id = utf8_percent_encode(¶m_id.to_string(), PATH_SEGMENT_ENCODE_SET), - expend = utf8_percent_encode(&query_expend, QUERY_ENCODE_SET) + expand = utf8_percent_encode(&query_expand, QUERY_ENCODE_SET) ); let hyper_client = (self.hyper_client)(); @@ -1171,15 +1171,15 @@ impl Api for Client { Box::new(futures::done(result)) } - fn get_creator(&self, param_id: String, param_expend: Option, context: &Context) -> Box + Send> { + fn get_creator(&self, param_id: String, param_expand: Option, context: &Context) -> Box + Send> { // Query parameters - let query_expend = param_expend.map_or_else(String::new, |query| format!("expend={expend}&", expend = query.to_string())); + let query_expand = param_expand.map_or_else(String::new, |query| format!("expand={expand}&", expand = query.to_string())); let url = format!( - "{}/v0/creator/{id}?{expend}", + "{}/v0/creator/{id}?{expand}", self.base_path, id = utf8_percent_encode(¶m_id.to_string(), PATH_SEGMENT_ENCODE_SET), - expend = utf8_percent_encode(&query_expend, QUERY_ENCODE_SET) + expand = utf8_percent_encode(&query_expand, QUERY_ENCODE_SET) ); let hyper_client = (self.hyper_client)(); @@ -1533,15 +1533,15 @@ impl Api for Client { Box::new(futures::done(result)) } - fn get_file(&self, param_id: String, param_expend: Option, context: &Context) -> Box + Send> { + fn get_file(&self, param_id: String, param_expand: Option, context: &Context) -> Box + Send> { // Query parameters - let query_expend = param_expend.map_or_else(String::new, |query| format!("expend={expend}&", expend = query.to_string())); + let query_expand = param_expand.map_or_else(String::new, |query| format!("expand={expand}&", expand = query.to_string())); let url = format!( - "{}/v0/file/{id}?{expend}", + "{}/v0/file/{id}?{expand}", self.base_path, id = utf8_percent_encode(¶m_id.to_string(), PATH_SEGMENT_ENCODE_SET), - expend = utf8_percent_encode(&query_expend, QUERY_ENCODE_SET) + expand = utf8_percent_encode(&query_expand, QUERY_ENCODE_SET) ); let hyper_client = (self.hyper_client)(); @@ -1669,15 +1669,15 @@ impl Api for Client { Box::new(futures::done(result)) } - fn get_release(&self, param_id: String, param_expend: Option, context: &Context) -> Box + Send> { + fn get_release(&self, param_id: String, param_expand: Option, context: &Context) -> Box + Send> { // Query parameters - let query_expend = param_expend.map_or_else(String::new, |query| format!("expend={expend}&", expend = query.to_string())); + let query_expand = param_expand.map_or_else(String::new, |query| format!("expand={expand}&", expand = query.to_string())); let url = format!( - "{}/v0/release/{id}?{expend}", + "{}/v0/release/{id}?{expand}", self.base_path, id = utf8_percent_encode(¶m_id.to_string(), PATH_SEGMENT_ENCODE_SET), - expend = utf8_percent_encode(&query_expend, QUERY_ENCODE_SET) + expand = utf8_percent_encode(&query_expand, QUERY_ENCODE_SET) ); let hyper_client = (self.hyper_client)(); @@ -1914,15 +1914,15 @@ impl Api for Client { Box::new(futures::done(result)) } - fn get_work(&self, param_id: String, param_expend: Option, context: &Context) -> Box + Send> { + fn get_work(&self, param_id: String, param_expand: Option, context: &Context) -> Box + Send> { // Query parameters - let query_expend = param_expend.map_or_else(String::new, |query| format!("expend={expend}&", expend = query.to_string())); + let query_expand = param_expand.map_or_else(String::new, |query| format!("expand={expand}&", expand = query.to_string())); let url = format!( - "{}/v0/work/{id}?{expend}", + "{}/v0/work/{id}?{expand}", self.base_path, id = utf8_percent_encode(¶m_id.to_string(), PATH_SEGMENT_ENCODE_SET), - expend = utf8_percent_encode(&query_expend, QUERY_ENCODE_SET) + expand = utf8_percent_encode(&query_expand, QUERY_ENCODE_SET) ); let hyper_client = (self.hyper_client)(); diff --git a/rust/fatcat-api/src/lib.rs b/rust/fatcat-api/src/lib.rs index c55d6eea..fac8ecac 100644 --- a/rust/fatcat-api/src/lib.rs +++ b/rust/fatcat-api/src/lib.rs @@ -466,11 +466,11 @@ pub trait Api { fn get_changelog_entry(&self, id: i64, context: &Context) -> Box + Send>; - fn get_container(&self, id: String, expend: Option, context: &Context) -> Box + Send>; + fn get_container(&self, id: String, expand: Option, context: &Context) -> Box + Send>; fn get_container_history(&self, id: String, limit: Option, context: &Context) -> Box + Send>; - fn get_creator(&self, id: String, expend: Option, context: &Context) -> Box + Send>; + fn get_creator(&self, id: String, expand: Option, context: &Context) -> Box + Send>; fn get_creator_history(&self, id: String, limit: Option, context: &Context) -> Box + Send>; @@ -482,11 +482,11 @@ pub trait Api { fn get_editor_changelog(&self, id: String, context: &Context) -> Box + Send>; - fn get_file(&self, id: String, expend: Option, context: &Context) -> Box + Send>; + fn get_file(&self, id: String, expand: Option, context: &Context) -> Box + Send>; fn get_file_history(&self, id: String, limit: Option, context: &Context) -> Box + Send>; - fn get_release(&self, id: String, expend: Option, context: &Context) -> Box + Send>; + fn get_release(&self, id: String, expand: Option, context: &Context) -> Box + Send>; fn get_release_files(&self, id: String, context: &Context) -> Box + Send>; @@ -494,7 +494,7 @@ pub trait Api { fn get_stats(&self, more: Option, context: &Context) -> Box + Send>; - fn get_work(&self, id: String, expend: Option, context: &Context) -> Box + Send>; + fn get_work(&self, id: String, expand: Option, context: &Context) -> Box + Send>; fn get_work_history(&self, id: String, limit: Option, context: &Context) -> Box + Send>; @@ -539,11 +539,11 @@ pub trait ApiNoContext { fn get_changelog_entry(&self, id: i64) -> Box + Send>; - fn get_container(&self, id: String, expend: Option) -> Box + Send>; + fn get_container(&self, id: String, expand: Option) -> Box + Send>; fn get_container_history(&self, id: String, limit: Option) -> Box + Send>; - fn get_creator(&self, id: String, expend: Option) -> Box + Send>; + fn get_creator(&self, id: String, expand: Option) -> Box + Send>; fn get_creator_history(&self, id: String, limit: Option) -> Box + Send>; @@ -555,11 +555,11 @@ pub trait ApiNoContext { fn get_editor_changelog(&self, id: String) -> Box + Send>; - fn get_file(&self, id: String, expend: Option) -> Box + Send>; + fn get_file(&self, id: String, expand: Option) -> Box + Send>; fn get_file_history(&self, id: String, limit: Option) -> Box + Send>; - fn get_release(&self, id: String, expend: Option) -> Box + Send>; + fn get_release(&self, id: String, expand: Option) -> Box + Send>; fn get_release_files(&self, id: String) -> Box + Send>; @@ -567,7 +567,7 @@ pub trait ApiNoContext { fn get_stats(&self, more: Option) -> Box + Send>; - fn get_work(&self, id: String, expend: Option) -> Box + Send>; + fn get_work(&self, id: String, expand: Option) -> Box + Send>; fn get_work_history(&self, id: String, limit: Option) -> Box + Send>; @@ -654,16 +654,16 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().get_changelog_entry(id, &self.context()) } - fn get_container(&self, id: String, expend: Option) -> Box + Send> { - self.api().get_container(id, expend, &self.context()) + fn get_container(&self, id: String, expand: Option) -> Box + Send> { + self.api().get_container(id, expand, &self.context()) } fn get_container_history(&self, id: String, limit: Option) -> Box + Send> { self.api().get_container_history(id, limit, &self.context()) } - fn get_creator(&self, id: String, expend: Option) -> Box + Send> { - self.api().get_creator(id, expend, &self.context()) + fn get_creator(&self, id: String, expand: Option) -> Box + Send> { + self.api().get_creator(id, expand, &self.context()) } fn get_creator_history(&self, id: String, limit: Option) -> Box + Send> { @@ -686,16 +686,16 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().get_editor_changelog(id, &self.context()) } - fn get_file(&self, id: String, expend: Option) -> Box + Send> { - self.api().get_file(id, expend, &self.context()) + fn get_file(&self, id: String, expand: Option) -> Box + Send> { + self.api().get_file(id, expand, &self.context()) } fn get_file_history(&self, id: String, limit: Option) -> Box + Send> { self.api().get_file_history(id, limit, &self.context()) } - fn get_release(&self, id: String, expend: Option) -> Box + Send> { - self.api().get_release(id, expend, &self.context()) + fn get_release(&self, id: String, expand: Option) -> Box + Send> { + self.api().get_release(id, expand, &self.context()) } fn get_release_files(&self, id: String) -> Box + Send> { @@ -710,8 +710,8 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().get_stats(more, &self.context()) } - fn get_work(&self, id: String, expend: Option) -> Box + Send> { - self.api().get_work(id, expend, &self.context()) + fn get_work(&self, id: String, expand: Option) -> Box + Send> { + self.api().get_work(id, expand, &self.context()) } fn get_work_history(&self, id: String, limit: Option) -> Box + Send> { diff --git a/rust/fatcat-api/src/server.rs b/rust/fatcat-api/src/server.rs index 0b170f03..68e08515 100644 --- a/rust/fatcat-api/src/server.rs +++ b/rust/fatcat-api/src/server.rs @@ -1497,9 +1497,9 @@ where // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response) let query_params = req.get::().unwrap_or_default(); - let param_expend = query_params.get("expend").and_then(|list| list.first()).and_then(|x| x.parse::().ok()); + let param_expand = query_params.get("expand").and_then(|list| list.first()).and_then(|x| x.parse::().ok()); - match api.get_container(param_id, param_expend, context).wait() { + match api.get_container(param_id, param_expand, context).wait() { Ok(rsp) => match rsp { GetContainerResponse::FoundEntity(body) => { let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize"); @@ -1681,9 +1681,9 @@ where // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response) let query_params = req.get::().unwrap_or_default(); - let param_expend = query_params.get("expend").and_then(|list| list.first()).and_then(|x| x.parse::().ok()); + let param_expand = query_params.get("expand").and_then(|list| list.first()).and_then(|x| x.parse::().ok()); - match api.get_creator(param_id, param_expend, context).wait() { + match api.get_creator(param_id, param_expand, context).wait() { Ok(rsp) => match rsp { GetCreatorResponse::FoundEntity(body) => { let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize"); @@ -2197,9 +2197,9 @@ where // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response) let query_params = req.get::().unwrap_or_default(); - let param_expend = query_params.get("expend").and_then(|list| list.first()).and_then(|x| x.parse::().ok()); + let param_expand = query_params.get("expand").and_then(|list| list.first()).and_then(|x| x.parse::().ok()); - match api.get_file(param_id, param_expend, context).wait() { + match api.get_file(param_id, param_expand, context).wait() { Ok(rsp) => match rsp { GetFileResponse::FoundEntity(body) => { let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize"); @@ -2381,9 +2381,9 @@ where // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response) let query_params = req.get::().unwrap_or_default(); - let param_expend = query_params.get("expend").and_then(|list| list.first()).and_then(|x| x.parse::().ok()); + let param_expand = query_params.get("expand").and_then(|list| list.first()).and_then(|x| x.parse::().ok()); - match api.get_release(param_id, param_expend, context).wait() { + match api.get_release(param_id, param_expand, context).wait() { Ok(rsp) => match rsp { GetReleaseResponse::FoundEntity(body) => { let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize"); @@ -2711,9 +2711,9 @@ where // Query parameters (note that non-required or collection query parameters will ignore garbage values, rather than causing a 400 response) let query_params = req.get::().unwrap_or_default(); - let param_expend = query_params.get("expend").and_then(|list| list.first()).and_then(|x| x.parse::().ok()); + let param_expand = query_params.get("expand").and_then(|list| list.first()).and_then(|x| x.parse::().ok()); - match api.get_work(param_id, param_expend, context).wait() { + match api.get_work(param_id, param_expand, context).wait() { Ok(rsp) => match rsp { GetWorkResponse::FoundEntity(body) => { let body_string = serde_json::to_string(&body).expect("impossible to fail to serialize"); -- cgit v1.2.3