diff --git a/badgateway.go b/badgateway.go index 56574fe..99de2ae 100644 --- a/badgateway.go +++ b/badgateway.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalBadGateway{} +var _ BadGateway = internalBadGateway{} + var ErrBadGateway error = BadGatewayWrap(errors.New("Bad Gateway")) type BadGateway interface { @@ -27,10 +30,6 @@ func (receiver internalBadGateway) Error() string { return receiver.err.Error() } -func (receiver internalBadGateway) Err() error { - return receiver.err -} - func (internalBadGateway) ErrHTTP() { // Nothing here. } diff --git a/badrequest.go b/badrequest.go index af09b8d..4000eb7 100644 --- a/badrequest.go +++ b/badrequest.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalBadRequest{} +var _ BadRequest = internalBadRequest{} + var ErrBadRequest = BadRequestWrap(errors.New("Bad Request")) type BadRequest interface { @@ -25,10 +28,6 @@ func (receiver internalBadRequest) Error() string { return receiver.err.Error() } -func (receiver internalBadRequest) Err() error { - return receiver.err -} - func (internalBadRequest) ErrHTTP() { // Nothing here. } diff --git a/badrequest_test.go b/badrequest_test.go deleted file mode 100644 index ba9a93f..0000000 --- a/badrequest_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestBadRequest(t *testing.T) { - - var x BadRequest = internalBadRequest{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/conflict.go b/conflict.go index a0ebe0e..a1e4062 100644 --- a/conflict.go +++ b/conflict.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalConflict{} +var _ Conflict = internalConflict{} + var ErrConflict = ConflictWrap(errors.New("Conflict")) type Conflict interface { @@ -25,10 +28,6 @@ func (receiver internalConflict) Error() string { return receiver.err.Error() } -func (receiver internalConflict) Err() error { - return receiver.err -} - func (internalConflict) ErrHTTP() { // Nothing here. } diff --git a/conflict_test.go b/conflict_test.go deleted file mode 100644 index c5132a6..0000000 --- a/conflict_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestConflict(t *testing.T) { - - var x Conflict = internalConflict{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/error.go b/error.go index 387c276..783eb0f 100644 --- a/error.go +++ b/error.go @@ -2,7 +2,6 @@ package errhttp type Error interface { error - Err() error ErrHTTP() Unwrap() error } diff --git a/expectationfailed.go b/expectationfailed.go index 92cce59..30bd594 100644 --- a/expectationfailed.go +++ b/expectationfailed.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalExpectationFailed{} +var _ ExpectationFailed = internalExpectationFailed{} + var ErrExpectationFailed error = ExpectationFailedWrap(errors.New("Expectation Failed")) type ExpectationFailed interface { @@ -25,10 +28,6 @@ func (receiver internalExpectationFailed) Error() string { return receiver.err.Error() } -func (receiver internalExpectationFailed) Err() error { - return receiver.err -} - func (internalExpectationFailed) ErrHTTP() { // Nothing here. } diff --git a/expectationfailed_test.go b/expectationfailed_test.go deleted file mode 100644 index c5dc7d7..0000000 --- a/expectationfailed_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestExpectationFailed(t *testing.T) { - - var x ExpectationFailed = internalExpectationFailed{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/faileddependency.go b/faileddependency.go index df6f180..bfcfec5 100644 --- a/faileddependency.go +++ b/faileddependency.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalFailedDependency{} +var _ FailedDependency = internalFailedDependency{} + var ErrFailedDependency error = FailedDependencyWrap(errors.New("Failed Dependency")) type FailedDependency interface { @@ -25,10 +28,6 @@ func (receiver internalFailedDependency) Error() string { return receiver.err.Error() } -func (receiver internalFailedDependency) Err() error { - return receiver.err -} - func (internalFailedDependency) ErrHTTP() { // Nothing here. } diff --git a/faileddependency_test.go b/faileddependency_test.go deleted file mode 100644 index 959a2ac..0000000 --- a/faileddependency_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestFailedDependency(t *testing.T) { - - var x FailedDependency = internalFailedDependency{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/forbidden.go b/forbidden.go index 5a4d890..bc7840f 100644 --- a/forbidden.go +++ b/forbidden.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalForbidden{} +var _ Forbidden = internalForbidden{} + var ErrForbidden error = ForbiddenWrap(errors.New("Forbidden")) type Forbidden interface { @@ -25,10 +28,6 @@ func (receiver internalForbidden) Error() string { return receiver.err.Error() } -func (receiver internalForbidden) Err() error { - return receiver.err -} - func (internalForbidden) ErrHTTP() { // Nothing here. } diff --git a/forbidden_test.go b/forbidden_test.go deleted file mode 100644 index 543c675..0000000 --- a/forbidden_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestForbidden(t *testing.T) { - - var x Forbidden = internalForbidden{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/gatewaytimeout.go b/gatewaytimeout.go index c33e0b5..969a0ce 100644 --- a/gatewaytimeout.go +++ b/gatewaytimeout.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalGatewayTimeout{} +var _ GatewayTimeout = internalGatewayTimeout{} + var ErrGatewayTimeout error = GatewayTimeoutWrap(errors.New("Gateway Timeout")) type GatewayTimeout interface { @@ -27,10 +30,6 @@ func (receiver internalGatewayTimeout) Error() string { return receiver.err.Error() } -func (receiver internalGatewayTimeout) Err() error { - return receiver.err -} - func (internalGatewayTimeout) ErrHTTP() { // Nothing here. } diff --git a/gone.go b/gone.go index cb8a2da..132c249 100644 --- a/gone.go +++ b/gone.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalGone{} +var _ Gone = internalGone{} + var ErrGone error = GoneWrap(errors.New("Gone")) type Gone interface { @@ -25,10 +28,6 @@ func (receiver internalGone) Error() string { return receiver.err.Error() } -func (receiver internalGone) Err() error { - return receiver.err -} - func (internalGone) ErrHTTP() { // Nothing here. } diff --git a/gone_test.go b/gone_test.go deleted file mode 100644 index d155e40..0000000 --- a/gone_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestGone(t *testing.T) { - - var x Gone = internalGone{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/httpversionnotsupported.go b/httpversionnotsupported.go index 97095a0..28b7c2c 100644 --- a/httpversionnotsupported.go +++ b/httpversionnotsupported.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalHTTPVersionNotSupported{} +var _ HTTPVersionNotSupported = internalHTTPVersionNotSupported{} + var ErrHTTPVersionNotSupported error = HTTPVersionNotSupportedWrap(errors.New("HTTP Version Not Supported")) type HTTPVersionNotSupported interface { @@ -27,10 +30,6 @@ func (receiver internalHTTPVersionNotSupported) Error() string { return receiver.err.Error() } -func (receiver internalHTTPVersionNotSupported) Err() error { - return receiver.err -} - func (internalHTTPVersionNotSupported) ErrHTTP() { // Nothing here. } diff --git a/insufficientstorage.go b/insufficientstorage.go index 1eb924b..36cb319 100644 --- a/insufficientstorage.go +++ b/insufficientstorage.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalInsufficientStorage{} +var _ InsufficientStorage = internalInsufficientStorage{} + var ErrInsufficientStorage error = InsufficientStorageWrap(errors.New("Insufficient Storage")) type InsufficientStorage interface { @@ -27,10 +30,6 @@ func (receiver internalInsufficientStorage) Error() string { return receiver.err.Error() } -func (receiver internalInsufficientStorage) Err() error { - return receiver.err -} - func (internalInsufficientStorage) ErrHTTP() { // Nothing here. } diff --git a/internalservererror.go b/internalservererror.go index 092396f..d2d34a4 100644 --- a/internalservererror.go +++ b/internalservererror.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalInternalServerError{} +var _ InternalServerError = internalInternalServerError{} + var ErrInternalServerError error = InternalServerErrorWrap(errors.New("Internal Server Error")) type InternalServerError interface { @@ -27,10 +30,6 @@ func (receiver internalInternalServerError) Error() string { return receiver.err.Error() } -func (receiver internalInternalServerError) Err() error { - return receiver.err -} - func (internalInternalServerError) ErrHTTP() { // Nothing here. } diff --git a/lengthrequired.go b/lengthrequired.go index 42fb0db..6842b86 100644 --- a/lengthrequired.go +++ b/lengthrequired.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalLengthRequired{} +var _ LengthRequired = internalLengthRequired{} + var ErrLengthRequired error = LengthRequiredWrap(errors.New("Length Required")) type LengthRequired interface { @@ -25,10 +28,6 @@ func (receiver internalLengthRequired) Error() string { return receiver.err.Error() } -func (receiver internalLengthRequired) Err() error { - return receiver.err -} - func (internalLengthRequired) ErrHTTP() { // Nothing here. } diff --git a/lengthrequired_test.go b/lengthrequired_test.go deleted file mode 100644 index 7b086fe..0000000 --- a/lengthrequired_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestLengthRequired(t *testing.T) { - - var x LengthRequired = internalLengthRequired{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/locked.go b/locked.go index 0644b01..60f4871 100644 --- a/locked.go +++ b/locked.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalLocked{} +var _ Locked = internalLocked{} + var ErrLocked error = LockedWrap(errors.New("Locked")) type Locked interface { @@ -25,10 +28,6 @@ func (receiver internalLocked) Error() string { return receiver.err.Error() } -func (receiver internalLocked) Err() error { - return receiver.err -} - func (internalLocked) ErrHTTP() { // Nothing here. } diff --git a/locked_test.go b/locked_test.go deleted file mode 100644 index 588ebe9..0000000 --- a/locked_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestLocked(t *testing.T) { - - var x Locked = internalLocked{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/loopdetected.go b/loopdetected.go index 9f2992e..1b95c2d 100644 --- a/loopdetected.go +++ b/loopdetected.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalLoopDetected{} +var _ LoopDetected = internalLoopDetected{} + var ErrLoopDetected error = LoopDetectedWrap(errors.New("Loop Detected")) type LoopDetected interface { @@ -27,10 +30,6 @@ func (receiver internalLoopDetected) Error() string { return receiver.err.Error() } -func (receiver internalLoopDetected) Err() error { - return receiver.err -} - func (internalLoopDetected) ErrHTTP() { // Nothing here. } diff --git a/methodnotallowed.go b/methodnotallowed.go index 6d5a7cc..8b33bb0 100644 --- a/methodnotallowed.go +++ b/methodnotallowed.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalMethodNotAllowed{} +var _ MethodNotAllowed = internalMethodNotAllowed{} + var ErrMethodNotAllowed error = MethodNotAllowedWrap(errors.New("Method Not Allowed")) type MethodNotAllowed interface { @@ -25,10 +28,6 @@ func (receiver internalMethodNotAllowed) Error() string { return receiver.err.Error() } -func (receiver internalMethodNotAllowed) Err() error { - return receiver.err -} - func (internalMethodNotAllowed) ErrHTTP() { // Nothing here. } diff --git a/methodnotallowed_test.go b/methodnotallowed_test.go deleted file mode 100644 index 6927b25..0000000 --- a/methodnotallowed_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestMethodNotAllowed(t *testing.T) { - - var x MethodNotAllowed = internalMethodNotAllowed{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/networkauthenticationrequired.go b/networkauthenticationrequired.go index 468313b..3238bbd 100644 --- a/networkauthenticationrequired.go +++ b/networkauthenticationrequired.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalNetworkAuthenticationRequired{} +var _ NetworkAuthenticationRequired = internalNetworkAuthenticationRequired{} + var ErrNetworkAuthenticationRequired error = NetworkAuthenticationRequiredWrap(errors.New("Network Authentication Required")) type NetworkAuthenticationRequired interface { @@ -27,10 +30,6 @@ func (receiver internalNetworkAuthenticationRequired) Error() string { return receiver.err.Error() } -func (receiver internalNetworkAuthenticationRequired) Err() error { - return receiver.err -} - func (internalNetworkAuthenticationRequired) ErrHTTP() { // Nothing here. } diff --git a/notacceptable.go b/notacceptable.go index ac4da30..b8165a9 100644 --- a/notacceptable.go +++ b/notacceptable.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalNotAcceptable{} +var _ NotAcceptable = internalNotAcceptable{} + var ErrNotAcceptable error = NotAcceptableWrap(errors.New("Not Acceptable")) type NotAcceptable interface { @@ -25,10 +28,6 @@ func (receiver internalNotAcceptable) Error() string { return receiver.err.Error() } -func (receiver internalNotAcceptable) Err() error { - return receiver.err -} - func (internalNotAcceptable) ErrHTTP() { // Nothing here. } diff --git a/notacceptable_test.go b/notacceptable_test.go deleted file mode 100644 index 4b45dfa..0000000 --- a/notacceptable_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestNotAcceptable(t *testing.T) { - - var x NotAcceptable = internalNotAcceptable{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/notextended.go b/notextended.go index f997fd0..3cc6be1 100644 --- a/notextended.go +++ b/notextended.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalNotExtended{} +var _ NotExtended = internalNotExtended{} + var ErrNotExtended error = NotExtendedWrap(errors.New("Not Extended")) type NotExtended interface { @@ -27,10 +30,6 @@ func (receiver internalNotExtended) Error() string { return receiver.err.Error() } -func (receiver internalNotExtended) Err() error { - return receiver.err -} - func (internalNotExtended) ErrHTTP() { // Nothing here. } diff --git a/notfound.go b/notfound.go index 50cfa96..003b699 100644 --- a/notfound.go +++ b/notfound.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalNotFound{} +var _ NotFound = internalNotFound{} + var ErrNotFound error = NotFoundWrap(errors.New("Not Found")) type NotFound interface { @@ -11,7 +14,7 @@ type NotFound interface { NotFound () } -type internalNotFound struct { +type internalNotFound struct { err error } @@ -25,10 +28,6 @@ func (receiver internalNotFound ) Error() string { return receiver.err.Error() } -func (receiver internalNotFound ) Err() error { - return receiver.err -} - func (internalNotFound ) ErrHTTP() { // Nothing here. } diff --git a/notfound_test.go b/notfound_test.go deleted file mode 100644 index aaada0c..0000000 --- a/notfound_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestNotFound(t *testing.T) { - - var x NotFound = internalNotFound{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/notimplemented.go b/notimplemented.go index 33780cf..4cbd9fc 100644 --- a/notimplemented.go +++ b/notimplemented.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalNotImplemented{} +var _ NotImplemented = internalNotImplemented{} + var ErrNotImplemented error = NotImplementedWrap(errors.New("Not Implemented")) type NotImplemented interface { @@ -27,10 +30,6 @@ func (receiver internalNotImplemented) Error() string { return receiver.err.Error() } -func (receiver internalNotImplemented) Err() error { - return receiver.err -} - func (internalNotImplemented) ErrHTTP() { // Nothing here. } diff --git a/payloadtoolarge.go b/payloadtoolarge.go index 208409b..2358af6 100644 --- a/payloadtoolarge.go +++ b/payloadtoolarge.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalPayloadTooLarge{} +var _ PayloadTooLarge = internalPayloadTooLarge{} + var ErrPayloadTooLarge error = PayloadTooLargeWrap(errors.New("Payload Too Large")) type PayloadTooLarge interface { @@ -25,10 +28,6 @@ func (receiver internalPayloadTooLarge) Error() string { return receiver.err.Error() } -func (receiver internalPayloadTooLarge) Err() error { - return receiver.err -} - func (internalPayloadTooLarge) ErrHTTP() { // Nothing here. } diff --git a/payloadtoolarge_test.go b/payloadtoolarge_test.go deleted file mode 100644 index 53ebb59..0000000 --- a/payloadtoolarge_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestPayloadTooLarge(t *testing.T) { - - var x PayloadTooLarge = internalPayloadTooLarge{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/paymentrequired.go b/paymentrequired.go index 56651fd..f59a85f 100644 --- a/paymentrequired.go +++ b/paymentrequired.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalPaymentRequired{} +var _ PaymentRequired = internalPaymentRequired{} + var ErrPaymentRequired error = PaymentRequiredWrap(errors.New("Payment Required")) type PaymentRequired interface { @@ -25,10 +28,6 @@ func (receiver internalPaymentRequired) Error() string { return receiver.err.Error() } -func (receiver internalPaymentRequired) Err() error { - return receiver.err -} - func (internalPaymentRequired) ErrHTTP() { // Nothing here. } diff --git a/paymentrequired_test.go b/paymentrequired_test.go deleted file mode 100644 index 544ddaa..0000000 --- a/paymentrequired_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestPaymentRequired(t *testing.T) { - - var x PaymentRequired = internalPaymentRequired{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/preconditionfailed.go b/preconditionfailed.go index 1f0a892..aaa9779 100644 --- a/preconditionfailed.go +++ b/preconditionfailed.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalPreconditionFailed{} +var _ PreconditionFailed = internalPreconditionFailed{} + var ErrPreconditionFailed error = PreconditionFailedWrap(errors.New("Precondition Failed")) type PreconditionFailed interface { @@ -25,10 +28,6 @@ func (receiver internalPreconditionFailed) Error() string { return receiver.err.Error() } -func (receiver internalPreconditionFailed) Err() error { - return receiver.err -} - func (internalPreconditionFailed) ErrHTTP() { // Nothing here. } diff --git a/preconditionfailed_test.go b/preconditionfailed_test.go deleted file mode 100644 index 623795f..0000000 --- a/preconditionfailed_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestPreconditionFailed(t *testing.T) { - - var x PreconditionFailed = internalPreconditionFailed{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/preconditionrequired.go b/preconditionrequired.go index 03b8e0d..53bf74a 100644 --- a/preconditionrequired.go +++ b/preconditionrequired.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalPreconditionRequired{} +var _ PreconditionRequired = internalPreconditionRequired{} + var ErrPreconditionRequired error = PreconditionRequiredWrap(errors.New("Precondition Required")) type PreconditionRequired interface { @@ -25,10 +28,6 @@ func (receiver internalPreconditionRequired) Error() string { return receiver.err.Error() } -func (receiver internalPreconditionRequired) Err() error { - return receiver.err -} - func (internalPreconditionRequired) ErrHTTP() { // Nothing here. } diff --git a/preconditionrequired_test.go b/preconditionrequired_test.go deleted file mode 100644 index b899a5a..0000000 --- a/preconditionrequired_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestPreconditionRequired(t *testing.T) { - - var x PreconditionRequired = internalPreconditionRequired{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/proxyauthrequired.go b/proxyauthrequired.go index a90137f..f4d062a 100644 --- a/proxyauthrequired.go +++ b/proxyauthrequired.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalProxyAuthRequired{} +var _ ProxyAuthRequired = internalProxyAuthRequired{} + var ErrProxyAuthRequired error = ProxyAuthRequiredWrap(errors.New("Proxy Auth Required")) type ProxyAuthRequired interface { @@ -25,10 +28,6 @@ func (receiver internalProxyAuthRequired) Error() string { return receiver.err.Error() } -func (receiver internalProxyAuthRequired) Err() error { - return receiver.err -} - func (internalProxyAuthRequired) ErrHTTP() { // Nothing here. } diff --git a/proxyauthrequired_test.go b/proxyauthrequired_test.go deleted file mode 100644 index 9ccf013..0000000 --- a/proxyauthrequired_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestProxyAuthRequired(t *testing.T) { - - var x ProxyAuthRequired = internalProxyAuthRequired{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/requestedrangenotsatisfiable.go b/requestedrangenotsatisfiable.go index 799b779..0f86ed7 100644 --- a/requestedrangenotsatisfiable.go +++ b/requestedrangenotsatisfiable.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalRequestedRangeNotSatisfiable{} +var _ RequestedRangeNotSatisfiable = internalRequestedRangeNotSatisfiable{} + var ErrRequestedRangeNotSatisfiable error = RequestedRangeNotSatisfiableWrap(errors.New("Requested Range Not Satisfiable")) type RequestedRangeNotSatisfiable interface { @@ -25,10 +28,6 @@ func (receiver internalRequestedRangeNotSatisfiable) Error() string { return receiver.err.Error() } -func (receiver internalRequestedRangeNotSatisfiable) Err() error { - return receiver.err -} - func (internalRequestedRangeNotSatisfiable) ErrHTTP() { // Nothing here. } diff --git a/requestedrangenotsatisfiable_test.go b/requestedrangenotsatisfiable_test.go deleted file mode 100644 index 05525b2..0000000 --- a/requestedrangenotsatisfiable_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestRequestedRangeNotSatisfiable(t *testing.T) { - - var x RequestedRangeNotSatisfiable = internalRequestedRangeNotSatisfiable{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/requestentitytoolarge.go b/requestentitytoolarge.go index 735330e..e602615 100644 --- a/requestentitytoolarge.go +++ b/requestentitytoolarge.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalRequestEntityTooLarge{} +var _ RequestEntityTooLarge = internalRequestEntityTooLarge{} + var ErrRequestEntityTooLarge error = RequestEntityTooLargeWrap(errors.New("Request Entity Too Large")) type RequestEntityTooLarge interface { @@ -25,10 +28,6 @@ func (receiver internalRequestEntityTooLarge) Error() string { return receiver.err.Error() } -func (receiver internalRequestEntityTooLarge) Err() error { - return receiver.err -} - func (internalRequestEntityTooLarge) ErrHTTP() { // Nothing here. } diff --git a/requestentitytoolarge_test.go b/requestentitytoolarge_test.go deleted file mode 100644 index 38b1013..0000000 --- a/requestentitytoolarge_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestRequestEntityTooLarge(t *testing.T) { - - var x RequestEntityTooLarge = internalRequestEntityTooLarge{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/requestheaderfieldstoolarge.go b/requestheaderfieldstoolarge.go index 9dd6d80..0838f64 100644 --- a/requestheaderfieldstoolarge.go +++ b/requestheaderfieldstoolarge.go @@ -4,11 +4,13 @@ import ( "errors" ) +var _ Error = internalRequestHeaderFieldsTooLarge{} +var _ RequestHeaderFieldsTooLarge = internalRequestHeaderFieldsTooLarge{} + var ErrRequestHeaderFieldsTooLarge error = RequestHeaderFieldsTooLargeWrap(errors.New("RequestHeaderFieldsTooLarge")) type RequestHeaderFieldsTooLarge interface { - error - Err() error + ClientError RequestHeaderFieldsTooLarge() } @@ -26,10 +28,6 @@ func (receiver internalRequestHeaderFieldsTooLarge) Error() string { return receiver.err.Error() } -func (receiver internalRequestHeaderFieldsTooLarge) Err() error { - return receiver.err -} - func (internalRequestHeaderFieldsTooLarge) ErrHTTP() { // Nothing here. } diff --git a/requestheaderfieldstoolarge_test.go b/requestheaderfieldstoolarge_test.go deleted file mode 100644 index 49e82af..0000000 --- a/requestheaderfieldstoolarge_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestRequestHeaderFieldsTooLarge(t *testing.T) { - - var x RequestHeaderFieldsTooLarge = internalRequestHeaderFieldsTooLarge{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/requesttimeout.go b/requesttimeout.go index 49912a2..44168e7 100644 --- a/requesttimeout.go +++ b/requesttimeout.go @@ -4,11 +4,13 @@ import ( "errors" ) +var _ Error = internalRequestTimeout{} +var _ RequestTimeout = internalRequestTimeout{} + var ErrRequestTimeout error = RequestTimeoutWrap(errors.New("Request Timeout")) type RequestTimeout interface { - error - Err() error + ClientError RequestTimeout() } @@ -26,10 +28,6 @@ func (receiver internalRequestTimeout) Error() string { return receiver.err.Error() } -func (receiver internalRequestTimeout) Err() error { - return receiver.err -} - func (internalRequestTimeout) ErrHTTP() { // Nothing here. } diff --git a/requesttimeout_test.go b/requesttimeout_test.go deleted file mode 100644 index a9629a9..0000000 --- a/requesttimeout_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestRequestTimeout(t *testing.T) { - - var x RequestTimeout = internalRequestTimeout{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/requesturitoolong.go b/requesturitoolong.go index a6ef238..e20b54c 100644 --- a/requesturitoolong.go +++ b/requesturitoolong.go @@ -4,11 +4,13 @@ import ( "errors" ) +var _ Error = internalRequestURITooLong{} +var _ RequestURITooLong = internalRequestURITooLong{} + var ErrRequestURITooLong error = RequestURITooLongWrap(errors.New("Request URI Too Long")) type RequestURITooLong interface { - error - Err() error + ClientError RequestURITooLong() } @@ -26,10 +28,6 @@ func (receiver internalRequestURITooLong) Error() string { return receiver.err.Error() } -func (receiver internalRequestURITooLong) Err() error { - return receiver.err -} - func (internalRequestURITooLong) ErrHTTP() { // Nothing here. } diff --git a/requesturitoolong_test.go b/requesturitoolong_test.go deleted file mode 100644 index b7ef868..0000000 --- a/requesturitoolong_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestRequestURITooLong(t *testing.T) { - - var x RequestURITooLong = internalRequestURITooLong{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/serviceunavailable.go b/serviceunavailable.go index 4645900..163c2a3 100644 --- a/serviceunavailable.go +++ b/serviceunavailable.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalServiceUnavailable{} +var _ ServiceUnavailable = internalServiceUnavailable{} + var ErrServiceUnavailable error = ServiceUnavailableWrap(errors.New("Service Unavailable")) type ServiceUnavailable interface { @@ -25,10 +28,6 @@ func (receiver internalServiceUnavailable) Error() string { return receiver.err.Error() } -func (receiver internalServiceUnavailable) Err() error { - return receiver.err -} - func (internalServiceUnavailable) ErrHTTP() { // Nothing here. } diff --git a/teapot.go b/teapot.go index 1ddcd19..5535dd0 100644 --- a/teapot.go +++ b/teapot.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalTeapot{} +var _ Teapot = internalTeapot{} + var ErrTeapot error = TeapotWrap(errors.New("I'm a teapot")) type Teapot interface { @@ -25,10 +28,6 @@ func (receiver internalTeapot) Error() string { return receiver.err.Error() } -func (receiver internalTeapot) Err() error { - return receiver.err -} - func (internalTeapot) ErrHTTP() { // Nothing here. } diff --git a/teapot_test.go b/teapot_test.go deleted file mode 100644 index bd5742e..0000000 --- a/teapot_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestTeapot(t *testing.T) { - - var x Teapot = internalTeapot{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/toomanyrequests.go b/toomanyrequests.go index 6d23323..d27dd68 100644 --- a/toomanyrequests.go +++ b/toomanyrequests.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalTooManyRequests{} +var _ TooManyRequests = internalTooManyRequests{} + var ErrTooManyRequests error = TooManyRequestsWrap(errors.New("Too Many Requests")) type TooManyRequests interface { @@ -25,10 +28,6 @@ func (receiver internalTooManyRequests) Error() string { return receiver.err.Error() } -func (receiver internalTooManyRequests) Err() error { - return receiver.err -} - func (internalTooManyRequests) ErrHTTP() { // Nothing here. } diff --git a/toomanyrequests_test.go b/toomanyrequests_test.go deleted file mode 100644 index 05e2576..0000000 --- a/toomanyrequests_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestTooManyRequests(t *testing.T) { - - var x TooManyRequests = internalTooManyRequests{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/unauthorized.go b/unauthorized.go index 77bc93c..b38a8c2 100644 --- a/unauthorized.go +++ b/unauthorized.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalUnauthorized{} +var _ Unauthorized = internalUnauthorized{} + var ErrUnauthorized error = UnauthorizedWrap(errors.New("Unauthorized")) type Unauthorized interface { @@ -25,10 +28,6 @@ func (receiver internalUnauthorized) Error() string { return receiver.err.Error() } -func (receiver internalUnauthorized) Err() error { - return receiver.err -} - func (internalUnauthorized) ErrHTTP() { // Nothing here. } diff --git a/unauthorized_test.go b/unauthorized_test.go deleted file mode 100644 index e4d2430..0000000 --- a/unauthorized_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestUnauthorized(t *testing.T) { - - var x Unauthorized = internalUnauthorized{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/unavailableforlegalreasons.go b/unavailableforlegalreasons.go index 172f209..6a86a90 100644 --- a/unavailableforlegalreasons.go +++ b/unavailableforlegalreasons.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalUnavailableForLegalReasons{} +var _ UnavailableForLegalReasons = internalUnavailableForLegalReasons{} + var ErrUnavailableForLegalReasons error = UnavailableForLegalReasonsWrap(errors.New("Unavailable For Legal Reasons")) type UnavailableForLegalReasons interface { @@ -25,10 +28,6 @@ func (receiver internalUnavailableForLegalReasons) Error() string { return receiver.err.Error() } -func (receiver internalUnavailableForLegalReasons) Err() error { - return receiver.err -} - func (internalUnavailableForLegalReasons) ErrHTTP() { // Nothing here. } diff --git a/unavailableforlegalreasons_test.go b/unavailableforlegalreasons_test.go deleted file mode 100644 index a9d156e..0000000 --- a/unavailableforlegalreasons_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestUnavailableForLegalReasons(t *testing.T) { - - var x UnavailableForLegalReasons = internalUnavailableForLegalReasons{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/unprocessableentity.go b/unprocessableentity.go index 4e1e02b..45e40cd 100644 --- a/unprocessableentity.go +++ b/unprocessableentity.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalUnprocessableEntity{} +var _ UnprocessableEntity = internalUnprocessableEntity{} + var ErrUnprocessableEntity error = UnprocessableEntityWrap(errors.New("Unprocessable Entity")) type UnprocessableEntity interface { @@ -25,10 +28,6 @@ func (receiver internalUnprocessableEntity) Error() string { return receiver.err.Error() } -func (receiver internalUnprocessableEntity) Err() error { - return receiver.err -} - func (internalUnprocessableEntity) ErrHTTP() { // Nothing here. } diff --git a/unprocessableentity_test.go b/unprocessableentity_test.go deleted file mode 100644 index a1c9023..0000000 --- a/unprocessableentity_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestUnprocessableEntity(t *testing.T) { - - var x UnprocessableEntity = internalUnprocessableEntity{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/unsupportedmediatype.go b/unsupportedmediatype.go index 528d058..37d4c57 100644 --- a/unsupportedmediatype.go +++ b/unsupportedmediatype.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalUnsupportedMediaType{} +var _ UnsupportedMediaType = internalUnsupportedMediaType{} + var ErrUnsupportedMediaType error = UnsupportedMediaTypeWrap(errors.New("Unsupported Media Type")) type UnsupportedMediaType interface { @@ -25,10 +28,6 @@ func (receiver internalUnsupportedMediaType) Error() string { return receiver.err.Error() } -func (receiver internalUnsupportedMediaType) Err() error { - return receiver.err -} - func (internalUnsupportedMediaType) ErrHTTP() { // Nothing here. } diff --git a/unsupportedmediatype_test.go b/unsupportedmediatype_test.go deleted file mode 100644 index ed870e2..0000000 --- a/unsupportedmediatype_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestUnsupportedMediaType(t *testing.T) { - - var x UnsupportedMediaType = internalUnsupportedMediaType{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/upgraderequired.go b/upgraderequired.go index d4b9f7e..9c03f74 100644 --- a/upgraderequired.go +++ b/upgraderequired.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalUpgradeRequired{} +var _ UpgradeRequired = internalUpgradeRequired{} + var ErrUpgradeRequired error = UpgradeRequiredWrap(errors.New("Upgrade Required")) type UpgradeRequired interface { @@ -25,10 +28,6 @@ func (receiver internalUpgradeRequired) Error() string { return receiver.err.Error() } -func (receiver internalUpgradeRequired) Err() error { - return receiver.err -} - func (internalUpgradeRequired) ErrHTTP() { // Nothing here. } diff --git a/upgraderequired_test.go b/upgraderequired_test.go deleted file mode 100644 index 6379794..0000000 --- a/upgraderequired_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestUpgradeRequired(t *testing.T) { - - var x UpgradeRequired = internalUpgradeRequired{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/uritoolong.go b/uritoolong.go index 6590b68..54e38e5 100644 --- a/uritoolong.go +++ b/uritoolong.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalURITooLong{} +var _ URITooLong = internalURITooLong{} + var ErrURITooLong error = URITooLongWrap(errors.New("URI Too Long")) type URITooLong interface { @@ -25,10 +28,6 @@ func (receiver internalURITooLong) Error() string { return receiver.err.Error() } -func (receiver internalURITooLong) Err() error { - return receiver.err -} - func (internalURITooLong) ErrHTTP() { // Nothing here. } diff --git a/uritoolong_test.go b/uritoolong_test.go deleted file mode 100644 index 4ccf14c..0000000 --- a/uritoolong_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package errhttp - -import ( - "testing" -) - -func TestURITooLong(t *testing.T) { - - var x URITooLong = internalURITooLong{} // THIS IS THE LINE THAT ACTUALLY MATTERS IN THIS TEST. - - if nil == x { - t.Errorf("This should not happen.") - } -} diff --git a/variantaisonegotiates.go b/variantaisonegotiates.go index 6863cbc..a329228 100644 --- a/variantaisonegotiates.go +++ b/variantaisonegotiates.go @@ -4,6 +4,9 @@ import ( "errors" ) +var _ Error = internalVariantAlsoNegotiates{} +var _ VariantAlsoNegotiates = internalVariantAlsoNegotiates{} + var ErrVariantAlsoNegotiates error = VariantAlsoNegotiatesWrap(errors.New("Variant Also Negotiates")) type VariantAlsoNegotiates interface { @@ -27,10 +30,6 @@ func (receiver internalVariantAlsoNegotiates) Error() string { return receiver.err.Error() } -func (receiver internalVariantAlsoNegotiates) Err() error { - return receiver.err -} - func (internalVariantAlsoNegotiates) ErrHTTP() { // Nothing here. }