code refactoring

moov-io · Oct 2, 2023 · 90dd1d9 · 90dd1d9
1 parent 0293e3a
commit 90dd1d9
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 64 deletions.
diff --git a/field/binary.go b/field/binary.go
@@ -125,17 +125,8 @@ func (f *Binary) Unmarshal(v interface{}) error {
 
 		switch val.Kind() { //nolint:exhaustive
 		case reflect.String:
-			if !val.CanSet() {
-				return fmt.Errorf("reflect.Value of the data can not be change")
-			}
-
-			str := hex.EncodeToString(f.value)
-			val.SetString(str)
+			val.SetString(hex.EncodeToString(f.value))
 		case reflect.Slice:
-			if !val.CanSet() {
-				return fmt.Errorf("reflect.Value of the data can not be change")
-			}
-
 			val.SetBytes(f.value)
 		default:
 			return fmt.Errorf("unsupported reflect.Value type: %s", val.Kind())
@@ -185,12 +176,18 @@ func (f *Binary) Marshal(v interface{}) error {
 
 		f.value = buf
 	case []byte:
+		if v == nil || len(v) == 0 {
+			f.value = nil
+			return nil
+		}
+
 		f.SetBytes(v)
 	case *[]byte:
 		if v == nil {
 			f.value = nil
 			return nil
 		}
+
 		f.SetBytes(*v)
 	default:
 		return fmt.Errorf("data does not match required *Binary or (string, *string, []byte, *[]byte) type")

diff --git a/field/binary_test.go b/field/binary_test.go
@@ -174,16 +174,16 @@ func TestBinaryFieldUnmarshal(t *testing.T) {
 	val6 := reflect.ValueOf(val2)
 	err = str.Unmarshal(val6)
 	require.Error(t, err)
-	require.Equal(t, "reflect.Value of the data can not be change", err.Error())
+	require.Equal(t, "cannot set reflect.Value of type string", err.Error())
 
 	val7 := reflect.ValueOf(&val2)
 	err = str.Unmarshal(val7)
 	require.Error(t, err)
-	require.Equal(t, "data does not match required reflect.Value type", err.Error())
+	require.Equal(t, "cannot set reflect.Value of type ptr", err.Error())
 
 	err = str.Unmarshal(nil)
 	require.Error(t, err)
-	require.Equal(t, "data does not match required *Binary or (*string, *[]byte) type", err.Error())
+	require.Equal(t, "unsupported type: expected *Binary, *string, *[]byte, or reflect.Value, got <nil>", err.Error())
 }
 
 func TestBinaryFieldMarshal(t *testing.T) {

diff --git a/field/bitmap.go b/field/bitmap.go
@@ -126,7 +126,7 @@ func (f *Bitmap) Unmarshal(v interface{}) error {
 
 	bmap, ok := v.(*Bitmap)
 	if !ok {
-		return fmt.Errorf("data does not match required *Bitmap type")
+		return fmt.Errorf("unsupported type: expected *Bitmap, got %T", v)
 	}
 
 	bmap.data = f.data

diff --git a/field/composite_test.go b/field/composite_test.go
@@ -747,7 +747,7 @@ func TestCompositePacking(t *testing.T) {
 		err = composite.Unmarshal(data)
 
 		require.Error(t, err)
-		require.EqualError(t, err, "failed to get data from field 1: data does not match required *String or *string type")
+		require.EqualError(t, err, "failed to get data from field 1: unsupported type: expected *String, *string, or reflect.Value, got *field.Numeric")
 	})
 
 	t.Run("Unpack returns an error on failure of subfield to unpack bytes", func(t *testing.T) {

diff --git a/field/hex.go b/field/hex.go
@@ -130,23 +130,19 @@ func (f *Hex) SetData(data interface{}) error {
 func (f *Hex) Unmarshal(v interface{}) error {
 	switch val := v.(type) {
 	case reflect.Value:
+		if !val.CanSet() {
+			return fmt.Errorf("cannot set reflect.Value of type %s", val.Kind())
+		}
+
 		switch val.Kind() { //nolint:exhaustive
 		case reflect.String:
-			if !val.CanSet() {
-				return fmt.Errorf("reflect.Value of the data can not be change")
-			}
-
 			str, _ := f.String()
 			val.SetString(str)
 		case reflect.Slice:
-			if !val.CanSet() {
-				return fmt.Errorf("reflect.Value of the data can not be change")
-			}
-
 			buf, _ := f.Bytes()
 			val.SetBytes(buf)
 		default:
-			return fmt.Errorf("data does not match required reflect.Value type")
+			return fmt.Errorf("unsupported reflect.Value type: %s", val.Kind())
 		}
 	case *string:
 		*val, _ = f.String()
@@ -155,7 +151,7 @@ func (f *Hex) Unmarshal(v interface{}) error {
 	case *Hex:
 		val.value = f.value
 	default:
-		return fmt.Errorf("data does not match required *Hex or (*string, *[]byte) type")
+		return fmt.Errorf("unsupported type: expected *Hex, *string, *[]byte, or reflect.Value, got %T", v)
 	}
 
 	return nil
@@ -175,7 +171,6 @@ func (f *Hex) Marshal(v interface{}) error {
 		}
 
 		f.value = v
-		hex.EncodeToString([]byte(v))
 	case *string:
 		if v == nil {
 			f.value = ""
@@ -184,6 +179,11 @@ func (f *Hex) Marshal(v interface{}) error {
 
 		f.value = *v
 	case []byte:
+		if v == nil || len(v) == 0 {
+			f.value = ""
+			return nil
+		}
+
 		f.SetBytes(v)
 	case *[]byte:
 		if v == nil {

diff --git a/field/hex_test.go b/field/hex_test.go
@@ -178,16 +178,16 @@ func TestHexFieldUnmarshal(t *testing.T) {
 	val6 := reflect.ValueOf(val2)
 	err = str.Unmarshal(val6)
 	require.Error(t, err)
-	require.Equal(t, "reflect.Value of the data can not be change", err.Error())
+	require.Equal(t, "cannot set reflect.Value of type string", err.Error())
 
 	val7 := reflect.ValueOf(&val2)
 	err = str.Unmarshal(val7)
 	require.Error(t, err)
-	require.Equal(t, "data does not match required reflect.Value type", err.Error())
+	require.Equal(t, "cannot set reflect.Value of type ptr", err.Error())
 
 	err = str.Unmarshal(nil)
 	require.Error(t, err)
-	require.Equal(t, "data does not match required *Hex or (*string, *[]byte) type", err.Error())
+	require.Equal(t, "unsupported type: expected *Hex, *string, *[]byte, or reflect.Value, got <nil>", err.Error())
 }
 
 func TestHexFieldMarshal(t *testing.T) {

diff --git a/field/numeric.go b/field/numeric.go
@@ -132,22 +132,18 @@ func (f *Numeric) SetData(data interface{}) error {
 func (f *Numeric) Unmarshal(v interface{}) error {
 	switch val := v.(type) {
 	case reflect.Value:
+		if !val.CanSet() {
+			return fmt.Errorf("cannot set reflect.Value of type %s", val.Kind())
+		}
+
 		switch val.Kind() { //nolint:exhaustive
 		case reflect.String:
-			if !val.CanSet() {
-				return fmt.Errorf("reflect.Value of the data can not be change")
-			}
-
 			str := strconv.Itoa(f.value)
 			val.SetString(str)
 		case reflect.Int:
-			if !val.CanSet() {
-				return fmt.Errorf("reflect.Value of the data can not be change")
-			}
-
 			val.SetInt(int64(f.value))
 		default:
-			return fmt.Errorf("data does not match required reflect.Value type")
+			return fmt.Errorf("unsupported reflect.Value type: %s", val.Kind())
 		}
 	case *string:
 		str := strconv.Itoa(f.value)
@@ -157,7 +153,7 @@ func (f *Numeric) Unmarshal(v interface{}) error {
 	case *Numeric:
 		val.value = f.value
 	default:
-		return fmt.Errorf("data does not match required *Numeric or *int type")
+		return fmt.Errorf("unsupported type: expected *Numeric, *int, or reflect.Value, got %T", v)
 	}
 
 	return nil

diff --git a/field/numeric_test.go b/field/numeric_test.go
@@ -119,16 +119,16 @@ func TestNumericFieldUnmarshal(t *testing.T) {
 	val6 := reflect.ValueOf(val2)
 	err = str.Unmarshal(val6)
 	require.Error(t, err)
-	require.Equal(t, "reflect.Value of the data can not be change", err.Error())
+	require.Equal(t, "cannot set reflect.Value of type string", err.Error())
 
 	val7 := reflect.ValueOf(&val2)
 	err = str.Unmarshal(val7)
 	require.Error(t, err)
-	require.Equal(t, "data does not match required reflect.Value type", err.Error())
+	require.Equal(t, "cannot set reflect.Value of type ptr", err.Error())
 
 	err = str.Unmarshal(nil)
 	require.Error(t, err)
-	require.Equal(t, "data does not match required *Numeric or *int type", err.Error())
+	require.Equal(t, "unsupported type: expected *Numeric, *int, or reflect.Value, got <nil>", err.Error())
 }
 
 func TestNumericFieldMarshal(t *testing.T) {

diff --git a/field/string.go b/field/string.go
@@ -118,26 +118,22 @@ func (f *String) SetData(data interface{}) error {
 func (f *String) Unmarshal(v interface{}) error {
 	switch val := v.(type) {
 	case reflect.Value:
+		if !val.CanSet() {
+			return fmt.Errorf("cannot set reflect.Value of type %s", val.Kind())
+		}
+
 		switch val.Kind() { //nolint:exhaustive
 		case reflect.String:
-			if !val.CanSet() {
-				return fmt.Errorf("reflect.Value of the data can not be change")
-			}
-
 			val.SetString(f.value)
 		case reflect.Int:
-			if !val.CanSet() {
-				return fmt.Errorf("reflect.Value of the data can not be change")
-			}
-
 			i, err := strconv.Atoi(f.value)
 			if err != nil {
 				return fmt.Errorf("failed to convert string to int: %w", err)
 			}
 
 			val.SetInt(int64(i))
 		default:
-			return fmt.Errorf("data does not match required reflect.Value type")
+			return fmt.Errorf("unsupported reflect.Value type: %s", val.Kind())
 		}
 	case *string:
 		*val = f.value
@@ -150,7 +146,7 @@ func (f *String) Unmarshal(v interface{}) error {
 	case *String:
 		val.value = f.value
 	default:
-		return fmt.Errorf("data does not match required *String or *string type")
+		return fmt.Errorf("unsupported type: expected *String, *string, or reflect.Value, got %T", v)
 	}
 
 	return nil

diff --git a/field/string_test.go b/field/string_test.go
@@ -120,16 +120,16 @@ func TestStringFieldUnmarshal(t *testing.T) {
 	val6 := reflect.ValueOf(val2)
 	err = str.Unmarshal(val6)
 	require.Error(t, err)
-	require.Equal(t, "reflect.Value of the data can not be change", err.Error())
+	require.Equal(t, "cannot set reflect.Value of type string", err.Error())
 
 	val7 := reflect.ValueOf(&val2)
 	err = str.Unmarshal(val7)
 	require.Error(t, err)
-	require.Equal(t, "data does not match required reflect.Value type", err.Error())
+	require.Equal(t, "cannot set reflect.Value of type ptr", err.Error())
 
 	err = str.Unmarshal(nil)
 	require.Error(t, err)
-	require.Equal(t, "data does not match required *String or *string type", err.Error())
+	require.Equal(t, "unsupported type: expected *String, *string, or reflect.Value, got <nil>", err.Error())
 }
 
 func TestStringFieldMarshal(t *testing.T) {

diff --git a/field/track1.go b/field/track1.go
@@ -123,7 +123,7 @@ func (f *Track1) Unmarshal(v interface{}) error {
 
 	track, ok := v.(*Track1)
 	if !ok {
-		return fmt.Errorf("data does not match required *Track1 type")
+		return fmt.Errorf("unsupported type: expected *Track1, got %T", v)
 	}
 
 	track.FixedLength = f.FixedLength
@@ -144,7 +144,7 @@ func (f *Track1) Marshal(v interface{}) error {
 
 	track, ok := v.(*Track1)
 	if !ok {
-		return fmt.Errorf("data does not match required *Track type")
+		return fmt.Errorf("unsupported type: expected *Track1, got %T", v)
 	}
 
 	f.FixedLength = track.FixedLength

diff --git a/field/track2.go b/field/track2.go
@@ -121,7 +121,7 @@ func (f *Track2) Unmarshal(v interface{}) error {
 
 	track, ok := v.(*Track2)
 	if !ok {
-		return fmt.Errorf("data does not match required *Track2 type")
+		return fmt.Errorf("unsupported type: expected *Track2, got %T", v)
 	}
 
 	track.PrimaryAccountNumber = f.PrimaryAccountNumber
@@ -140,7 +140,7 @@ func (f *Track2) Marshal(v interface{}) error {
 
 	track, ok := v.(*Track2)
 	if !ok {
-		return fmt.Errorf("data does not match required *Track type")
+		return fmt.Errorf("unsupported type: expected *Track2, got %T", v)
 	}
 
 	f.PrimaryAccountNumber = track.PrimaryAccountNumber

diff --git a/field/track3.go b/field/track3.go
@@ -120,7 +120,7 @@ func (f *Track3) Unmarshal(v interface{}) error {
 
 	track, ok := v.(*Track3)
 	if !ok {
-		return fmt.Errorf("data does not match required *Track3 type")
+		return fmt.Errorf("unsupported type: expected *Track3, got %T", v)
 	}
 
 	track.PrimaryAccountNumber = f.PrimaryAccountNumber
@@ -137,7 +137,7 @@ func (f *Track3) Marshal(v interface{}) error {
 
 	track, ok := v.(*Track3)
 	if !ok {
-		return fmt.Errorf("data does not match required *Track type")
+		return fmt.Errorf("unsupported type: expected *Track3, got %T", v)
 	}
 
 	f.FormatCode = track.FormatCode

diff --git a/field/track_test.go b/field/track_test.go
@@ -138,7 +138,7 @@ func TestTrack1(t *testing.T) {
 		t.Run("Returns an error on mismatch of track type", func(t *testing.T) {
 			track := NewTrack1(track1Spec)
 			err := track.Marshal(NewStringValue("hello"))
-			require.EqualError(t, err, "data does not match required *Track type")
+			require.EqualError(t, err, "unsupported type: expected *Track1, got *field.String")
 		})
 
 		t.Run("Unmarshal gets track values into data parameter", func(t *testing.T) {
@@ -305,7 +305,7 @@ func TestTrack2TypedAPI(t *testing.T) {
 		t.Run("Returns an error on mismatch of track type", func(t *testing.T) {
 			track := NewTrack2(track2Spec)
 			err := track.Marshal(NewStringValue("hello"))
-			require.EqualError(t, err, "data does not match required *Track type")
+			require.EqualError(t, err, "unsupported type: expected *Track2, got *field.String")
 		})
 
 		t.Run("Unmarshal gets track values into data parameter", func(t *testing.T) {
@@ -516,7 +516,7 @@ func TestTrack3TypedAPI(t *testing.T) {
 		t.Run("Returns an error on mismatch of track type", func(t *testing.T) {
 			track := NewTrack3(track3Spec)
 			err := track.Marshal(NewStringValue("hello"))
-			require.EqualError(t, err, "data does not match required *Track type")
+			require.EqualError(t, err, "unsupported type: expected *Track3, got *field.String")
 		})
 
 		t.Run("Unmarshal gets track values into data parameter", func(t *testing.T) {