From 0bc7adf44226ad898f73b253eb5feb40f8d0bcee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Gill=C3=A9?= <philipp.gille@gmail.com>
Date: Sun, 26 Nov 2023 15:58:03 +0100
Subject: [PATCH 1/4] Replace interface{} with any

Introduced in Go 1.18
---
 README.md                                     | 10 ++---
 badgerdb/badgerdb.go                          |  4 +-
 badgerdb/badgerdb_test.go                     |  2 +-
 bbolt/bbolt.go                                |  4 +-
 bbolt/bbolt_test.go                           |  2 +-
 bigcache/bigcache.go                          |  4 +-
 bigcache/bigcache_test.go                     |  2 +-
 cockroachdb/cockroachdb_test.go               |  2 +-
 consul/consul.go                              |  4 +-
 consul/consul_test.go                         |  2 +-
 datastore/datastore.go                        |  4 +-
 datastore/datastore_test.go                   |  2 +-
 dynamodb/dynamodb.go                          |  4 +-
 dynamodb/dynamodb_test.go                     |  2 +-
 encoding/codec.go                             |  4 +-
 encoding/gob.go                               |  4 +-
 encoding/json.go                              |  4 +-
 encoding/proto/proto.go                       |  4 +-
 etcd/etcd.go                                  |  4 +-
 etcd/etcd_test.go                             |  5 +--
 .../tutorialpb/addressbook.pb.go              |  8 ++--
 file/file.go                                  |  4 +-
 file/file_test.go                             |  2 +-
 freecache/freecache.go                        |  4 +-
 freecache/freecache_test.go                   |  2 +-
 gomap/gomap.go                                |  4 +-
 gomap/gomap_test.go                           |  2 +-
 hazelcast/hazelcast.go                        |  4 +-
 hazelcast/hazelcast_test.go                   |  2 +-
 ignite/ignite.go                              |  4 +-
 ignite/ignite_test.go                         |  2 +-
 leveldb/leveldb.go                            |  4 +-
 leveldb/leveldb_test.go                       |  2 +-
 memcached/memcached.go                        |  4 +-
 memcached/memcached_test.go                   |  2 +-
 mongodb/mongodb.go                            |  4 +-
 mongodb/mongodb_test.go                       |  2 +-
 mysql/mysql.go                                |  4 +-
 mysql/mysql_test.go                           |  3 +-
 noop/noop.go                                  |  4 +-
 postgresql/postgresql_test.go                 |  2 +-
 redis/redis.go                                |  8 ++--
 redis/redis_test.go                           |  2 +-
 s3/s3.go                                      |  4 +-
 s3/s3_test.go                                 |  2 +-
 sql/sql.go                                    |  4 +-
 store.go                                      |  6 +--
 syncmap/syncmap.go                            |  4 +-
 syncmap/syncmap_test.go                       |  2 +-
 tablestorage/tablestorage.go                  |  6 +--
 tablestorage/tablestorage_test.go             |  2 +-
 tablestore/tablestore.go                      |  4 +-
 tablestore/tablestore_test.go                 |  2 +-
 test/test.go                                  | 38 +++++++++----------
 util/util.go                                  |  4 +-
 zookeeper/zookeeper.go                        |  4 +-
 zookeeper/zookeeper_test.go                   |  2 +-
 57 files changed, 117 insertions(+), 119 deletions(-)

diff --git a/README.md b/README.md
index 8f4fdb29..77b33747 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,8 @@ Features
 
 ```go
 type Store interface {
-    Set(k string, v interface{}) error
-    Get(k string, v interface{}) (found bool, err error)
+    Set(k string, v any) error
+    Get(k string, v any) (found bool, err error)
     Delete(k string) error
     Close() error
 }
@@ -103,7 +103,7 @@ For the Godoc of specific implementations, see <https://pkg.go.dev/github.com/ph
 
 ### Value types
 
-Most Go packages for key-value stores just accept a `[]byte` as value, which requires developers for example to marshal (and later unmarshal) their structs. `gokv` is meant to be simple and make developers' lifes easier, so it accepts any type (with using `interface{}` as parameter), including structs, and automatically (un-)marshals the value.
+Most Go packages for key-value stores just accept a `[]byte` as value, which requires developers for example to marshal (and later unmarshal) their structs. `gokv` is meant to be simple and make developers' lifes easier, so it accepts any type (with using `any` as parameter), including structs, and automatically (un-)marshals the value.
 
 The kind of (un-)marshalling is left to the implementation. All implementations in this repository currently support JSON and [gob](https://blog.golang.org/gobs-of-data) by using the `encoding` subpackage in this repository, which wraps the core functionality of the standard library's `encoding/json` and `encoding/gob` packages. See [Marshal formats](#marshal-formats) for details.
 
@@ -249,9 +249,9 @@ Project status
 
 Planned interface methods until `v1.0.0`:
 
-- `List(interface{}) error` / `GetAll(interface{}) error` or similar
+- `List(any) error` / `GetAll(any) error` or similar
 
-The interface might even change until `v1.0.0`. For example one consideration is to change `Get(string, interface{}) (bool, error)` to `Get(string, interface{}) error` (no boolean return value anymore), with the `error` being something like `gokv.ErrNotFound // "Key-value pair not found"` to fulfill the additional role of indicating that the key-value pair wasn't found. But at the moment we prefer the current method signature.
+The interface might even change until `v1.0.0`. For example one consideration is to change `Get(string, any) (bool, error)` to `Get(string, any) error` (no boolean return value anymore), with the `error` being something like `gokv.ErrNotFound // "Key-value pair not found"` to fulfill the additional role of indicating that the key-value pair wasn't found. But at the moment we prefer the current method signature.
 
 Also, more interfaces might be added. For example so that there's a `SimpleStore` and an `AdvancedStore`, with the first one containing only the basic methods and the latter one with advanced features such as key-value pair lifetimes (deletion of key-value pairs after a given time), notification of value changes via Go channels etc. But currently the focus is simplicity, see [Design decisions](#design-decisions).
 
