Arav/httpr
1
0
Fork 0
Code Releases 6 Activity

Inversed logic of if else statement to reduce nesting by 1.

Browse Source
This commit is contained in:
Alexander Andreev 2023-08-12 19:37:51 +04:00
parent a2cb6182e8
commit 92692454da
Signed by: Arav
GPG Key ID: D22A817D95815393
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
httpr.go
View File

@ -157,27 +157,29 @@ func New() *Router {
} }
func (rr *Router) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (rr *Router) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if tree, ok := rr.tree[r.Method]; ok { tree, ok := rr.tree[r.Method]
path, err := newPath(r.URL.Path) if !ok {
if err != nil {
http.Error(w, err.Error(), http.StatusNotAcceptable)
return
}
if handler, params := tree.get(path); handler != nil {
if params != nil {
r = r.WithContext(context.WithValue(r.Context(), ParamsKey, params))
}
handler(w, r)
} else {
if rr.NotFoundHandler != nil {
rr.NotFoundHandler(w, r)
} else {
http.Error(w, "Not Found", http.StatusNotFound)
}
}
} else {
http.Error(w, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed) http.Error(w, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed)
return
}
path, err := newPath(r.URL.Path)
if err != nil {
http.Error(w, err.Error(), http.StatusNotAcceptable)
return
}
if handler, params := tree.get(path); handler != nil {
if params != nil {
r = r.WithContext(context.WithValue(r.Context(), ParamsKey, params))
}
handler(w, r)
} else {
if rr.NotFoundHandler != nil {
rr.NotFoundHandler(w, r)
} else {
http.Error(w, "Not Found", http.StatusNotFound)
}
} }
} }