Add generic registry (hides golang/go#44895)

charger/charger.go

@@ -6,9 +6,11 @@ import (
 	"github.com/andig/evcc/api"
 	"github.com/andig/evcc/provider"
 	"github.com/andig/evcc/util"
-	"github.com/andig/evcc/util/registry"
+	reg "github.com/andig/evcc/util/registry"
 )
 
+var registry = reg.New[api.Charger]()
+
 // Charger is an api.Charger implementation with configurable getters and setters.
 type Charger struct {
 	statusG     func() (string, error)
@@ -17,10 +19,7 @@ type Charger struct {
 	maxCurrentS func(int64) error
 }
 
-var registry registry.Registry[api.Charger]
-
 func init() {
-	registry=registry.New()
 	registry.Add("default", NewConfigurableFromConfig)
 }
 

meter/meter.go

@@ -7,8 +7,11 @@ import (
 	"github.com/andig/evcc/api"
 	"github.com/andig/evcc/provider"
 	"github.com/andig/evcc/util"
+	reg "github.com/andig/evcc/util/registry"
 )
 
+var registry = reg.New[api.Meter]()
+
 func init() {
 	registry.Add("default", NewConfigurableFromConfig)
 }

util/registry/registry.go

@@ -7,11 +7,8 @@ import (
 
 type Registry[T any] map[string]func(map[string]interface{}) (T, error)
 
-// var registry [T]Registry = make(map[string]func(map[string]interface{}) (T, error))
-
 func New[T any]() Registry[T] {
-	reg := make(map[string]func(map[string]interface{}) (T, error))
-	return reg
+	return make(map[string]func(map[string]interface{}) (T, error))
 }
 
 func (r Registry[T]) Add(name string, factory func(map[string]interface{}) (T, error)) {
@@ -29,7 +26,6 @@ func (r Registry[T]) Get(name string) (func(map[string]interface{}) (T, error),
 	return factory, nil
 }
 
-
 // NewFromConfig creates charger from configuration
 func (r Registry[T]) NewFromConfig(typ string, other map[string]interface{}) (v T, err error) {
 	factory, err := r.Get(strings.ToLower(typ))

vehicle/vehicle.go

@@ -7,8 +7,13 @@ import (
 	"github.com/andig/evcc/api"
 	"github.com/andig/evcc/provider"
 	"github.com/andig/evcc/util"
+	reg "github.com/andig/evcc/util/registry"
 )
 
+const interval = 15 * time.Minute
+
+var registry = reg.New[api.Vehicle]()
+
 type embed struct {
 	title    string
 	capacity int64