fixed bug in receiver

Author: KenWilliamson

coverage.out

@@ -1,4 +1,8 @@
 mode: set
+github.com/GolangToolKits/grrt/router.go:25.25,28.2 2 1
+github.com/GolangToolKits/grrt/router.go:31.46,33.49 2 1
+github.com/GolangToolKits/grrt/router.go:36.2,36.12 1 1
+github.com/GolangToolKits/grrt/router.go:33.49,35.3 1 1
 github.com/GolangToolKits/grrt/reqRoute.go:28.32,32.2 3 1
 github.com/GolangToolKits/grrt/reqRoute.go:35.56,36.14 1 1
 github.com/GolangToolKits/grrt/reqRoute.go:39.2,39.10 1 1
@@ -88,64 +92,60 @@ github.com/GolangToolKits/grrt/reqRoute.go:273.14,274.41 1 1
 github.com/GolangToolKits/grrt/reqRoute.go:274.41,276.4 1 1
 github.com/GolangToolKits/grrt/reqRoute.go:278.8,280.3 1 1
 github.com/GolangToolKits/grrt/reqRoute.go:284.55,288.2 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:34.70,38.53 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:38.53,40.3 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:40.8,43.16 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:51.3,51.34 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:43.16,46.23 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:46.23,49.5 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:51.34,53.4 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:53.9,53.43 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:53.43,55.4 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:55.9,58.4 2 1
-github.com/GolangToolKits/grrt/reqRouter.go:82.37,86.2 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:89.68,92.16 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:106.2,106.11 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:92.16,94.3 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:94.8,96.28 2 1
-github.com/GolangToolKits/grrt/reqRouter.go:102.3,102.12 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:96.28,97.55 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:97.55,100.5 2 1
-github.com/GolangToolKits/grrt/reqRouter.go:102.12,104.4 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:110.94,113.16 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:127.2,127.11 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:113.16,115.3 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:115.8,117.28 2 1
-github.com/GolangToolKits/grrt/reqRouter.go:123.3,123.12 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:117.28,118.55 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:118.55,121.5 2 1
-github.com/GolangToolKits/grrt/reqRouter.go:123.12,125.4 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:131.48,134.16 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:137.2,137.11 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:134.16,136.3 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:141.33,143.2 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:146.54,149.28 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:149.28,151.20 2 1
-github.com/GolangToolKits/grrt/reqRouter.go:154.3,154.55 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:151.20,152.12 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:159.54,163.2 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:166.55,169.28 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:169.28,171.20 2 1
-github.com/GolangToolKits/grrt/reqRouter.go:174.3,174.55 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:171.20,172.12 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:178.54,183.2 4 1
-github.com/GolangToolKits/grrt/reqRouter.go:185.48,189.2 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:191.69,199.23 7 1
-github.com/GolangToolKits/grrt/reqRouter.go:220.2,220.19 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:199.23,200.13 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:205.3,207.17 3 1
-github.com/GolangToolKits/grrt/reqRouter.go:200.13,201.12 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:202.9,202.19 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:202.19,203.9 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:207.17,208.28 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:208.28,209.38 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:209.38,213.11 4 1
-github.com/GolangToolKits/grrt/reqRouter.go:216.9,218.4 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:223.95,225.36 2 1
-github.com/GolangToolKits/grrt/reqRouter.go:230.2,231.27 2 1
-github.com/GolangToolKits/grrt/reqRouter.go:225.36,226.32 1 1
-github.com/GolangToolKits/grrt/reqRouter.go:226.32,228.4 1 1
-github.com/GolangToolKits/grrt/router.go:25.25,28.2 2 1
-github.com/GolangToolKits/grrt/router.go:31.46,33.49 2 1
-github.com/GolangToolKits/grrt/router.go:36.2,36.12 1 1
-github.com/GolangToolKits/grrt/router.go:33.49,35.3 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:35.71,42.53 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:42.53,45.3 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:45.8,48.16 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:56.3,56.34 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:48.16,51.23 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:51.23,54.5 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:56.34,58.4 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:58.9,58.43 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:58.43,60.4 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:60.9,63.4 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:87.38,91.2 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:94.69,97.16 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:111.2,111.11 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:97.16,99.3 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:99.8,101.28 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:107.3,107.12 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:101.28,102.55 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:102.55,105.5 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:107.12,109.4 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:115.95,118.16 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:132.2,132.11 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:118.16,120.3 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:120.8,122.28 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:128.3,128.12 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:122.28,123.55 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:123.55,126.5 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:128.12,130.4 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:136.49,139.16 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:142.2,142.11 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:139.16,141.3 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:146.34,148.2 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:151.55,154.28 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:154.28,156.20 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:159.3,159.55 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:156.20,157.12 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:164.55,168.2 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:171.56,174.28 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:174.28,176.20 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:179.3,179.55 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:176.20,177.12 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:183.55,189.2 5 1
+github.com/GolangToolKits/grrt/reqRouter.go:191.49,195.2 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:197.70,205.23 7 1
+github.com/GolangToolKits/grrt/reqRouter.go:226.2,226.19 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:205.23,206.13 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:211.3,213.17 3 1
+github.com/GolangToolKits/grrt/reqRouter.go:206.13,207.12 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:208.9,208.19 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:208.19,209.9 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:213.17,214.28 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:214.28,215.38 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:215.38,219.11 4 1
+github.com/GolangToolKits/grrt/reqRouter.go:222.9,224.4 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:229.96,231.36 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:236.2,237.27 2 1
+github.com/GolangToolKits/grrt/reqRouter.go:231.36,232.32 1 1
+github.com/GolangToolKits/grrt/reqRouter.go:232.32,234.4 1 1

