Skip to content

refactor(route): replace raw string with const and remove redundant assignment #1433

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

Open
gaspardruan wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

refactor(route): replace raw string with const and remove redundant assignment #1433

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 12 additions & 10 deletions pkg/route/tree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ const (
pkind
// all kind
akind
)

const (
paramLabel = byte(':')
anyLabel = byte('*')
slash = "/"
Expand All @@ -121,17 +124,17 @@ func checkPathValid(path string) {
}
for i, c := range []byte(path) {
switch c {
case ':':
case paramLabel:
if (i < len(path)-1 && path[i+1] == '/') || i == (len(path)-1) {
panic("wildcards must be named with a non-empty name in path '" + path + "'")
}
i++
for ; i < len(path) && path[i] != '/'; i++ {
if path[i] == ':' || path[i] == '*' {
if path[i] == paramLabel || path[i] == anyLabel {
panic("only one wildcard per path segment is allowed, find multi in path '" + path + "'")
}
}
case '*':
case anyLabel:
if i == len(path)-1 {
panic("wildcards must be named with a non-empty name in path '" + path + "'")
}
Expand Down Expand Up @@ -221,7 +224,7 @@ func (r *router) insert(path string, h app.HandlersChain, t kind, ppath string,
currentNode.ppath = ppath
currentNode.pnames = pnames
}
currentNode.isLeaf = currentNode.children == nil && currentNode.paramChild == nil && currentNode.anyChild == nil
currentNode.isLeaf = true
} else if lcpLen < prefixLen {
// Split node
n := newNode(
Expand Down Expand Up @@ -273,7 +276,6 @@ func (r *router) insert(path string, h app.HandlersChain, t kind, ppath string,
// Only Static children could reach here
currentNode.children = append(currentNode.children, n)
}
currentNode.isLeaf = currentNode.children == nil && currentNode.paramChild == nil && currentNode.anyChild == nil
} else if lcpLen < searchLen {
search = search[lcpLen:]
c := currentNode.findChildWithLabel(search[0])
Expand All @@ -292,7 +294,7 @@ func (r *router) insert(path string, h app.HandlersChain, t kind, ppath string,
case akind:
currentNode.anyChild = n
}
currentNode.isLeaf = currentNode.children == nil && currentNode.paramChild == nil && currentNode.anyChild == nil
currentNode.isLeaf = false
} else {
// Node already exists
if currentNode.handlers != nil && h != nil {
Expand Down Expand Up @@ -383,7 +385,7 @@ func (r *router) find(path string, paramsPointer *param.Params, unescape bool) (
// Static node
if search != nilString {
// If it can execute that logic, there is handler registered on the current node and search is `/`.
if search == "/" && cn.handlers != nil {
if search == slash && cn.handlers != nil {
res.tsr = true
}
if child := cn.findChild(search[0]); child != nil {
Expand Down Expand Up @@ -549,7 +551,7 @@ func (n *node) findCaseInsensitivePath(path string, fixTrailingSlash bool) (ciPa
if fixTrailingSlash && len(n.children) == 1 {
// No handle found. Check if a handle for this path with(without) a trailing slash exists
n = n.children[0]
if n.prefix == "/" && n.handlers != nil {
if n.prefix == slash && n.handlers != nil {
return append(ciPath, '/'), true
}
}
Expand Down Expand Up @@ -589,7 +591,7 @@ func (n *node) findCaseInsensitivePath(path string, fixTrailingSlash bool) (ciPa
} else if fixTrailingSlash {
// Nothing found.
// Try to fix the path by adding / removing a trailing slash.
if path == "/" {
if path == slash {
return ciPath, true
}
if len(path)+1 == len(n.prefix) && n.prefix[len(path)] == '/' &&
Expand Down Expand Up @@ -626,6 +628,6 @@ loop:

// Nothing found. We can recommend to redirect to the same URL
// without a trailing slash if a leaf exists for that path
found = fixTrailingSlash && path == "/" && n.handlers != nil
found = fixTrailingSlash && path == slash && n.handlers != nil
return
}