From 14cbf49e9ae97bcfcd8014b1a1d2f072d57b1b83 Mon Sep 17 00:00:00 2001 From: dtookey Date: Thu, 21 Jul 2022 09:53:49 -0400 Subject: [PATCH] cleaned up the api for adding routes (it does it automatically when you create the route). Added a function to the server to announce registered routes. --- servlet/dynamicRoute.go | 4 +++- servlet/server.go | 7 +++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/servlet/dynamicRoute.go b/servlet/dynamicRoute.go index f5c19c9..d63861f 100644 --- a/servlet/dynamicRoute.go +++ b/servlet/dynamicRoute.go @@ -25,13 +25,15 @@ const ( UNDEFINED ) -func NewApiRoute(pattern string) *ApiRoute { +func NewApiRoute(serv *VinegarServlet, pattern string) *ApiRoute { functionMap := make(map[HttpMethod]VinegarHandlerFunction) ancestorRoute := NewServletRoute(pattern, createMethodHandler(&functionMap)) route := ApiRoute{ ancestorRoute, &functionMap, } + + serv.AddRoute(route.VinegarRoute) return &route } diff --git a/servlet/server.go b/servlet/server.go index 62f95b7..04de9dc 100644 --- a/servlet/server.go +++ b/servlet/server.go @@ -52,6 +52,7 @@ func NewServletRoute(routePattern string, handleFunc VinegarHandlerFunction) *Vi } func (s *VinegarServlet) AddRoute(route *VinegarRoute) { + route.Announce() s.Routes = append(s.Routes, route) } @@ -78,10 +79,8 @@ func (s *VinegarServlet) Start() { } -func (s *VinegarServlet) PrintRoutes() { - for _, route := range s.Routes { - log.Println(route.Pattern.String()) - } +func (r *VinegarRoute) Announce() { + log.Printf("Added route for [%s]\n", r.Pattern.String()) } func SendError(w http.ResponseWriter, code int, msg string) {