@@ -57,21 +57,14 @@ func Dump(w io.Writer) Middleware {
5757 }
5858}
5959
60- // DumpToStout dumps requests and responses to os.Stdout
61- // Deprecated: use DumpToStdout instead.
62- func DumpToStout () Middleware {
63- return Dump (os .Stdout )
60+ // DumpToStdout dumps requests and responses to os.Stdout
61+ func DumpToStdout () Middleware {
62+ return Dump (os .Stdout )
6463}
6564
6665// DumpToStderr dumps requests and responses to os.Stderr
6766func DumpToStderr () Middleware {
68- return Dump (os .Stderr )
69- }
70-
71- // DumpToStdout dumps requests and responses to os.Stdout.
72- // This is a correctly spelled alias of DumpToStout.
73- func DumpToStdout () Middleware {
74- return Dump (os .Stdout )
67+ return Dump (os .Stderr )
7568}
7669
7770type logFunc func (a ... any )
@@ -113,49 +106,49 @@ func ExpectCode(code int) Middleware {
113106//
114107// The response body will still be read and returned.
115108func ExpectSuccessCode () Middleware {
116- return func (next Doer ) Doer {
117- return DoerFunc (func (req * http.Request ) (* http.Response , error ) {
118- r , c := getCodeChecker (req )
119- c .code = expectSuccessCode
120- resp , err := next .Do (r )
121-
122- return c .checkCode (resp , err )
123- })
124- }
109+ return func (next Doer ) Doer {
110+ return DoerFunc (func (req * http.Request ) (* http.Response , error ) {
111+ r , c := getCodeChecker (req )
112+ c .code = expectSuccessCode
113+ resp , err := next .Do (r )
114+
115+ return c .checkCode (resp , err )
116+ })
117+ }
125118}
126119
127120// ExpectCodes generates an error if the response's status code does not match
128121// any of the provided codes. If no codes are provided, it behaves like ExpectSuccessCode.
129122// The response body is still read and returned.
130123func ExpectCodes (codes ... int ) Middleware {
131- if len (codes ) == 0 {
132- return ExpectSuccessCode ()
133- }
134-
135- allowed := make (map [int ]struct {}, len (codes ))
136- for _ , code := range codes {
137- allowed [code ] = struct {}{}
138- }
139-
140- return func (next Doer ) Doer {
141- return DoerFunc (func (req * http.Request ) (* http.Response , error ) {
142- resp , err := next .Do (req )
143- if err != nil || resp == nil {
144- return resp , err
145- }
146-
147- if _ , ok := allowed [resp .StatusCode ]; ! ok {
148- err = rout .HTTPErrorResponse (
149- fmt .Errorf ("%w: server returned unexpected status code. expected one of: %v, received: %d" ,
150- ErrUnsuccessfulResponse ,
151- codes ,
152- resp .StatusCode ,
153- ))
154- }
155-
156- return resp , err
157- })
158- }
124+ if len (codes ) == 0 {
125+ return ExpectSuccessCode ()
126+ }
127+
128+ allowed := make (map [int ]struct {}, len (codes ))
129+ for _ , code := range codes {
130+ allowed [code ] = struct {}{}
131+ }
132+
133+ return func (next Doer ) Doer {
134+ return DoerFunc (func (req * http.Request ) (* http.Response , error ) {
135+ resp , err := next .Do (req )
136+ if err != nil || resp == nil {
137+ return resp , err
138+ }
139+
140+ if _ , ok := allowed [resp .StatusCode ]; ! ok {
141+ err = rout .HTTPErrorResponse (
142+ fmt .Errorf ("%w: server returned unexpected status code. expected one of: %v, received: %d" ,
143+ ErrUnsuccessfulResponse ,
144+ codes ,
145+ resp .StatusCode ,
146+ ))
147+ }
148+
149+ return resp , err
150+ })
151+ }
159152}
160153
161154type ctxKey int
0 commit comments