Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
7 changes: 7 additions & 0 deletions gs/gs.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,13 @@ func Config() *gs_conf.AppConfig {
return gs_app.GS.P
}

// Component registers a bean definition for a given object.
func Component[T any](i T) T {
b := gs_bean.NewBean(reflect.ValueOf(i))
gs_app.GS.C.Register(b).Caller(1)
return i
}

// Object registers a bean definition for a given object.
func Object(i interface{}) *RegisteredBean {
b := gs_bean.NewBean(reflect.ValueOf(i))
Expand Down
25 changes: 21 additions & 4 deletions gs/internal/gs_core/injecting/injecting_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"fmt"
"net/http"
"reflect"
"runtime"
"testing"
"time"

Expand Down Expand Up @@ -927,20 +928,36 @@ type DyncValue struct {
func TestForceClean(t *testing.T) {

t.Run("no dync value", func(t *testing.T) {
release := make(map[string]struct{})

r := New(conf.Map(map[string]interface{}{
"spring": map[string]interface{}{
"force-clean": true,
},
}))
beans := []*gs.BeanDefinition{
objectBean(&SimpleLogger{}).Name("biz"),
objectBean(&SimpleLogger{}).Name("sys"),
}

b1 := objectBean(&SimpleLogger{}).Name("biz")
runtime.AddCleanup(&b1, func(s string) {
release[s] = struct{}{}
}, "biz")

b2 := objectBean(&SimpleLogger{}).Name("sys")
runtime.AddCleanup(&b2, func(s string) {
release[s] = struct{}{}
}, "sys")

beans := []*gs.BeanDefinition{b1, b2}
err := r.Refresh(extractBeans(beans))
assert.Nil(t, err)
assert.Nil(t, r.p)
assert.Nil(t, r.beansByName)
assert.Nil(t, r.beansByType)

runtime.GC()
assert.That(t, release).Equal(map[string]struct{}{
"biz": {},
"sys": {},
})
})

t.Run("has dync value", func(t *testing.T) {
Expand Down
31 changes: 31 additions & 0 deletions gs/internal/gs_dync/dync_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,4 +181,35 @@ func TestDync(t *testing.T) {
assert.ThatError(t, err).Matches("strconv.ParseInt: parsing \\\"xyz\\\": invalid syntax")
assert.That(t, p.ObjectsCount()).Equal(4)
})

t.Run("refresh struct", func(t *testing.T) {
p := New(conf.Map(map[string]interface{}{
"config.s1.value": "99",
}))

v := &Value[struct {
S1 struct {
Value int `value:"${value}"`
} `value:"${s1}"`
}]{}

var param conf.BindParam
err := param.BindTag("${config}", "")
assert.Nil(t, err)

err = p.RefreshField(reflect.ValueOf(v), param)
assert.Nil(t, err)
assert.That(t, v.Value().S1.Value).Equal(99)

err = p.Refresh(conf.Map(map[string]interface{}{
"config.s1.value": "xyz",
}))
assert.ThatError(t, err).Matches("strconv.ParseInt: parsing \"xyz\": invalid syntax")

err = p.Refresh(conf.Map(map[string]interface{}{
"config.s1.value": "10",
}))
assert.Nil(t, err)
assert.That(t, v.Value().S1.Value).Equal(10)
})
}
Loading