go 1.18

Author: ungerik

calling/calling.go

@@ -8,7 +8,7 @@ import (
 type WithStringArgsFunc func(args ...string)
 type WithStringArgsErrorFunc func(args ...string) error
 
-func WithStringArgs(function interface{}) WithStringArgsFunc {
+func WithStringArgs(function any) WithStringArgsFunc {
 	v := reflect.ValueOf(function)
 	t := v.Type()
 	if t.Kind() != reflect.Func {
@@ -40,7 +40,7 @@ func WithStringArgs(function interface{}) WithStringArgsFunc {
 
 var typeOfError = reflect.TypeOf((*error)(nil)).Elem()
 
-func WithStringArgsError(function interface{}) WithStringArgsErrorFunc {
+func WithStringArgsError(function any) WithStringArgsErrorFunc {
 	v := reflect.ValueOf(function)
 	t := v.Type()
 	if t.Kind() != reflect.Func {

go.mod

@@ -1,3 +1,3 @@
 module github.com/ungerik/go-httpx
 
-go 1.17
+go 1.18

httperr/handler.go

@@ -13,6 +13,9 @@ type Handler interface {
 type HandlerFunc func(err error, writer http.ResponseWriter, request *http.Request) (handled bool)
 
 func (f HandlerFunc) HandleError(err error, writer http.ResponseWriter, request *http.Request) (handled bool) {
+	if err == nil {
+		return false
+	}
 	return f(err, writer, request)
 }
 
@@ -25,7 +28,7 @@ func Handle(err error, writer http.ResponseWriter, request *http.Request) (handl
 }
 
 // HandlePanic will call DefaultHandler.HandleError(AsError(recoverResult), writer, request)
-func HandlePanic(recoverResult interface{}, writer http.ResponseWriter, request *http.Request) (handled bool) {
+func HandlePanic(recoverResult any, writer http.ResponseWriter, request *http.Request) (handled bool) {
 	return Handle(AsError(recoverResult), writer, request)
 }
 
@@ -87,7 +90,7 @@ func WriteHandler(err error, writer http.ResponseWriter, request *http.Request)
 // If Logger is not nil, then it will be used to log an error message.
 // If DebugShowInternalErrorsInResponse is true, then the error message
 // will be shown in the response body, else only "Internal Server Error" will be used.
-func WriteInternalServerError(err interface{}, writer http.ResponseWriter) {
+func WriteInternalServerError(err any, writer http.ResponseWriter) {
 	message := http.StatusText(http.StatusInternalServerError)
 	if DebugShowInternalErrorsInResponse {
 		message += fmt.Sprintf(DebugShowInternalErrorsInResponseFormat, err)

httperr/json.go

@@ -12,7 +12,7 @@ import (
 // response body using the passed statusCode.
 // If err could not be marshalled as JSON, then an internal server error
 // will be written instead using WriteInternalServerError with a wrapped erorr message.
-func WriteAsJSON(err interface{}, statusCode int, writer http.ResponseWriter) {
+func WriteAsJSON(err any, statusCode int, writer http.ResponseWriter) {
 	body, e := json.MarshalIndent(err, "", "  ")
 	if e != nil {
 		e = fmt.Errorf("can't marshall error of type %T as JSON because: %w", err, e)
@@ -31,7 +31,7 @@ func WriteAsJSON(err interface{}, statusCode int, writer http.ResponseWriter) {
 // and the passed body marshalled as JSON.
 // Pass a json.RawMessage as body if the error
 // message is already in JSON format.
-func JSON(statusCode int, body interface{}) Response {
+func JSON(statusCode int, body any) Response {
 	return statusCodeAndJSON{
 		statusCode: statusCode,
 		body:       body,
@@ -40,7 +40,7 @@ func JSON(statusCode int, body interface{}) Response {
 
 type statusCodeAndJSON struct {
 	statusCode int
-	body       interface{}
+	body       any
 }
 
 func (e statusCodeAndJSON) Error() string {

httperr/response.go

@@ -25,7 +25,7 @@ func New(statusCode int, statusText ...string) Response {
 	}
 }
 
-func Errorf(statusCode int, format string, a ...interface{}) Response {
+func Errorf(statusCode int, format string, a ...any) Response {
 	return statusCodeAndText{
 		statusCode: statusCode,
 		statusText: fmt.Sprintf(format, a...),

httperr/wrap.go

@@ -43,7 +43,7 @@ func (e errDontLog) Unwrap() error {
 // AsError converts val to an error by either casting val to error if possible,
 // or using its string value or String method as error message,
 // or using fmt.Errorf("%+v", val) to format the value as error.
-func AsError(val interface{}) error {
+func AsError(val any) error {
 	switch x := val.(type) {
 	case nil:
 		return nil

logger.go

@@ -1,5 +1,5 @@
 package httpx
 
 type Logger interface {
-	Printf(format string, args ...interface{})
+	Printf(format string, args ...any)
 }

respond/json.go

@@ -8,7 +8,7 @@ import (
 	"github.com/ungerik/go-httpx/httperr"
 )
 
-type JSON func(http.ResponseWriter, *http.Request) (response interface{}, err error)
+type JSON func(http.ResponseWriter, *http.Request) (response any, err error)
 
 func (handlerFunc JSON) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
 	if CatchPanics {
@@ -25,7 +25,7 @@ func (handlerFunc JSON) ServeHTTP(writer http.ResponseWriter, request *http.Requ
 	WriteJSON(writer, response)
 }
 
-func WriteJSON(writer http.ResponseWriter, response interface{}) {
+func WriteJSON(writer http.ResponseWriter, response any) {
 	b, err := EncodeJSON(response)
 	if err != nil {
 		httperr.WriteInternalServerError(err, writer)
@@ -35,7 +35,7 @@ func WriteJSON(writer http.ResponseWriter, response interface{}) {
 	writer.Write(b) //#nosec G104
 }
 
-func EncodeJSON(response interface{}) ([]byte, error) {
+func EncodeJSON(response any) ([]byte, error) {
 	if PrettyPrint {
 		return json.MarshalIndent(response, "", PrettyPrintIndent)
 	}

respond/xml.go

@@ -8,7 +8,7 @@ import (
 	"github.com/ungerik/go-httpx/httperr"
 )
 
-type XML func(http.ResponseWriter, *http.Request) (response interface{}, err error)
+type XML func(http.ResponseWriter, *http.Request) (response any, err error)
 
 func (handlerFunc XML) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
 	if CatchPanics {
@@ -25,7 +25,7 @@ func (handlerFunc XML) ServeHTTP(writer http.ResponseWriter, request *http.Reque
 	WriteXML(writer, response)
 }
 
-func WriteXML(writer http.ResponseWriter, response interface{}) {
+func WriteXML(writer http.ResponseWriter, response any) {
 	b, err := EncodeXML(response)
 	if err != nil {
 		httperr.WriteInternalServerError(err, writer)
@@ -36,7 +36,7 @@ func WriteXML(writer http.ResponseWriter, response interface{}) {
 	writer.Write(b)                  //#nosec G104
 }
 
-func EncodeXML(response interface{}) ([]byte, error) {
+func EncodeXML(response any) ([]byte, error) {
 	if PrettyPrint {
 		return xml.MarshalIndent(response, "", PrettyPrintIndent)
 	}