go-restful: Fix Params handling

Author: julienschmidt

bench_test.go

@@ -157,7 +157,7 @@ func BenchmarkGoJsonRest_Param(b *testing.B) {
 	benchRequest(b, router, r)
 }
 func BenchmarkGoRestful_Param(b *testing.B) {
-	router := loadGoRestfulSingle("GET", "/user/:name", goRestfulHandler)
+	router := loadGoRestfulSingle("GET", "/user/{name}", goRestfulHandler)
 
 	r, _ := http.NewRequest("GET", "/user/gordon", nil)
 	benchRequest(b, router, r)
@@ -325,7 +325,7 @@ func BenchmarkGoJsonRest_Param5(b *testing.B) {
 	benchRequest(b, handler, r)
 }
 func BenchmarkGoRestful_Param5(b *testing.B) {
-	router := loadGoRestfulSingle("GET", fiveColon, goRestfulHandler)
+	router := loadGoRestfulSingle("GET", fiveBrace, goRestfulHandler)
 
 	r, _ := http.NewRequest("GET", fiveRoute, nil)
 	benchRequest(b, router, r)
@@ -493,7 +493,7 @@ func BenchmarkGoJsonRest_Param20(b *testing.B) {
 	benchRequest(b, handler, r)
 }
 func BenchmarkGoRestful_Param20(b *testing.B) {
-	handler := loadGoRestfulSingle("GET", twentyColon, goRestfulHandler)
+	handler := loadGoRestfulSingle("GET", twentyBrace, goRestfulHandler)
 
 	r, _ := http.NewRequest("GET", twentyRoute, nil)
 	benchRequest(b, handler, r)
@@ -657,7 +657,7 @@ func BenchmarkGoJsonRest_ParamWrite(b *testing.B) {
 	benchRequest(b, handler, r)
 }
 func BenchmarkGoRestful_ParamWrite(b *testing.B) {
-	handler := loadGoRestfulSingle("GET", "/user/:name", goRestfulHandlerWrite)
+	handler := loadGoRestfulSingle("GET", "/user/{name}", goRestfulHandlerWrite)
 
 	r, _ := http.NewRequest("GET", "/user/gordon", nil)
 	benchRequest(b, handler, r)

routers.go

@@ -459,27 +459,31 @@ func loadGoJsonRestSingle(method, path string, hfunc rest.HandlerFunc) http.Hand
 
 // go-restful
 func goRestfulHandlerWrite(r *restful.Request, w *restful.Response) {
-	io.WriteString(w, r.Request.URL.Query().Get("name"))
+	io.WriteString(w, r.PathParameter("name"))
 }
 
 func goRestfulHandler(r *restful.Request, w *restful.Response) {}
 
 func loadGoRestful(routes []route) http.Handler {
+	re := regexp.MustCompile(":([^/]*)")
+
 	wsContainer := restful.NewContainer()
 	ws := new(restful.WebService)
 
 	for _, route := range routes {
+		path := re.ReplaceAllString(route.path, "{$1}")
+
 		switch route.method {
 		case "GET":
-			ws.Route(ws.GET(route.path).To(goRestfulHandler))
+			ws.Route(ws.GET(path).To(goRestfulHandler))
 		case "POST":
-			ws.Route(ws.POST(route.path).To(goRestfulHandler))
+			ws.Route(ws.POST(path).To(goRestfulHandler))
 		case "PUT":
-			ws.Route(ws.PUT(route.path).To(goRestfulHandler))
+			ws.Route(ws.PUT(path).To(goRestfulHandler))
 		case "PATCH":
-			ws.Route(ws.PATCH(route.path).To(goRestfulHandler))
+			ws.Route(ws.PATCH(path).To(goRestfulHandler))
 		case "DELETE":
-			ws.Route(ws.DELETE(route.path).To(goRestfulHandler))
+			ws.Route(ws.DELETE(path).To(goRestfulHandler))
 		default:
 			panic("Unknow HTTP method: " + route.method)
 		}