@@ -367,34 +367,32 @@ func goJsonRestHandlerWrite(w rest.ResponseWriter, req *rest.Request) {
367
367
io .WriteString (w .(io.Writer ), req .PathParam ("name" ))
368
368
}
369
369
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
-
380
370
func loadGoJsonRest (routes []route ) http.Handler {
381
- handler := newGoJsonRestResourceHandler ()
371
+ api := rest . NewApi ()
382
372
restRoutes := make ([]* rest.Route , 0 , len (routes ))
383
373
for _ , route := range routes {
384
374
restRoutes = append (restRoutes ,
385
375
& rest.Route {route .method , route .path , goJsonRestHandler },
386
376
)
387
377
}
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 ()
390
384
}
391
385
392
386
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 (
395
389
& rest.Route {method , path , hfunc },
396
390
)
397
- return handler
391
+ if err != nil {
392
+ log .Fatal (err )
393
+ }
394
+ api .SetApp (router )
395
+ return api .MakeHandler ()
398
396
}
399
397
400
398
// go-restful
0 commit comments