Fixes

Author: amigin

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

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use crate::{cookies::*, HttpFailResult, HttpOkResultBuilder, WebContentType};
+use crate::{cookies::*, HttpFailResult, HttpResultBuilder, WebContentType};
 use hyper::Response;
 use my_hyper_utils::*;
 use rust_extensions::StrOrString;
@@ -31,8 +31,8 @@ pub enum HttpOutput {
 }
 
 impl HttpOutput {
-    pub fn from_builder() -> HttpOkResultBuilder {
-        HttpOkResultBuilder::new()
+    pub fn from_builder() -> HttpResultBuilder {
+        HttpResultBuilder::new()
     }
 
     pub fn into_ok_result(self, write_telemetry: bool) -> Result<HttpOkResult, HttpFailResult> {
@@ -151,32 +151,32 @@ impl HttpOutput {
         Err(result)
     }
 
-    pub fn as_text<'s>(text: impl Into<StrOrString<'s>>) -> HttpOkResultBuilder {
+    pub fn as_text<'s>(text: impl Into<StrOrString<'s>>) -> HttpResultBuilder {
         let text = text.into().to_string();
 
-        HttpOkResultBuilder {
+        HttpResultBuilder {
             headers: None,
             content_type: Some(WebContentType::Text),
             cookies: Default::default(),
             body: text.into_bytes(),
         }
     }
 
-    pub fn as_json<T: Serialize>(model: T) -> HttpOkResultBuilder {
+    pub fn as_json<T: Serialize>(model: T) -> HttpResultBuilder {
         let json = serde_json::to_vec(&model).unwrap();
 
-        HttpOkResultBuilder {
+        HttpResultBuilder {
             headers: None,
             content_type: Some(WebContentType::Json),
             cookies: Default::default(),
             body: json,
         }
     }
 
-    pub fn as_yaml<T: Serialize>(model: T) -> HttpOkResultBuilder {
+    pub fn as_yaml<T: Serialize>(model: T) -> HttpResultBuilder {
         let yaml = serde_yaml::to_string(&model).unwrap();
 
-        HttpOkResultBuilder {
+        HttpResultBuilder {
             headers: None,
             content_type: Some(WebContentType::Yaml),
             cookies: Default::default(),

my-http-server-core/src/http_ok_result/http_ok_result_builder.rs renamed to my-http-server-core/src/http_ok_result/http_result_builder.rs

@@ -6,14 +6,14 @@ use crate::{cookies::*, HttpFailResult, HttpOutput, WebContentType};
 
 use super::HttpOkResult;
 
-pub struct HttpOkResultBuilder {
+pub struct HttpResultBuilder {
     pub(crate) headers: Option<HashMap<String, String>>,
     pub(crate) content_type: Option<WebContentType>,
     pub(crate) cookies: Option<CookieJar>,
     pub(crate) body: Vec<u8>,
 }
 
-impl HttpOkResultBuilder {
+impl HttpResultBuilder {
     pub fn new() -> Self {
         Self {
             headers: None,
@@ -111,4 +111,19 @@ impl HttpOkResultBuilder {
             content,
         }
     }
+
+    pub fn into_fail_result(
+        self,
+        status_code: u16,
+        write_telemetry: bool,
+    ) -> Result<HttpOkResult, HttpFailResult> {
+        HttpFailResult {
+            content_type: self.content_type.unwrap_or(WebContentType::Text),
+            status_code,
+            content: self.body,
+            write_telemetry,
+            write_to_log: true,
+        }
+        .into()
+    }
 }

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

@@ -1,5 +1,5 @@
-mod http_ok_result_builder;
-pub use http_ok_result_builder::*;
+mod http_result_builder;
+pub use http_result_builder::*;
 
 mod http_ok_result;
 pub use http_ok_result::*;