feat:remove opt request response

Author: eastspire

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "hyperlane"
-version = "2.14.0"
+version = "2.15.0"
 edition = "2021"
 authors = ["ltpp-universe <root@ltpp.vip>"] 
 license = "MIT"
@@ -17,8 +17,8 @@ exclude = [
 
 [dependencies]
 color-output = "6.1.4"
-http-request = "8.14.0"
-http-type = "2.4.0"
+http-request = "8.15.0"
+http-type = "2.5.0"
 hyperlane-log = "0.6.0"
 hyperlane-time = "0.0.1"
 lombok-macros = "1.5.0"

Cargo.toml

@@ -99,7 +99,7 @@ fn run_server() {
     server.log_size(1_024_000);
 
     server.middleware(|controller_data| {
-        let request: Request = controller_data.get_request().clone().unwrap();
+        let request: Request = controller_data.get_request().clone();
         let stream: ControllerDataStream = controller_data.get_stream().clone().unwrap();
         let host: String = stream
             .peer_addr()
@@ -115,7 +115,7 @@ fn run_server() {
         controller_data
             .get_log()
             .log_info("visit path /", common_log);
-        let mut response: Response = controller_data.get_response().clone().unwrap();
+        let mut response: Response = controller_data.get_response().clone();
         let body: Vec<u8> = "404 Not Found".as_bytes().to_vec();
         let stream: ControllerDataStream = controller_data.get_stream().clone().unwrap();
         let res: ResponseResult = response
@@ -133,7 +133,7 @@ fn run_server() {
         controller_data
             .get_log()
             .log_info("visit path /request", common_log);
-        let mut response: Response = controller_data.get_response().clone().unwrap();
+        let mut response: Response = controller_data.get_response().clone();
         let body: Vec<u8> = send_request();
         let stream: ControllerDataStream = controller_data.get_stream().clone().unwrap();
         let res: ResponseResult = response
@@ -152,7 +152,7 @@ fn run_server() {
         controller_data
             .get_log()
             .log_info("visit path /hello", common_log);
-        let mut response: Response = controller_data.get_response().clone().unwrap();
+        let mut response: Response = controller_data.get_response().clone();
         let body: Vec<u8> = "hello world!".as_bytes().to_vec();
         let stream: ControllerDataStream = controller_data.get_stream().clone().unwrap();
         let res: ResponseResult = response

readme.md

@@ -76,7 +76,7 @@ fn test_server_basic_usage() {
         server.log_size(1_024_000);
 
         server.middleware(|controller_data| {
-            let request: Request = controller_data.get_request().clone().unwrap();
+            let request: Request = controller_data.get_request().clone();
             let stream: ControllerDataStream = controller_data.get_stream().clone().unwrap();
             let host: String = stream
                 .peer_addr()
@@ -92,7 +92,7 @@ fn test_server_basic_usage() {
             controller_data
                 .get_log()
                 .log_info("visit path /", common_log);
-            let mut response: Response = controller_data.get_response().clone().unwrap();
+            let mut response: Response = controller_data.get_response().clone();
             let body: Vec<u8> = "404 Not Found".as_bytes().to_vec();
             let stream: ControllerDataStream = controller_data.get_stream().clone().unwrap();
             let res: ResponseResult = response
@@ -110,7 +110,7 @@ fn test_server_basic_usage() {
             controller_data
                 .get_log()
                 .log_info("visit path /request", common_log);
-            let mut response: Response = controller_data.get_response().clone().unwrap();
+            let mut response: Response = controller_data.get_response().clone();
             let body: Vec<u8> = send_request();
             let stream: ControllerDataStream = controller_data.get_stream().clone().unwrap();
             let res: ResponseResult = response
@@ -129,7 +129,7 @@ fn test_server_basic_usage() {
             controller_data
                 .get_log()
                 .log_info("visit path /hello", common_log);
-            let mut response: Response = controller_data.get_response().clone().unwrap();
+            let mut response: Response = controller_data.get_response().clone();
             let body: Vec<u8> = "hello world!".as_bytes().to_vec();
             let stream: ControllerDataStream = controller_data.get_stream().clone().unwrap();
             let res: ResponseResult = response

src/cfg.rs

@@ -1,12 +1,13 @@
 use super::r#type::ControllerData;
+use http_type::{Request, Response};
 use hyperlane_log::*;
 
 impl ControllerData {
     pub fn new() -> Self {
         ControllerData {
             stream: None,
-            request: None,
-            response: None,
+            request: Request::default(),
+            response: Response::default(),
             log: Log::default(),
         }
     }

src/server/controller_data/impl.rs

@@ -6,14 +6,12 @@ use std::{net::TcpStream, sync::Arc};
 pub type ControllerDataStream = Arc<TcpStream>;
 pub type ControllerDataStreamOpt = Option<ControllerDataStream>;
 pub type ControllerDataRequest = Request;
-pub type ControllerDataRequestOpt = Option<ControllerDataRequest>;
 pub type ControllerDataResponse = Response;
-pub type ControllerDataResponseOpt = Option<ControllerDataResponse>;
 
 #[derive(Clone, Debug, Lombok)]
 pub struct ControllerData {
     pub(super) stream: ControllerDataStreamOpt,
-    pub(super) request: ControllerDataRequestOpt,
-    pub(super) response: ControllerDataResponseOpt,
+    pub(super) request: ControllerDataRequest,
+    pub(super) response: ControllerDataResponse,
     pub(super) log: Log,
 }

src/server/controller_data/type.rs

@@ -143,8 +143,8 @@ impl Server {
                         let mut controller_data: ControllerData = ControllerData::new();
                         controller_data
                             .set_stream(Some(stream_arc.clone()))
-                            .set_response(Some(Response::default()))
-                            .set_request(Some(request_obj.clone()))
+                            .set_response(Response::default())
+                            .set_request(request_obj.clone())
                             .set_log(log);
                         if let Ok(middleware_guard) = middleware_arc.read() {
                             for middleware in middleware_guard.iter() {