AVRO-3631: Use #[serde(with)] attribute to get rid of implementation detail ByteArray

Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>

Author: martin-g

lang/rust/avro/src/de.rs

@@ -595,7 +595,6 @@ pub fn from_value<'de, D: Deserialize<'de>>(value: &'de Value) -> Result<D, Erro
 mod tests {
     use pretty_assertions::assert_eq;
     use serde::Serialize;
-    use serde_bytes::ByteArray;
     use uuid::Uuid;
 
     use super::*;
@@ -1068,7 +1067,8 @@ mod tests {
     fn avro_3631_test_struct_fixed_field() {
         #[derive(Debug, Serialize, Deserialize)]
         struct TestStructFixedField {
-            field: ByteArray<6>,
+            #[serde(with = "serde_bytes")]
+            field: [u8; 6],
         }
 
         let value = Value::Record(vec![(

lang/rust/avro/src/ser.rs

@@ -487,7 +487,6 @@ mod tests {
     use super::*;
     use pretty_assertions::assert_eq;
     use serde::{Deserialize, Serialize};
-    use serde_bytes::ByteArray;
 
     #[derive(Debug, Deserialize, Serialize, Clone)]
     struct Test {
@@ -678,11 +677,6 @@ mod tests {
         Val2(f32, f32, f32),
     }
 
-    #[derive(Debug, Serialize, Deserialize)]
-    struct TestStructFixedField {
-        field: ByteArray<6>,
-    }
-
     #[test]
     fn test_to_value() {
         let test = Test {
@@ -1007,12 +1001,16 @@ mod tests {
 
     #[test]
     fn avro_3631_test_to_value_fixed_field() {
-        let test = TestStructFixedField {
-            field: ByteArray::new([1; 6]),
-        };
+        #[derive(Debug, Serialize, Deserialize)]
+        struct TestStructFixedField {
+            #[serde(with = "serde_bytes")]
+            field: [u8; 6],
+        }
+
+        let test = TestStructFixedField { field: [1; 6] };
         let expected = Value::Record(vec![(
             "field".to_owned(),
-            Value::Fixed(6, Vec::from(test.field.clone().into_array())),
+            Value::Fixed(6, Vec::from(test.field.clone())),
         )]);
         assert_eq!(
             expected,

lang/rust/avro/src/types.rs

@@ -958,7 +958,6 @@ mod tests {
     use apache_avro_test_helper::logger::{assert_logged, assert_not_logged};
     use pretty_assertions::assert_eq;
     use serde::{Deserialize, Serialize};
-    use serde_bytes::ByteArray;
     use uuid::Uuid;
 
     #[test]
@@ -2399,12 +2398,11 @@ Field with name '"b"' is not a member of the map items"#,
     fn avro_3631_test_serialize_fixed_fields() {
         #[derive(Debug, Serialize, Deserialize)]
         struct TestStructFixedField {
-            field: ByteArray<6>,
+            #[serde(with = "serde_bytes")]
+            field: [u8; 6],
         }
 
-        let test = TestStructFixedField {
-            field: ByteArray::new([1; 6]),
-        };
+        let test = TestStructFixedField { field: [1; 6] };
         let value: Value = to_value(test).unwrap();
         let schema = Schema::parse_str(
             r#"