Version 2 - Generics Support (#2)

* update to Go v1.18

* replace interface{} with any

Author: felix-kaestner

.devcontainer/Dockerfile

@@ -1,7 +1,7 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/go/.devcontainer/base.Dockerfile
 
-# [Choice] Go version (use -bullseye variants on local arm64/Apple Silicon): 1, 1.16, 1.17, 1-bullseye, 1.16-bullseye, 1.17-bullseye, 1-buster, 1.16-buster, 1.17-buster
-ARG VARIANT="1.17-bullseye"
+# [Choice] Go version (use -bullseye variants on local arm64/Apple Silicon): 1, 1.17, 1.18, 1-bullseye, 1.17-bullseye, 1.18-bullseye, 1-buster, 1.17-buster, 1.18-buster
+ARG VARIANT="1.18-bullseye"
 FROM mcr.microsoft.com/vscode/devcontainers/go:0-${VARIANT}
 
 # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10

.devcontainer/devcontainer.json

@@ -5,10 +5,10 @@
 	"build": {
 		"dockerfile": "Dockerfile",
 		"args": {
-			// Update the VARIANT arg to pick a version of Go: 1, 1.16, 1.17
+			// Update the VARIANT arg to pick a version of Go: 1, 1.17, 1.18
 			// Append -bullseye or -buster to pin to an OS version.
 			// Use -bullseye variants on local arm64/Apple Silicon.
-			"VARIANT": "1.17-bullseye",
+			"VARIANT": "1.18-bullseye",
 		}
 	},
 	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],

.github/workflows/main.yml

@@ -9,14 +9,14 @@ on:
 jobs:
 
   build:
-    name: Build
+    name: Build & Test
     runs-on: ubuntu-latest
     steps:
 
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
-        go-version: ^1.17
+        go-version: ^1.18
       id: go
 
     - name: Check out code into the Go module directory

app.go

