Skip to content

Commit 80db2c8

Browse files
committed
Merge pull request julienschmidt#17 from ant0ine/master
Rewrite the Go-Json-Rest benchmark to use the v3 api.
2 parents 99794b6 + 9b7e648 commit 80db2c8

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

routers.go

+14-16
Original file line numberDiff line numberDiff line change
@@ -367,34 +367,32 @@ func goJsonRestHandlerWrite(w rest.ResponseWriter, req *rest.Request) {
367367
io.WriteString(w.(io.Writer), req.PathParam("name"))
368368
}
369369

370-
func newGoJsonRestResourceHandler() *rest.ResourceHandler {
371-
handler := rest.ResourceHandler{
372-
EnableRelaxedContentType: true,
373-
Logger: nullLogger,
374-
ErrorLogger: nullLogger,
375-
DisableXPoweredBy: true,
376-
}
377-
return &handler
378-
}
379-
380370
func loadGoJsonRest(routes []route) http.Handler {
381-
handler := newGoJsonRestResourceHandler()
371+
api := rest.NewApi()
382372
restRoutes := make([]*rest.Route, 0, len(routes))
383373
for _, route := range routes {
384374
restRoutes = append(restRoutes,
385375
&rest.Route{route.method, route.path, goJsonRestHandler},
386376
)
387377
}
388-
handler.SetRoutes(restRoutes...)
389-
return handler
378+
router, err := rest.MakeRouter(restRoutes...)
379+
if err != nil {
380+
log.Fatal(err)
381+
}
382+
api.SetApp(router)
383+
return api.MakeHandler()
390384
}
391385

392386
func loadGoJsonRestSingle(method, path string, hfunc rest.HandlerFunc) http.Handler {
393-
handler := newGoJsonRestResourceHandler()
394-
handler.SetRoutes(
387+
api := rest.NewApi()
388+
router, err := rest.MakeRouter(
395389
&rest.Route{method, path, hfunc},
396390
)
397-
return handler
391+
if err != nil {
392+
log.Fatal(err)
393+
}
394+
api.SetApp(router)
395+
return api.MakeHandler()
398396
}
399397

400398
// go-restful

0 commit comments

Comments
 (0)