Even more into_future

sdk/data_cosmos/examples/collection.rs

@@ -1,4 +1,3 @@
-use azure_core::prelude::*;
 use azure_data_cosmos::prelude::*;
 use futures::stream::StreamExt;
 use std::error::Error;
@@ -60,12 +59,10 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     for db in databases.databases {
         let database_client = client.clone().into_database_client(db.id.clone());
-        let collections = Box::pin(
-            database_client.list_collections(Context::new(), ListCollectionsOptions::new()),
-        )
-        .next()
-        .await
-        .unwrap()?;
+        let collections = Box::pin(database_client.list_collections().into_stream())
+            .next()
+            .await
+            .unwrap()?;
         println!(
             "database {} has {} collection(s)",
             db.id,

sdk/data_cosmos/examples/create_delete_database.rs

@@ -1,4 +1,3 @@
-use azure_core::Context;
 use azure_data_cosmos::prelude::*;
 use futures::stream::StreamExt;
 use std::error::Error;
@@ -61,7 +60,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
         let get_collection_response = db_collection.get_collection().into_future().await?;
         println!("get_collection_response == {:#?}", get_collection_response);
 
-        let stream = db_client.list_collections(Context::new(), ListCollectionsOptions::new());
+        let stream = db_client.list_collections().into_stream();
         let mut stream = Box::pin(stream);
         while let Some(res) = stream.next().await {
             let res = res?;

sdk/data_cosmos/examples/database_00.rs

@@ -1,4 +1,3 @@
-use azure_core::Context;
 use azure_data_cosmos::prelude::*;
 use futures::stream::StreamExt;
 use serde_json::Value;
@@ -25,11 +24,10 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
         println!("database == {:?}", db);
         let database = client.clone().into_database_client(db.name().to_owned());
 
-        let collections =
-            Box::pin(database.list_collections(Context::new(), ListCollectionsOptions::new()))
-                .next()
-                .await
-                .unwrap()?;
+        let collections = Box::pin(database.list_collections().into_stream())
+            .next()
+            .await
+            .unwrap()?;
         for collection in collections.collections {
             println!("collection == {:?}", collection);
             let collection_client = database.clone().into_collection_client(collection.id);
@@ -66,10 +64,9 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
                 println!("\nReplacing collection");
                 let replace_collection_response = collection_client
-                    .replace_collection(
-                        Context::new(),
-                        ReplaceCollectionOptions::new("/age").indexing_policy(indexing_policy_new),
-                    )
+                    .replace_collection("/age")
+                    .indexing_policy(indexing_policy_new)
+                    .into_future()
                     .await?;
                 println!(
                     "replace_collection_response == {:#?}",

sdk/data_cosmos/examples/database_01.rs

@@ -1,4 +1,3 @@
-use azure_core::Context;
 use azure_data_cosmos::prelude::*;
 use futures::stream::StreamExt;
 use std::error::Error;
@@ -18,11 +17,10 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     let database_client = client.into_database_client("pollo");
     println!("database_name == {}", database_client.database_name());
 
-    let collections =
-        Box::pin(database_client.list_collections(Context::new(), ListCollectionsOptions::new()))
-            .next()
-            .await
-            .unwrap()?;
+    let collections = Box::pin(database_client.list_collections().into_stream())
+        .next()
+        .await
+        .unwrap()?;
     println!("collections == {:#?}", collections);
 
     let collection_client = database_client.into_collection_client("cnt");

sdk/data_cosmos/examples/document_00.rs

@@ -85,7 +85,8 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
             client
                 .clone()
                 .into_database_client(database.id.clone())
-                .list_collections(Context::new(), ListCollectionsOptions::new()),
+                .list_collections()
+                .into_stream(),
         )
         .next()
         .await
@@ -156,7 +157,8 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     let get_document_response = collection_client
         .clone()
         .into_document_client(doc.id.clone(), &doc.id)?
-        .get_document::<MySampleStruct>(Context::new(), GetDocumentOptions::new())
+        .get_document()
+        .into_future::<MySampleStruct>()
         .await?;
     println!("get_document_response == {:#?}", get_document_response);
 
@@ -170,12 +172,12 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
         // the etag received in the previous get_document. The etag is an opaque value that
         // changes every time the document is updated. If the passed etag is different in
         // CosmosDB it means something else updated the document before us!
-        let options = ReplaceDocumentOptions::new()
-            .if_match_condition(IfMatchCondition::Match(document.etag));
         let replace_document_response = collection_client
             .clone()
             .into_document_client(doc.id.clone(), &doc.id)?
-            .replace_document(Context::new(), &doc, options)
+            .replace_document(doc)
+            .if_match_condition(IfMatchCondition::Match(document.etag))
+            .into_future()
             .await?;
         println!(
             "replace_document_response == {:#?}",

sdk/data_cosmos/examples/document_entries_00.rs

@@ -115,13 +115,11 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     let id = format!("unique_id{}", 3);
     let partition_key = &id;
 
-    let response = client
+    let response: GetDocumentResponse<MySampleStruct> = client
         .clone()
         .into_document_client(id.clone(), partition_key)?
-        .get_document::<MySampleStruct>(
-            Context::new(),
-            GetDocumentOptions::new().consistency_level(session_token),
-        )
+        .get_document()
+        .into_future()
         .await?;
 
     assert!(matches!(response, GetDocumentResponse::Found(_)));
@@ -137,13 +135,10 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     let replace_document_response = client
         .clone()
         .into_document_client(id.clone(), &id)?
-        .replace_document(
-            Context::new(),
-            &doc.document,
-            ReplaceDocumentOptions::new()
-                .consistency_level(ConsistencyLevel::from(&response))
-                .if_match_condition(IfMatchCondition::Match(doc.etag)), // use optimistic concurrency check
-        )
+        .replace_document(doc.document)
+        .consistency_level(ConsistencyLevel::from(&response))
+        .if_match_condition(IfMatchCondition::Match(doc.etag)) // use optimistic concurrency check
+        .into_future()
         .await?;
 
     println!(
@@ -155,14 +150,12 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     // has_been_found == false
     println!("\n\nLooking for non-existing item");
     let id = format!("unique_id{}", 100);
-
-    let response = client
+    let response: GetDocumentResponse<MySampleStruct> = client
         .clone()
         .into_document_client(id.clone(), &id)?
-        .get_document::<MySampleStruct>(
-            Context::new(),
-            GetDocumentOptions::new().consistency_level(&response),
-        )
+        .get_document()
+        .consistency_level(&response)
+        .into_future()
         .await?;
 
     assert!(matches!(response, GetDocumentResponse::NotFound(_)));

sdk/data_cosmos/examples/document_entries_01.rs

@@ -1,4 +1,3 @@
-use azure_core::Context;
 use azure_data_cosmos::prelude::*;
 use serde::{Deserialize, Serialize};
 use std::error::Error;
@@ -62,20 +61,18 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     let get_document_response = client
         .clone()
         .into_document_client(doc.id.clone(), &doc.id)?
-        .get_document::<serde_json::Value>(
-            Context::new(),
-            GetDocumentOptions::new().consistency_level(&create_document_response),
-        )
+        .get_document()
+        .consistency_level(&create_document_response)
+        .into_future::<serde_json::Value>()
         .await?;
     println!("get_document_response == {:#?}", get_document_response);
 
     let get_document_response = client
         .clone()
         .into_document_client("ciccia", &doc.id)?
-        .get_document::<serde_json::Value>(
-            Context::new(),
-            GetDocumentOptions::new().consistency_level(&create_document_response),
-        )
+        .get_document()
+        .consistency_level(&create_document_response)
+        .into_future::<serde_json::Value>()
         .await?;
     println!(
         "get_document_response == {:#?}\n\n\n",
@@ -104,11 +101,9 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let replace_document_response = client
         .into_document_client(doc.id.clone(), &doc.id)?
-        .replace_document(
-            Context::new(),
-            &doc,
-            ReplaceDocumentOptions::new().consistency_level(&query_documents_response),
-        )
+        .replace_document(doc)
+        .consistency_level(&query_documents_response)
+        .into_future()
         .await?;
     println!(
         "replace_document_response == {:#?}",

sdk/data_cosmos/examples/permission_00.rs

@@ -101,12 +101,11 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     );
 
     let get_permission_response = permission_client
-        .get_permission(
-            Context::new(),
-            GetPermissionOptions::new().consistency_level(ConsistencyLevel::Session(
-                list_permissions_response.session_token,
-            )),
-        )
+        .get_permission()
+        .consistency_level(ConsistencyLevel::Session(
+            list_permissions_response.session_token,
+        ))
+        .into_future()
         .await
         .unwrap();
     println!("get_permission_response == {:#?}", get_permission_response);

sdk/data_cosmos/examples/user_00.rs

@@ -1,6 +1,6 @@
 use azure_core::Context;
 use azure_data_cosmos::prelude::*;
-use futures::stream::StreamExt;
+use futures::StreamExt;
 use std::error::Error;
 
 #[tokio::main]
@@ -32,16 +32,14 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     let create_user_response = user_client.create_user().into_future().await?;
     println!("create_user_response == {:#?}", create_user_response);
 
-    let users = Box::pin(database_client.list_users(Context::new(), ListUsersOptions::new()))
+    let users = Box::pin(database_client.list_users().into_stream())
         .next()
         .await
         .unwrap()?;
 
     println!("list_users_response == {:#?}", users);
 
-    let get_user_response = user_client
-        .get_user(Context::new(), GetUserOptions::new())
-        .await?;
+    let get_user_response = user_client.get_user().into_future().await?;
     println!("get_user_response == {:#?}", get_user_response);
 
     let new_user = format!("{}replaced", user_name);

sdk/data_cosmos/src/clients/collection_client.rs

@@ -2,10 +2,10 @@ use super::{DatabaseClient, UserDefinedFunctionClient};
 use crate::clients::*;
 use crate::operations::*;
 use crate::requests;
-use crate::resources::ResourceType;
+use crate::resources::collection::PartitionKey;
 use crate::CosmosEntity;
 use crate::ReadonlyString;
-use azure_core::{Context, HttpClient, Pipeline, Request};
+use azure_core::{HttpClient, Pipeline, Request};
 use serde::Serialize;
 
 /// A client for Cosmos collection resources.
@@ -52,21 +52,11 @@ impl CollectionClient {
     }
 
     /// Replace a collection
-    pub async fn replace_collection(
+    pub fn replace_collection<P: Into<PartitionKey>>(
         &self,
-        ctx: Context,
-        options: ReplaceCollectionOptions,
-    ) -> crate::Result<ReplaceCollectionResponse> {
-        let mut request = self.prepare_request_with_collection_name(http::Method::PUT);
-
-        options.decorate_request(&mut request, self.collection_name())?;
-
-        let response = self
-            .pipeline()
-            .send(ctx.clone().insert(ResourceType::Collections), &mut request)
-            .await?;
-
-        Ok(ReplaceCollectionResponse::try_from(response).await?)
+        partition_key: P,
+    ) -> ReplaceCollectionBuilder {
+        ReplaceCollectionBuilder::new(self.clone(), partition_key.into())
     }
 
     /// list documents in a collection

sdk/data_cosmos/src/clients/cosmos_client.rs

@@ -168,8 +168,8 @@ impl CosmosClient {
     }
 
     /// List all databases
-    pub fn list_databases(&self) -> ListDatabases {
-        ListDatabases::new(self.clone())
+    pub fn list_databases(&self) -> ListDatabasesBuilder {
+        ListDatabasesBuilder::new(self.clone())
     }
 
     /// Convert into a [`DatabaseClient`]