reqRouter.go

@@ -32,7 +32,7 @@ type ReqRouter struct {
 }
 
 // ServeHTTP ServeHTTP dispatches the handler registered in the matched route.
-func (t ReqRouter) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (t *ReqRouter) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// When there is a match, the route variables can be retrieved calling
 	// mux.Vars(request).
 
@@ -84,14 +84,14 @@ func (t ReqRouter) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 // NewRoute NewRoute
-func (t ReqRouter) NewRoute() Route {
+func (t *ReqRouter) NewRoute() Route {
 	var rt ReqRoute
 	rrt := rt.New()
 	return rrt
 }
 
 // Handle Handle
-func (t ReqRouter) Handle(path string, handler http.Handler) Route {
+func (t *ReqRouter) Handle(path string, handler http.Handler) Route {
 	rt := t.NewRoute().Path(path).Handler(handler)
 	fts := t.namedRoutes[rt.GetPath()]
 	if fts == nil {
@@ -112,7 +112,7 @@ func (t ReqRouter) Handle(path string, handler http.Handler) Route {
 }
 
 // HandleFunc HandleFunc
-func (t ReqRouter) HandleFunc(path string, f func(http.ResponseWriter, *http.Request)) Route {
+func (t *ReqRouter) HandleFunc(path string, f func(http.ResponseWriter, *http.Request)) Route {
 	rt := t.NewRoute().Path(path).HandlerFunc(f)
 	fts := t.namedRoutes[rt.GetPath()]
 	if fts == nil {
@@ -133,7 +133,7 @@ func (t ReqRouter) HandleFunc(path string, f func(http.ResponseWriter, *http.Req
 }
 
 // PathPrefix PathPrefix
-func (t ReqRouter) PathPrefix(px string) Route {
+func (t *ReqRouter) PathPrefix(px string) Route {
 	rt := t.NewRoute().PathPrefix(px)
 	fts := t.prefixRoutes[rt.GetPrefix()]
 	if fts == nil {
@@ -143,12 +143,12 @@ func (t ReqRouter) PathPrefix(px string) Route {
 }
 
 // EnableCORS EnableCORS
-func (t ReqRouter) EnableCORS() {
+func (t *ReqRouter) EnableCORS() {
 	t.corsEnabled = true
 }
 
 // SetCorsAllowedHeaders SetAllowedHeaders
-func (t ReqRouter) SetCorsAllowedHeaders(hdr string) {
+func (t *ReqRouter) SetCorsAllowedHeaders(hdr string) {
 	hdr = strings.ReplaceAll(hdr, " ", "")
 	headers := strings.Split(hdr, ",")
 	for _, v := range headers {
@@ -161,14 +161,14 @@ func (t ReqRouter) SetCorsAllowedHeaders(hdr string) {
 }
 
 // SetCorsAllowedOrigins AllowedOrigins
-func (t ReqRouter) SetCorsAllowedOrigins(org string) {
+func (t *ReqRouter) SetCorsAllowedOrigins(org string) {
 	org = strings.ReplaceAll(org, " ", "")
 	var origins = strings.Split(org, ",")
 	t.allowedOrigins = origins
 }
 
 // SetCorsAllowedMethods AllowedMethods
-func (t ReqRouter) SetCorsAllowedMethods(mths string) {
+func (t *ReqRouter) SetCorsAllowedMethods(mths string) {
 	mths = strings.ReplaceAll(mths, " ", "")
 	var methods = strings.Split(mths, ",")
 	for _, v := range methods {
@@ -180,21 +180,21 @@ func (t ReqRouter) SetCorsAllowedMethods(mths string) {
 	}
 }
 
-func (t ReqRouter) handleCors(w http.ResponseWriter) {
+func (t *ReqRouter) handleCors(w http.ResponseWriter) {
 	fmt.Println("inside handleCors ------")
 	w.Header().Set(corsAllowOriginHeader, strings.Join(t.allowedOrigins, ","))
 	w.Header().Set(corsAllowHeadersHeader, strings.Join(t.allowedHeaders, ","))
 	w.Header().Set(corsAllowMethodsHeader, strings.Join(t.allowedMethods, ","))
 	w.WriteHeader(http.StatusOK)
 }
 
-func (t ReqRouter) findPrefix(px string) Route {
+func (t *ReqRouter) findPrefix(px string) Route {
 	var rtn Route
 	rtn = t.prefixRoutes[px]
 	return rtn
 }
 
-func (t ReqRouter) findRouteAndVars(path string) (Route, *[]string) {
+func (t *ReqRouter) findRouteAndVars(path string) (Route, *[]string) {
 	var rnt Route
 	sp := strings.Split(path, "/")
 	var vars []string
@@ -226,7 +226,7 @@ func (t ReqRouter) findRouteAndVars(path string) (Route, *[]string) {
 	return rnt, &vars
 }
 
-func (t ReqRouter) requestWithVars(r *http.Request, pVarNames, pvars *[]string) *http.Request {
+func (t *ReqRouter) requestWithVars(r *http.Request, pVarNames, pvars *[]string) *http.Request {
 	var vars = make(map[string]string)
 	if len(*pVarNames) == len(*pvars) {
 		for i, n := range *pVarNames {