fix blob_storage_request (#862)

* fix blob_storage_request

* change prepare_request to use Url

Author: ctaggart

sdk/data_tables/src/clients/entity_client.rs

@@ -100,7 +100,7 @@ impl EntityClient {
 
     pub(crate) fn prepare_request(
         &self,
-        url: &str,
+        url: Url,
         method: Method,
         request_body: Option<Bytes>,
     ) -> azure_core::Result<Request> {

sdk/data_tables/src/clients/partition_key_client.rs

@@ -2,6 +2,7 @@ use crate::{prelude::*, requests::*};
 
 use azure_core::Method;
 use azure_core::Request;
+use azure_core::Url;
 use azure_storage::core::clients::StorageAccountClient;
 use bytes::Bytes;
 use std::sync::Arc;
@@ -55,7 +56,7 @@ impl PartitionKeyClient {
 
     pub(crate) fn prepare_request(
         &self,
-        url: &str,
+        url: Url,
         method: Method,
         request_body: Option<Bytes>,
     ) -> azure_core::Result<Request> {

sdk/data_tables/src/clients/table_client.rs

@@ -1,6 +1,7 @@
 use crate::{clients::TableServiceClient, requests::*};
 use azure_core::Method;
 use azure_core::Request;
+use azure_core::Url;
 use azure_storage::core::clients::StorageAccountClient;
 use bytes::Bytes;
 use std::sync::Arc;
@@ -66,7 +67,7 @@ impl TableClient {
 
     pub(crate) fn prepare_request(
         &self,
-        url: &str,
+        url: Url,
         method: Method,
         request_body: Option<Bytes>,
     ) -> azure_core::Result<Request> {

sdk/data_tables/src/clients/table_service_client.rs

@@ -57,7 +57,7 @@ impl TableServiceClient {
 
     pub(crate) fn prepare_request(
         &self,
-        url: &str,
+        url: Url,
         method: Method,
         request_body: Option<Bytes>,
     ) -> azure_core::Result<Request> {

sdk/data_tables/src/requests/create_table_builder.rs

@@ -22,7 +22,7 @@ impl<'a> CreateTableBuilder<'a> {
     }
 
     pub async fn execute(&self) -> azure_core::Result<CreateTableResponse> {
-        let url = self.table_client.url();
+        let url = self.table_client.url().clone();
 
         #[derive(Debug, Clone, Serialize)]
         struct RequestBody<'a> {
@@ -35,7 +35,7 @@ impl<'a> CreateTableBuilder<'a> {
         })?;
 
         let mut request = self.table_client.prepare_request(
-            url.as_str(),
+            url,
             Method::POST,
             Some(bytes::Bytes::from(request_body_serialized)),
         )?;

sdk/data_tables/src/requests/delete_entity_builder.rs

@@ -38,7 +38,7 @@ impl<'a> DeleteEntityBuilder<'a> {
 
         let mut request = self
             .entity_client
-            .prepare_request(url.as_str(), Method::DELETE, None)?;
+            .prepare_request(url, Method::DELETE, None)?;
         request.add_optional_header(&self.client_request_id);
         request.add_mandatory_header(&self.if_match);
 

sdk/data_tables/src/requests/delete_table_builder.rs

@@ -33,7 +33,7 @@ impl<'a> DeleteTableBuilder<'a> {
 
         let mut request = self
             .table_client
-            .prepare_request(url.as_str(), Method::DELETE, None)?;
+            .prepare_request(url, Method::DELETE, None)?;
         request.add_optional_header(&self.client_request_id);
         request.insert_header("Accept", "application/json");
 

sdk/data_tables/src/requests/get_entity_builder.rs

@@ -33,9 +33,7 @@ impl<'a> GetEntityBuilder<'a> {
 
         self.select.append_to_url_query(&mut url);
 
-        let mut request = self
-            .entity_client
-            .prepare_request(url.as_str(), Method::GET, None)?;
+        let mut request = self.entity_client.prepare_request(url, Method::GET, None)?;
         request.add_optional_header(&self.client_request_id);
         request.insert_header("Accept", "application/json;odata=fullmetadata");
 

sdk/data_tables/src/requests/insert_entity_builder.rs

@@ -47,7 +47,7 @@ impl<'a> InsertEntityBuilder<'a> {
         let request_body_serialized = serde_json::to_string(entity)?;
 
         let mut request = self.table_client.prepare_request(
-            url.as_str(),
+            url,
             Method::POST,
             Some(bytes::Bytes::from(request_body_serialized)),
         )?;

sdk/data_tables/src/requests/insert_or_replace_or_merge_entity_builder.rs

@@ -44,7 +44,7 @@ impl<'a> InsertOrReplaceOrMergeEntityBuilder<'a> {
         let request_body_serialized = serde_json::to_string(entity)?;
 
         let mut request = self.entity_client.prepare_request(
-            url.as_str(),
+            url,
             match self.operation {
                 Operation::InsertOrMerge => crate::MERGE.to_owned(),
                 Operation::InsertOrReplace => Method::PUT,