fix: json checker

cloudwego · Oct 10, 2024 · 245df74 · 245df74
1 parent 0e582ec
commit 245df74
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/cmd/hz/generator/json_checker_test.go b/cmd/hz/generator/json_checker_test.go
@@ -0,0 +1,18 @@
+package generator
+
+import (
+	"regexp"
+	"testing"
+)
+
+var jsonCheck = regexp.MustCompile(`(?i:(application|text)/(json|.*\+json|json\-.*)(;\s*|$))`)
+
+func Test_JSONChecker(t *testing.T) {
+	ct := []string{"application/json", "application/json;", "application/json; ", "application/json;charset=UTF-8", "application/json; charset=UTF-8"}
+
+	for _, c := range ct {
+		if jsonCheck.MatchString(c) != true {
+			t.Errorf("%s is json content-type, but get false", c)
+		}
+	}
+}
diff --git a/cmd/hz/generator/package_tpl.go b/cmd/hz/generator/package_tpl.go
@@ -312,8 +312,8 @@ var (
 	jsonContentType = "application/json; charset=utf-8"
 	formContentType = "multipart/form-data"
 
-	jsonCheck = regexp.MustCompile(` + "`(?i:(application|text)/(json|.*\\+json|json\\-.*)(; |$))`)\n" +
-	`xmlCheck  = regexp.MustCompile(` + "`(?i:(application|text)/(xml|.*\\+xml)(; |$))`)\n" +
+	jsonCheck = regexp.MustCompile(` + "`(?i:(application|text)/(json|.*\\+json|json\\-.*)(;\\s*|$))`)\n" +
+	`xmlCheck  = regexp.MustCompile(` + "`(?i:(application|text)/(xml|.*\\+xml)(;\\s*|$))`)\n" +
 	`
 )