[Rust] Add user agent handling for rust template (master) (#7375)

* Add user agent handling for rust template * Run ./bin/rust-petstore.sh
OpenAPITools · Jan 14, 2018 · 66be7a7 · 66be7a7
1 parent ea8b184
commit 66be7a7
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 1 deletion.
diff --git a/modules/swagger-codegen/src/main/resources/rust/api.mustache b/modules/swagger-codegen/src/main/resources/rust/api.mustache
@@ -1,12 +1,15 @@
 {{>partial_header}}
 use std::rc::Rc;
 use std::borrow::Borrow;
+use std::borrow::Cow;
 
 use hyper;
 use serde_json;
 use futures;
 use futures::{Future, Stream};
 
+use hyper::header::UserAgent;
+
 use super::{Error, configuration};
 
 pub struct {{{classname}}}Client<C: hyper::client::Connect> {
@@ -57,6 +60,10 @@ impl<C: hyper::client::Connect>{{classname}} for {{classname}}Client<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
         {{#hasHeaderParams}}
         {
             let mut headers = req.headers_mut();

diff --git a/modules/swagger-codegen/src/main/resources/rust/configuration.mustache b/modules/swagger-codegen/src/main/resources/rust/configuration.mustache
@@ -3,13 +3,15 @@ use hyper;
 
 pub struct Configuration<C: hyper::client::Connect> {
   pub base_path: String,
+  pub user_agent: Option<String>,
   pub client: hyper::client::Client<C>,
 }
 
 impl<C: hyper::client::Connect> Configuration<C> {
   pub fn new(client: hyper::client::Client<C>) -> Configuration<C> {
     Configuration {
       base_path: "{{{basePath}}}".to_owned(),
+      user_agent: {{#httpUserAgent}}Some("{{{.}}}".to_owned()){{/httpUserAgent}}{{^httpUserAgent}}None{{/httpUserAgent}},
       client: client,
     }
   }

diff --git a/samples/client/petstore/rust/.swagger-codegen/VERSION b/samples/client/petstore/rust/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.3.0-SNAPSHOT
+2.3.1-SNAPSHOT
diff --git a/samples/client/petstore/rust/src/apis/configuration.rs b/samples/client/petstore/rust/src/apis/configuration.rs
@@ -12,13 +12,15 @@ use hyper;
 
 pub struct Configuration<C: hyper::client::Connect> {
   pub base_path: String,
+  pub user_agent: Option<String>,
   pub client: hyper::client::Client<C>,
 }
 
 impl<C: hyper::client::Connect> Configuration<C> {
   pub fn new(client: hyper::client::Client<C>) -> Configuration<C> {
     Configuration {
       base_path: "http://petstore.swagger.io/v2".to_owned(),
+      user_agent: None,
       client: client,
     }
   }

diff --git a/samples/client/petstore/rust/src/apis/pet_api.rs b/samples/client/petstore/rust/src/apis/pet_api.rs
@@ -10,12 +10,15 @@
 
 use std::rc::Rc;
 use std::borrow::Borrow;
+use std::borrow::Cow;
 
 use hyper;
 use serde_json;
 use futures;
 use futures::{Future, Stream};
 
+use hyper::header::UserAgent;
+
 use super::{Error, configuration};
 
 pub struct PetApiClient<C: hyper::client::Connect> {
@@ -57,6 +60,10 @@ impl<C: hyper::client::Connect>PetApi for PetApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
         let serialized = serde_json::to_string(&body).unwrap();
         req.headers_mut().set(hyper::header::ContentType::json());
@@ -85,6 +92,10 @@ impl<C: hyper::client::Connect>PetApi for PetApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
         {
             let mut headers = req.headers_mut();
             headers.set_raw("api_key", api_key);
@@ -116,6 +127,10 @@ impl<C: hyper::client::Connect>PetApi for PetApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
 
         // send request
@@ -146,6 +161,10 @@ impl<C: hyper::client::Connect>PetApi for PetApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
 
         // send request
@@ -173,6 +192,10 @@ impl<C: hyper::client::Connect>PetApi for PetApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
 
         // send request
@@ -200,6 +223,10 @@ impl<C: hyper::client::Connect>PetApi for PetApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
         let serialized = serde_json::to_string(&body).unwrap();
         req.headers_mut().set(hyper::header::ContentType::json());
@@ -228,6 +255,10 @@ impl<C: hyper::client::Connect>PetApi for PetApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
 
         // send request
@@ -252,6 +283,10 @@ impl<C: hyper::client::Connect>PetApi for PetApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
 
         // send request

diff --git a/samples/client/petstore/rust/src/apis/store_api.rs b/samples/client/petstore/rust/src/apis/store_api.rs
@@ -10,12 +10,15 @@
 
 use std::rc::Rc;
 use std::borrow::Borrow;
+use std::borrow::Cow;
 
 use hyper;
 use serde_json;
 use futures;
 use futures::{Future, Stream};
 
+use hyper::header::UserAgent;
+
 use super::{Error, configuration};
 
 pub struct StoreApiClient<C: hyper::client::Connect> {
@@ -53,6 +56,10 @@ impl<C: hyper::client::Connect>StoreApi for StoreApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
 
         // send request
@@ -77,6 +84,10 @@ impl<C: hyper::client::Connect>StoreApi for StoreApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
 
         // send request
@@ -104,6 +115,10 @@ impl<C: hyper::client::Connect>StoreApi for StoreApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
 
         // send request
@@ -131,6 +146,10 @@ impl<C: hyper::client::Connect>StoreApi for StoreApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
         let serialized = serde_json::to_string(&body).unwrap();
         req.headers_mut().set(hyper::header::ContentType::json());

diff --git a/samples/client/petstore/rust/src/apis/user_api.rs b/samples/client/petstore/rust/src/apis/user_api.rs
@@ -10,12 +10,15 @@
 
 use std::rc::Rc;
 use std::borrow::Borrow;
+use std::borrow::Cow;
 
 use hyper;
 use serde_json;
 use futures;
 use futures::{Future, Stream};
 
+use hyper::header::UserAgent;
+
 use super::{Error, configuration};
 
 pub struct UserApiClient<C: hyper::client::Connect> {
@@ -57,6 +60,10 @@ impl<C: hyper::client::Connect>UserApi for UserApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
         let serialized = serde_json::to_string(&body).unwrap();
         req.headers_mut().set(hyper::header::ContentType::json());
@@ -85,6 +92,10 @@ impl<C: hyper::client::Connect>UserApi for UserApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
         let serialized = serde_json::to_string(&body).unwrap();
         req.headers_mut().set(hyper::header::ContentType::json());
@@ -113,6 +124,10 @@ impl<C: hyper::client::Connect>UserApi for UserApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
         let serialized = serde_json::to_string(&body).unwrap();
         req.headers_mut().set(hyper::header::ContentType::json());
@@ -141,6 +156,10 @@ impl<C: hyper::client::Connect>UserApi for UserApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
 
         // send request
@@ -165,6 +184,10 @@ impl<C: hyper::client::Connect>UserApi for UserApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
 
         // send request
@@ -196,6 +219,10 @@ impl<C: hyper::client::Connect>UserApi for UserApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
 
         // send request
@@ -223,6 +250,10 @@ impl<C: hyper::client::Connect>UserApi for UserApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
 
         // send request
@@ -247,6 +278,10 @@ impl<C: hyper::client::Connect>UserApi for UserApiClient<C> {
         // }
         let mut req = hyper::Request::new(method, uri.unwrap());
 
+        if let Some(ref user_agent) = configuration.user_agent {
+            req.headers_mut().set(UserAgent::new(Cow::Owned(user_agent.clone())));
+        }
+
 
         let serialized = serde_json::to_string(&body).unwrap();
         req.headers_mut().set(hyper::header::ContentType::json());