prop: implement InvalidProperty with Default

crates/carddav/src/address_object/resource.rs

@@ -1,11 +1,11 @@
 use crate::{principal::PrincipalResource, Error};
 use actix_web::{dev::ResourceMap, web::Data, HttpRequest};
 use async_trait::async_trait;
-use derive_more::derive::{From, Into, TryInto};
+use derive_more::derive::{From, Into};
 use rustical_dav::{
     extensions::CommonPropertiesProp,
     privileges::UserPrivilegeSet,
-    resource::{InvalidProperty, Resource, ResourceService},
+    resource::{Resource, ResourceService},
 };
 use rustical_store::{auth::User, AddressObject, AddressbookStore};
 use serde::{Deserialize, Serialize};
@@ -30,7 +30,7 @@ pub enum AddressObjectPropName {
     Getcontenttype,
 }
 
-#[derive(Deserialize, Serialize, From, TryInto)]
+#[derive(Default, Deserialize, Serialize, From, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub enum AddressObjectProp {
     // WebDAV (RFC 2518)
@@ -43,19 +43,13 @@ pub enum AddressObjectProp {
 
     #[serde(skip_deserializing, untagged)]
     #[from]
-    #[try_into]
     ExtCommonProperties(CommonPropertiesProp<Resourcetype>),
 
     #[serde(untagged)]
+    #[default]
     Invalid,
 }
 
-impl InvalidProperty for AddressObjectProp {
-    fn invalid_property(&self) -> bool {
-        matches!(self, Self::Invalid)
-    }
-}
-
 #[derive(Clone, From, Into)]
 pub struct AddressObjectResource {
     pub object: AddressObject,
@@ -63,7 +57,7 @@ pub struct AddressObjectResource {
 }
 
 // TODO: set correct resourcetype
-#[derive(Debug, Clone, Deserialize, Serialize, Default)]
+#[derive(Debug, Clone, Deserialize, Serialize, Default, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct Resourcetype {
     collection: (),

crates/carddav/src/addressbook/prop.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct AddressDataType {
     #[serde(rename = "@content-type")]
@@ -9,7 +9,7 @@ pub struct AddressDataType {
     pub version: String,
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct SupportedAddressData {
     #[serde(rename = "CARD:address-data-type", alias = "address-data-type")]
@@ -33,7 +33,7 @@ impl Default for SupportedAddressData {
     }
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize, Default)]
+#[derive(Debug, Clone, Deserialize, Serialize, Default, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct Resourcetype {
     #[serde(rename = "CARD:addressbook", alias = "addressbook")]
@@ -41,21 +41,21 @@ pub struct Resourcetype {
     collection: (),
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub enum ReportMethod {
     AddressbookMultiget,
     SyncCollection,
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct ReportWrapper {
     #[serde(rename = "$value")]
     report: ReportMethod,
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct SupportedReportWrapper {
     report: ReportWrapper,
@@ -70,7 +70,7 @@ impl From<ReportMethod> for SupportedReportWrapper {
 }
 
 // RFC 3253 section-3.1.5
-#[derive(Debug, Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct SupportedReportSet {
     supported_report: Vec<SupportedReportWrapper>,

crates/carddav/src/addressbook/resource.rs

@@ -9,10 +9,10 @@ use actix_web::http::Method;
 use actix_web::web;
 use actix_web::{web::Data, HttpRequest};
 use async_trait::async_trait;
-use derive_more::derive::{From, Into, TryInto};
+use derive_more::derive::{From, Into};
 use rustical_dav::extensions::CommonPropertiesProp;
 use rustical_dav::privileges::UserPrivilegeSet;
-use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
+use rustical_dav::resource::{Resource, ResourceService};
 use rustical_store::auth::User;
 use rustical_store::{Addressbook, AddressbookStore};
 use serde::{Deserialize, Serialize};
@@ -40,7 +40,7 @@ pub enum AddressbookPropName {
     Getctag,
 }
 
-#[derive(Deserialize, Serialize, From, TryInto)]
+#[derive(Default, Deserialize, Serialize, From, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub enum AddressbookProp {
     // WebDAV (RFC 2518)
@@ -69,19 +69,13 @@ pub enum AddressbookProp {
 
     #[serde(skip_deserializing, untagged)]
     #[from]
-    #[try_into]
     ExtCommonProperties(CommonPropertiesProp<Resourcetype>),
 
     #[serde(untagged)]
+    #[default]
     Invalid,
 }
 
-impl InvalidProperty for AddressbookProp {
-    fn invalid_property(&self) -> bool {
-        matches!(self, Self::Invalid)
-    }
-}
-
 #[derive(Clone, Debug, From, Into)]
 pub struct AddressbookResource(Addressbook);
 

crates/carddav/src/principal/mod.rs

@@ -4,10 +4,10 @@ use actix_web::dev::ResourceMap;
 use actix_web::web::Data;
 use actix_web::HttpRequest;
 use async_trait::async_trait;
-use derive_more::derive::{From, TryInto};
+use derive_more::derive::From;
 use rustical_dav::extensions::CommonPropertiesProp;
 use rustical_dav::privileges::UserPrivilegeSet;
-use rustical_dav::resource::{InvalidProperty, Resource, ResourceService};
+use rustical_dav::resource::{Resource, ResourceService};
 use rustical_dav::xml::HrefElement;
 use rustical_store::auth::User;
 use rustical_store::AddressbookStore;
@@ -25,14 +25,14 @@ pub struct PrincipalResource {
     principal: String,
 }
 
-#[derive(Deserialize, Serialize, Default, Debug)]
+#[derive(Deserialize, Serialize, Default, Debug, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub struct Resourcetype {
     principal: (),
     collection: (),
 }
 
-#[derive(Deserialize, Serialize, From, TryInto)]
+#[derive(Default, Deserialize, Serialize, From, PartialEq)]
 #[serde(rename_all = "kebab-case")]
 pub enum PrincipalProp {
     // WebDAV Access Control (RFC 3744)
@@ -47,20 +47,14 @@ pub enum PrincipalProp {
 
     #[serde(skip_deserializing, untagged)]
     #[from]
-    #[try_into]
     ExtCommonProperties(CommonPropertiesProp<Resourcetype>),
 
     #[serde(untagged)]
+    #[default]
     Invalid,
 }
 
-impl InvalidProperty for PrincipalProp {
-    fn invalid_property(&self) -> bool {
-        matches!(self, Self::Invalid)
-    }
-}
-
-#[derive(EnumString, VariantNames, Clone, From, TryInto)]
+#[derive(EnumString, VariantNames, Clone)]
 #[strum(serialize_all = "kebab-case")]
 pub enum PrincipalPropName {
     #[strum(serialize = "principal-URL")]