From 05ace4f43f8f936fcff82d2e7d2aa638e464e7d2 Mon Sep 17 00:00:00 2001
From: Richard Whitehouse <richard.whitehouse@metaswitch.com>
Date: Tue, 24 Mar 2020 09:25:48 +0000
Subject: [PATCH] [Rust Server] Preserve path provided in base path (#5555)

* Preserve path provided in base path
* Update samples
---
 .../src/main/resources/rust-server/client-mod.mustache          | 2 +-
 .../petstore/rust-server/output/multipart-v3/src/client/mod.rs  | 2 +-
 .../petstore/rust-server/output/no-example-v3/src/client/mod.rs | 2 +-
 .../petstore/rust-server/output/openapi-v3/src/client/mod.rs    | 2 +-
 .../server/petstore/rust-server/output/ops-v3/src/client/mod.rs | 2 +-
 .../src/client/mod.rs                                           | 2 +-
 .../rust-server/output/rust-server-test/src/client/mod.rs       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache b/modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache
index 5bd0071fad3..7b6e286489b 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache
@@ -23,7 +23,7 @@ fn into_base_path(input: &str, correct_scheme: Option<&'static str>) -> Result<S
 
     let host = uri.host().ok_or_else(|| ClientInitError::MissingHost)?;
     let port = uri.port_part().map(|x| format!(":{}", x)).unwrap_or_default();
-    Ok(format!("{}://{}{}", scheme, host, port))
+    Ok(format!("{}://{}{}{}", scheme, host, port, uri.path().trim_end_matches('/')))
 }
 
 /// A client that implements the API by making HTTP calls out to a server.
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs b/samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs
index 117b34ab85b..2015e861f9b 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/multipart-v3/src/client/mod.rs
@@ -62,7 +62,7 @@ fn into_base_path(input: &str, correct_scheme: Option<&'static str>) -> Result<S
 
     let host = uri.host().ok_or_else(|| ClientInitError::MissingHost)?;
     let port = uri.port_part().map(|x| format!(":{}", x)).unwrap_or_default();
-    Ok(format!("{}://{}{}", scheme, host, port))
+    Ok(format!("{}://{}{}{}", scheme, host, port, uri.path().trim_end_matches('/')))
 }
 
 /// A client that implements the API by making HTTP calls out to a server.
diff --git a/samples/server/petstore/rust-server/output/no-example-v3/src/client/mod.rs b/samples/server/petstore/rust-server/output/no-example-v3/src/client/mod.rs
index 7823059fba3..d055f146067 100644
--- a/samples/server/petstore/rust-server/output/no-example-v3/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/no-example-v3/src/client/mod.rs
@@ -54,7 +54,7 @@ fn into_base_path(input: &str, correct_scheme: Option<&'static str>) -> Result<S
 
     let host = uri.host().ok_or_else(|| ClientInitError::MissingHost)?;
     let port = uri.port_part().map(|x| format!(":{}", x)).unwrap_or_default();
-    Ok(format!("{}://{}{}", scheme, host, port))
+    Ok(format!("{}://{}{}{}", scheme, host, port, uri.path().trim_end_matches('/')))
 }
 
 /// A client that implements the API by making HTTP calls out to a server.
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs
index 7284e8b3a81..a29ff1fef06 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs
@@ -76,7 +76,7 @@ fn into_base_path(input: &str, correct_scheme: Option<&'static str>) -> Result<S
 
     let host = uri.host().ok_or_else(|| ClientInitError::MissingHost)?;
     let port = uri.port_part().map(|x| format!(":{}", x)).unwrap_or_default();
-    Ok(format!("{}://{}{}", scheme, host, port))
+    Ok(format!("{}://{}{}{}", scheme, host, port, uri.path().trim_end_matches('/')))
 }
 
 /// A client that implements the API by making HTTP calls out to a server.
diff --git a/samples/server/petstore/rust-server/output/ops-v3/src/client/mod.rs b/samples/server/petstore/rust-server/output/ops-v3/src/client/mod.rs
index 56497beb555..e30b0008b9f 100644
--- a/samples/server/petstore/rust-server/output/ops-v3/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/ops-v3/src/client/mod.rs
@@ -90,7 +90,7 @@ fn into_base_path(input: &str, correct_scheme: Option<&'static str>) -> Result<S
 
     let host = uri.host().ok_or_else(|| ClientInitError::MissingHost)?;
     let port = uri.port_part().map(|x| format!(":{}", x)).unwrap_or_default();
-    Ok(format!("{}://{}{}", scheme, host, port))
+    Ok(format!("{}://{}{}{}", scheme, host, port, uri.path().trim_end_matches('/')))
 }
 
 /// A client that implements the API by making HTTP calls out to a server.
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
index 082850f9dd5..960a4af6ad0 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs
@@ -93,7 +93,7 @@ fn into_base_path(input: &str, correct_scheme: Option<&'static str>) -> Result<S
 
     let host = uri.host().ok_or_else(|| ClientInitError::MissingHost)?;
     let port = uri.port_part().map(|x| format!(":{}", x)).unwrap_or_default();
-    Ok(format!("{}://{}{}", scheme, host, port))
+    Ok(format!("{}://{}{}{}", scheme, host, port, uri.path().trim_end_matches('/')))
 }
 
 /// A client that implements the API by making HTTP calls out to a server.
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/src/client/mod.rs b/samples/server/petstore/rust-server/output/rust-server-test/src/client/mod.rs
index 77baf0552ff..6910c25ed22 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/rust-server-test/src/client/mod.rs
@@ -62,7 +62,7 @@ fn into_base_path(input: &str, correct_scheme: Option<&'static str>) -> Result<S
 
     let host = uri.host().ok_or_else(|| ClientInitError::MissingHost)?;
     let port = uri.port_part().map(|x| format!(":{}", x)).unwrap_or_default();
-    Ok(format!("{}://{}{}", scheme, host, port))
+    Ok(format!("{}://{}{}{}", scheme, host, port, uri.path().trim_end_matches('/')))
 }
 
 /// A client that implements the API by making HTTP calls out to a server.