fixed bug

Signed-off-by: kumarabd <[email protected]>

utils/error.go

@@ -15,18 +15,10 @@ func ErrUnmarshalInvalid(err error, typ reflect.Type) error {
 	return errors.NewDefault(errors.ErrUnmarshal, fmt.Sprintf("Unmarshal invalid error for type:%v, Error:%s", typ, err.Error()))
 }
 
-func ErrUnmarshalUTF(err error, val string) error {
-	return errors.NewDefault(errors.ErrUnmarshal, fmt.Sprintf("Unmarshal invalid utf8 error for string:%s, Error:%s", val, err.Error()))
-}
-
 func ErrUnmarshalSyntax(err error, offset int64) error {
 	return errors.NewDefault(errors.ErrUnmarshal, fmt.Sprintf("Unmarshal syntax error at offest: %d. Error: %s", offset, err.Error()))
 }
 
-func ErrUnmarshalField(err error, key string) error {
-	return errors.NewDefault(errors.ErrUnmarshal, fmt.Sprintf("Unmarshal field error at key: %s. Error: %s", key, err.Error()))
-}
-
 func ErrUnmarshalType(err error, value string) error {
 	return errors.NewDefault(errors.ErrUnmarshal, fmt.Sprintf("Unmarshal type error at key: %s. Error: %s", value, err.Error()))
 }

utils/utils.go

@@ -21,25 +21,19 @@ func Unmarshal(obj string, result interface{}) error {
 	err := json.Unmarshal([]byte(obj), result)
 	if err != nil {
 		if e, ok := err.(*json.SyntaxError); ok {
-			ErrUnmarshalSyntax(err, e.Offset)
-		}
-		if e, ok := err.(*json.UnmarshalFieldError); ok {
-			ErrUnmarshalField(err, e.Key)
+			return ErrUnmarshalSyntax(err, e.Offset)
 		}
 		if e, ok := err.(*json.UnmarshalTypeError); ok {
-			ErrUnmarshalType(err, e.Value)
+			return ErrUnmarshalType(err, e.Value)
 		}
 		if e, ok := err.(*json.UnsupportedTypeError); ok {
-			ErrUnmarshalUnsupportedType(err, e.Type)
+			return ErrUnmarshalUnsupportedType(err, e.Type)
 		}
 		if e, ok := err.(*json.UnsupportedValueError); ok {
-			ErrUnmarshalUnsupportedValue(err, e.Value)
+			return ErrUnmarshalUnsupportedValue(err, e.Value)
 		}
 		if e, ok := err.(*json.InvalidUnmarshalError); ok {
-			ErrUnmarshalInvalid(err, e.Type)
-		}
-		if e, ok := err.(*json.InvalidUTF8Error); ok {
-			ErrUnmarshalUTF(err, e.S)
+			return ErrUnmarshalInvalid(err, e.Type)
 		}
 		return ErrUnmarshal(err)
 	}