@@ -23,7 +23,7 @@ func New(configure ...func(*Config)) (app *App) {
 	app = &App{
 		router: NewRouter(),
 		pool: sync.Pool{
-			New: func() interface{} {
+			New: func() any {
 				return &Context{App: app}
 			},
 		},

assert.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 )
 
-func isNil(i interface{}) bool {
+func isNil(i any) bool {
 	if i == nil {
 		return true
 	}
@@ -25,27 +25,27 @@ func isNil(i interface{}) bool {
 	return false
 }
 
-func assertNil(t *testing.T, actual interface{}) {
+func assertNil(t *testing.T, actual any) {
 	if !isNil(actual) {
 		t.Errorf("Test %s: Expected value to be nil, Received `%v` (type %v)", t.Name(), actual, reflect.TypeOf(actual))
 	}
 }
 
-func assertNotNil(t *testing.T, actual interface{}) {
+func assertNotNil(t *testing.T, actual any) {
 	if isNil(actual) {
 		t.Errorf("Test %s: Expected value to not be nil, Received `%v` (type %v)", t.Name(), actual, reflect.TypeOf(actual))
 	}
 }
 
-func assertEqual(t *testing.T, expected, actual interface{}) {
+func assertEqual(t *testing.T, expected, actual any) {
 	if (isNil(expected) && isNil(actual)) || reflect.DeepEqual(expected, actual) {
 		return
 	}
 
 	t.Errorf("Test %s: Expected `%v` (type %v), Received `%v` (type %v)", t.Name(), expected, reflect.TypeOf(expected), actual, reflect.TypeOf(actual))
 }
 
-func assertPanic(t *testing.T, expected interface{}, f func()) {
+func assertPanic(t *testing.T, expected any, f func()) {
 	defer func() {
 		if r := recover(); r == nil || r != expected {
 			t.Errorf("Test %s: Expected Panic `%v` (type %v), Received Panic `%v` (type %v)", t.Name(), expected, reflect.TypeOf(expected), r, reflect.TypeOf(r))

assert_test.go

@@ -8,7 +8,7 @@ import (
 func TestAssertNil(t *testing.T) {
 	assertNil(t, nil)
 
-	i := (*interface{})(nil)
+	i := (*any)(nil)
 	assertNil(t, i)
 
 	var s []int
@@ -41,7 +41,7 @@ func TestAssertNotNil(t *testing.T) {
 func TestAssertEqualNil(t *testing.T) {
 	assertEqual(t, nil, nil)
 
-	i := (*interface{})(nil)
+	i := (*any)(nil)
 	assertEqual(t, i, i)
 
 	var s []int

context.go

@@ -198,7 +198,7 @@ func (c *Context) Error(code int) (err error) {
 // Errorf dispatches a error response with custom message.
 // Use the method parameter `code` to set status code of the response.
 // Use the method parameter `message` to set the message of the response.
-func (c *Context) Errorf(code int, message interface{}) (err error) {
+func (c *Context) Errorf(code int, message any) (err error) {
 	msg := fmt.Sprintf("%v", message)
 	err = &RequestError{Code: code, Message: msg}
 	return
@@ -225,7 +225,7 @@ func (c *Context) NotFound() error {
 // Text dispatches a text response.
 // Use the method parameter `code` to set the header status code.
 // Use the method parameter `value` to supply the object to be serialized to text.
-func (c *Context) Text(code int, value interface{}) (err error) {
+func (c *Context) Text(code int, value any) (err error) {
 	c.SetHeader(HeaderContentType, MIMETextPlain)
 	c.WriteHeader(code)
 	_, err = fmt.Fprint(c.Response, value)
@@ -235,15 +235,15 @@ func (c *Context) Text(code int, value interface{}) (err error) {
 // Json dispatches a JSON response.
 // Use the method parameter `code` to set the header status code.
 // Use the method parameter `value` to supply the object to be serialized to JSON.
-func (c *Context) Json(code int, value interface{}) (err error) {
+func (c *Context) Json(code int, value any) (err error) {
 	c.SetHeader(HeaderContentType, MIMEApplicationJSON)
 	c.WriteHeader(code)
 	err = json.NewEncoder(c.Response).Encode(value)
 	return
 }
 
 // DecodeJSONBody decodes an object with a given interface from a JSON request body.
-func (c *Context) DecodeJSONBody(dst interface{}) error {
+func (c *Context) DecodeJSONBody(dst any) error {
 
 	// check that the the Content-Type header has the value application/json.
 	if mt, _, err := c.ParseMediaType(); err != nil || !strings.HasPrefix(mt, MIMEApplicationJSON) {

go.mod

@@ -1,3 +1,3 @@
 module github.com/felix-kaestner/lungo
 
-go 1.16
+go 1.18

lungo.go

@@ -181,8 +181,8 @@ const (
 )
 
 type (
-	// Map is a shorthand of type `map[string]interface{}`.
-	Map map[string]interface{}
+	// Map is a shorthand of type `map[string]any`.
+	Map map[string]any
 )
 
 // Common HTTP methods.

middleware/cors/cors_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/felix-kaestner/lungo"
 )
 
-func assertEqual(t *testing.T, expected, actual interface{}) {
+func assertEqual(t *testing.T, expected, actual any) {
 	if reflect.DeepEqual(expected, actual) {
 		return
 	}

middleware/logging/color.go

@@ -25,6 +25,6 @@ const (
 
 // Sprintf colorizes the provided string by wrapping
 // it inside an ANSI color escape sequence
-func (c ColorCode) Sprintf(a interface{}) string {
+func (c ColorCode) Sprintf(a any) string {
 	return fmt.Sprintf("\033[1;%dm%s\033[0m", c, a)
 }

middleware/logging/logging_test.go

@@ -15,7 +15,7 @@ import (
 
 const LogRegex = `^\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2} GET / ((\d*[.])?\d+)µs$`
 
-func assertEqual(t *testing.T, expected, actual interface{}) {
+func assertEqual(t *testing.T, expected, actual any) {
 	if reflect.DeepEqual(expected, actual) {
 		return
 	}

middleware/recover/config.go

@@ -6,7 +6,7 @@ type Config struct {
 	// the stack trace of the panic.
 	//
 	// Optional. Default: nil
-	HandleStackTrace func(e interface{})
+	HandleStackTrace func(e any)
 }
 
 // DefaultConfig contains the default value for the

middleware/recover/recover_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/felix-kaestner/lungo"
 )
 
-func assertEqual(t *testing.T, expected, actual interface{}) {
+func assertEqual(t *testing.T, expected, actual any) {
 	if reflect.DeepEqual(expected, actual) {
 		return
 	}
@@ -30,7 +30,7 @@ func TestRecover(t *testing.T) {
 		},
 		{
 			middleware: New(func(c *Config) {
-				c.HandleStackTrace = func(e interface{}) {
+				c.HandleStackTrace = func(e any) {
 					assertEqual(t, "Error", e)
 				}
 			}),

middleware/secure/secure_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/felix-kaestner/lungo"
 )
 
-func assertEqual(t *testing.T, expected, actual interface{}) {
+func assertEqual(t *testing.T, expected, actual any) {
 	if reflect.DeepEqual(expected, actual) {
 		return
 	}

middleware/template/template_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/felix-kaestner/lungo"
 )
 
-func assertEqual(t *testing.T, expected, actual interface{}) {
+func assertEqual(t *testing.T, expected, actual any) {
 	if reflect.DeepEqual(expected, actual) {
 		return
 	}