Merge branch 'main' into feature/implement-2118-updateparam

Author: sixcolors

path.go

@@ -69,7 +69,7 @@ const (
 )
 
 // TypeConstraint parameter constraint types
-type TypeConstraint int16
+type TypeConstraint uint16
 
 // Constraint describes the validation rules that apply to a dynamic route
 // segment when matching incoming requests.
@@ -95,7 +95,7 @@ type CustomConstraint interface {
 }
 
 const (
-	noConstraint TypeConstraint = iota + 1
+	noConstraint TypeConstraint = 1 << iota
 	intConstraint
 	boolConstraint
 	floatConstraint
@@ -112,6 +112,11 @@ const (
 	regexConstraint
 )
 
+const (
+	needOneData = minLenConstraint | maxLenConstraint | lenConstraint | minConstraint | maxConstraint | datetimeConstraint | regexConstraint
+	needTwoData = betweenLenConstraint | rangeConstraint
+)
+
 // list of possible parameter and segment delimiter
 var (
 	// slash has a special role, unlike the other parameters it must not be interpreted as a parameter
@@ -705,18 +710,13 @@ func (c *Constraint) CheckConstraint(param string) bool {
 		num int
 	)
 
-	// Validate constraint has required data using switch instead of slice allocation
-	switch c.ID {
-	case minLenConstraint, maxLenConstraint, lenConstraint, minConstraint, maxConstraint, datetimeConstraint, regexConstraint:
-		if len(c.Data) == 0 {
-			return false
-		}
-	case betweenLenConstraint, rangeConstraint:
-		if len(c.Data) < 2 {
-			return false
-		}
-	default:
-		// Other constraints don't require data validation
+	// Validate constraint has required data
+	if c.ID&needOneData != 0 && len(c.Data) == 0 {
+		return false
+	}
+
+	if c.ID&needTwoData != 0 && len(c.Data) < 2 {
+		return false
 	}
 
 	switch c.ID {