refactor(acceptHeaders): remove redundant field wildcards

Author: marjune163

src/acceptHeaders/acceptItem.go

@@ -11,35 +11,39 @@ const defaultQuality = 1000
 const maxQualityDecimals = 3
 
 type acceptItem struct {
-	value     string
-	quality   int
-	wildcards int
+	value   string
+	quality int
 }
 
 func (item acceptItem) less(other acceptItem) bool {
 	if item.quality != other.quality {
 		return item.quality > other.quality
 	}
-	return item.wildcards < other.wildcards
+
+	if item.value != other.value {
+		if other.value == "*/*" {
+			return true
+		} else if strings.HasSuffix(other.value, "/*") && !strings.HasPrefix(item.value, "/*") {
+			return true
+		}
+	}
+
+	return false
 }
 
 func (item acceptItem) match(value string) bool {
 	if item.value == value {
 		return true
 	}
-
-	switch item.wildcards {
-	case 0:
-		return false
-	case 1:
-		slashIndex := strings.IndexByte(item.value, '/')
-		itemPrefix := item.value[:slashIndex+1]
-		return strings.HasPrefix(value, itemPrefix)
-	case 2:
+	if item.value == "*/*" {
 		return true
 	}
+	if !strings.HasSuffix(item.value, "/*") {
+		return false
+	}
 
-	return false
+	itemPrefix := item.value[:len(item.value)-1]
+	return strings.HasPrefix(value, itemPrefix)
 }
 
 func parseAcceptItem(input string) acceptItem {
@@ -60,14 +64,7 @@ func parseAcceptItem(input string) acceptItem {
 		}
 	}
 
-	wildcards := 0
-	if value == "*/*" {
-		wildcards = 2
-	} else if strings.HasSuffix(value, "/*") {
-		wildcards = 1
-	}
-
-	return acceptItem{value, quality, wildcards}
+	return acceptItem{value, quality}
 }
 
 func parseQuality(input string) (quality int) {

src/acceptHeaders/acceptItem_test.go

@@ -163,15 +163,15 @@ func TestParseAcceptItem(t *testing.T) {
 func TestAcceptItemMatch(t *testing.T) {
 	var item acceptItem
 
-	item = acceptItem{"text/html", 1000, 0}
+	item = acceptItem{"text/html", 1000}
 	if !item.match("text/html") {
 		t.Error()
 	}
 	if item.match("text/plain") {
 		t.Error()
 	}
 
-	item = acceptItem{"text/*", 1000, 1}
+	item = acceptItem{"text/*", 1000}
 	if !item.match("text/*") {
 		t.Error()
 	}
@@ -185,7 +185,7 @@ func TestAcceptItemMatch(t *testing.T) {
 		t.Error()
 	}
 
-	item = acceptItem{"*/*", 1000, 2}
+	item = acceptItem{"*/*", 1000}
 	if !item.match("text/*") {
 		t.Error()
 	}

src/acceptHeaders/accepts_test.go

@@ -12,22 +12,22 @@ func TestParseAccept(t *testing.T) {
 		t.Error(len(accepts))
 	}
 
-	if !reflect.DeepEqual(accepts[0], acceptItem{"text/html", 1000, 0}) {
+	if !reflect.DeepEqual(accepts[0], acceptItem{"text/html", 1000}) {
 		t.Error(accepts[0])
 	}
-	if !reflect.DeepEqual(accepts[1], acceptItem{"text/plain", 900, 0}) {
+	if !reflect.DeepEqual(accepts[1], acceptItem{"text/plain", 900}) {
 		t.Error(accepts[1])
 	}
-	if !reflect.DeepEqual(accepts[2], acceptItem{"image/png", 800, 0}) {
+	if !reflect.DeepEqual(accepts[2], acceptItem{"image/png", 800}) {
 		t.Error(accepts[2])
 	}
-	if !reflect.DeepEqual(accepts[3], acceptItem{"image/*", 800, 1}) {
+	if !reflect.DeepEqual(accepts[3], acceptItem{"image/*", 800}) {
 		t.Error(accepts[3])
 	}
-	if !reflect.DeepEqual(accepts[4], acceptItem{"application/json", 700, 0}) {
+	if !reflect.DeepEqual(accepts[4], acceptItem{"application/json", 700}) {
 		t.Error(accepts[4])
 	}
-	if !reflect.DeepEqual(accepts[5], acceptItem{"*/*", 600, 2}) {
+	if !reflect.DeepEqual(accepts[5], acceptItem{"*/*", 600}) {
 		t.Error(accepts[5])
 	}