repub reqwest

Author: driftluo

src/client.rs

@@ -9,33 +9,33 @@ use crate::{error, serialization, ChunkedQuery, Node, Point, Points, Precision,
 /// The client to influxdb
 #[derive(Debug, Clone)]
 pub struct Client {
-    host: String,
+    host: Url,
     db: String,
     authentication: Option<(String, String)>,
     client: HttpClient,
 }
 
 impl Client {
     /// Create a new influxdb client with http
-    pub fn new<T>(host: T, db: T) -> Self
+    pub fn new<T>(host: Url, db: T) -> Self
     where
         T: Into<String>,
     {
         Client {
-            host: host.into(),
+            host,
             db: db.into(),
             authentication: None,
             client: HttpClient::default(),
         }
     }
 
     /// Create a new influxdb client with custom reqwest's client.
-    pub fn new_with_client<T>(host: T, db: T, client: HttpClient) -> Self
+    pub fn new_with_client<T>(host: Url, db: T, client: HttpClient) -> Self
     where
         T: Into<String>,
     {
         Client {
-            host: host.into(),
+            host,
             db: db.into(),
             authentication: None,
             client,
@@ -452,7 +452,7 @@ impl Client {
 
     /// Constructs the full URL for an API call.
     fn build_url(&self, key: &str, param: Option<Vec<(&str, &str)>>) -> Url {
-        let url = Url::parse(&self.host).unwrap().join(key).unwrap();
+        let url = self.host.join(key).unwrap();
 
         let mut authentication = Vec::new();
 
@@ -474,7 +474,7 @@ impl Client {
 impl Default for Client {
     /// connecting for default database `test` and host `http://localhost:8086`
     fn default() -> Self {
-        Client::new("http://localhost:8086", "test")
+        Client::new(Url::parse("http://localhost:8086").unwrap(), "test")
     }
 }
 

src/lib.rs

@@ -70,3 +70,5 @@ pub(crate) mod serialization;
 pub use client::{Client, UdpClient};
 pub use error::Error;
 pub use keys::{ChunkedQuery, Node, Point, Points, Precision, Query, Series, Value};
+
+pub use reqwest;

tests/client_test.rs

@@ -1,4 +1,6 @@
-use influx_db_client::{point, points, Client, Point, Points, Precision, UdpClient, Value};
+use influx_db_client::{
+    point, points, reqwest::Url, Client, Point, Points, Precision, UdpClient, Value,
+};
 use std::fs::File;
 use std::io::Read;
 use std::thread::sleep;
@@ -242,7 +244,11 @@ bind-address = "127.0.0.1:{rpc_port}"
         .unwrap();
 
     let host = format!("https://localhost:{}", http_port);
-    let client = Client::new_with_client(host.as_str(), "test_use_https", http_client);
+    let client = Client::new_with_client(
+        Url::parse(host.as_str()).unwrap(),
+        "test_use_https",
+        http_client,
+    );
 
     block_on(async {
         client.create_database(client.get_db()).await.unwrap();