fix: use '&&' for security pair(AND) (#1659)

README.md

@@ -897,18 +897,18 @@ Each API operation.
 // @Security ApiKeyAuth
 ```
 
-Make it AND condition
+Make it OR condition
 
 ```go
 // @Security ApiKeyAuth
 // @Security OAuth2Application[write, admin]
 ```
 
-Make it OR condition
+Make it AND condition
 
 ```go
-// @Security ApiKeyAuth || firebase
-// @Security OAuth2Application[write, admin] || APIKeyAuth
+// @Security ApiKeyAuth && firebase
+// @Security OAuth2Application[write, admin] && APIKeyAuth
 ```
 
 

README_pt.md

@@ -870,18 +870,18 @@ Cada operação API.
 // @Security ApiKeyAuth
 ```
 
-Faça-o AND condicione-o
+Faça-o OR condicione-o
 
 ```go
 // @Security ApiKeyAuth
 // @Security OAuth2Application[write, admin]
 ```
 
-Faça-o OR condição
+Faça-o AND condição
 
 ```go
-// @Security ApiKeyAuth || firebase
-// @Security OAuth2Application[write, admin] || APIKeyAuth
+// @Security ApiKeyAuth && firebase
+// @Security OAuth2Application[write, admin] && APIKeyAuth
 ```
 
 

README_zh-CN.md

@@ -732,8 +732,7 @@ type Resp struct {
 使用AND条件。
 
 ```go
-// @Security ApiKeyAuth
-// @Security OAuth2Application[write, admin]
+// @Security ApiKeyAuth && OAuth2Application[write, admin]
 ```
 
 ## 项目相关

operation.go

@@ -50,6 +50,7 @@ var mimeTypeAliases = map[string]string{
 }
 
 var mimeTypePattern = regexp.MustCompile("^[^/]+/[^/]+$")
+var securityPairSepPattern = regexp.MustCompile(`\|\||&&`) // || for compatibility with old version, && for clarity
 
 // NewOperation creates a new Operation with default properties.
 // map[int]Response.
@@ -743,7 +744,7 @@ func (operation *Operation) ParseSecurityComment(commentLine string) error {
 		securitySource = commentLine[strings.Index(commentLine, "@Security")+1:]
 	)
 
-	for _, securityOption := range strings.Split(securitySource, "||") {
+	for _, securityOption := range securityPairSepPattern.Split(securitySource, -1) {
 		securityOption = strings.TrimSpace(securityOption)
 
 		left, right := strings.Index(securityOption, "["), strings.Index(securityOption, "]")

operation_test.go

@@ -2314,21 +2314,28 @@ func TestParseSecurityCommentSimple(t *testing.T) {
 	})
 }
 
-func TestParseSecurityCommentOr(t *testing.T) {
+func TestParseSecurityCommentAnd(t *testing.T) {
 	t.Parallel()
 
-	comment := `@Security OAuth2Implicit[read, write] || Firebase[]`
+	comment := `@Security OAuth2Implicit[read, write] && Firebase[]`
 	operation := NewOperation(nil)
 
 	err := operation.ParseComment(comment, nil)
 	assert.NoError(t, err)
 
-	assert.Equal(t, operation.Security, []map[string][]string{
+	expect := []map[string][]string{
 		{
 			"OAuth2Implicit": {"read", "write"},
 			"Firebase":       {""},
 		},
-	})
+	}
+	assert.Equal(t, operation.Security, expect)
+
+	oldVersionComment := `@Security OAuth2Implicit[read, write] || Firebase[]`
+	operation = NewOperation(nil)
+	err = operation.ParseComment(oldVersionComment, nil)
+	assert.NoError(t, err)
+	assert.Equal(t, operation.Security, expect)
 }
 
 func TestParseMultiDescription(t *testing.T) {

parser.go

@@ -842,7 +842,7 @@ loopline:
 func parseSecurity(commentLine string) map[string][]string {
 	securityMap := make(map[string][]string)
 
-	for _, securityOption := range strings.Split(commentLine, "||") {
+	for _, securityOption := range securityPairSepPattern.Split(commentLine, -1) {
 		securityOption = strings.TrimSpace(securityOption)
 
 		left, right := strings.Index(securityOption, "["), strings.Index(securityOption, "]")

testdata/global_security/main.go

@@ -14,5 +14,5 @@ package global_security
 // @scope.write Grants write access
 // @scope.admin Grants read and write access to administrative information
 
-// @security APIKeyAuth || OAuth2Application
+// @security APIKeyAuth && OAuth2Application
 func main() {}