change operation signature

rrgmc · Jul 9, 2023 · bd6aa23 · bd6aa23
1 parent ba3f9d3
commit bd6aa23
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 21 deletions.
diff --git a/operation_body.go b/operation_body.go
@@ -20,8 +20,8 @@ var (
 type DecodeOperationBody struct {
 }
 
-func (d *DecodeOperationBody) Decode(ctx DecodeContext, r *http.Request, field reflect.Value,
-	typ reflect.Type, tag *Tag) (bool, any, error) {
+func (d *DecodeOperationBody) Decode(ctx DecodeContext, r *http.Request, isList bool, field reflect.Value,
+	tag *Tag) (bool, any, error) {
 
 	if r.Body == nil {
 		return false, nil, nil
@@ -31,7 +31,7 @@ func (d *DecodeOperationBody) Decode(ctx DecodeContext, r *http.Request, field r
 		return false, nil, errors.New("body operation not allowed")
 	}
 	if ctx.IsBodyDecoded() {
-		return false, nil, fmt.Errorf("body was already decoded for type '%s'", typ.String())
+		return false, nil, fmt.Errorf("body was already decoded")
 	}
 
 	return decodeBody(ctx, r, field, tag)

diff --git a/operation_form.go b/operation_form.go
@@ -12,8 +12,8 @@ import (
 type DecodeOperationForm struct {
 }
 
-func (d *DecodeOperationForm) Decode(ctx DecodeContext, r *http.Request, field reflect.Value,
-	typ reflect.Type, tag *Tag) (bool, any, error) {
+func (d *DecodeOperationForm) Decode(ctx DecodeContext, r *http.Request, isList bool, field reflect.Value,
+	tag *Tag) (bool, any, error) {
 	var form multipart.Form
 
 	err := r.ParseForm()
@@ -40,7 +40,7 @@ func (d *DecodeOperationForm) Decode(ctx DecodeContext, r *http.Request, field r
 
 	ctx.ValueUsed(OperationForm, tag.Name)
 
-	if field.Kind() == reflect.Slice {
+	if isList {
 		return true, values, nil
 	}
 	return true, values[0], nil

diff --git a/operation_header.go b/operation_header.go
@@ -9,18 +9,15 @@ import (
 type DecodeOperationHeader struct {
 }
 
-func (d *DecodeOperationHeader) Decode(ctx DecodeContext, r *http.Request, field reflect.Value,
-	typ reflect.Type, tag *Tag) (bool, any, error) {
+func (d *DecodeOperationHeader) Decode(ctx DecodeContext, r *http.Request, isList bool, field reflect.Value,
+	tag *Tag) (bool, any, error) {
 	values := r.Header.Values(tag.Name)
 
 	if len(values) == 0 {
 		return false, nil, nil
 	}
 
-	// only check slices/arrays for primitive types, otherwise "type UUID [16]byte" would be checked as an array
-	isPrimitive := field.Type().PkgPath() == ""
-
-	if isPrimitive && (field.Kind() == reflect.Slice || field.Kind() == reflect.Array) {
+	if isList {
 		return true, values, nil
 	}
 	return true, values[0], nil

diff --git a/operation_path.go b/operation_path.go
@@ -11,10 +11,10 @@ import (
 type DecodeOperationPath struct {
 }
 
-func (d *DecodeOperationPath) Decode(ctx DecodeContext, r *http.Request, field reflect.Value,
-	typ reflect.Type, tag *Tag) (bool, any, error) {
+func (d *DecodeOperationPath) Decode(ctx DecodeContext, r *http.Request, isList bool, field reflect.Value,
+	tag *Tag) (bool, any, error) {
 	if ctx.PathValue() == nil {
-		return false, nil, fmt.Errorf("path value function not set for type '%s'", typ.Name())
+		return false, nil, fmt.Errorf("path value function not set")
 	}
 
 	ctx.ValueUsed(OperationPath, tag.Name)

diff --git a/operation_query.go b/operation_query.go
@@ -12,16 +12,13 @@ import (
 type DecodeOperationQuery struct {
 }
 
-func (d *DecodeOperationQuery) Decode(ctx DecodeContext, r *http.Request, field reflect.Value,
-	typ reflect.Type, tag *Tag) (bool, any, error) {
+func (d *DecodeOperationQuery) Decode(ctx DecodeContext, r *http.Request, isList bool, field reflect.Value,
+	tag *Tag) (bool, any, error) {
 	if !r.URL.Query().Has(tag.Name) {
 		return false, nil, nil
 	}
 
-	// only check slices/arrays for primitive types, otherwise "type UUID [16]byte" would be checked as an array
-	isPrimitive := field.Type().PkgPath() == ""
-
-	if isPrimitive && (field.Kind() == reflect.Slice || field.Kind() == reflect.Array) {
+	if isList {
 		explode, err := tag.Options.BoolValue("explode", false)
 		if err != nil {
 			return false, nil, err