Skip to content

Commit a61b7bb

Browse files
richardwhiukrichardwhiuk
authored
[Rust Server] Reinstate tests (#8477)
* Revert "comment out rust server tests (#8440)" This reverts commit 32b01cb. * 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
1 parent 4d75a29 commit a61b7bb

11 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ client = [
1515
"mime_0_2",
1616
{{/apiUsesMultipart}}
1717
{{#apiUsesMultipartFormData}}
18-
"multipart", "multipart/client", "swagger/multipart",
18+
"multipart", "multipart/client", "swagger/multipart_form",
1919
{{/apiUsesMultipartFormData}}
2020
{{#apiUsesMultipartRelated}}
2121
"hyper_0_10", "mime_multipart",
@@ -60,7 +60,7 @@ openssl = {version = "0.10", optional = true }
6060
async-trait = "0.1.24"
6161
chrono = { version = "0.4", features = ["serde"] }
6262
futures = "0.3"
63-
swagger = "5.0.0-alpha-1"
63+
swagger = "5.0.2"
6464
log = "0.4.0"
6565
mime = "0.3"
6666

‎modules/openapi-generator/src/main/resources/rust-server/server-operation.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
{{/hasAuthMethods}}
4040
{{#vendorExtensions}}
4141
{{#x-consumes-multipart}}
42-
let boundary = match swagger::multipart::boundary(&headers) {
42+
let boundary = match swagger::multipart::form::boundary(&headers) {
4343
Some(boundary) => boundary.to_string(),
4444
None => return Ok(Response::builder()
4545
.status(StatusCode::BAD_REQUEST)

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1189,7 +1189,7 @@
11891189
<module>samples/server/petstore/php-slim4</module>
11901190
<module>samples/server/petstore/php-laravel</module>
11911191
<module>samples/server/petstore/php-lumen</module>
1192-
<!--<module>samples/server/petstore/rust-server</module>-->
1192+
<module>samples/server/petstore/rust-server</module>
11931193
<!-- clients -->
11941194
<!--<module>samples/client/petstore/perl</module>
11951195
<module>samples/client/petstore/bash</module>-->

‎samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2018"
1010
default = ["client", "server"]
1111
client = [
1212
"mime_0_2",
13-
"multipart", "multipart/client", "swagger/multipart",
13+
"multipart", "multipart/client", "swagger/multipart_form",
1414
"hyper_0_10", "mime_multipart",
1515
"hyper", "hyper-openssl", "hyper-tls", "native-tls", "openssl", "url"
1616
]
@@ -35,7 +35,7 @@ openssl = {version = "0.10", optional = true }
3535
async-trait = "0.1.24"
3636
chrono = { version = "0.4", features = ["serde"] }
3737
futures = "0.3"
38-
swagger = "5.0.0-alpha-1"
38+
swagger = "5.0.2"
3939
log = "0.4.0"
4040
mime = "0.3"
4141

‎samples/server/petstore/rust-server/output/multipart-v3/src/server/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
286286

287287
// MultipartRequestPost - POST /multipart_request
288288
&hyper::Method::POST if path.matched(paths::ID_MULTIPART_REQUEST) => {
289-
let boundary = match swagger::multipart::boundary(&headers) {
289+
let boundary = match swagger::multipart::form::boundary(&headers) {
290290
Some(boundary) => boundary.to_string(),
291291
None => return Ok(Response::builder()
292292
.status(StatusCode::BAD_REQUEST)

‎samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ openssl = {version = "0.10", optional = true }
2929
async-trait = "0.1.24"
3030
chrono = { version = "0.4", features = ["serde"] }
3131
futures = "0.3"
32-
swagger = "5.0.0-alpha-1"
32+
swagger = "5.0.2"
3333
log = "0.4.0"
3434
mime = "0.3"
3535

‎samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ openssl = {version = "0.10", optional = true }
3131
async-trait = "0.1.24"
3232
chrono = { version = "0.4", features = ["serde"] }
3333
futures = "0.3"
34-
swagger = "5.0.0-alpha-1"
34+
swagger = "5.0.2"
3535
log = "0.4.0"
3636
mime = "0.3"
3737

‎samples/server/petstore/rust-server/output/ops-v3/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ openssl = {version = "0.10", optional = true }
2929
async-trait = "0.1.24"
3030
chrono = { version = "0.4", features = ["serde"] }
3131
futures = "0.3"
32-
swagger = "5.0.0-alpha-1"
32+
swagger = "5.0.2"
3333
log = "0.4.0"
3434
mime = "0.3"
3535

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2018"
1010
default = ["client", "server"]
1111
client = [
1212
"mime_0_2",
13-
"multipart", "multipart/client", "swagger/multipart",
13+
"multipart", "multipart/client", "swagger/multipart_form",
1414
"serde_urlencoded",
1515
"hyper", "hyper-openssl", "hyper-tls", "native-tls", "openssl", "url"
1616
]
@@ -34,7 +34,7 @@ openssl = {version = "0.10", optional = true }
3434
async-trait = "0.1.24"
3535
chrono = { version = "0.4", features = ["serde"] }
3636
futures = "0.3"
37-
swagger = "5.0.0-alpha-1"
37+
swagger = "5.0.2"
3838
log = "0.4.0"
3939
mime = "0.3"
4040

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1989,7 +1989,7 @@ impl<T, C> hyper::service::Service<(Request<Body>, C)> for Service<T, C> where
19891989
}
19901990
}
19911991

1992-
let boundary = match swagger::multipart::boundary(&headers) {
1992+
let boundary = match swagger::multipart::form::boundary(&headers) {
19931993
Some(boundary) => boundary.to_string(),
19941994
None => return Ok(Response::builder()
19951995
.status(StatusCode::BAD_REQUEST)

0 commit comments

Comments
 (0)