Skip to content

Commit

Permalink
make middlewareType public
Browse files Browse the repository at this point in the history
  • Loading branch information
xujiajun committed Mar 19, 2018
1 parent e19b6ef commit 2dd7ecc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions router.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ var (
)

type (
// middlewareType is a private type that is used for middleware
middlewareType func(next http.HandlerFunc) http.HandlerFunc
// MiddlewareType is a private type that is used for middleware
MiddlewareType func(next http.HandlerFunc) http.HandlerFunc
// Router is a simple HTTP route multiplexer that parses a request path,
// records any URL params, and executes an end handler.
Router struct {
prefix string
// The middleware stack
middleware []middlewareType
middleware []MiddlewareType
// the tree routers
trees map[string]*Tree
// Custom route not found handler
Expand Down Expand Up @@ -194,14 +194,14 @@ func (router *Router) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}

// Use appends a middleware handler to the middleware stack.
func (router *Router) Use(middleware ...middlewareType) {
func (router *Router) Use(middleware ...MiddlewareType) {
if len(middleware) > 0 {
router.middleware = append(router.middleware, middleware...)
}
}

// HandleNotFound registers a handler when the request route is not found
func (router *Router) HandleNotFound(w http.ResponseWriter, r *http.Request, middleware []middlewareType) {
func (router *Router) HandleNotFound(w http.ResponseWriter, r *http.Request, middleware []MiddlewareType) {
if router.notFound != nil {
handle(w, r, router.notFound, middleware)
return
Expand All @@ -210,7 +210,7 @@ func (router *Router) HandleNotFound(w http.ResponseWriter, r *http.Request, mid
}

// handle execute middleware chain
func handle(w http.ResponseWriter, r *http.Request, handler http.HandlerFunc, middleware []middlewareType) {
func handle(w http.ResponseWriter, r *http.Request, handler http.HandlerFunc, middleware []MiddlewareType) {
var baseHandler = handler
for _, m := range middleware {
baseHandler = m(baseHandler)
Expand Down
4 changes: 2 additions & 2 deletions tree.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ type (
// isLeaf flag
isLeaf bool
// middleware records middleware stack
middleware []middlewareType
middleware []MiddlewareType
}
)

Expand All @@ -45,7 +45,7 @@ func NewTree() *Tree {
}

// Add use `pattern` 、handle、middleware stack as node register to tree
func (tree *Tree) Add(pattern string, handle http.HandlerFunc, middleware ...middlewareType) {
func (tree *Tree) Add(pattern string, handle http.HandlerFunc, middleware ...MiddlewareType) {
var parent = tree.root

if pattern != parent.key {
Expand Down

0 comments on commit 2dd7ecc

Please sign in to comment.