service/router
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change method names to prevent conflicts

Browse Source
This commit is contained in:
some 2024-10-10 15:27:29 -04:00
parent a1c8153d3c
commit 7280eed20c
Signed by: some
GPG Key ID: 65D0589220B9BFC8
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
default.go
View File

@ -50,7 +50,7 @@ func (e DefaultError) Response() *GenericResponse {
} }
return &GenericResponse{ return &GenericResponse{
Status: e.Status(), Status: e.Status(),
Header: Header{"Content-Type": []string{"text/javascript", "charset=utf-8"}}, Header: Header{"Content-Type": []string{"text/javascript", "charInit=utf-8"}},
Body: body, Body: body,
} }
} }
@ -93,40 +93,40 @@ func NewDefaultRequestBuilder() *DefaultRequestBuilder {
return &DefaultRequestBuilder{} return &DefaultRequestBuilder{}
} }
func (rqb *DefaultRequestBuilder) SetErrorHandler(errorHandler Error) *DefaultRequestBuilder { func (rqb *DefaultRequestBuilder) InitErrorHandler(errorHandler Error) *DefaultRequestBuilder {
rqb.errorHandler = errorHandler rqb.errorHandler = errorHandler
return rqb return rqb
} }
func (rqb *DefaultRequestBuilder) SetAllowedMethods(allowedMethods *[]string) *DefaultRequestBuilder { func (rqb *DefaultRequestBuilder) InitAllowedMethods(allowedMethods *[]string) *DefaultRequestBuilder {
rqb.allowedMethods = allowedMethods rqb.allowedMethods = allowedMethods
return rqb return rqb
} }
func (rqb *DefaultRequestBuilder) SetUrl(url *url.URL) *DefaultRequestBuilder { func (rqb *DefaultRequestBuilder) InitUrl(url *url.URL) *DefaultRequestBuilder {
rqb.url = url rqb.url = url
return rqb return rqb
} }
func (rqb *DefaultRequestBuilder) SetHeader(parsed *Header, fields header) *DefaultRequestBuilder { func (rqb *DefaultRequestBuilder) InitHeader(parsed *Header, fields header) *DefaultRequestBuilder {
rqb.header.Header = parsed rqb.header.Header = parsed
rqb.header.fields = fields rqb.header.fields = fields
return rqb return rqb
} }
func (rqb *DefaultRequestBuilder) SetValues(parsed *Values, fields values) *DefaultRequestBuilder { func (rqb *DefaultRequestBuilder) InitValues(parsed *Values, fields values) *DefaultRequestBuilder {
rqb.values.Values = parsed rqb.values.Values = parsed
rqb.values.fields = fields rqb.values.fields = fields
return rqb return rqb
} }
func (rqb *DefaultRequestBuilder) SetBody(parsed *Body, fields body) *DefaultRequestBuilder { func (rqb *DefaultRequestBuilder) InitBody(parsed *Body, fields body) *DefaultRequestBuilder {
rqb.body.Body = parsed rqb.body.Body = parsed
rqb.body.fields = fields rqb.body.fields = fields
return rqb return rqb
} }
func (rqb *DefaultRequestBuilder) SetDefaults() *DefaultRequestBuilder { func (rqb *DefaultRequestBuilder) Init() *DefaultRequestBuilder {
if rqb.errorHandler == nil { if rqb.errorHandler == nil {
rqb.errorHandler = &DefaultErrorHandler{} rqb.errorHandler = &DefaultErrorHandler{}
} }
@ -159,7 +159,7 @@ func (rqb *DefaultRequestBuilder) SetDefaults() *DefaultRequestBuilder {
return rqb return rqb
} }
func (rqb *DefaultRequestBuilder) Allowed(method string) (e Error) { func (rqb *DefaultRequestBuilder) SetAllowed(method string) (e Error) {
var ok bool var ok bool
for _, m := range *rqb.allowedMethods { for _, m := range *rqb.allowedMethods {
if m == method { if m == method {
@ -172,12 +172,12 @@ func (rqb *DefaultRequestBuilder) Allowed(method string) (e Error) {
return return
} }
func (rqb *DefaultRequestBuilder) Url(url url.URL) (e Error) { func (rqb *DefaultRequestBuilder) SetUrl(url url.URL) (e Error) {
*rqb.url = url *rqb.url = url
return return
} }
func (rqb *DefaultRequestBuilder) Header(header map[string][]string) (e Error) { func (rqb *DefaultRequestBuilder) SetHeader(header map[string][]string) (e Error) {
*rqb.header.Header = header *rqb.header.Header = header
err := rqb.header.Header.Unmarshal(rqb.header.fields) err := rqb.header.Header.Unmarshal(rqb.header.fields)
if err != nil { if err != nil {
@ -186,13 +186,13 @@ func (rqb *DefaultRequestBuilder) Header(header map[string][]string) (e Error) {
return return
} }
func (rqb *DefaultRequestBuilder) Body(body io.ReadCloser) (e Error) { func (rqb *DefaultRequestBuilder) SetBody(body io.ReadCloser) (e Error) {
defer body.Close() defer body.Close()
json.NewDecoder(body).Decode(rqb.body.fields) json.NewDecoder(body).Decode(rqb.body.fields)
return return
} }
func (rqb *DefaultRequestBuilder) Values(values map[string][]string) (e Error) { func (rqb *DefaultRequestBuilder) SetValues(values map[string][]string) (e Error) {
*rqb.values.Values = values *rqb.values.Values = values
err := rqb.values.Values.Unmarshal(rqb.values.fields) err := rqb.values.Values.Unmarshal(rqb.values.fields)
if err != nil { if err != nil {
@ -236,29 +236,29 @@ func NewDefaultResponseBuilder() *DefaultResponseBuilder {
return &DefaultResponseBuilder{} return &DefaultResponseBuilder{}
} }
func (rsb *DefaultResponseBuilder) SetErrorHandler(errorHandler Error) *DefaultResponseBuilder { func (rsb *DefaultResponseBuilder) InitErrorHandler(errorHandler Error) *DefaultResponseBuilder {
rsb.errorHandler = errorHandler rsb.errorHandler = errorHandler
return rsb return rsb
} }
func (rsb *DefaultResponseBuilder) SetStatus(code *int) *DefaultResponseBuilder { func (rsb *DefaultResponseBuilder) InitStatus(code *int) *DefaultResponseBuilder {
rsb.status = code rsb.status = code
return rsb return rsb
} }
func (rsb *DefaultResponseBuilder) SetHeader(parsed *Header, fields header) *DefaultResponseBuilder { func (rsb *DefaultResponseBuilder) InitHeader(parsed *Header, fields header) *DefaultResponseBuilder {
rsb.header.Header = parsed rsb.header.Header = parsed
rsb.header.fields = fields rsb.header.fields = fields
return rsb return rsb
} }
func (rsb *DefaultResponseBuilder) SetBody(parsed *Body, fields body) *DefaultResponseBuilder { func (rsb *DefaultResponseBuilder) InitBody(parsed *Body, fields body) *DefaultResponseBuilder {
rsb.body.Body = parsed rsb.body.Body = parsed
rsb.body.fields = fields rsb.body.fields = fields
return rsb return rsb
} }
func (rsb *DefaultResponseBuilder) SetDefaults() *DefaultResponseBuilder { func (rsb *DefaultResponseBuilder) Init() *DefaultResponseBuilder {
if rsb.errorHandler == nil { if rsb.errorHandler == nil {
rsb.errorHandler = &DefaultErrorHandler{} rsb.errorHandler = &DefaultErrorHandler{}
} }
@ -281,7 +281,7 @@ func (rsb *DefaultResponseBuilder) SetDefaults() *DefaultResponseBuilder {
return rsb return rsb
} }
func (rsb *DefaultResponseBuilder) Header(header map[string][]string) (e Error) { func (rsb *DefaultResponseBuilder) SetHeader(header map[string][]string) (e Error) {
*rsb.header.Header = header *rsb.header.Header = header
err := rsb.header.Header.Unmarshal(rsb.header.fields) err := rsb.header.Header.Unmarshal(rsb.header.fields)
if err != nil { if err != nil {
@ -290,8 +290,8 @@ func (rsb *DefaultResponseBuilder) Header(header map[string][]string) (e Error)
return return
} }
func (rsb *DefaultResponseBuilder) Write(body []byte) (e Error) { func (rsb *DefaultResponseBuilder) SetBody(body []byte) (e Error) {
*rsb.body.Body = append(*rsb.body.Body, body...) *rsb.body.Body = body
return return
} }

24
server.go
View File

@ -52,11 +52,11 @@ func (*Request[RQB]) RequestBuilder() RequestBuilder {
type RequestBuilder interface { type RequestBuilder interface {
mustEmbedDefaultRequestBuilder() mustEmbedDefaultRequestBuilder()
New() (rqb RequestBuilder) New() (rqb RequestBuilder)
Allowed(method string) (err Error) SetAllowed(method string) (err Error)
Url(url url.URL) (err Error) SetUrl(url url.URL) (err Error)
Header(map[string][]string) (err Error) SetHeader(map[string][]string) (err Error)
Values(map[string][]string) (err Error) SetValues(map[string][]string) (err Error)
Body(body io.ReadCloser) (err Error) SetBody(body io.ReadCloser) (err Error)
Request() *GenericRequest Request() *GenericRequest
} }
@ -68,8 +68,8 @@ func (*Response[RSB]) ResponseBuilder() ResponseBuilder {
type ResponseBuilder interface { type ResponseBuilder interface {
mustEmbedDefaultResponseBuilder() mustEmbedDefaultResponseBuilder()
New() (rsb ResponseBuilder) New() (rsb ResponseBuilder)
Header(map[string][]string) (err Error) SetHeader(map[string][]string) (err Error)
Write(body []byte) (err Error) SetBody(body []byte) (err Error)
Response() *GenericResponse Response() *GenericResponse
} }
@ -147,20 +147,20 @@ func (srv *server[RQB, RSB]) ServeHTTP(w http.ResponseWriter, r *http.Request) {
var rqb RQB var rqb RQB
rqb = rqb.New().(RQB) rqb = rqb.New().(RQB)
wr := writer{ResponseWriter: w, Logger: srv.logger} wr := writer{ResponseWriter: w, Logger: srv.logger}
if ok := wr.handleError(rqb.Allowed(r.Method)); !ok { if ok := wr.handleError(rqb.SetAllowed(r.Method)); !ok {
return return
} }
if ok := wr.handleError(rqb.Url(*r.URL)); !ok { if ok := wr.handleError(rqb.SetUrl(*r.URL)); !ok {
return return
} }
if ok := wr.handleError(rqb.Header(r.Header)); !ok { if ok := wr.handleError(rqb.SetHeader(r.Header)); !ok {
return return
} }
if ok := wr.handleError(rqb.Body(r.Body)); !ok { if ok := wr.handleError(rqb.SetBody(r.Body)); !ok {
return return
} }
r.ParseForm() r.ParseForm()
if ok := wr.handleError(rqb.Values(r.Form)); !ok { if ok := wr.handleError(rqb.SetValues(r.Form)); !ok {
return return
} }
for _, stage := range srv.serve { for _, stage := range srv.serve {