Added ResponseErrorWriter interface to allow for custom error json ma…

…rshalling
rcrowley · Jul 27, 2015 · 80565de · 80565de
1 parent 4deeabb
commit 80565de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/method_not_allowed.go b/method_not_allowed.go
@@ -52,10 +52,7 @@ func (h MethodNotAllowedHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques
 			strings.Join(methods, ", "),
 		)
 		if acceptJSON(r) {
-			w.Header().Set("Content-Type", "application/json")
-			w.WriteHeader(http.StatusMethodNotAllowed)
-			err := MethodNotAllowed{Err: errors.New(description)}
-			ResponseErrorWriter.WriteJSONError(w, err)
+			ResponseErrorWriter.WriteJSONError(w, MethodNotAllowed{Err: errors.New(description)})
 		} else {
 			w.Header().Set("Content-Type", "text/plain")
 			w.WriteHeader(http.StatusMethodNotAllowed)

diff --git a/not_found.go b/not_found.go
@@ -12,10 +12,7 @@ type NotFoundHandler struct{}
 func (NotFoundHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	description := fmt.Sprintf("%s %s not found", r.Method, r.URL.Path)
 	if acceptJSON(r) {
-		w.Header().Set("Content-Type", "application/json")
-		w.WriteHeader(http.StatusNotFound)
-		err := NotFound{Err: errors.New(description)}
-		ResponseErrorWriter.WriteJSONError(w, err)
+		ResponseErrorWriter.WriteJSONError(w, NotFound{Err: errors.New(description)})
 	} else {
 		w.Header().Set("Content-Type", "text/plain")
 		w.WriteHeader(http.StatusNotFound)