From 2ff27814b782450343eb760a3af8dd00b5d3ba86 Mon Sep 17 00:00:00 2001
From: Lennart <18233294+lennart-k@users.noreply.github.com>
Date: Mon, 4 Nov 2024 20:07:57 +0100
Subject: [PATCH] make attributes private

---
 crates/caldav/src/calendar/resource.rs        |  8 +++-----
 crates/caldav/src/calendar_object/resource.rs | 10 ++++------
 crates/carddav/src/address_object/resource.rs | 10 ++++------
 crates/carddav/src/addressbook/resource.rs    |  8 +++-----
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/crates/caldav/src/calendar/resource.rs b/crates/caldav/src/calendar/resource.rs
index ded48b0..14eeb7a 100644
--- a/crates/caldav/src/calendar/resource.rs
+++ b/crates/caldav/src/calendar/resource.rs
@@ -24,10 +24,9 @@ use std::sync::Arc;
 use strum::{EnumString, VariantNames};
 
 pub struct CalendarResourceService<C: CalendarStore + ?Sized> {
-    pub cal_store: Arc<C>,
-    pub path: String,
-    pub principal: String,
-    pub calendar_id: String,
+    cal_store: Arc<C>,
+    principal: String,
+    calendar_id: String,
 }
 
 #[derive(EnumString, VariantNames, Clone)]
@@ -283,7 +282,6 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResourceService<C> {
             .into_inner();
 
         Ok(Self {
-            path: req.path().to_owned(),
             principal: path_components.0,
             calendar_id: path_components.1,
             cal_store,
diff --git a/crates/caldav/src/calendar_object/resource.rs b/crates/caldav/src/calendar_object/resource.rs
index 9a485ef..066d1a1 100644
--- a/crates/caldav/src/calendar_object/resource.rs
+++ b/crates/caldav/src/calendar_object/resource.rs
@@ -14,11 +14,10 @@ use std::sync::Arc;
 use strum::{EnumString, VariantNames};
 
 pub struct CalendarObjectResourceService<C: CalendarStore + ?Sized> {
-    pub cal_store: Arc<C>,
-    pub path: String,
-    pub principal: String,
-    pub cal_id: String,
-    pub object_id: String,
+    cal_store: Arc<C>,
+    principal: String,
+    cal_id: String,
+    object_id: String,
 }
 
 #[derive(EnumString, VariantNames, Clone)]
@@ -153,7 +152,6 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarObjectResourceServic
             principal,
             cal_id,
             object_id,
-            path: req.path().to_string(),
         })
     }
 
diff --git a/crates/carddav/src/address_object/resource.rs b/crates/carddav/src/address_object/resource.rs
index 260a621..bdba789 100644
--- a/crates/carddav/src/address_object/resource.rs
+++ b/crates/carddav/src/address_object/resource.rs
@@ -15,11 +15,10 @@ use strum::{EnumString, VariantNames};
 use super::methods::{get_object, put_object};
 
 pub struct AddressObjectResourceService<AS: AddressbookStore + ?Sized> {
-    pub addr_store: Arc<AS>,
-    pub path: String,
-    pub principal: String,
-    pub cal_id: String,
-    pub object_id: String,
+    addr_store: Arc<AS>,
+    principal: String,
+    cal_id: String,
+    object_id: String,
 }
 
 #[derive(EnumString, VariantNames, Clone)]
@@ -154,7 +153,6 @@ impl<AS: AddressbookStore + ?Sized> ResourceService for AddressObjectResourceSer
             principal,
             cal_id,
             object_id,
-            path: req.path().to_string(),
         })
     }
 
diff --git a/crates/carddav/src/addressbook/resource.rs b/crates/carddav/src/addressbook/resource.rs
index 863ce9b..9401f30 100644
--- a/crates/carddav/src/addressbook/resource.rs
+++ b/crates/carddav/src/addressbook/resource.rs
@@ -21,10 +21,9 @@ use std::sync::Arc;
 use strum::{EnumString, VariantNames};
 
 pub struct AddressbookResourceService<AS: AddressbookStore + ?Sized> {
-    pub addr_store: Arc<AS>,
-    pub path: String,
-    pub principal: String,
-    pub addressbook_id: String,
+    addr_store: Arc<AS>,
+    principal: String,
+    addressbook_id: String,
 }
 
 #[derive(EnumString, VariantNames, Clone)]
@@ -220,7 +219,6 @@ impl<AS: AddressbookStore + ?Sized> ResourceService for AddressbookResourceServi
             .into_inner();
 
         Ok(Self {
-            path: req.path().to_owned(),
             principal: path_components.0,
             addressbook_id: path_components.1,
             addr_store,