From a61b7bbc6564bb1526f4254c4cd54e3cc8cd7eda Mon Sep 17 00:00:00 2001 From: Richard Whitehouse Date: Wed, 20 Jan 2021 23:16:54 +0000 Subject: [PATCH] [Rust Server] Reinstate tests (#8477) * 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 --- .../src/main/resources/rust-server/Cargo.mustache | 4 ++-- .../src/main/resources/rust-server/server-operation.mustache | 2 +- pom.xml | 2 +- .../petstore/rust-server/output/multipart-v3/Cargo.toml | 4 ++-- .../rust-server/output/multipart-v3/src/server/mod.rs | 2 +- .../petstore/rust-server/output/no-example-v3/Cargo.toml | 2 +- .../server/petstore/rust-server/output/openapi-v3/Cargo.toml | 2 +- samples/server/petstore/rust-server/output/ops-v3/Cargo.toml | 2 +- .../Cargo.toml | 4 ++-- .../src/server/mod.rs | 2 +- .../petstore/rust-server/output/rust-server-test/Cargo.toml | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache b/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache index 6625d274b0a..4c733fbafe4 100644 --- a/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache +++ b/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache @@ -15,7 +15,7 @@ client = [ "mime_0_2", {{/apiUsesMultipart}} {{#apiUsesMultipartFormData}} - "multipart", "multipart/client", "swagger/multipart", + "multipart", "multipart/client", "swagger/multipart_form", {{/apiUsesMultipartFormData}} {{#apiUsesMultipartRelated}} "hyper_0_10", "mime_multipart", @@ -60,7 +60,7 @@ openssl = {version = "0.10", optional = true } async-trait = "0.1.24" chrono = { version = "0.4", features = ["serde"] } futures = "0.3" -swagger = "5.0.0-alpha-1" +swagger = "5.0.2" log = "0.4.0" mime = "0.3" diff --git a/modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache b/modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache index 6399da844aa..cbb812e4f26 100644 --- a/modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache +++ b/modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache @@ -39,7 +39,7 @@ {{/hasAuthMethods}} {{#vendorExtensions}} {{#x-consumes-multipart}} - let boundary = match swagger::multipart::boundary(&headers) { + let boundary = match swagger::multipart::form::boundary(&headers) { Some(boundary) => boundary.to_string(), None => return Ok(Response::builder() .status(StatusCode::BAD_REQUEST) diff --git a/pom.xml b/pom.xml index 79d7cf93da1..1213adf3b32 100644 --- a/pom.xml +++ b/pom.xml @@ -1189,7 +1189,7 @@ samples/server/petstore/php-slim4 samples/server/petstore/php-laravel samples/server/petstore/php-lumen - + samples/server/petstore/rust-server diff --git a/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml b/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml index eaca5af92e2..9efa57da146 100644 --- a/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml +++ b/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" default = ["client", "server"] client = [ "mime_0_2", - "multipart", "multipart/client", "swagger/multipart", + "multipart", "multipart/client", "swagger/multipart_form", "hyper_0_10", "mime_multipart", "hyper", "hyper-openssl", "hyper-tls", "native-tls", "openssl", "url" ] @@ -35,7 +35,7 @@ openssl = {version = "0.10", optional = true } async-trait = "0.1.24" chrono = { version = "0.4", features = ["serde"] } futures = "0.3" -swagger = "5.0.0-alpha-1" +swagger = "5.0.2" log = "0.4.0" mime = "0.3" diff --git a/samples/server/petstore/rust-server/output/multipart-v3/src/server/mod.rs b/samples/server/petstore/rust-server/output/multipart-v3/src/server/mod.rs index 72cf6b4f20e..a9890bb121a 100644 --- a/samples/server/petstore/rust-server/output/multipart-v3/src/server/mod.rs +++ b/samples/server/petstore/rust-server/output/multipart-v3/src/server/mod.rs @@ -286,7 +286,7 @@ impl hyper::service::Service<(Request, C)> for Service where // MultipartRequestPost - POST /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(), None => return Ok(Response::builder() .status(StatusCode::BAD_REQUEST) diff --git a/samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml b/samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml index da632fac28d..589b163d0e3 100644 --- a/samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml +++ b/samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml @@ -29,7 +29,7 @@ openssl = {version = "0.10", optional = true } async-trait = "0.1.24" chrono = { version = "0.4", features = ["serde"] } futures = "0.3" -swagger = "5.0.0-alpha-1" +swagger = "5.0.2" log = "0.4.0" mime = "0.3" diff --git a/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml b/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml index 0f19d1f064a..45c2007cd6f 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml +++ b/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml @@ -31,7 +31,7 @@ openssl = {version = "0.10", optional = true } async-trait = "0.1.24" chrono = { version = "0.4", features = ["serde"] } futures = "0.3" -swagger = "5.0.0-alpha-1" +swagger = "5.0.2" log = "0.4.0" mime = "0.3" diff --git a/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml b/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml index 793ffbb6c00..5410fb3d3cf 100644 --- a/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml +++ b/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml @@ -29,7 +29,7 @@ openssl = {version = "0.10", optional = true } async-trait = "0.1.24" chrono = { version = "0.4", features = ["serde"] } futures = "0.3" -swagger = "5.0.0-alpha-1" +swagger = "5.0.2" log = "0.4.0" mime = "0.3" diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml index 869f0b722d7..fb344637445 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" default = ["client", "server"] client = [ "mime_0_2", - "multipart", "multipart/client", "swagger/multipart", + "multipart", "multipart/client", "swagger/multipart_form", "serde_urlencoded", "hyper", "hyper-openssl", "hyper-tls", "native-tls", "openssl", "url" ] @@ -34,7 +34,7 @@ openssl = {version = "0.10", optional = true } async-trait = "0.1.24" chrono = { version = "0.4", features = ["serde"] } futures = "0.3" -swagger = "5.0.0-alpha-1" +swagger = "5.0.2" log = "0.4.0" mime = "0.3" diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs index a4ea1843810..9803b110d86 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs @@ -1989,7 +1989,7 @@ impl hyper::service::Service<(Request, C)> for Service where } } - let boundary = match swagger::multipart::boundary(&headers) { + let boundary = match swagger::multipart::form::boundary(&headers) { Some(boundary) => boundary.to_string(), None => return Ok(Response::builder() .status(StatusCode::BAD_REQUEST) diff --git a/samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml b/samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml index adb71498607..929cb2bf04b 100644 --- a/samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml +++ b/samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml @@ -29,7 +29,7 @@ openssl = {version = "0.10", optional = true } async-trait = "0.1.24" chrono = { version = "0.4", features = ["serde"] } futures = "0.3" -swagger = "5.0.0-alpha-1" +swagger = "5.0.2" log = "0.4.0" mime = "0.3"