Move get blob to pageable (#850)

* initial work to extend Pageable to support more than just

* cleanup debugging

* cleanup test

* fmt

* use From instead of Into

* address clippy

* address comments to be clearer

* address feedback

* fix issue from refactor

* update generator to support new Continuation

* regenerate services using the updated Continuation support

Co-authored-by: Brian Caswell <[email protected]>

Author: bmc-msft

sdk/core/src/pageable.rs

@@ -42,10 +42,12 @@ where
                         r#try!(request.await)
                     }
                     State::Continuation(token) => {
-                        let request = make_request(Some(Continuation::new(token)));
+                        let request = make_request(Some(token));
                         r#try!(request.await)
                     }
-                    State::Done => return None,
+                    State::Done => {
+                        return None;
+                    }
                 };
 
                 let next_state = response
@@ -82,12 +84,12 @@ impl<T, O> std::fmt::Debug for Pageable<T, O> {
 
 /// A type that can yield an optional continuation token
 pub trait Continuable {
-    fn continuation(&self) -> Option<String>;
+    fn continuation(&self) -> Option<Continuation>;
 }
 
 #[derive(Debug, Clone, PartialEq)]
 enum State {
     Init,
-    Continuation(String),
+    Continuation(Continuation),
     Done,
 }

sdk/core/src/request_options/continuation.rs

@@ -1,15 +1,50 @@
-use crate::{headers, Header};
+use crate::{headers, request_options::NextMarker, request_options::Range, Header};
+use std::ops::Range as StdRange;
 
-#[derive(Debug, Clone)]
-pub struct Continuation(String);
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Continuation {
+    String(String),
+    Range(StdRange<u64>),
+}
 
-impl Continuation {
-    pub fn new(c: String) -> Self {
-        Self(c)
+impl From<NextMarker> for Continuation {
+    fn from(next_marker: NextMarker) -> Self {
+        Continuation::String(next_marker.as_str().to_string())
+    }
+}
+
+impl From<&str> for Continuation {
+    fn from(value: &str) -> Self {
+        Continuation::String(value.to_string())
+    }
+}
+
+impl From<String> for Continuation {
+    fn from(value: String) -> Self {
+        Continuation::String(value)
     }
+}
+
+impl From<StdRange<u64>> for Continuation {
+    fn from(value: StdRange<u64>) -> Self {
+        Continuation::Range(value)
+    }
+}
 
-    pub fn into_raw(self) -> String {
-        self.0
+impl From<Range> for Continuation {
+    fn from(value: Range) -> Self {
+        Continuation::Range(value.start..value.end)
+    }
+}
+
+impl Continuation {
+    pub fn as_string(&self) -> String {
+        match self {
+            Self::String(c) => c.clone(),
+            Self::Range(_) => {
+                panic!("unable to convert Continuation::Range to string")
+            }
+        }
     }
 }
 
@@ -19,6 +54,6 @@ impl Header for Continuation {
     }
 
     fn value(&self) -> headers::HeaderValue {
-        self.0.to_owned().into()
+        self.as_string().into()
     }
 }

sdk/core/src/request_options/next_marker.rs

@@ -48,7 +48,7 @@ impl AppendToUrlQuery for NextMarker {
 
 impl From<Continuation> for NextMarker {
     fn from(next_marker: Continuation) -> Self {
-        Self::new(next_marker.into_raw())
+        Self::new(next_marker.as_string())
     }
 }
 

sdk/data_cosmos/src/operations/list_attachments.rs

@@ -160,7 +160,7 @@ impl ListAttachmentsResponse {
 }
 
 impl Continuable for ListAttachmentsResponse {
-    fn continuation(&self) -> Option<String> {
-        self.continuation_token.clone()
+    fn continuation(&self) -> Option<Continuation> {
+        self.continuation_token.clone().map(Continuation::from)
     }
 }

sdk/data_cosmos/src/operations/list_collections.rs

@@ -116,7 +116,7 @@ impl ListCollectionsResponse {
 }
 
 impl Continuable for ListCollectionsResponse {
-    fn continuation(&self) -> Option<String> {
-        self.continuation_token.clone()
+    fn continuation(&self) -> Option<Continuation> {
+        self.continuation_token.clone().map(Continuation::from)
     }
 }

sdk/data_cosmos/src/operations/list_databases.rs

@@ -112,8 +112,8 @@ impl ListDatabasesResponse {
 }
 
 impl Continuable for ListDatabasesResponse {
-    fn continuation(&self) -> Option<String> {
-        self.continuation_token.clone()
+    fn continuation(&self) -> Option<Continuation> {
+        self.continuation_token.clone().map(Continuation::from)
     }
 }
 

sdk/data_cosmos/src/operations/list_documents.rs

@@ -192,8 +192,8 @@ where
 }
 
 impl<T> Continuable for ListDocumentsResponse<T> {
-    fn continuation(&self) -> Option<String> {
-        self.continuation_token.clone()
+    fn continuation(&self) -> Option<Continuation> {
+        self.continuation_token.clone().map(Continuation::from)
     }
 }
 

sdk/data_cosmos/src/operations/list_permissions.rs

@@ -107,7 +107,7 @@ impl ListPermissionsResponse {
 }
 
 impl Continuable for ListPermissionsResponse {
-    fn continuation(&self) -> Option<String> {
-        self.continuation_token.clone()
+    fn continuation(&self) -> Option<Continuation> {
+        self.continuation_token.clone().map(Continuation::from)
     }
 }

sdk/data_cosmos/src/operations/list_stored_procedures.rs

@@ -113,7 +113,7 @@ impl ListStoredProceduresResponse {
 }
 
 impl Continuable for ListStoredProceduresResponse {
-    fn continuation(&self) -> Option<String> {
-        self.continuation_token.clone()
+    fn continuation(&self) -> Option<Continuation> {
+        self.continuation_token.clone().map(Continuation::from)
     }
 }

sdk/data_cosmos/src/operations/list_triggers.rs

@@ -149,7 +149,7 @@ impl ListTriggersResponse {
 }
 
 impl Continuable for ListTriggersResponse {
-    fn continuation(&self) -> Option<String> {
-        self.continuation_token.clone()
+    fn continuation(&self) -> Option<Continuation> {
+        self.continuation_token.clone().map(Continuation::from)
     }
 }