refactor: add set_self_href and clear_self_href (#746)

Author: gadomski

crates/api/src/client.rs

@@ -209,7 +209,7 @@ impl Client {
         let mut value = self
             .request::<(), V>(Method::GET, url.clone(), None, None)
             .await?;
-        *value.self_href_mut() = Some(url.into());
+        value.set_self_href(url);
         Ok(value)
     }
 

crates/core/CHANGELOG.md

@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - More permissive datetime interval parsing ([#715](https://github.com/stac-utils/rustac/pull/715))
 - `Format` methods for providing your own object store ([#730](https://github.com/stac-utils/rustac/pull/730))
 - `type` field to **stac-geoparquet** writes ([#736](https://github.com/stac-utils/rustac/pull/736))
+- `SelfHref::set_self_href` and `SelfHref::clear_self_href` ([#746](https://github.com/stac-utils/rustac/pull/746))
 
 ### Changed
 

crates/core/src/geoparquet.rs

@@ -278,7 +278,7 @@ mod tests {
     #[test]
     fn roundtrip() {
         let mut item: Item = crate::read("examples/simple-item.json").unwrap();
-        *item.self_href_mut() = None;
+        item.clear_self_href();
         let mut cursor = Cursor::new(Vec::new());
         super::into_writer(&mut cursor, vec![item.clone()]).unwrap();
         let bytes = Bytes::from(cursor.into_inner());

crates/core/src/href.rs

@@ -62,6 +62,16 @@ pub trait SelfHref {
     /// *item.self_href_mut() = Option::Some("./a/relative/path.json".into());
     /// ```
     fn self_href_mut(&mut self) -> &mut Option<Href>;
+
+    /// Sets this object's self href.
+    fn set_self_href(&mut self, href: impl Into<Href>) {
+        *self.self_href_mut() = Some(href.into())
+    }
+
+    /// Clear's this object's self href.
+    fn clear_self_href(&mut self) {
+        *self.self_href_mut() = None
+    }
 }
 
 impl Href {

crates/core/src/lib.rs

@@ -173,7 +173,7 @@ where
     let path = path.as_ref();
     let file = File::open(path)?;
     let mut value: T = serde_json::from_reader(file)?;
-    *value.self_href_mut() = Some(path.to_string_lossy().into_owned().into());
+    value.set_self_href(path.to_string_lossy().into_owned());
     Ok(value)
 }
 

crates/io/src/format.rs

@@ -71,7 +71,7 @@ impl Format {
                 value
             }
         };
-        *value.self_href_mut() = Some(href);
+        value.set_self_href(href);
         Ok(value)
     }
 
@@ -164,7 +164,7 @@ impl Format {
                             href,
                             message: err.to_string(),
                         })?;
-                *value.self_href_mut() = Some(Href::Url(url));
+                value.set_self_href(url);
                 Ok(value)
             }
             RealizedHref::PathBuf(path) => {

crates/io/src/json.rs

@@ -20,7 +20,7 @@ pub trait FromJsonPath: FromJson + SelfHref {
         let mut buf = Vec::new();
         let _ = File::open(path)?.read_to_end(&mut buf)?;
         let mut value = Self::from_json_slice(&buf)?;
-        *value.self_href_mut() = Some(path.into());
+        value.set_self_href(path);
         Ok(value)
     }
 }

crates/io/src/ndjson.rs

@@ -55,7 +55,7 @@ impl FromNdjsonPath for ItemCollection {
             items.push(serde_json::from_str(&line?)?);
         }
         let mut item_collection = ItemCollection::from(items);
-        *item_collection.self_href_mut() = Some(path.into());
+        item_collection.set_self_href(path);
         Ok(item_collection)
     }
 }