From 85a05217236b175d33ac2d552e8a2974ffeeaf22 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Mon, 1 Oct 2018 21:21:27 +0200 Subject: [PATCH] rename err.BindArgument() to err.Put() --- err/interface.go | 4 ++-- server.go | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/err/interface.go b/err/interface.go index 0946212..6c37fbf 100644 --- a/err/interface.go +++ b/err/interface.go @@ -14,9 +14,9 @@ type Error struct { Arguments []interface{} } -// BindArgument adds an argument to the error +// Put adds an argument to the error // to be displayed back to API caller -func (e *Error) BindArgument(arg interface{}) { +func (e *Error) Put(arg interface{}) { /* (1) Make slice if not */ if e.Arguments == nil { diff --git a/server.go b/server.go index 5817683..ab5a4ca 100644 --- a/server.go +++ b/server.go @@ -135,7 +135,7 @@ func (s *Server) ServeHTTP(res http.ResponseWriter, req *http.Request) { httpMethod := strings.ToUpper(req.Method) if err != nil { httpErr := e.UncallableController - httpErr.BindArgument(err) + httpErr.Put(err) httpError(res, httpErr) log.Printf("err( %s )\n", err) return @@ -204,7 +204,7 @@ func (s *Server) extractParameters(req *apirequest.Request, methodParam map[stri /* (2) Required & missing */ if !isset && !param.Optional { err = e.MissingParam - err.BindArgument(name) + err.Put(name) return nil, err } @@ -233,8 +233,8 @@ func (s *Server) extractParameters(req *apirequest.Request, methodParam map[stri waitFile, gotFile := param.Type == "FILE", p.File if gotFile && !waitFile || !gotFile && waitFile { err = e.InvalidParam - err.BindArgument(param.Rename) - err.BindArgument("FILE") + err.Put(param.Rename) + err.Put("FILE") return nil, err } @@ -248,9 +248,9 @@ func (s *Server) extractParameters(req *apirequest.Request, methodParam map[stri if s.checker.Run(param.Type, p.Value) != nil { err = e.InvalidParam - err.BindArgument(param.Rename) - err.BindArgument(param.Type) - err.BindArgument(p.Value) + err.Put(param.Rename) + err.Put(param.Type) + err.Put(p.Value) break }