Read optional params from json blob instead

src/workerskv/write_bulk.rs

@@ -7,11 +7,10 @@ use crate::endpoint::{Endpoint, Method};
 pub struct BulkWrite<'a> {
     pub account_identifier: &'a str,
     pub namespace_identifier: &'a str,
-    pub params: BulkWriteParams<'a>,
     pub bulk_key_value_pairs: Vec<KeyValuePair>,
 }
 
-impl<'a> Endpoint<(), BulkWriteParams<'a>, Vec<KeyValuePair>> for BulkWrite<'a> {
+impl<'a> Endpoint<(), (), Vec<KeyValuePair>> for BulkWrite<'a> {
     fn method(&self) -> Method {
         Method::Put
     }
@@ -22,23 +21,17 @@ impl<'a> Endpoint<(), BulkWriteParams<'a>, Vec<KeyValuePair>> for BulkWrite<'a>
     fn body(&self) -> Option<Vec<KeyValuePair>> {
         Some(self.bulk_key_value_pairs.clone())
     }
-    fn query(&self) -> Option<BulkWriteParams<'a>> {
-        Some(self.params.clone())
-    }
     // default content-type is already application/json
 }
 
-#[derive(Serialize, Clone, Debug)]
-pub struct BulkWriteParams<'a> {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub expiration: Option<&'a str>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub expiration_ttl: Option<&'a str>,
-}
-
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct KeyValuePair {
     pub key: String,
     pub value: String,
-    pub base64: bool,
-}
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub expiration: Option<i32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub expiration_ttl: Option<i32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub base64: Option<bool>,
+}