Minor Improvements

Author: amigin

my-http-server-core/src/http_ok_result/http_ok_result.rs

@@ -68,7 +68,7 @@ impl HttpOutput {
 
     pub fn get_content_type(&self) -> &str {
         match self {
-            HttpOutput::Empty => "text/plain",
+            HttpOutput::Empty => "text/plain".into(),
             HttpOutput::Content {
                 headers: _,
                 content_type,
@@ -77,17 +77,18 @@ impl HttpOutput {
             } => content_type
                 .as_ref()
                 .map(|ct| ct.as_str())
-                .unwrap_or("text/plain"),
+                .unwrap_or("text/plain")
+                .into(),
             HttpOutput::Redirect {
                 url: _,
                 headers: _,
                 permanent: _,
-            } => "text/plain",
+            } => "text/plain".into(),
             HttpOutput::File {
                 file_name: _,
                 content: _,
             } => "application/octet-stream",
-            HttpOutput::Raw(_) => "text/plain",
+            HttpOutput::Raw(_) => "text/plain".into(),
         }
     }
 
@@ -98,7 +99,7 @@ impl HttpOutput {
     ) -> Result<HttpOkResult, HttpFailResult> {
         let result = match self {
             HttpOutput::Empty => HttpFailResult {
-                content_type: WebContentType::Text,
+                content_type: WebContentType::Text.into(),
                 status_code: status_code,
                 content: Vec::new(),
                 write_telemetry,
@@ -150,13 +151,14 @@ impl HttpOutput {
         Err(result)
     }
 
-    pub fn as_text<'s>(text: impl Into<StrOrString<'s>>) -> Self {
+    pub fn as_text<'s>(text: impl Into<StrOrString<'s>>) -> HttpOkResultBuilder {
         let text = text.into().to_string();
-        Self::Content {
+
+        HttpOkResultBuilder {
             headers: None,
             content_type: Some(WebContentType::Text),
-            content: text.into_bytes(),
-            set_cookies: None,
+            cookies: Default::default(),
+            body: text.into_bytes(),
         }
     }
 
@@ -171,14 +173,14 @@ impl HttpOutput {
         }
     }
 
-    pub fn as_yaml<T: Serialize>(model: T) -> Self {
+    pub fn as_yaml<T: Serialize>(model: T) -> HttpOkResultBuilder {
         let yaml = serde_yaml::to_string(&model).unwrap();
 
-        Self::Content {
+        HttpOkResultBuilder {
             headers: None,
             content_type: Some(WebContentType::Yaml),
-            content: yaml.into_bytes(),
-            set_cookies: None,
+            cookies: Default::default(),
+            body: yaml.into_bytes(),
         }
     }
 

my-http-server-core/src/http_ok_result/http_ok_result_builder.rs

@@ -9,7 +9,7 @@ use super::HttpOkResult;
 pub struct HttpOkResultBuilder {
     pub(crate) headers: Option<HashMap<String, String>>,
     pub(crate) content_type: Option<WebContentType>,
-    pub(crate) cookies: CookieJar,
+    pub(crate) cookies: Option<CookieJar>,
     pub(crate) body: Vec<u8>,
 }
 
@@ -64,15 +64,28 @@ impl HttpOkResultBuilder {
     }
 
     pub fn set_cookie(mut self, cookie: impl Into<Cookie>) -> Self {
-        self.cookies = self.cookies.set_cookie(cookie);
+        let cookie_jar = match self.cookies.take() {
+            Some(cookie_jar) => cookie_jar,
+            None => CookieJar::new(),
+        };
+
+        self.cookies = Some(cookie_jar.set_cookie(cookie));
+
         self
     }
 
     pub fn set_cookies(mut self, cookies: impl IntoIterator<Item = impl Into<Cookie>>) -> Self {
+        let mut cookie_jar = match self.cookies.take() {
+            Some(cookies) => cookies,
+            None => CookieJar::new(),
+        };
+
         for cookie in cookies {
-            self.cookies = self.cookies.set_cookie(cookie);
+            cookie_jar = cookie_jar.set_cookie(cookie);
         }
 
+        self.cookies = Some(cookie_jar);
+
         self
     }
 
@@ -84,11 +97,7 @@ impl HttpOkResultBuilder {
             output: HttpOutput::Content {
                 headers: self.headers,
                 content_type: self.content_type,
-                set_cookies: if self.cookies.is_empty() {
-                    None
-                } else {
-                    Some(self.cookies)
-                },
+                set_cookies: self.cookies,
                 content: self.body,
             },
         })
@@ -98,11 +107,7 @@ impl HttpOkResultBuilder {
         HttpOutput::Content {
             headers: self.headers,
             content_type: self.content_type,
-            set_cookies: if self.cookies.is_empty() {
-                None
-            } else {
-                Some(self.cookies)
-            },
+            set_cookies: self.cookies,
             content,
         }
     }