From 984e912542ac27cb2595f4a816eb2bd248232df2 Mon Sep 17 00:00:00 2001 From: appflowy Date: Fri, 23 Jul 2021 14:54:31 +0800 Subject: [PATCH] rename moduleData to unit --- rust-lib/flowy-dispatch/src/module/data.rs | 20 +++++++++---------- rust-lib/flowy-dispatch/src/module/module.rs | 4 ++-- .../flowy-editor/src/handlers/doc_handler.rs | 12 +++++------ .../flowy-user/src/handlers/auth_handler.rs | 4 ++-- .../flowy-user/src/handlers/user_handler.rs | 6 +++--- .../src/handlers/app_handler.rs | 6 +++--- .../src/handlers/view_handler.rs | 4 ++-- .../src/handlers/workspace_handler.rs | 8 ++++---- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/rust-lib/flowy-dispatch/src/module/data.rs b/rust-lib/flowy-dispatch/src/module/data.rs index 552decc122..368126cd28 100644 --- a/rust-lib/flowy-dispatch/src/module/data.rs +++ b/rust-lib/flowy-dispatch/src/module/data.rs @@ -5,18 +5,18 @@ use crate::{ }; use std::{any::type_name, ops::Deref, sync::Arc}; -pub struct ModuleData(Arc); +pub struct Unit(Arc); -impl ModuleData +impl Unit where T: Send + Sync, { - pub fn new(data: T) -> Self { ModuleData(Arc::new(data)) } + pub fn new(data: T) -> Self { Unit(Arc::new(data)) } pub fn get_ref(&self) -> &T { self.0.as_ref() } } -impl Deref for ModuleData +impl Deref for Unit where T: ?Sized + Send + Sync, { @@ -25,21 +25,21 @@ where fn deref(&self) -> &Arc { &self.0 } } -impl Clone for ModuleData +impl Clone for Unit where T: ?Sized + Send + Sync, { - fn clone(&self) -> ModuleData { ModuleData(self.0.clone()) } + fn clone(&self) -> Unit { Unit(self.0.clone()) } } -impl From> for ModuleData +impl From> for Unit where T: ?Sized + Send + Sync, { - fn from(arc: Arc) -> Self { ModuleData(arc) } + fn from(arc: Arc) -> Self { Unit(arc) } } -impl FromRequest for ModuleData +impl FromRequest for Unit where T: ?Sized + Send + Sync + 'static, { @@ -48,7 +48,7 @@ where #[inline] fn from_request(req: &EventRequest, _: &mut Payload) -> Self::Future { - if let Some(data) = req.module_data::>() { + if let Some(data) = req.module_data::>() { ready(Ok(data.clone())) } else { let msg = format!( diff --git a/rust-lib/flowy-dispatch/src/module/module.rs b/rust-lib/flowy-dispatch/src/module/module.rs index a715e93b53..ffe79c11bf 100644 --- a/rust-lib/flowy-dispatch/src/module/module.rs +++ b/rust-lib/flowy-dispatch/src/module/module.rs @@ -13,7 +13,7 @@ use pin_project::pin_project; use crate::{ errors::{DispatchError, InternalError}, - module::{container::ModuleDataMap, ModuleData}, + module::{container::ModuleDataMap, Unit}, request::{payload::Payload, EventRequest, FromRequest}, response::{EventResponse, Responder}, service::{ @@ -77,7 +77,7 @@ impl Module { pub fn data(mut self, data: D) -> Self { Arc::get_mut(&mut self.module_data) .unwrap() - .insert(ModuleData::new(data)); + .insert(Unit::new(data)); self } diff --git a/rust-lib/flowy-editor/src/handlers/doc_handler.rs b/rust-lib/flowy-editor/src/handlers/doc_handler.rs index 9b9fd02c81..ad7d7fa9ec 100644 --- a/rust-lib/flowy-editor/src/handlers/doc_handler.rs +++ b/rust-lib/flowy-editor/src/handlers/doc_handler.rs @@ -12,8 +12,8 @@ use std::{ pub async fn create_doc( data: Data, - controller: ModuleData, - manager: ModuleData>, + controller: Unit, + manager: Unit>, ) -> ResponseResult { let params: CreateDocParams = data.into_inner().try_into()?; let path = manager.read().unwrap().make_file_path(¶ms.id); @@ -25,8 +25,8 @@ pub async fn create_doc( pub async fn read_doc( data: Data, - controller: ModuleData, - manager: ModuleData>, + controller: Unit, + manager: Unit>, ) -> ResponseResult { let params: QueryDocParams = data.into_inner().try_into()?; let desc = controller.read_doc(¶ms.doc_id).await?; @@ -42,8 +42,8 @@ pub async fn read_doc( pub async fn update_doc( data: Data, - controller: ModuleData, - manager: ModuleData>, + controller: Unit, + manager: Unit>, ) -> Result<(), EditorError> { let mut params: UpdateDocParams = data.into_inner().try_into()?; match params.content.take() { diff --git a/rust-lib/flowy-user/src/handlers/auth_handler.rs b/rust-lib/flowy-user/src/handlers/auth_handler.rs index 601d8b6f09..f716e3233c 100644 --- a/rust-lib/flowy-user/src/handlers/auth_handler.rs +++ b/rust-lib/flowy-user/src/handlers/auth_handler.rs @@ -12,7 +12,7 @@ use std::{convert::TryInto, sync::Arc}; )] pub async fn user_sign_in_handler( data: Data, - session: ModuleData>, + session: Unit>, ) -> ResponseResult { let params: SignInParams = data.into_inner().try_into()?; let user = session.sign_in(params).await?; @@ -30,7 +30,7 @@ pub async fn user_sign_in_handler( )] pub async fn user_sign_up_handler( data: Data, - session: ModuleData>, + session: Unit>, ) -> ResponseResult { let params: SignUpParams = data.into_inner().try_into()?; let user = session.sign_up(params).await?; diff --git a/rust-lib/flowy-user/src/handlers/user_handler.rs b/rust-lib/flowy-user/src/handlers/user_handler.rs index 7cb31b3d88..7922efd03e 100644 --- a/rust-lib/flowy-user/src/handlers/user_handler.rs +++ b/rust-lib/flowy-user/src/handlers/user_handler.rs @@ -3,20 +3,20 @@ use flowy_dispatch::prelude::*; use std::{convert::TryInto, sync::Arc}; pub async fn user_get_status_handler( - session: ModuleData>, + session: Unit>, ) -> ResponseResult { let user_detail = session.user_detail()?; response_ok(user_detail) } -pub async fn sign_out_handler(session: ModuleData>) -> Result<(), UserError> { +pub async fn sign_out_handler(session: Unit>) -> Result<(), UserError> { let _ = session.sign_out()?; Ok(()) } pub async fn update_user_handler( data: Data, - session: ModuleData>, + session: Unit>, ) -> ResponseResult { let params: UpdateUserParams = data.into_inner().try_into()?; let user_detail = session.update_user(params)?; diff --git a/rust-lib/flowy-workspace/src/handlers/app_handler.rs b/rust-lib/flowy-workspace/src/handlers/app_handler.rs index 0c58e0872f..77e0cb9707 100644 --- a/rust-lib/flowy-workspace/src/handlers/app_handler.rs +++ b/rust-lib/flowy-workspace/src/handlers/app_handler.rs @@ -6,13 +6,13 @@ use crate::{ errors::WorkspaceError, services::AppController, }; -use flowy_dispatch::prelude::{response_ok, Data, ModuleData, ResponseResult}; +use flowy_dispatch::prelude::{response_ok, Data, ResponseResult, Unit}; use std::{convert::TryInto, sync::Arc}; #[tracing::instrument(name = "create_app", skip(data, controller))] pub async fn create_app( data: Data, - controller: ModuleData>, + controller: Unit>, ) -> ResponseResult { let params: CreateAppParams = data.into_inner().try_into()?; let detail = controller.create_app(params)?; @@ -22,7 +22,7 @@ pub async fn create_app( #[tracing::instrument(name = "get_app", skip(data, controller))] pub async fn get_app( data: Data, - controller: ModuleData>, + controller: Unit>, ) -> ResponseResult { let params: QueryAppParams = data.into_inner().try_into()?; let mut app = controller.read_app(¶ms.app_id).await?; diff --git a/rust-lib/flowy-workspace/src/handlers/view_handler.rs b/rust-lib/flowy-workspace/src/handlers/view_handler.rs index eb3d600b38..7800cab47b 100644 --- a/rust-lib/flowy-workspace/src/handlers/view_handler.rs +++ b/rust-lib/flowy-workspace/src/handlers/view_handler.rs @@ -3,12 +3,12 @@ use crate::{ errors::WorkspaceError, services::ViewController, }; -use flowy_dispatch::prelude::{response_ok, Data, ModuleData, ResponseResult}; +use flowy_dispatch::prelude::{response_ok, Data, ResponseResult, Unit}; use std::{convert::TryInto, sync::Arc}; pub async fn create_view( data: Data, - controller: ModuleData>, + controller: Unit>, ) -> ResponseResult { let params: CreateViewParams = data.into_inner().try_into()?; let view = controller.create_view(params).await?; diff --git a/rust-lib/flowy-workspace/src/handlers/workspace_handler.rs b/rust-lib/flowy-workspace/src/handlers/workspace_handler.rs index beb6d0a055..04ce81c674 100644 --- a/rust-lib/flowy-workspace/src/handlers/workspace_handler.rs +++ b/rust-lib/flowy-workspace/src/handlers/workspace_handler.rs @@ -3,13 +3,13 @@ use crate::{ errors::WorkspaceError, services::WorkspaceController, }; -use flowy_dispatch::prelude::{response_ok, Data, ModuleData, ResponseResult}; +use flowy_dispatch::prelude::{response_ok, Data, ResponseResult, Unit}; use std::{convert::TryInto, sync::Arc}; #[tracing::instrument(name = "create_workspace", skip(data, controller))] pub async fn create_workspace( data: Data, - controller: ModuleData>, + controller: Unit>, ) -> ResponseResult { let controller = controller.get_ref().clone(); let params: CreateWorkspaceParams = data.into_inner().try_into()?; @@ -19,7 +19,7 @@ pub async fn create_workspace( #[tracing::instrument(name = "get_cur_workspace", skip(controller))] pub async fn get_cur_workspace( - controller: ModuleData>, + controller: Unit>, ) -> ResponseResult { let workspace = controller.read_cur_workspace().await?; response_ok(workspace) @@ -28,7 +28,7 @@ pub async fn get_cur_workspace( #[tracing::instrument(name = "get_workspace", skip(data, controller))] pub async fn get_workspace( data: Data, - controller: ModuleData>, + controller: Unit>, ) -> ResponseResult { let params: QueryWorkspaceParams = data.into_inner().try_into()?; let mut workspace = controller.read_workspace(¶ms.workspace_id).await?;