cleanup multiple versions of new functions

Author: dsmith3197

lib/codecs/src/decoding/format/json.rs

@@ -45,7 +45,7 @@ pub struct JsonDeserializerOptions {
     lossy: bool,
 }
 
-fn default_lossy() -> bool {
+const fn default_lossy() -> bool {
     true
 }
 
@@ -87,12 +87,7 @@ impl JsonDeserializerConfig {
 
 impl JsonDeserializerConfig {
     /// Creates a new `JsonDeserializerConfig`.
-    pub fn new() -> Self {
-        Default::default()
-    }
-
-    /// Creates a new `JsonDeserializerConfig` with the given options.
-    pub fn new_with_options(options: JsonDeserializerOptions) -> Self {
+    pub fn new(options: JsonDeserializerOptions) -> Self {
         Self { json: options }
     }
 }
@@ -107,12 +102,7 @@ pub struct JsonDeserializer {
 
 impl JsonDeserializer {
     /// Creates a new `JsonDeserializer`.
-    pub fn new() -> Self {
-        Default::default()
-    }
-
-    /// Creates a new `JsonDeserializer` with the given lossy option.
-    pub fn new_with_lossy(lossy: bool) -> Self {
+    pub fn new(lossy: bool) -> Self {
         Self { lossy }
     }
 }
@@ -183,7 +173,7 @@ mod tests {
     #[test]
     fn deserialize_json() {
         let input = Bytes::from(r#"{ "foo": 123 }"#);
-        let deserializer = JsonDeserializer::new();
+        let deserializer = JsonDeserializer::default();
 
         for namespace in [LogNamespace::Legacy, LogNamespace::Vector] {
             let events = deserializer.parse(input.clone(), namespace).unwrap();
@@ -210,7 +200,7 @@ mod tests {
     #[test]
     fn deserialize_json_array() {
         let input = Bytes::from(r#"[{ "foo": 123 }, { "bar": 456 }]"#);
-        let deserializer = JsonDeserializer::new();
+        let deserializer = JsonDeserializer::default();
         for namespace in [LogNamespace::Legacy, LogNamespace::Vector] {
             let events = deserializer.parse(input.clone(), namespace).unwrap();
             let mut events = events.into_iter();
@@ -247,7 +237,7 @@ mod tests {
     #[test]
     fn deserialize_skip_empty() {
         let input = Bytes::from("");
-        let deserializer = JsonDeserializer::new();
+        let deserializer = JsonDeserializer::default();
 
         for namespace in [LogNamespace::Legacy, LogNamespace::Vector] {
             let events = deserializer.parse(input.clone(), namespace).unwrap();
@@ -258,7 +248,7 @@ mod tests {
     #[test]
     fn deserialize_error_invalid_json() {
         let input = Bytes::from("{ foo");
-        let deserializer = JsonDeserializer::new();
+        let deserializer = JsonDeserializer::default();
 
         for namespace in [LogNamespace::Legacy, LogNamespace::Vector] {
             assert!(deserializer.parse(input.clone(), namespace).is_err());
@@ -268,7 +258,7 @@ mod tests {
     #[test]
     fn deserialize_lossy_replace_invalid_utf8() {
         let input = Bytes::from(b"{ \"foo\": \"Hello \xF0\x90\x80World\" }".as_slice());
-        let deserializer = JsonDeserializer::new();
+        let deserializer = JsonDeserializer::new(true);
 
         for namespace in [LogNamespace::Legacy, LogNamespace::Vector] {
             let events = deserializer.parse(input.clone(), namespace).unwrap();
@@ -295,7 +285,7 @@ mod tests {
     #[test]
     fn deserialize_non_lossy_error_invalid_utf8() {
         let input = Bytes::from(b"{ \"foo\": \"Hello \xF0\x90\x80World\" }".as_slice());
-        let deserializer = JsonDeserializer::new_with_lossy(false);
+        let deserializer = JsonDeserializer::new(false);
 
         for namespace in [LogNamespace::Legacy, LogNamespace::Vector] {
             assert!(deserializer.parse(input.clone(), namespace).is_err());

lib/codecs/src/decoding/mod.rs

@@ -316,7 +316,7 @@ impl DeserializerConfig {
         match self {
             DeserializerConfig::Bytes => Deserializer::Bytes(BytesDeserializerConfig.build()),
             DeserializerConfig::Json { json } => {
-                Deserializer::Json(JsonDeserializerConfig::new_with_options(json.clone()).build())
+                Deserializer::Json(JsonDeserializerConfig::new(json.clone()).build())
             }
             #[cfg(feature = "syslog")]
             DeserializerConfig::Syslog => {
@@ -352,7 +352,7 @@ impl DeserializerConfig {
         match self {
             DeserializerConfig::Bytes => BytesDeserializerConfig.output_type(),
             DeserializerConfig::Json { json } => {
-                JsonDeserializerConfig::new_with_options(json.clone()).output_type()
+                JsonDeserializerConfig::new(json.clone()).output_type()
             }
             #[cfg(feature = "syslog")]
             DeserializerConfig::Syslog => SyslogDeserializerConfig::default().output_type(),
@@ -367,8 +367,7 @@ impl DeserializerConfig {
         match self {
             DeserializerConfig::Bytes => BytesDeserializerConfig.schema_definition(log_namespace),
             DeserializerConfig::Json { json } => {
-                JsonDeserializerConfig::new_with_options(json.clone())
-                    .schema_definition(log_namespace)
+                JsonDeserializerConfig::new(json.clone()).schema_definition(log_namespace)
             }
             #[cfg(feature = "syslog")]
             DeserializerConfig::Syslog => {

src/codecs/decoding/decoder.rs

@@ -122,7 +122,7 @@ mod tests {
         let reader = StreamReader::new(stream);
         let decoder = Decoder::new(
             Framer::NewlineDelimited(NewlineDelimitedDecoder::new()),
-            Deserializer::Json(JsonDeserializer::new()),
+            Deserializer::Json(JsonDeserializer::default()),
         );
         let mut stream = FramedRead::new(reader, decoder);
 

src/sources/http_server.rs

@@ -202,11 +202,11 @@ impl SimpleHttpConfig {
                 ),
                 Encoding::Json => (
                     BytesDecoderConfig::new().into(),
-                    JsonDeserializerConfig::new().into(),
+                    JsonDeserializerConfig::default().into(),
                 ),
                 Encoding::Ndjson => (
                     NewlineDelimitedDecoderConfig::new().into(),
-                    JsonDeserializerConfig::new().into(),
+                    JsonDeserializerConfig::default().into(),
                 ),
                 Encoding::Binary => (
                     BytesDecoderConfig::new().into(),
@@ -762,7 +762,7 @@ mod tests {
                 EventStatus::Delivered,
                 true,
                 None,
-                Some(JsonDeserializerConfig::new().into()),
+                Some(JsonDeserializerConfig::default().into()),
             )
             .await;
 
@@ -812,7 +812,7 @@ mod tests {
                 EventStatus::Delivered,
                 true,
                 None,
-                Some(JsonDeserializerConfig::new().into()),
+                Some(JsonDeserializerConfig::default().into()),
             )
             .await;
 
@@ -855,7 +855,7 @@ mod tests {
                 EventStatus::Delivered,
                 true,
                 None,
-                Some(JsonDeserializerConfig::new().into()),
+                Some(JsonDeserializerConfig::default().into()),
             )
             .await;
 
@@ -904,7 +904,7 @@ mod tests {
                 EventStatus::Delivered,
                 true,
                 None,
-                Some(JsonDeserializerConfig::new().into()),
+                Some(JsonDeserializerConfig::default().into()),
             )
             .await;
 
@@ -988,7 +988,7 @@ mod tests {
                 EventStatus::Delivered,
                 true,
                 None,
-                Some(JsonDeserializerConfig::new().into()),
+                Some(JsonDeserializerConfig::default().into()),
             )
             .await;
 
@@ -1029,7 +1029,7 @@ mod tests {
                 EventStatus::Delivered,
                 true,
                 None,
-                Some(JsonDeserializerConfig::new().into()),
+                Some(JsonDeserializerConfig::default().into()),
             )
             .await;
 
@@ -1108,7 +1108,7 @@ mod tests {
                 EventStatus::Delivered,
                 true,
                 None,
-                Some(JsonDeserializerConfig::new().into()),
+                Some(JsonDeserializerConfig::default().into()),
             )
             .await;
 
@@ -1152,7 +1152,7 @@ mod tests {
                 EventStatus::Delivered,
                 true,
                 None,
-                Some(JsonDeserializerConfig::new().into()),
+                Some(JsonDeserializerConfig::default().into()),
             )
             .await;
 
@@ -1221,7 +1221,7 @@ mod tests {
             EventStatus::Delivered,
             true,
             None,
-            Some(JsonDeserializerConfig::new().into()),
+            Some(JsonDeserializerConfig::default().into()),
         )
         .await;