From 17c18b4794bb118fce1908ff85248e18a86822d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Victor=20Oliveira=20Couto?= Date: Sun, 24 Jul 2022 02:51:05 -0300 Subject: [PATCH] :skull: fix: Injector options not being copied to new injector on constructor --- remy/internal/injector/standard_injector.go | 1 + remy/internal/injector/storage.go | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/remy/internal/injector/standard_injector.go b/remy/internal/injector/standard_injector.go index 6ec9005..4ea9f14 100644 --- a/remy/internal/injector/standard_injector.go +++ b/remy/internal/injector/standard_injector.go @@ -23,6 +23,7 @@ func New(canOverride bool, reflectOpts types.ReflectionOptions, parent ...types. return &StdInjector{ allowOverride: canOverride, parentInjector: parentInjector, + reflectOpts: reflectOpts, bindStorage: NewElementsStorage[types.BindKey](canOverride, reflectOpts), instanceStorage: NewElementsStorage[types.BindKey](canOverride, reflectOpts), } diff --git a/remy/internal/injector/storage.go b/remy/internal/injector/storage.go index 741643b..a47015c 100644 --- a/remy/internal/injector/storage.go +++ b/remy/internal/injector/storage.go @@ -9,24 +9,24 @@ import ( type ( genericAnyMap[T comparable] map[T]any ElementsStorage[T comparable] struct { - allowOverride bool - generifyInterface types.ReflectionOptions - namedElements map[string]genericAnyMap[T] - elements genericAnyMap[T] + allowOverride bool + reflectOpts types.ReflectionOptions + namedElements map[string]genericAnyMap[T] + elements genericAnyMap[T] } ) func NewElementsStorage[T comparable](allowOverride bool, reflectionOptions types.ReflectionOptions) *ElementsStorage[T] { return &ElementsStorage[T]{ - allowOverride: allowOverride, - generifyInterface: reflectionOptions, - namedElements: map[string]genericAnyMap[T]{}, - elements: genericAnyMap[T]{}, + allowOverride: allowOverride, + reflectOpts: reflectionOptions, + namedElements: map[string]genericAnyMap[T]{}, + elements: genericAnyMap[T]{}, } } func (s ElementsStorage[T]) ReflectOpts() types.ReflectionOptions { - return s.generifyInterface + return s.reflectOpts } func (s *ElementsStorage[T]) Set(key T, value any) {