Refactor to use strings.ReplaceAll (oapi-codegen#1079)

adrianpk · adrianpk · commit e84115966dac · 2023-06-02T17:03:46.000+01:00
diff --git a/pkg/codegen/codegen.go b/pkg/codegen/codegen.go
@@ -820,7 +820,7 @@ func GenerateUnionAndAdditionalProopertiesBoilerplate(t *template.Template, type
 func SanitizeCode(goCode string) string {
 	// remove any byte-order-marks which break Go-Code
 	// See: https://groups.google.com/forum/#!topic/golang-nuts/OToNIPdfkks
-	return strings.Replace(goCode, "\uFEFF", "", -1)
+	return strings.ReplaceAll(goCode, "\uFEFF", "")
 }
 
 // GetUserTemplateText attempts to retrieve the template text from a passed in URL or file
diff --git a/pkg/codegen/utils.go b/pkg/codegen/utils.go
@@ -728,8 +728,8 @@ func stringToGoCommentWithPrefix(in, prefix string) string {
 	}
 
 	// Normalize newlines from Windows/Mac to Linux
-	in = strings.Replace(in, "\r\n", "\n", -1)
-	in = strings.Replace(in, "\r", "\n", -1)
+	in = strings.ReplaceAll(in, "\r\n", "\n")
+	in = strings.ReplaceAll(in, "\r", "\n")
 
 	// Add comment to each line
 	var lines []string

Original file line number	Diff line number	Diff line change
`@@ -820,7 +820,7 @@ func GenerateUnionAndAdditionalProopertiesBoilerplate(t *template.Template, type`
`820`	`820`	`func SanitizeCode(goCode string) string {`
`821`	`821`	`// remove any byte-order-marks which break Go-Code`
`822`	`822`	`// See: https://groups.google.com/forum/#!topic/golang-nuts/OToNIPdfkks`
`823`		`- return strings.Replace(goCode, "\uFEFF", "", -1)`
	`823`	`+ return strings.ReplaceAll(goCode, "\uFEFF", "")`
`824`	`824`	`}`
`825`	`825`
`826`	`826`	`// GetUserTemplateText attempts to retrieve the template text from a passed in URL or file`
Original file line number	Diff line number	Diff line change
`@@ -728,8 +728,8 @@ func stringToGoCommentWithPrefix(in, prefix string) string {`
`728`	`728`	`}`
`729`	`729`
`730`	`730`	`// Normalize newlines from Windows/Mac to Linux`
`731`		`- in = strings.Replace(in, "\r\n", "\n", -1)`
`732`		`- in = strings.Replace(in, "\r", "\n", -1)`
	`731`	`+ in = strings.ReplaceAll(in, "\r\n", "\n")`
	`732`	`+ in = strings.ReplaceAll(in, "\r", "\n")`
`733`	`733`
`734`	`734`	`// Add comment to each line`
`735`	`735`	`var lines []string`