From 19ac12d95b5226d75a484378be87ace1a093c812 Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Thu, 8 Jun 2023 15:18:43 +0200 Subject: [PATCH] location: make genericBackendFactory private --- internal/backend/location/registry.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/backend/location/registry.go b/internal/backend/location/registry.go index 5d644dfb9..f15095590 100644 --- a/internal/backend/location/registry.go +++ b/internal/backend/location/registry.go @@ -36,35 +36,35 @@ type Factory interface { Open(ctx context.Context, cfg interface{}, rt http.RoundTripper, lim limiter.Limiter) (restic.Backend, error) } -type GenericBackendFactory[C any, T restic.Backend] struct { +type genericBackendFactory[C any, T restic.Backend] struct { parseConfigFn func(s string) (*C, error) stripPasswordFn func(s string) string createFn func(ctx context.Context, cfg C, rt http.RoundTripper, lim limiter.Limiter) (T, error) openFn func(ctx context.Context, cfg C, rt http.RoundTripper, lim limiter.Limiter) (T, error) } -func (f *GenericBackendFactory[C, T]) ParseConfig(s string) (interface{}, error) { +func (f *genericBackendFactory[C, T]) ParseConfig(s string) (interface{}, error) { return f.parseConfigFn(s) } -func (f *GenericBackendFactory[C, T]) StripPassword(s string) string { +func (f *genericBackendFactory[C, T]) StripPassword(s string) string { if f.stripPasswordFn != nil { return f.stripPasswordFn(s) } return s } -func (f *GenericBackendFactory[C, T]) Create(ctx context.Context, cfg interface{}, rt http.RoundTripper, lim limiter.Limiter) (restic.Backend, error) { +func (f *genericBackendFactory[C, T]) Create(ctx context.Context, cfg interface{}, rt http.RoundTripper, lim limiter.Limiter) (restic.Backend, error) { return f.createFn(ctx, *cfg.(*C), rt, lim) } -func (f *GenericBackendFactory[C, T]) Open(ctx context.Context, cfg interface{}, rt http.RoundTripper, lim limiter.Limiter) (restic.Backend, error) { +func (f *genericBackendFactory[C, T]) Open(ctx context.Context, cfg interface{}, rt http.RoundTripper, lim limiter.Limiter) (restic.Backend, error) { return f.openFn(ctx, *cfg.(*C), rt, lim) } func NewHTTPBackendFactory[C any, T restic.Backend](parseConfigFn func(s string) (*C, error), stripPasswordFn func(s string) string, createFn func(ctx context.Context, cfg C, rt http.RoundTripper) (T, error), - openFn func(ctx context.Context, cfg C, rt http.RoundTripper) (T, error)) *GenericBackendFactory[C, T] { + openFn func(ctx context.Context, cfg C, rt http.RoundTripper) (T, error)) Factory { - return &GenericBackendFactory[C, T]{ + return &genericBackendFactory[C, T]{ parseConfigFn: parseConfigFn, stripPasswordFn: stripPasswordFn, createFn: func(ctx context.Context, cfg C, rt http.RoundTripper, _ limiter.Limiter) (T, error) { @@ -79,9 +79,9 @@ func NewHTTPBackendFactory[C any, T restic.Backend](parseConfigFn func(s string) func NewLimitedBackendFactory[C any, T restic.Backend](parseConfigFn func(s string) (*C, error), stripPasswordFn func(s string) string, createFn func(ctx context.Context, cfg C, lim limiter.Limiter) (T, error), - openFn func(ctx context.Context, cfg C, lim limiter.Limiter) (T, error)) *GenericBackendFactory[C, T] { + openFn func(ctx context.Context, cfg C, lim limiter.Limiter) (T, error)) Factory { - return &GenericBackendFactory[C, T]{ + return &genericBackendFactory[C, T]{ parseConfigFn: parseConfigFn, stripPasswordFn: stripPasswordFn, createFn: func(ctx context.Context, cfg C, _ http.RoundTripper, lim limiter.Limiter) (T, error) {