@@ -23,7 +23,7 @@ import (
23
23
)
24
24
25
25
// DefaultHTTPCode is used when the error Code cannot be used as an HTTP code.
26
- var DefaultHTTPCode = 422
26
+ var DefaultHTTPCode = http . StatusUnprocessableEntity
27
27
28
28
// Error represents a error interface all swagger framework errors implement
29
29
type Error interface {
@@ -115,8 +115,6 @@ func MethodNotAllowed(requested string, allow []string) Error {
115
115
return & MethodNotAllowedError {code : http .StatusMethodNotAllowed , Allowed : allow , message : msg }
116
116
}
117
117
118
- const head = "HEAD"
119
-
120
118
// ServeError the error handler interface implementation
121
119
func ServeError (rw http.ResponseWriter , r * http.Request , err error ) {
122
120
rw .Header ().Set ("Content-Type" , "application/json" )
@@ -133,7 +131,7 @@ func ServeError(rw http.ResponseWriter, r *http.Request, err error) {
133
131
case * MethodNotAllowedError :
134
132
rw .Header ().Add ("Allow" , strings .Join (err .(* MethodNotAllowedError ).Allowed , "," ))
135
133
rw .WriteHeader (asHTTPCode (int (e .Code ())))
136
- if r == nil || r .Method != head {
134
+ if r == nil || r .Method != http . MethodHead {
137
135
_ , _ = rw .Write (errorAsJSON (e ))
138
136
}
139
137
case Error :
@@ -144,15 +142,15 @@ func ServeError(rw http.ResponseWriter, r *http.Request, err error) {
144
142
return
145
143
}
146
144
rw .WriteHeader (asHTTPCode (int (e .Code ())))
147
- if r == nil || r .Method != head {
145
+ if r == nil || r .Method != http . MethodHead {
148
146
_ , _ = rw .Write (errorAsJSON (e ))
149
147
}
150
148
case nil :
151
149
rw .WriteHeader (http .StatusInternalServerError )
152
150
_ , _ = rw .Write (errorAsJSON (New (http .StatusInternalServerError , "Unknown error" )))
153
151
default :
154
152
rw .WriteHeader (http .StatusInternalServerError )
155
- if r == nil || r .Method != head {
153
+ if r == nil || r .Method != http . MethodHead {
156
154
_ , _ = rw .Write (errorAsJSON (New (http .StatusInternalServerError , err .Error ())))
157
155
}
158
156
}
0 commit comments