make attributes private

This commit is contained in:
Lennart
2024-11-04 20:07:57 +01:00
parent 05bd8f2aa0
commit 2ff27814b7
4 changed files with 14 additions and 22 deletions

View File

@@ -24,10 +24,9 @@ use std::sync::Arc;
use strum::{EnumString, VariantNames}; use strum::{EnumString, VariantNames};
pub struct CalendarResourceService<C: CalendarStore + ?Sized> { pub struct CalendarResourceService<C: CalendarStore + ?Sized> {
pub cal_store: Arc<C>, cal_store: Arc<C>,
pub path: String, principal: String,
pub principal: String, calendar_id: String,
pub calendar_id: String,
} }
#[derive(EnumString, VariantNames, Clone)] #[derive(EnumString, VariantNames, Clone)]
@@ -283,7 +282,6 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResourceService<C> {
.into_inner(); .into_inner();
Ok(Self { Ok(Self {
path: req.path().to_owned(),
principal: path_components.0, principal: path_components.0,
calendar_id: path_components.1, calendar_id: path_components.1,
cal_store, cal_store,

View File

@@ -14,11 +14,10 @@ use std::sync::Arc;
use strum::{EnumString, VariantNames}; use strum::{EnumString, VariantNames};
pub struct CalendarObjectResourceService<C: CalendarStore + ?Sized> { pub struct CalendarObjectResourceService<C: CalendarStore + ?Sized> {
pub cal_store: Arc<C>, cal_store: Arc<C>,
pub path: String, principal: String,
pub principal: String, cal_id: String,
pub cal_id: String, object_id: String,
pub object_id: String,
} }
#[derive(EnumString, VariantNames, Clone)] #[derive(EnumString, VariantNames, Clone)]
@@ -153,7 +152,6 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarObjectResourceServic
principal, principal,
cal_id, cal_id,
object_id, object_id,
path: req.path().to_string(),
}) })
} }

View File

@@ -15,11 +15,10 @@ use strum::{EnumString, VariantNames};
use super::methods::{get_object, put_object}; use super::methods::{get_object, put_object};
pub struct AddressObjectResourceService<AS: AddressbookStore + ?Sized> { pub struct AddressObjectResourceService<AS: AddressbookStore + ?Sized> {
pub addr_store: Arc<AS>, addr_store: Arc<AS>,
pub path: String, principal: String,
pub principal: String, cal_id: String,
pub cal_id: String, object_id: String,
pub object_id: String,
} }
#[derive(EnumString, VariantNames, Clone)] #[derive(EnumString, VariantNames, Clone)]
@@ -154,7 +153,6 @@ impl<AS: AddressbookStore + ?Sized> ResourceService for AddressObjectResourceSer
principal, principal,
cal_id, cal_id,
object_id, object_id,
path: req.path().to_string(),
}) })
} }

View File

@@ -21,10 +21,9 @@ use std::sync::Arc;
use strum::{EnumString, VariantNames}; use strum::{EnumString, VariantNames};
pub struct AddressbookResourceService<AS: AddressbookStore + ?Sized> { pub struct AddressbookResourceService<AS: AddressbookStore + ?Sized> {
pub addr_store: Arc<AS>, addr_store: Arc<AS>,
pub path: String, principal: String,
pub principal: String, addressbook_id: String,
pub addressbook_id: String,
} }
#[derive(EnumString, VariantNames, Clone)] #[derive(EnumString, VariantNames, Clone)]
@@ -220,7 +219,6 @@ impl<AS: AddressbookStore + ?Sized> ResourceService for AddressbookResourceServi
.into_inner(); .into_inner();
Ok(Self { Ok(Self {
path: req.path().to_owned(),
principal: path_components.0, principal: path_components.0,
addressbook_id: path_components.1, addressbook_id: path_components.1,
addr_store, addr_store,