diff --git a/badgerdb/badgerdb.go b/badgerdb/badgerdb.go
index 842f0e18..9715972f 100644
--- a/badgerdb/badgerdb.go
+++ b/badgerdb/badgerdb.go
@@ -16,7 +16,7 @@ type Store struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (s Store) Set(k string, v interface{}) error {
+func (s Store) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -42,7 +42,7 @@ func (s Store) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (s Store) Get(k string, v interface{}) (found bool, err error) {
+func (s Store) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/badgerdb/badgerdb_test.go b/badgerdb/badgerdb_test.go
index b5b68eb6..12a3407d 100644
--- a/badgerdb/badgerdb_test.go
+++ b/badgerdb/badgerdb_test.go
@@ -118,7 +118,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = store.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/bbolt/bbolt.go b/bbolt/bbolt.go
index 9500b63b..3a50c8c0 100644
--- a/bbolt/bbolt.go
+++ b/bbolt/bbolt.go
@@ -17,7 +17,7 @@ type Store struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (s Store) Set(k string, v interface{}) error {
+func (s Store) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -44,7 +44,7 @@ func (s Store) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (s Store) Get(k string, v interface{}) (found bool, err error) {
+func (s Store) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/bbolt/bbolt_test.go b/bbolt/bbolt_test.go
index b6dfa377..bfae7444 100644
--- a/bbolt/bbolt_test.go
+++ b/bbolt/bbolt_test.go
@@ -118,7 +118,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = store.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/bigcache/bigcache.go b/bigcache/bigcache.go
index 586e39a5..b5f332a7 100644
--- a/bigcache/bigcache.go
+++ b/bigcache/bigcache.go
@@ -18,7 +18,7 @@ type Store struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (s Store) Set(k string, v interface{}) error {
+func (s Store) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -37,7 +37,7 @@ func (s Store) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (s Store) Get(k string, v interface{}) (found bool, err error) {
+func (s Store) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/bigcache/bigcache_test.go b/bigcache/bigcache_test.go
index 5bc080db..84c95090 100644
--- a/bigcache/bigcache_test.go
+++ b/bigcache/bigcache_test.go
@@ -113,7 +113,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = store.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/cockroachdb/cockroachdb_test.go b/cockroachdb/cockroachdb_test.go
index 562081bd..f6942419 100644
--- a/cockroachdb/cockroachdb_test.go
+++ b/cockroachdb/cockroachdb_test.go
@@ -144,7 +144,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = client.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/consul/consul.go b/consul/consul.go
index 530cd48d..d99de5c4 100644
--- a/consul/consul.go
+++ b/consul/consul.go
@@ -17,7 +17,7 @@ type Client struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (c Client) Set(k string, v interface{}) error {
+func (c Client) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -49,7 +49,7 @@ func (c Client) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (c Client) Get(k string, v interface{}) (found bool, err error) {
+func (c Client) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/consul/consul_test.go b/consul/consul_test.go
index dbd5ec07..9d7b5ac8 100644
--- a/consul/consul_test.go
+++ b/consul/consul_test.go
@@ -140,7 +140,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = client.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/datastore/datastore.go b/datastore/datastore.go
index 114a396b..5c736ce3 100644
--- a/datastore/datastore.go
+++ b/datastore/datastore.go
@@ -34,7 +34,7 @@ type Client struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (c Client) Set(k string, v interface{}) error {
+func (c Client) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -65,7 +65,7 @@ func (c Client) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (c Client) Get(k string, v interface{}) (found bool, err error) {
+func (c Client) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/datastore/datastore_test.go b/datastore/datastore_test.go
index 613e5f8f..5e949d9f 100644
--- a/datastore/datastore_test.go
+++ b/datastore/datastore_test.go
@@ -151,7 +151,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = client.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/dynamodb/dynamodb.go b/dynamodb/dynamodb.go
index 65478d5a..b4e87366 100644
--- a/dynamodb/dynamodb.go
+++ b/dynamodb/dynamodb.go
@@ -31,7 +31,7 @@ type Client struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (c Client) Set(k string, v interface{}) error {
+func (c Client) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -66,7 +66,7 @@ func (c Client) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (c Client) Get(k string, v interface{}) (found bool, err error) {
+func (c Client) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/dynamodb/dynamodb_test.go b/dynamodb/dynamodb_test.go
index 721bf23b..104e9bbb 100644
--- a/dynamodb/dynamodb_test.go
+++ b/dynamodb/dynamodb_test.go
@@ -180,7 +180,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = client.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/encoding/codec.go b/encoding/codec.go
index 93a816c6..a28300eb 100644
--- a/encoding/codec.go
+++ b/encoding/codec.go
@@ -3,9 +3,9 @@ package encoding
 // Codec encodes/decodes Go values to/from slices of bytes.
 type Codec interface {
 	// Marshal encodes a Go value to a slice of bytes.
-	Marshal(v interface{}) ([]byte, error)
+	Marshal(v any) ([]byte, error)
 	// Unmarshal decodes a slice of bytes into a Go value.
-	Unmarshal(data []byte, v interface{}) error
+	Unmarshal(data []byte, v any) error
 }
 
 // Convenience variables
diff --git a/encoding/gob.go b/encoding/gob.go
index 1fa7afa0..fe124669 100644
--- a/encoding/gob.go
+++ b/encoding/gob.go
@@ -10,7 +10,7 @@ import (
 type GobCodec struct{}
 
 // Marshal encodes a Go value to gob.
-func (c GobCodec) Marshal(v interface{}) ([]byte, error) {
+func (c GobCodec) Marshal(v any) ([]byte, error) {
 	buffer := new(bytes.Buffer)
 	encoder := gob.NewEncoder(buffer)
 	err := encoder.Encode(v)
@@ -21,7 +21,7 @@ func (c GobCodec) Marshal(v interface{}) ([]byte, error) {
 }
 
 // Unmarshal decodes a gob value into a Go value.
-func (c GobCodec) Unmarshal(data []byte, v interface{}) error {
+func (c GobCodec) Unmarshal(data []byte, v any) error {
 	reader := bytes.NewReader(data)
 	decoder := gob.NewDecoder(reader)
 	return decoder.Decode(v)
diff --git a/encoding/json.go b/encoding/json.go
index a25baa67..4666e10e 100644
--- a/encoding/json.go
+++ b/encoding/json.go
@@ -9,11 +9,11 @@ import (
 type JSONcodec struct{}
 
 // Marshal encodes a Go value to JSON.
-func (c JSONcodec) Marshal(v interface{}) ([]byte, error) {
+func (c JSONcodec) Marshal(v any) ([]byte, error) {
 	return json.Marshal(v)
 }
 
 // Unmarshal decodes a JSON value into a Go value.
-func (c JSONcodec) Unmarshal(data []byte, v interface{}) error {
+func (c JSONcodec) Unmarshal(data []byte, v any) error {
 	return json.Unmarshal(data, v)
 }
diff --git a/encoding/proto/proto.go b/encoding/proto/proto.go
index f700053a..47eaca27 100644
--- a/encoding/proto/proto.go
+++ b/encoding/proto/proto.go
@@ -18,7 +18,7 @@ type PBcodec struct{}
 
 // Marshal encodes a proto message struct into the binary wire format.
 // Passed value can't be any Go value, but must be an object of a proto message struct.
-func (c PBcodec) Marshal(v interface{}) ([]byte, error) {
+func (c PBcodec) Marshal(v any) ([]byte, error) {
 	msg, ok := v.(proto.Message)
 	if !ok {
 		return nil, errors.New("error casting interface to proto")
@@ -28,7 +28,7 @@ func (c PBcodec) Marshal(v interface{}) ([]byte, error) {
 
 // Unmarshal parses a wire-format message in proto message struct.
 // Passed value can't be any Go value, but must be an object of a proto message struct.
-func (c PBcodec) Unmarshal(data []byte, v interface{}) error {
+func (c PBcodec) Unmarshal(data []byte, v any) error {
 	msg, ok := v.(proto.Message)
 	if !ok {
 		return errors.New("error casting interface to proto")
diff --git a/etcd/etcd.go b/etcd/etcd.go
index 7540e1ee..d37732da 100644
--- a/etcd/etcd.go
+++ b/etcd/etcd.go
@@ -23,7 +23,7 @@ type Client struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (c Client) Set(k string, v interface{}) error {
+func (c Client) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -50,7 +50,7 @@ func (c Client) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (c Client) Get(k string, v interface{}) (found bool, err error) {
+func (c Client) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/etcd/etcd_test.go b/etcd/etcd_test.go
index 774e4245..259c3804 100644
--- a/etcd/etcd_test.go
+++ b/etcd/etcd_test.go
@@ -6,11 +6,10 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/client/v3"
-
 	"github.com/philippgille/gokv/encoding"
 	"github.com/philippgille/gokv/etcd"
 	"github.com/philippgille/gokv/test"
+	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 // TestClient tests if reading from, writing to and deleting from the store works properly.
@@ -147,7 +146,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = client.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/examples/proto_encoding/tutorialpb/addressbook.pb.go b/examples/proto_encoding/tutorialpb/addressbook.pb.go
index eb7a1abf..a0b81c92 100644
--- a/examples/proto_encoding/tutorialpb/addressbook.pb.go
+++ b/examples/proto_encoding/tutorialpb/addressbook.pb.go
@@ -310,7 +310,7 @@ func file_addressbook_proto_rawDescGZIP() []byte {
 
 var file_addressbook_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_addressbook_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_addressbook_proto_goTypes = []interface{}{
+var file_addressbook_proto_goTypes = []any{
 	(Person_PhoneType)(0),         // 0: tutorial.Person.PhoneType
 	(*Person)(nil),                // 1: tutorial.Person
 	(*AddressBook)(nil),           // 2: tutorial.AddressBook
@@ -335,7 +335,7 @@ func file_addressbook_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_addressbook_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_addressbook_proto_msgTypes[0].Exporter = func(v any, i int) any {
 			switch v := v.(*Person); i {
 			case 0:
 				return &v.state
@@ -347,7 +347,7 @@ func file_addressbook_proto_init() {
 				return nil
 			}
 		}
-		file_addressbook_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_addressbook_proto_msgTypes[1].Exporter = func(v any, i int) any {
 			switch v := v.(*AddressBook); i {
 			case 0:
 				return &v.state
@@ -359,7 +359,7 @@ func file_addressbook_proto_init() {
 				return nil
 			}
 		}
-		file_addressbook_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_addressbook_proto_msgTypes[2].Exporter = func(v any, i int) any {
 			switch v := v.(*Person_PhoneNumber); i {
 			case 0:
 				return &v.state
diff --git a/file/file.go b/file/file.go
index e483ad41..86a1b0e3 100644
--- a/file/file.go
+++ b/file/file.go
@@ -28,7 +28,7 @@ type Store struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (s Store) Set(k string, v interface{}) error {
+func (s Store) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -61,7 +61,7 @@ func (s Store) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (s Store) Get(k string, v interface{}) (found bool, err error) {
+func (s Store) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/file/file_test.go b/file/file_test.go
index 918d5f36..99a4f4bf 100644
--- a/file/file_test.go
+++ b/file/file_test.go
@@ -117,7 +117,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = store.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/freecache/freecache.go b/freecache/freecache.go
index 44bf3806..05a9bd65 100644
--- a/freecache/freecache.go
+++ b/freecache/freecache.go
@@ -18,7 +18,7 @@ type Store struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (s Store) Set(k string, v interface{}) error {
+func (s Store) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -37,7 +37,7 @@ func (s Store) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (s Store) Get(k string, v interface{}) (found bool, err error) {
+func (s Store) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/freecache/freecache_test.go b/freecache/freecache_test.go
index c2b81113..319fac88 100644
--- a/freecache/freecache_test.go
+++ b/freecache/freecache_test.go
@@ -102,7 +102,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = store.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/gomap/gomap.go b/gomap/gomap.go
index 1a98323b..3fb78f85 100644
--- a/gomap/gomap.go
+++ b/gomap/gomap.go
@@ -17,7 +17,7 @@ type Store struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (s Store) Set(k string, v interface{}) error {
+func (s Store) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -39,7 +39,7 @@ func (s Store) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (s Store) Get(k string, v interface{}) (found bool, err error) {
+func (s Store) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/gomap/gomap_test.go b/gomap/gomap_test.go
index 07b1dc86..1a9f1160 100644
--- a/gomap/gomap_test.go
+++ b/gomap/gomap_test.go
@@ -104,7 +104,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = store.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/hazelcast/hazelcast.go b/hazelcast/hazelcast.go
index 8f2742ca..2cdbe14b 100644
--- a/hazelcast/hazelcast.go
+++ b/hazelcast/hazelcast.go
@@ -22,7 +22,7 @@ type Client struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (c Client) Set(k string, v interface{}) error {
+func (c Client) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -47,7 +47,7 @@ func (c Client) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (c Client) Get(k string, v interface{}) (found bool, err error) {
+func (c Client) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/hazelcast/hazelcast_test.go b/hazelcast/hazelcast_test.go
index 96a2222a..c313be81 100644
--- a/hazelcast/hazelcast_test.go
+++ b/hazelcast/hazelcast_test.go
@@ -138,7 +138,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = client.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/ignite/ignite.go b/ignite/ignite.go
index 1d12764f..c56772d5 100644
--- a/ignite/ignite.go
+++ b/ignite/ignite.go
@@ -21,7 +21,7 @@ type Client struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (c Client) Set(k string, v interface{}) error {
+func (c Client) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -41,7 +41,7 @@ func (c Client) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (c Client) Get(k string, v interface{}) (found bool, err error) {
+func (c Client) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/ignite/ignite_test.go b/ignite/ignite_test.go
index 4961c4d4..c4aca372 100644
--- a/ignite/ignite_test.go
+++ b/ignite/ignite_test.go
@@ -147,7 +147,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = client.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/leveldb/leveldb.go b/leveldb/leveldb.go
index 50a10f43..588c477d 100644
--- a/leveldb/leveldb.go
+++ b/leveldb/leveldb.go
@@ -18,7 +18,7 @@ type Store struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (s Store) Set(k string, v interface{}) error {
+func (s Store) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -44,7 +44,7 @@ func (s Store) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (s Store) Get(k string, v interface{}) (found bool, err error) {
+func (s Store) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/leveldb/leveldb_test.go b/leveldb/leveldb_test.go
index 798c7833..ebfdc2b8 100644
--- a/leveldb/leveldb_test.go
+++ b/leveldb/leveldb_test.go
@@ -118,7 +118,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = store.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/memcached/memcached.go b/memcached/memcached.go
index 9ffd212c..86ec03b8 100644
--- a/memcached/memcached.go
+++ b/memcached/memcached.go
@@ -21,7 +21,7 @@ type Client struct {
 // The key must not be longer than 250 bytes (this is a restriction of Memcached).
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (c Client) Set(k string, v interface{}) error {
+func (c Client) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -51,7 +51,7 @@ func (c Client) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (c Client) Get(k string, v interface{}) (found bool, err error) {
+func (c Client) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/memcached/memcached_test.go b/memcached/memcached_test.go
index e01cd547..74459122 100644
--- a/memcached/memcached_test.go
+++ b/memcached/memcached_test.go
@@ -139,7 +139,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = client.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/mongodb/mongodb.go b/mongodb/mongodb.go
index b211c93d..bcf663b9 100644
--- a/mongodb/mongodb.go
+++ b/mongodb/mongodb.go
@@ -50,7 +50,7 @@ type Client struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (c Client) Set(k string, v interface{}) error {
+func (c Client) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -81,7 +81,7 @@ func (c Client) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (c Client) Get(k string, v interface{}) (found bool, err error) {
+func (c Client) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/mongodb/mongodb_test.go b/mongodb/mongodb_test.go
index c39cc5d6..66eb4c7d 100644
--- a/mongodb/mongodb_test.go
+++ b/mongodb/mongodb_test.go
@@ -154,7 +154,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = client.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/mysql/mysql.go b/mysql/mysql.go
index 465733f3..babdb327 100644
--- a/mysql/mysql.go
+++ b/mysql/mysql.go
@@ -28,7 +28,7 @@ type Client struct {
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The length of the key must not exceed 255 characters.
 // The key must not be "" and the value must not be nil.
-func (c Client) Set(k string, v interface{}) error {
+func (c Client) Set(k string, v any) error {
 	// It's tempting to remove this "wrapper" method
 	// and just use *sql.Client as embedded field,
 	// But we need this explicit method for a different GoDoc
@@ -43,7 +43,7 @@ func (c Client) Set(k string, v interface{}) error {
 // If no value is found it returns (false, nil).
 // The length of the key must not exceed 255 characters.
 // The key must not be "" and the pointer must not be nil.
-func (c Client) Get(k string, v interface{}) (found bool, err error) {
+func (c Client) Get(k string, v any) (found bool, err error) {
 	// It's tempting to remove this "wrapper" method
 	// and just use *sql.Client as embedded field,
 	// But we need this explicit method for a different GoDoc
diff --git a/mysql/mysql_test.go b/mysql/mysql_test.go
index 1c67139d..875d1397 100644
--- a/mysql/mysql_test.go
+++ b/mysql/mysql_test.go
@@ -146,7 +146,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = client.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
@@ -214,7 +214,6 @@ func TestClose(t *testing.T) {
 	}
 }
 
-//
 // Note: This test is only executed if the initial connection to MySQL works.
 func TestDefaultMaxOpenConnections(t *testing.T) {
 	if !checkConnection() {
diff --git a/noop/noop.go b/noop/noop.go
index fa84d41b..8f07ef25 100644
--- a/noop/noop.go
+++ b/noop/noop.go
@@ -6,7 +6,7 @@ import "github.com/philippgille/gokv/util"
 type Store struct{}
 
 // Set pretends if stores the key. Always return nil error unless the key or value are invalid.
-func (s Store) Set(k string, v interface{}) error {
+func (s Store) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -15,7 +15,7 @@ func (s Store) Set(k string, v interface{}) error {
 }
 
 // Get pretends it fetches the key. Always return not found and nil error unless the key or value are invalid.
-func (s Store) Get(k string, v interface{}) (found bool, err error) {
+func (s Store) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/postgresql/postgresql_test.go b/postgresql/postgresql_test.go
index fbe9a681..46a829a8 100644
--- a/postgresql/postgresql_test.go
+++ b/postgresql/postgresql_test.go
@@ -155,7 +155,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = client.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/redis/redis.go b/redis/redis.go
index 2bcfbca0..e1126041 100644
--- a/redis/redis.go
+++ b/redis/redis.go
@@ -22,14 +22,14 @@ type Client struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (c Client) Set(k string, v interface{}) error {
+func (c Client) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
 
 	// First turn the passed object into something that Redis can handle
-	// (the Set method takes an interface{}, but the Get method only returns a string,
-	// so it can be assumed that the interface{} parameter type is only for convenience
+	// (the Set method takes an any, but the Get method only returns a string,
+	// so it can be assumed that the any parameter type is only for convenience
 	// for a couple of builtin types like int etc.).
 	data, err := c.codec.Marshal(v)
 	if err != nil {
@@ -52,7 +52,7 @@ func (c Client) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (c Client) Get(k string, v interface{}) (found bool, err error) {
+func (c Client) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/redis/redis_test.go b/redis/redis_test.go
index 8193e256..197128da 100644
--- a/redis/redis_test.go
+++ b/redis/redis_test.go
@@ -150,7 +150,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = client.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/s3/s3.go b/s3/s3.go
index c8c2376e..b0478f77 100644
--- a/s3/s3.go
+++ b/s3/s3.go
@@ -25,7 +25,7 @@ type Client struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (c Client) Set(k string, v interface{}) error {
+func (c Client) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -55,7 +55,7 @@ func (c Client) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (c Client) Get(k string, v interface{}) (found bool, err error) {
+func (c Client) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/s3/s3_test.go b/s3/s3_test.go
index 459fe358..2f06c255 100644
--- a/s3/s3_test.go
+++ b/s3/s3_test.go
@@ -182,7 +182,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = client.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/sql/sql.go b/sql/sql.go
index bf285df6..bee440eb 100644
--- a/sql/sql.go
+++ b/sql/sql.go
@@ -19,7 +19,7 @@ type Client struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (c Client) Set(k string, v interface{}) error {
+func (c Client) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -44,7 +44,7 @@ func (c Client) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (c Client) Get(k string, v interface{}) (found bool, err error) {
+func (c Client) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/store.go b/store.go
index 22ac087c..5b720465 100644
--- a/store.go
+++ b/store.go
@@ -2,13 +2,13 @@ package gokv
 
 // Store is an abstraction for different key-value store implementations.
 // A store must be able to store, retrieve and delete key-value pairs,
-// with the key being a string and the value being any Go interface{}.
+// with the key being a string and the value being any Go any.
 type Store interface {
 	// Set stores the given value for the given key.
 	// The implementation automatically marshalls the value.
 	// The marshalling format depends on the implementation. It can be JSON, gob etc.
 	// The key must not be "" and the value must not be nil.
-	Set(k string, v interface{}) error
+	Set(k string, v any) error
 	// Get retrieves the value for the given key.
 	// The implementation automatically unmarshalls the value.
 	// The unmarshalling source depends on the implementation. It can be JSON, gob etc.
@@ -18,7 +18,7 @@ type Store interface {
 	// that the passed pointer points to with the values of the retrieved object's values.
 	// If no value is found it returns (false, nil).
 	// The key must not be "" and the pointer must not be nil.
-	Get(k string, v interface{}) (found bool, err error)
+	Get(k string, v any) (found bool, err error)
 	// Delete deletes the stored value for the given key.
 	// Deleting a non-existing key-value pair does NOT lead to an error.
 	// The key must not be "".
diff --git a/syncmap/syncmap.go b/syncmap/syncmap.go
index e01de47f..a366455b 100644
--- a/syncmap/syncmap.go
+++ b/syncmap/syncmap.go
@@ -16,7 +16,7 @@ type Store struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (s Store) Set(k string, v interface{}) error {
+func (s Store) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -36,7 +36,7 @@ func (s Store) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (s Store) Get(k string, v interface{}) (found bool, err error) {
+func (s Store) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/syncmap/syncmap_test.go b/syncmap/syncmap_test.go
index ffb6fa36..c95adc5f 100644
--- a/syncmap/syncmap_test.go
+++ b/syncmap/syncmap_test.go
@@ -103,7 +103,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = store.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/tablestorage/tablestorage.go b/tablestorage/tablestorage.go
index 48eac544..81956025 100644
--- a/tablestorage/tablestorage.go
+++ b/tablestorage/tablestorage.go
@@ -33,7 +33,7 @@ type Client struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (c Client) Set(k string, v interface{}) error {
+func (c Client) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -46,7 +46,7 @@ func (c Client) Set(k string, v interface{}) error {
 
 	partitionKey := c.partitionKeySupplier(k)
 	entity := c.c.GetEntityReference(partitionKey, k)
-	valMap := make(map[string]interface{})
+	valMap := make(map[string]any)
 	valMap[valAttrName] = data
 	entity.Properties = valMap
 	entityOptions := storage.EntityOptions{
@@ -65,7 +65,7 @@ func (c Client) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (c Client) Get(k string, v interface{}) (found bool, err error) {
+func (c Client) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/tablestorage/tablestorage_test.go b/tablestorage/tablestorage_test.go
index 6d5f63f8..8682f2e5 100644
--- a/tablestorage/tablestorage_test.go
+++ b/tablestorage/tablestorage_test.go
@@ -151,7 +151,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = client.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/tablestore/tablestore.go b/tablestore/tablestore.go
index 779eaf93..7925a36b 100644
--- a/tablestore/tablestore.go
+++ b/tablestore/tablestore.go
@@ -23,7 +23,7 @@ type Client struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (c Client) Set(k string, v interface{}) error {
+func (c Client) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -62,7 +62,7 @@ func (c Client) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (c Client) Get(k string, v interface{}) (found bool, err error) {
+func (c Client) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/tablestore/tablestore_test.go b/tablestore/tablestore_test.go
index 027b2a3b..f311eec6 100644
--- a/tablestore/tablestore_test.go
+++ b/tablestore/tablestore_test.go
@@ -143,7 +143,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = client.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")
diff --git a/test/test.go b/test/test.go
index 3d4f03d0..43af018b 100644
--- a/test/test.go
+++ b/test/test.go
@@ -134,11 +134,11 @@ func TestTypes(store gokv.Store, t *testing.T) {
 
 	testVals := []struct {
 		subTestName string
-		val         interface{}
-		expected    interface{}
-		testGet     func(*testing.T, gokv.Store, string, interface{})
+		val         any
+		expected    any
+		testGet     func(*testing.T, gokv.Store, string, any)
 	}{
-		{"bool", boolVar, boolVar, func(t *testing.T, store gokv.Store, key string, expected interface{}) {
+		{"bool", boolVar, boolVar, func(t *testing.T, store gokv.Store, key string, expected any) {
 			actualPtr := new(bool)
 			found, err := store.Get(key, actualPtr)
 			handleGetError(t, err, found)
@@ -147,7 +147,7 @@ func TestTypes(store gokv.Store, t *testing.T) {
 				t.Errorf("Expected: %v, but was: %v", expected, actual)
 			}
 		}},
-		{"float", floatVar, floatVar, func(t *testing.T, store gokv.Store, key string, expected interface{}) {
+		{"float", floatVar, floatVar, func(t *testing.T, store gokv.Store, key string, expected any) {
 			actualPtr := new(float64)
 			found, err := store.Get(key, actualPtr)
 			handleGetError(t, err, found)
@@ -156,7 +156,7 @@ func TestTypes(store gokv.Store, t *testing.T) {
 				t.Errorf("Expected: %v, but was: %v", expected, actual)
 			}
 		}},
-		{"int", intVar, intVar, func(t *testing.T, store gokv.Store, key string, expected interface{}) {
+		{"int", intVar, intVar, func(t *testing.T, store gokv.Store, key string, expected any) {
 			actualPtr := new(int)
 			found, err := store.Get(key, actualPtr)
 			handleGetError(t, err, found)
@@ -165,7 +165,7 @@ func TestTypes(store gokv.Store, t *testing.T) {
 				t.Errorf("Expected: %v, but was: %v", expected, actual)
 			}
 		}},
-		{"rune", runeVar, runeVar, func(t *testing.T, store gokv.Store, key string, expected interface{}) {
+		{"rune", runeVar, runeVar, func(t *testing.T, store gokv.Store, key string, expected any) {
 			actualPtr := new(rune)
 			found, err := store.Get(key, actualPtr)
 			handleGetError(t, err, found)
@@ -174,7 +174,7 @@ func TestTypes(store gokv.Store, t *testing.T) {
 				t.Errorf("Expected: %v, but was: %v", expected, actual)
 			}
 		}},
-		{"string", stringVar, stringVar, func(t *testing.T, store gokv.Store, key string, expected interface{}) {
+		{"string", stringVar, stringVar, func(t *testing.T, store gokv.Store, key string, expected any) {
 			actualPtr := new(string)
 			found, err := store.Get(key, actualPtr)
 			handleGetError(t, err, found)
@@ -183,7 +183,7 @@ func TestTypes(store gokv.Store, t *testing.T) {
 				t.Errorf("Expected: %v, but was: %v", expected, actual)
 			}
 		}},
-		{"struct", structVar, structVar, func(t *testing.T, store gokv.Store, key string, expected interface{}) {
+		{"struct", structVar, structVar, func(t *testing.T, store gokv.Store, key string, expected any) {
 			actualPtr := new(Foo)
 			found, err := store.Get(key, actualPtr)
 			handleGetError(t, err, found)
@@ -192,7 +192,7 @@ func TestTypes(store gokv.Store, t *testing.T) {
 				t.Errorf("Expected: %v, but was: %v", expected, actual)
 			}
 		}},
-		{"struct with private field", structWithPrivateFieldVar, structWithPrivateFieldExpectedVar, func(t *testing.T, store gokv.Store, key string, expected interface{}) {
+		{"struct with private field", structWithPrivateFieldVar, structWithPrivateFieldExpectedVar, func(t *testing.T, store gokv.Store, key string, expected any) {
 			actualPtr := new(Foo)
 			found, err := store.Get(key, actualPtr)
 			handleGetError(t, err, found)
@@ -201,7 +201,7 @@ func TestTypes(store gokv.Store, t *testing.T) {
 				t.Errorf("Expected: %v, but was: %v", expected, actual)
 			}
 		}},
-		{"private struct", privateStructVar, privateStructVar, func(t *testing.T, store gokv.Store, key string, expected interface{}) {
+		{"private struct", privateStructVar, privateStructVar, func(t *testing.T, store gokv.Store, key string, expected any) {
 			actualPtr := new(privateFoo)
 			found, err := store.Get(key, actualPtr)
 			handleGetError(t, err, found)
@@ -210,7 +210,7 @@ func TestTypes(store gokv.Store, t *testing.T) {
 				t.Errorf("Expected: %v, but was: %v", expected, actual)
 			}
 		}},
-		{"private struct with private field", privateStructWithPrivateFieldVar, privateStructWithPrivateFieldExpectedVar, func(t *testing.T, store gokv.Store, key string, expected interface{}) {
+		{"private struct with private field", privateStructWithPrivateFieldVar, privateStructWithPrivateFieldExpectedVar, func(t *testing.T, store gokv.Store, key string, expected any) {
 			actualPtr := new(privateFoo)
 			found, err := store.Get(key, actualPtr)
 			handleGetError(t, err, found)
@@ -219,7 +219,7 @@ func TestTypes(store gokv.Store, t *testing.T) {
 				t.Errorf("Expected: %v, but was: %v", expected, actual)
 			}
 		}},
-		{"slice of bool", sliceOfBool, sliceOfBool, func(t *testing.T, store gokv.Store, key string, expected interface{}) {
+		{"slice of bool", sliceOfBool, sliceOfBool, func(t *testing.T, store gokv.Store, key string, expected any) {
 			actualPtr := new([]bool)
 			found, err := store.Get(key, actualPtr)
 			handleGetError(t, err, found)
@@ -228,7 +228,7 @@ func TestTypes(store gokv.Store, t *testing.T) {
 				t.Error(diff)
 			}
 		}},
-		{"slice of byte", sliceOfByte, sliceOfByte, func(t *testing.T, store gokv.Store, key string, expected interface{}) {
+		{"slice of byte", sliceOfByte, sliceOfByte, func(t *testing.T, store gokv.Store, key string, expected any) {
 			actualPtr := new([]byte)
 			found, err := store.Get(key, actualPtr)
 			handleGetError(t, err, found)
@@ -237,7 +237,7 @@ func TestTypes(store gokv.Store, t *testing.T) {
 				t.Error(diff)
 			}
 		}},
-		{"slice of int", sliceOfInt, sliceOfInt, func(t *testing.T, store gokv.Store, key string, expected interface{}) {
+		{"slice of int", sliceOfInt, sliceOfInt, func(t *testing.T, store gokv.Store, key string, expected any) {
 			actualPtr := new([]int)
 			found, err := store.Get(key, actualPtr)
 			handleGetError(t, err, found)
@@ -246,7 +246,7 @@ func TestTypes(store gokv.Store, t *testing.T) {
 				t.Error(diff)
 			}
 		}},
-		{"slice of string", sliceOfString, sliceOfString, func(t *testing.T, store gokv.Store, key string, expected interface{}) {
+		{"slice of string", sliceOfString, sliceOfString, func(t *testing.T, store gokv.Store, key string, expected any) {
 			actualPtr := new([]string)
 			found, err := store.Get(key, actualPtr)
 			handleGetError(t, err, found)
@@ -255,7 +255,7 @@ func TestTypes(store gokv.Store, t *testing.T) {
 				t.Error(diff)
 			}
 		}},
-		{"slice of slice of string", sliceOfSliceOfString, sliceOfSliceOfString, func(t *testing.T, store gokv.Store, key string, expected interface{}) {
+		{"slice of slice of string", sliceOfSliceOfString, sliceOfSliceOfString, func(t *testing.T, store gokv.Store, key string, expected any) {
 			actualPtr := new([][]string)
 			found, err := store.Get(key, actualPtr)
 			handleGetError(t, err, found)
@@ -264,7 +264,7 @@ func TestTypes(store gokv.Store, t *testing.T) {
 				t.Error(diff)
 			}
 		}},
-		{"slice of struct", sliceOfStruct, sliceOfStruct, func(t *testing.T, store gokv.Store, key string, expected interface{}) {
+		{"slice of struct", sliceOfStruct, sliceOfStruct, func(t *testing.T, store gokv.Store, key string, expected any) {
 			actualPtr := new([]Foo)
 			found, err := store.Get(key, actualPtr)
 			handleGetError(t, err, found)
@@ -273,7 +273,7 @@ func TestTypes(store gokv.Store, t *testing.T) {
 				t.Error(diff)
 			}
 		}},
-		{"slice of private struct", sliceOfPrivateStruct, sliceOfPrivateStruct, func(t *testing.T, store gokv.Store, key string, expected interface{}) {
+		{"slice of private struct", sliceOfPrivateStruct, sliceOfPrivateStruct, func(t *testing.T, store gokv.Store, key string, expected any) {
 			actualPtr := new([]privateFoo)
 			found, err := store.Get(key, actualPtr)
 			handleGetError(t, err, found)
diff --git a/util/util.go b/util/util.go
index d4f4856f..6b553e6a 100644
--- a/util/util.go
+++ b/util/util.go
@@ -5,7 +5,7 @@ import (
 )
 
 // CheckKeyAndValue returns an error if k == "" or if v == nil
-func CheckKeyAndValue(k string, v interface{}) error {
+func CheckKeyAndValue(k string, v any) error {
 	if err := CheckKey(k); err != nil {
 		return err
 	}
@@ -21,7 +21,7 @@ func CheckKey(k string) error {
 }
 
 // CheckVal returns an error if v == nil
-func CheckVal(v interface{}) error {
+func CheckVal(v any) error {
 	if v == nil {
 		return errors.New("The passed value is nil, which is not allowed")
 	}
diff --git a/zookeeper/zookeeper.go b/zookeeper/zookeeper.go
index 61c0684c..b41e4ee8 100644
--- a/zookeeper/zookeeper.go
+++ b/zookeeper/zookeeper.go
@@ -21,7 +21,7 @@ type Client struct {
 // Set stores the given value for the given key.
 // Values are automatically marshalled to JSON or gob (depending on the configuration).
 // The key must not be "" and the value must not be nil.
-func (c Client) Set(k string, v interface{}) error {
+func (c Client) Set(k string, v any) error {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return err
 	}
@@ -49,7 +49,7 @@ func (c Client) Set(k string, v interface{}) error {
 // that v points to with the values of the retrieved object's values.
 // If no value is found it returns (false, nil).
 // The key must not be "" and the pointer must not be nil.
-func (c Client) Get(k string, v interface{}) (found bool, err error) {
+func (c Client) Get(k string, v any) (found bool, err error) {
 	if err := util.CheckKeyAndValue(k, v); err != nil {
 		return false, err
 	}
diff --git a/zookeeper/zookeeper_test.go b/zookeeper/zookeeper_test.go
index 9fded8a2..7ddbcd61 100644
--- a/zookeeper/zookeeper_test.go
+++ b/zookeeper/zookeeper_test.go
@@ -156,7 +156,7 @@ func TestNil(t *testing.T) {
 				t.Error("An error was expected")
 			}
 
-			var i interface{} // actually nil
+			var i any // actually nil
 			_, err = client.Get("foo", i)
 			if err == nil {
 				t.Error("An error was expected")

From 62045e0df42fc68eb838000ce7b24ae34fd75fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Gill=C3=A9?= <philipp.gille@gmail.com>
Date: Sun, 26 Nov 2023 18:15:47 +0100
Subject: [PATCH 2/4] Mention interface{} where appropriate

---
 README.md      | 2 +-
 redis/redis.go | 4 ++--
 store.go       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 77b33747..bc85396f 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ For the Godoc of specific implementations, see <https://pkg.go.dev/github.com/ph
 
 ### Value types
 
-Most Go packages for key-value stores just accept a `[]byte` as value, which requires developers for example to marshal (and later unmarshal) their structs. `gokv` is meant to be simple and make developers' lifes easier, so it accepts any type (with using `any` as parameter), including structs, and automatically (un-)marshals the value.
+Most Go packages for key-value stores just accept a `[]byte` as value, which requires developers for example to marshal (and later unmarshal) their structs. `gokv` is meant to be simple and make developers' lifes easier, so it accepts any type (with using `any`/`interface{}` as parameter), including structs, and automatically (un-)marshals the value.
 
 The kind of (un-)marshalling is left to the implementation. All implementations in this repository currently support JSON and [gob](https://blog.golang.org/gobs-of-data) by using the `encoding` subpackage in this repository, which wraps the core functionality of the standard library's `encoding/json` and `encoding/gob` packages. See [Marshal formats](#marshal-formats) for details.
 
diff --git a/redis/redis.go b/redis/redis.go
index e1126041..5ec6ad63 100644
--- a/redis/redis.go
+++ b/redis/redis.go
@@ -28,8 +28,8 @@ func (c Client) Set(k string, v any) error {
 	}
 
 	// First turn the passed object into something that Redis can handle
-	// (the Set method takes an any, but the Get method only returns a string,
-	// so it can be assumed that the any parameter type is only for convenience
+	// (the Set method takes an interface{}, but the Get method only returns a string,
+	// so it can be assumed that the interface{} parameter type is only for convenience
 	// for a couple of builtin types like int etc.).
 	data, err := c.codec.Marshal(v)
 	if err != nil {
diff --git a/store.go b/store.go
index 5b720465..ebd24232 100644
--- a/store.go
+++ b/store.go
@@ -2,7 +2,7 @@ package gokv
 
 // Store is an abstraction for different key-value store implementations.
 // A store must be able to store, retrieve and delete key-value pairs,
-// with the key being a string and the value being any Go any.
+// with the key being a string and the value being any Go interface{}.
 type Store interface {
 	// Set stores the given value for the given key.
 	// The implementation automatically marshalls the value.

From 080db3eeab6ceddc07c8f0b25c8948ac29ada7b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Gill=C3=A9?= <philipp.gille@gmail.com>
Date: Sun, 26 Nov 2023 18:19:07 +0100
Subject: [PATCH 3/4] Revert interface{} replacement in generated file

---
 examples/proto_encoding/tutorialpb/addressbook.pb.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/proto_encoding/tutorialpb/addressbook.pb.go b/examples/proto_encoding/tutorialpb/addressbook.pb.go
index a0b81c92..eb7a1abf 100644
--- a/examples/proto_encoding/tutorialpb/addressbook.pb.go
+++ b/examples/proto_encoding/tutorialpb/addressbook.pb.go
@@ -310,7 +310,7 @@ func file_addressbook_proto_rawDescGZIP() []byte {
 
 var file_addressbook_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_addressbook_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_addressbook_proto_goTypes = []any{
+var file_addressbook_proto_goTypes = []interface{}{
 	(Person_PhoneType)(0),         // 0: tutorial.Person.PhoneType
 	(*Person)(nil),                // 1: tutorial.Person
 	(*AddressBook)(nil),           // 2: tutorial.AddressBook
@@ -335,7 +335,7 @@ func file_addressbook_proto_init() {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_addressbook_proto_msgTypes[0].Exporter = func(v any, i int) any {
+		file_addressbook_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Person); i {
 			case 0:
 				return &v.state
@@ -347,7 +347,7 @@ func file_addressbook_proto_init() {
 				return nil
 			}
 		}
-		file_addressbook_proto_msgTypes[1].Exporter = func(v any, i int) any {
+		file_addressbook_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AddressBook); i {
 			case 0:
 				return &v.state
@@ -359,7 +359,7 @@ func file_addressbook_proto_init() {
 				return nil
 			}
 		}
-		file_addressbook_proto_msgTypes[2].Exporter = func(v any, i int) any {
+		file_addressbook_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Person_PhoneNumber); i {
 			case 0:
 				return &v.state

From 822e5c5279cd5cfabed1ea7b2ed6b1733638c18b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Gill=C3=A9?= <philipp.gille@gmail.com>
Date: Sun, 26 Nov 2023 18:32:40 +0100
Subject: [PATCH 4/4] Revert import grouping change

---
 etcd/etcd_test.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etcd/etcd_test.go b/etcd/etcd_test.go
index 259c3804..a07c232a 100644
--- a/etcd/etcd_test.go
+++ b/etcd/etcd_test.go
@@ -6,10 +6,11 @@ import (
 	"testing"
 	"time"
 
+	clientv3 "go.etcd.io/etcd/client/v3"
+
 	"github.com/philippgille/gokv/encoding"
 	"github.com/philippgille/gokv/etcd"
 	"github.com/philippgille/gokv/test"
-	clientv3 "go.etcd.io/etcd/client/v3"
 )
 
 // TestClient tests if reading from, writing to and deleting from the store works properly.