Skip to content

Commit 27725f9

Browse files
rylevrylev
authored
Change prepare_pipeline methods to request methods (#845)
1 parent eea5fd6 commit 27725f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+79
-143
lines changed

‎sdk/data_cosmos/src/clients/attachment.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ impl AttachmentClient {
9999
&self.attachment_name
100100
}
101101

102-
pub(crate) fn prepare_pipeline(&self, method: http::Method) -> Request {
103-
self.cosmos_client().prepare_request_pipeline(
102+
pub(crate) fn attachments_request(&self, method: http::Method) -> Request {
103+
self.cosmos_client().request(
104104
&format!(
105105
"dbs/{}/colls/{}/docs/{}/attachments",
106106
self.database_client().database_name(),
@@ -111,8 +111,8 @@ impl AttachmentClient {
111111
)
112112
}
113113

114-
pub(crate) fn prepare_pipeline_with_attachment_name(&self, method: http::Method) -> Request {
115-
self.cosmos_client().prepare_request_pipeline(
114+
pub(crate) fn attachment_request(&self, method: http::Method) -> Request {
115+
self.cosmos_client().request(
116116
&format!(
117117
"dbs/{}/colls/{}/docs/{}/attachments/{}",
118118
self.database_client().database_name(),

‎sdk/data_cosmos/src/clients/collection.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,27 +127,22 @@ impl CollectionClient {
127127
&self.collection_name
128128
}
129129

130-
pub(crate) fn prepare_request_with_collection_name(
131-
&self,
132-
http_method: http::Method,
133-
) -> Request {
130+
pub(crate) fn collection_request(&self, http_method: http::Method) -> Request {
134131
let path = &format!(
135132
"dbs/{}/colls/{}",
136133
self.database_client().database_name(),
137134
self.collection_name()
138135
);
139-
self.cosmos_client()
140-
.prepare_request_pipeline(path, http_method)
136+
self.cosmos_client().request(path, http_method)
141137
}
142138

143-
pub(crate) fn prepare_doc_request_pipeline(&self, http_method: http::Method) -> Request {
139+
pub(crate) fn docs_request(&self, http_method: http::Method) -> Request {
144140
let path = &format!(
145141
"dbs/{}/colls/{}/docs",
146142
self.database_client().database_name(),
147143
self.collection_name()
148144
);
149-
self.cosmos_client()
150-
.prepare_request_pipeline(path, http_method)
145+
self.cosmos_client().request(path, http_method)
151146
}
152147

153148
pub(crate) fn pipeline(&self) -> &Pipeline {

‎sdk/data_cosmos/src/clients/cosmos.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,7 @@ impl CosmosClient {
121121
/// This function will add the cloud location to the URI suffix and generate
122122
/// a Request with the specified HTTP Method. It will also set the body
123123
/// to an empty `Bytes` instance.
124-
pub(crate) fn prepare_request_pipeline(
125-
&self,
126-
uri_path: &str,
127-
http_method: http::Method,
128-
) -> Request {
124+
pub(crate) fn request(&self, uri_path: &str, http_method: http::Method) -> Request {
129125
let uri = format!("{}/{}", self.cloud_location.url(), uri_path);
130126
Request::new(uri.parse().unwrap(), http_method)
131127
}

‎sdk/data_cosmos/src/clients/database.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ impl DatabaseClient {
7272
&self.database_name
7373
}
7474

75-
pub(crate) fn prepare_pipeline(&self, method: Method) -> Request {
75+
pub(crate) fn database_request(&self, method: Method) -> Request {
7676
self.cosmos_client()
77-
.prepare_request_pipeline(&format!("dbs/{}", self.database_name()), method)
77+
.request(&format!("dbs/{}", self.database_name()), method)
7878
}
7979

80-
pub(crate) fn prepare_collections_pipeline(&self, method: Method) -> Request {
80+
pub(crate) fn collections_request(&self, method: Method) -> Request {
8181
self.cosmos_client()
82-
.prepare_request_pipeline(&format!("dbs/{}/colls", self.database_name()), method)
82+
.request(&format!("dbs/{}/colls", self.database_name()), method)
8383
}
8484
}

‎sdk/data_cosmos/src/clients/document.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,8 @@ impl DocumentClient {
8484
&self.partition_key_serialized
8585
}
8686

87-
pub(crate) fn prepare_request_pipeline_with_document_name(
88-
&self,
89-
method: http::Method,
90-
) -> Request {
91-
self.cosmos_client().prepare_request_pipeline(
87+
pub(crate) fn document_request(&self, method: http::Method) -> Request {
88+
self.cosmos_client().request(
9289
&format!(
9390
"dbs/{}/colls/{}/docs/{}",
9491
self.database_client().database_name(),

‎sdk/data_cosmos/src/clients/permission.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ impl PermissionClient {
5959
&self.permission_name
6060
}
6161

62-
pub(crate) fn prepare_request_with_permission_name(&self, method: http::Method) -> Request {
63-
self.cosmos_client().prepare_request_pipeline(
62+
pub(crate) fn permission_request(&self, method: http::Method) -> Request {
63+
self.cosmos_client().request(
6464
&format!(
6565
"dbs/{}/users/{}/permissions/{}",
6666
self.database_client().database_name(),

‎sdk/data_cosmos/src/clients/stored_procedure.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,8 @@ impl StoredProcedureClient {
6767
&self.stored_procedure_name
6868
}
6969

70-
pub(crate) fn prepare_pipeline_with_stored_procedure_name(
71-
&self,
72-
method: http::Method,
73-
) -> Request {
74-
self.cosmos_client().prepare_request_pipeline(
70+
pub(crate) fn stored_procedure_request(&self, method: http::Method) -> Request {
71+
self.cosmos_client().request(
7572
&format!(
7673
"dbs/{}/colls/{}/sprocs/{}",
7774
self.database_client().database_name(),
@@ -82,8 +79,8 @@ impl StoredProcedureClient {
8279
)
8380
}
8481

85-
pub(crate) fn prepare_request_pipeline(&self, method: http::Method) -> Request {
86-
self.cosmos_client().prepare_request_pipeline(
82+
pub(crate) fn stored_procedures_request(&self, method: http::Method) -> Request {
83+
self.cosmos_client().request(
8784
&format!(
8885
"dbs/{}/colls/{}/sprocs",
8986
self.database_client().database_name(),

‎sdk/data_cosmos/src/clients/trigger.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@ impl TriggerClient {
9090
&self.trigger_name
9191
}
9292

93-
pub(crate) fn prepare_pipeline_with_trigger_name(&self, method: http::Method) -> Request {
94-
self.cosmos_client().prepare_request_pipeline(
93+
/// Create a request for a specific collection trigger
94+
pub(crate) fn trigger_request(&self, method: http::Method) -> Request {
95+
self.cosmos_client().request(
9596
&format!(
9697
"dbs/{}/colls/{}/triggers/{}",
9798
self.database_client().database_name(),
@@ -102,8 +103,9 @@ impl TriggerClient {
102103
)
103104
}
104105

105-
pub(crate) fn prepare_pipeline(&self, method: http::Method) -> Request {
106-
self.cosmos_client().prepare_request_pipeline(
106+
/// Create a request for collection triggers
107+
pub(crate) fn triggers_request(&self, method: http::Method) -> Request {
108+
self.cosmos_client().request(
107109
&format!(
108110
"dbs/{}/colls/{}/triggers",
109111
self.database_client().database_name(),

‎sdk/data_cosmos/src/clients/user.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ impl UserClient {
6666
&self.user_name
6767
}
6868

69-
pub(crate) fn prepare_request_with_user_name(&self, method: http::Method) -> Request {
70-
self.cosmos_client().prepare_request_pipeline(
69+
pub(crate) fn user_request(&self, method: http::Method) -> Request {
70+
self.cosmos_client().request(
7171
&format!(
7272
"dbs/{}/users/{}",
7373
self.database_client().database_name(),

‎sdk/data_cosmos/src/clients/user_defined_function.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ impl UserDefinedFunctionClient {
6868
&self.user_defined_function_name
6969
}
7070

71-
pub(crate) fn prepare_pipeline(&self, method: http::Method) -> Request {
72-
self.cosmos_client().prepare_request_pipeline(
71+
pub(crate) fn udfs_request(&self, method: http::Method) -> Request {
72+
self.cosmos_client().request(
7373
&format!(
7474
"dbs/{}/colls/{}/udfs",
7575
self.database_client().database_name(),
@@ -79,11 +79,8 @@ impl UserDefinedFunctionClient {
7979
)
8080
}
8181

82-
pub(crate) fn prepare_pipeline_with_user_defined_function_name(
83-
&self,
84-
method: http::Method,
85-
) -> Request {
86-
self.cosmos_client().prepare_request_pipeline(
82+
pub(crate) fn udf_request(&self, method: http::Method) -> Request {
83+
self.cosmos_client().request(
8784
&format!(
8885
"dbs/{}/colls/{}/udfs/{}",
8986
self.database_client().database_name(),

0 commit comments

Comments
 (0)