Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: code optimization #1670

Open
wants to merge 2 commits into
base: release-branch.v7
Choose a base branch
from
Open

chore: code optimization #1670

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8f9963
chore: code optimization
testwill May 26, 2023
83b9840
chore: CamelCase style
testwill May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions uritemplates/uritemplates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
)

var (
unreserved = regexp.MustCompile("[^A-Za-z0-9\\-._~]")
reserved = regexp.MustCompile("[^A-Za-z0-9\\-._~:/?#[\\]@!$&'()*+,;=]")
validname = regexp.MustCompile("^([A-Za-z0-9_\\.]|%[0-9A-Fa-f][0-9A-Fa-f])+$")
unreserved = regexp.MustCompile(`[^A-Za-z0-9\-._~]`)
reserved = regexp.MustCompile(`[^A-Za-z0-9\-._~:/?#[\]@!$&'()*+,;=]`)
validName = regexp.MustCompile(`^([A-Za-z0-9_\.]|%[0-9A-Fa-f][0-9A-Fa-f])+$`)
hex = []byte("0123456789ABCDEF")
)

Expand Down Expand Up @@ -61,10 +61,10 @@ type UriTemplate struct {
}

// Parse parses a URI template string into a UriTemplate object.
func Parse(rawtemplate string) (template *UriTemplate, err error) {
func Parse(rawTemplate string) (template *UriTemplate, err error) {
template = new(UriTemplate)
template.raw = rawtemplate
split := strings.Split(rawtemplate, "{")
template.raw = rawTemplate
split := strings.Split(rawTemplate, "{")
template.parts = make([]templatePart, len(split)*2-1)
for i, s := range split {
if i == 0 {
Expand All @@ -74,17 +74,17 @@ func Parse(rawtemplate string) (template *UriTemplate, err error) {
}
template.parts[i].raw = s
} else {
subsplit := strings.Split(s, "}")
if len(subsplit) != 2 {
subSplit := strings.Split(s, "}")
if len(subSplit) != 2 {
err = errors.New("malformed template")
break
}
expression := subsplit[0]
expression := subSplit[0]
template.parts[i*2-1], err = parseExpression(expression)
if err != nil {
break
}
template.parts[i*2].raw = subsplit[1]
template.parts[i*2].raw = subSplit[1]
}
}
if err != nil {
Expand Down Expand Up @@ -148,9 +148,9 @@ func parseExpression(expression string) (result templatePart, err error) {
default:
result.sep = ","
}
rawterms := strings.Split(expression, ",")
result.terms = make([]templateTerm, len(rawterms))
for i, raw := range rawterms {
rawTerms := strings.Split(expression, ",")
result.terms = make([]templateTerm, len(rawTerms))
for i, raw := range rawTerms {
result.terms[i], err = parseTerm(raw)
if err != nil {
break
Expand All @@ -175,7 +175,7 @@ func parseTerm(term string) (result templateTerm, err error) {
} else {
err = errors.New("multiple colons in same term")
}
if !validname.MatchString(result.name) {
if !validName.MatchString(result.name) {
err = errors.New("not a valid name: " + result.name)
}
if result.explode && result.truncate > 0 {
Expand Down