Regenerate client after renaming StorageServiceStats to QueueServiceStats. Updated QueueClient::send_message to return Result<Response<SentMessage, XmlFormat>> in place of Result<Response<Option<SentMessage>, XmlFormat>>

Author: lsiddiquee

sdk/storage/azure_storage_queue/samples/queue_client.rs

@@ -21,7 +21,7 @@ use azure_storage_queue::{
 async fn send_message(
     queue_client: &QueueClient,
     message: &str,
-) -> Result<Response<Option<SentMessage>, XmlFormat>, Error> {
+) -> Result<Response<SentMessage, XmlFormat>, Error> {
     let queue_message = QueueMessage {
         message_text: Some(message.to_owned()),
     };
@@ -40,18 +40,15 @@ async fn send_and_delete_message(
     if let Ok(response) = result {
         let message = response.into_body().await?;
 
-        if let Some(message) = message {
-            if let (Some(message_id), Some(pop_receipt)) = (message.message_id, message.pop_receipt)
-            {
-                println!(
-                    "Deleting message with ID: {} and pop receipt: {}",
-                    message_id, pop_receipt
-                );
-                let delete_result = queue_client
-                    .delete_message(&message_id, &pop_receipt, None)
-                    .await;
-                log_operation_result(&delete_result, "delete_message");
-            }
+        if let (Some(message_id), Some(pop_receipt)) = (message.message_id, message.pop_receipt) {
+            println!(
+                "Deleting message with ID: {} and pop receipt: {}",
+                message_id, pop_receipt
+            );
+            let delete_result = queue_client
+                .delete_message(&message_id, &pop_receipt, None)
+                .await;
+            log_operation_result(&delete_result, "delete_message");
         }
     }
 
@@ -67,26 +64,23 @@ async fn send_and_update_message(
     if let Ok(response) = result {
         let message = response.into_body().await?;
 
-        if let Some(message) = message {
-            if let (Some(message_id), Some(pop_receipt)) = (message.message_id, message.pop_receipt)
-            {
-                println!(
-                    "Updating message with ID: {} and pop receipt: {}",
-                    message_id, pop_receipt
-                );
-                let queue_message = QueueMessage {
-                    message_text: Some("Updated message text from Rust".to_string()),
-                };
-                let update_option = QueueClientUpdateOptions {
-                    // Serialize the message text as bytes for the update
-                    queue_message: Some(queue_message.try_into()?),
-                    ..Default::default()
-                };
-                let update_result = queue_client
-                    .update_message(&message_id.clone(), &pop_receipt, 50, Some(update_option))
-                    .await;
-                log_operation_result(&update_result, "update_message");
-            }
+        if let (Some(message_id), Some(pop_receipt)) = (message.message_id, message.pop_receipt) {
+            println!(
+                "Updating message with ID: {} and pop receipt: {}",
+                message_id, pop_receipt
+            );
+            let queue_message = QueueMessage {
+                message_text: Some("Updated message text from Rust".to_string()),
+            };
+            let update_option = QueueClientUpdateOptions {
+                // Serialize the message text as bytes for the update
+                queue_message: Some(queue_message.try_into()?),
+                ..Default::default()
+            };
+            let update_result = queue_client
+                .update_message(&message_id.clone(), &pop_receipt, 50, Some(update_option))
+                .await;
+            log_operation_result(&update_result, "update_message");
         }
     }
 

sdk/storage/azure_storage_queue/src/clients/queue_client.rs

@@ -211,15 +211,18 @@ impl QueueClient {
     ///
     /// # Errors
     ///
-    /// Returns an error if the queue doesn't exist or if the request fails
+    /// Returns an error if the queue doesn't exist, if no message was sent, or if the request fails
     pub async fn send_message(
         &self,
         queue_message: RequestContent<QueueMessage, XmlFormat>,
         options: Option<QueueClientSendMessageOptions<'_>>,
-    ) -> Result<Response<Option<SentMessage>, XmlFormat>> {
+    ) -> Result<Response<SentMessage, XmlFormat>> {
         let response = self.client.send_message(queue_message, options).await?;
 
-        Self::extract_first_message(response, |list: &ListOfSentMessage| list.items.clone()).await
+        Self::extract_first_message(response, |list: &ListOfSentMessage| {
+            list.items.clone().unwrap_or_default()
+        })
+        .await
     }
 
     /// Deletes a specific message from the queue.
@@ -325,8 +328,8 @@ impl QueueClient {
     /// Helper function to extract the first message from a list response and convert it to a single message response
     async fn extract_first_message<T, U>(
         response: Response<T, XmlFormat>,
-        extract_fn: impl Fn(&T) -> Option<Vec<U>>,
-    ) -> Result<Response<Option<U>, XmlFormat>>
+        extract_fn: impl Fn(&T) -> Vec<U>,
+    ) -> Result<Response<U, XmlFormat>>
     where
         T: serde::de::DeserializeOwned,
         U: serde::Serialize + Clone,
@@ -335,19 +338,16 @@ impl QueueClient {
         let headers = response.headers().clone();
         let message_list = response.into_body().await?;
 
-        if let Some(messages) = extract_fn(&message_list) {
-            if let Some(first_message) = messages.into_iter().next() {
-                let xml_body = xml::to_xml(&first_message)?;
-                let raw_response = RawResponse::from_bytes(status, headers, xml_body);
-                Ok(raw_response.into())
-            } else {
-                let raw_response =
-                    RawResponse::from_bytes(status, headers, Bytes::from_static(&[]));
-                Ok(raw_response.into())
-            }
-        } else {
-            let raw_response = RawResponse::from_bytes(status, headers, Bytes::from_static(&[]));
-            Ok(raw_response.into())
-        }
+        let messages = extract_fn(&message_list);
+        let first_message = messages.into_iter().next().ok_or_else(|| {
+            azure_core::Error::message(
+                azure_core::error::ErrorKind::DataConversion,
+                "No messages found in the response",
+            )
+        })?;
+
+        let xml_body = xml::to_xml(&first_message)?;
+        let raw_response = RawResponse::from_bytes(status, headers, xml_body);
+        Ok(raw_response.into())
     }
 }

sdk/storage/azure_storage_queue/src/clients/queue_service_client.rs

@@ -198,7 +198,7 @@ impl QueueServiceClient {
     pub async fn get_statistics(
         &self,
         options: Option<QueueServiceClientGetStatisticsOptions<'_>>,
-    ) -> Result<Response<StorageServiceStats, XmlFormat>> {
+    ) -> Result<Response<QueueServiceStats, XmlFormat>> {
         self.client.get_statistics(options).await
     }
 }

sdk/storage/azure_storage_queue/src/generated/clients/queue_service_client.rs

@@ -192,7 +192,7 @@ async fn test_delete_message(ctx: TestContext) -> Result<()> {
             )
             .await?;
 
-        let send_message = sent_message_response.into_body().await?.unwrap();
+        let send_message = sent_message_response.into_body().await?;
 
         let delete_response = queue_client
             .delete_message(
@@ -235,7 +235,7 @@ async fn test_update_message(ctx: TestContext) -> Result<()> {
             )
             .await?;
 
-        let sent_message = send_message_response.into_body().await?.unwrap();
+        let sent_message = send_message_response.into_body().await?;
 
         // Update the message in the queue
         let option = Some(QueueClientUpdateOptions {

sdk/storage/azure_storage_queue/src/generated/models/header_traits.rs

@@ -1,4 +1,4 @@
 directory: specification/storage/Microsoft.QueueStorage
-commit: 32a39e8db24d3042d9c7a786efd2569690537138
+commit: 7d60037de342e7897ca3248aa98a39d3036ee214
 repo: Azure/azure-rest-api-specs
 additionalDirectories: