Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion di.go
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,17 @@ func injectSingletonDependencies() error {
func injectDependencies(beanID string, instance interface{}, chain map[string]bool) error {
logrus.WithField("beanID", beanID).Trace("injecting dependencies")
instanceType := beans[beanID]
instanceElement := instanceType.Elem()
return injectDependenciesWithType(instanceType.Elem(), beanID, instance, chain)
}

func injectDependenciesWithType(instanceElement reflect.Type, beanID string, instance interface{}, chain map[string]bool) error {
for i := 0; i < instanceElement.NumField(); i++ {
field := instanceElement.Field(i)
if field.Type.Kind() == reflect.Struct && field.Anonymous {
fieldToInject := reflect.ValueOf(instance).Elem().Field(i)
injectDependenciesWithType(field.Type, beanID, fieldToInject.Addr().Interface(), chain)
continue
}
beanToInject, ok := field.Tag.Lookup(string(inject))
if !ok {
continue
Expand Down
23 changes: 23 additions & 0 deletions di_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1166,3 +1166,26 @@ func (suite *TestSuite) TestShutdownContinueOnError() {
assert.Equal(suite.T(), 5, len(closedSingletons))
assert.Equal(suite.T(), 5, len(singletonBeansWithErrorOnClose))
}

func (suite *TestSuite) TestInjectInParent() {
type SingletonBeanParent struct {
otherBean1 someInterface `di.inject:""`
}
type SingletonBeanChild struct {
SingletonBeanParent
otherBean2 someInterface `di.inject:""`
}

overwritten, err := RegisterBean("singletonBean", reflect.TypeOf((*SingletonBeanChild)(nil)))
assert.False(suite.T(), overwritten)
assert.NoError(suite.T(), err)
overwritten, err = RegisterBean("otherBean", reflect.TypeOf((*otherBean)(nil)))
assert.False(suite.T(), overwritten)
assert.NoError(suite.T(), err)
err = InitializeContainer()
assert.NoError(suite.T(), err)
instance, err := GetInstanceSafe("singletonBean")
assert.NoError(suite.T(), err)
assert.NotNil(suite.T(), instance.(*SingletonBeanChild).otherBean1)
assert.NotNil(suite.T(), instance.(*SingletonBeanChild).otherBean2)
}