Registry object implementation

crates/jmap-proto/src/object/registry.rs

@@ -10,7 +10,7 @@ use crate::{
 };
 use registry::{
     jmap::RegistryValue,
-    schema::prelude::{Object, Property},
+    schema::prelude::{ObjectType, Property},
 };
 use std::borrow::Cow;
 use types::id::Id;
@@ -20,7 +20,7 @@ pub struct Registry;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum RegistryFilter {
-    Type(Object),
+    Type(ObjectType),
     Text(String),
     Id(Vec<Id>),
     Property(Property),

crates/jmap-proto/src/request/method.rs

@@ -5,7 +5,7 @@
  */
 
 use std::{borrow::Cow, fmt::Display};
-use registry::{schema::prelude::Object, types::EnumType};
+use registry::{schema::prelude::ObjectType, types::EnumImpl};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct MethodName {
@@ -36,7 +36,7 @@ pub enum MethodObject {
     FileNode,
     ParticipantIdentity,
     ShareNotification,
-    Registry(Object),
+    Registry(ObjectType),
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -300,7 +300,7 @@ impl MethodName {
 
         ).or_else(|| {
             let (obj, fnc) = s.strip_prefix("x:")?.split_once('/')?;
-            let obj = Object::parse(obj)?;
+            let obj = ObjectType::parse(obj)?;
             let fnc = hashify::tiny_map!(fnc.as_bytes(), 
                 "get" => MethodFunction::Get,
                 "set" => MethodFunction::Set,
@@ -364,6 +364,15 @@ impl MethodFunction {
     }
 }
 
+impl MethodObject {
+    pub fn unwrap_registry(self) -> ObjectType {
+        match self {
+            MethodObject::Registry(obj) => obj,
+            _ => panic!("Not a registry method object"),
+         }
+    }
+}
+
 impl<'de> serde::Deserialize<'de> for MethodName {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where