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

[Rust Server] Reinstate tests (#8477)

Browse Source 
* Revert "comment out rust server tests (#8440)"

This reverts commit 32b01cb39bea5bc0d006e9d31d41afedf4dcab29.

* Update to swagger-rs 5.0.2

* Update samples for swagger-rs 5.0.2

* Update swagger multipart usage

- swagger/multipart renamed multipart_form
- Update boundary call

* Update samples
This commit is contained in:
Richard Whitehouse 2021-01-20 23:16:54 +00:00 committed by GitHub
parent 4d75a29991
commit a61b7bbc65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache vendored
View File

@ -15,7 +15,7 @@ client = [
"mime_0_2", "mime_0_2",
{{/apiUsesMultipart}} {{/apiUsesMultipart}}
{{#apiUsesMultipartFormData}} {{#apiUsesMultipartFormData}}
"multipart", "multipart/client", "swagger/multipart", "multipart", "multipart/client", "swagger/multipart_form",
{{/apiUsesMultipartFormData}} {{/apiUsesMultipartFormData}}
{{#apiUsesMultipartRelated}} {{#apiUsesMultipartRelated}}
"hyper_0_10", "mime_multipart", "hyper_0_10", "mime_multipart",
@ -60,7 +60,7 @@ openssl = {version = "0.10", optional = true }
async-trait = "0.1.24" async-trait = "0.1.24"
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
futures = "0.3" futures = "0.3"
swagger = "5.0.0-alpha-1" swagger = "5.0.2"
log = "0.4.0" log = "0.4.0"
mime = "0.3" mime = "0.3"

2
modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache vendored
View File

@ -39,7 +39,7 @@
{{/hasAuthMethods}} {{/hasAuthMethods}}
{{#vendorExtensions}} {{#vendorExtensions}}
{{#x-consumes-multipart}} {{#x-consumes-multipart}}
let boundary = match swagger::multipart::boundary(&headers) { let boundary = match swagger::multipart::form::boundary(&headers) {
Some(boundary) => boundary.to_string(), Some(boundary) => boundary.to_string(),
None => return Ok(Response::builder() None => return Ok(Response::builder()
.status(StatusCode::BAD_REQUEST) .status(StatusCode::BAD_REQUEST)

2
pom.xml
View File

@ -1189,7 +1189,7 @@
<module>samples/server/petstore/php-slim4</module> <module>samples/server/petstore/php-slim4</module>
<module>samples/server/petstore/php-laravel</module> <module>samples/server/petstore/php-laravel</module>
<module>samples/server/petstore/php-lumen</module> <module>samples/server/petstore/php-lumen</module>
<!--<module>samples/server/petstore/rust-server</module>--> <module>samples/server/petstore/rust-server</module>
<!-- clients --> <!-- clients -->
<!--<module>samples/client/petstore/perl</module> <!--<module>samples/client/petstore/perl</module>
<module>samples/client/petstore/bash</module>--> <module>samples/client/petstore/bash</module>-->

4
samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml
View File

@ -10,7 +10,7 @@ edition = "2018"
default = ["client", "server"] default = ["client", "server"]
client = [ client = [
"mime_0_2", "mime_0_2",
"multipart", "multipart/client", "swagger/multipart", "multipart", "multipart/client", "swagger/multipart_form",
"hyper_0_10", "mime_multipart", "hyper_0_10", "mime_multipart",
"hyper", "hyper-openssl", "hyper-tls", "native-tls", "openssl", "url" "hyper", "hyper-openssl", "hyper-tls", "native-tls", "openssl", "url"
] ]
@ -35,7 +35,7 @@ openssl = {version = "0.10", optional = true }
async-trait = "0.1.24" async-trait = "0.1.24"
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
futures = "0.3" futures = "0.3"
swagger = "5.0.0-alpha-1" swagger = "5.0.2"
log = "0.4.0" log = "0.4.0"
mime = "0.3" mime = "0.3"

2
samples/server/petstore/rust-server/output/multipart-v3/src/server/mod.rs
View File

@ -286,7 +286,7 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
// MultipartRequestPost - POST /multipart_request // MultipartRequestPost - POST /multipart_request
&hyper::Method::POST if path.matched(paths::ID_MULTIPART_REQUEST) => { &hyper::Method::POST if path.matched(paths::ID_MULTIPART_REQUEST) => {
let boundary = match swagger::multipart::boundary(&headers) { let boundary = match swagger::multipart::form::boundary(&headers) {
Some(boundary) => boundary.to_string(), Some(boundary) => boundary.to_string(),
None => return Ok(Response::builder() None => return Ok(Response::builder()
.status(StatusCode::BAD_REQUEST) .status(StatusCode::BAD_REQUEST)

2
samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml
View File

@ -29,7 +29,7 @@ openssl = {version = "0.10", optional = true }
async-trait = "0.1.24" async-trait = "0.1.24"
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
futures = "0.3" futures = "0.3"
swagger = "5.0.0-alpha-1" swagger = "5.0.2"
log = "0.4.0" log = "0.4.0"
mime = "0.3" mime = "0.3"

2
samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml
View File

@ -31,7 +31,7 @@ openssl = {version = "0.10", optional = true }
async-trait = "0.1.24" async-trait = "0.1.24"
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
futures = "0.3" futures = "0.3"
swagger = "5.0.0-alpha-1" swagger = "5.0.2"
log = "0.4.0" log = "0.4.0"
mime = "0.3" mime = "0.3"

2
samples/server/petstore/rust-server/output/ops-v3/Cargo.toml
View File

@ -29,7 +29,7 @@ openssl = {version = "0.10", optional = true }
async-trait = "0.1.24" async-trait = "0.1.24"
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
futures = "0.3" futures = "0.3"
swagger = "5.0.0-alpha-1" swagger = "5.0.2"
log = "0.4.0" log = "0.4.0"
mime = "0.3" mime = "0.3"

4
samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml
View File

@ -10,7 +10,7 @@ edition = "2018"
default = ["client", "server"] default = ["client", "server"]
client = [ client = [
"mime_0_2", "mime_0_2",
"multipart", "multipart/client", "swagger/multipart", "multipart", "multipart/client", "swagger/multipart_form",
"serde_urlencoded", "serde_urlencoded",
"hyper", "hyper-openssl", "hyper-tls", "native-tls", "openssl", "url" "hyper", "hyper-openssl", "hyper-tls", "native-tls", "openssl", "url"
] ]
@ -34,7 +34,7 @@ openssl = {version = "0.10", optional = true }
async-trait = "0.1.24" async-trait = "0.1.24"
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
futures = "0.3" futures = "0.3"
swagger = "5.0.0-alpha-1" swagger = "5.0.2"
log = "0.4.0" log = "0.4.0"
mime = "0.3" mime = "0.3"

2
samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs
View File

@ -1989,7 +1989,7 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
} }
} }
let boundary = match swagger::multipart::boundary(&headers) { let boundary = match swagger::multipart::form::boundary(&headers) {
Some(boundary) => boundary.to_string(), Some(boundary) => boundary.to_string(),
None => return Ok(Response::builder() None => return Ok(Response::builder()
.status(StatusCode::BAD_REQUEST) .status(StatusCode::BAD_REQUEST)

2
samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml
View File

@ -29,7 +29,7 @@ openssl = {version = "0.10", optional = true }
async-trait = "0.1.24" async-trait = "0.1.24"
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
futures = "0.3" futures = "0.3"
swagger = "5.0.0-alpha-1" swagger = "5.0.2"
log = "0.4.0" log = "0.4.0"
mime = "0.3" mime = "0.3"