Update test cases and simplify container logic

Author: limpo1989

gs/app.go

@@ -39,14 +39,17 @@ type AppEvent interface {
 
 // App Ioc App
 type App struct {
+	props     *conf.Properties
 	container *container
 	exitChan  chan struct{}
 }
 
 // NewApp make a new App
 func NewApp() *App {
+	props := conf.New()
 	return &App{
-		container: New().(*container),
+		props:     props,
+		container: NewContainer(props).(*container),
 		exitChan:  make(chan struct{}),
 	}
 }
@@ -63,26 +66,23 @@ func (app *App) Run(resourceLocator ...ResourceLocator) error {
 
 func (app *App) run(resourceLocator ResourceLocator) error {
 
-	e := NewAppConfiguration(resourceLocator)
-
-	if err := e.Load(app.container.props); nil != err {
+	// load resource configuration.
+	if err := NewAppConfiguration(resourceLocator).Load(app.props); nil != err {
 		return err
 	}
 
-	if showBanner, _ := strconv.ParseBool(app.container.props.Get("spring.config.banner", conf.Def("true"))); showBanner {
-		app.printBanner(app.getBanner(app.container.props))
-	}
+	// print spring banner in console.
+	app.printBanner(app.props)
 
-	if err := app.container.p.Refresh(app.container.props); nil != err {
-		return err
-	}
-
-	if err := app.container.refresh(true); err != nil {
+	// Refresh the container's beans.
+	if err := app.container.Refresh(); err != nil {
+		app.container.Close()
 		return err
 	}
 
 	var logger = GetLogger()
 
+	// post OnAppStart event.
 	app.onAppStart(app.container)
 
 	logger.Info("application started successfully")
@@ -92,13 +92,15 @@ func (app *App) run(resourceLocator ResourceLocator) error {
 		ch := make(chan os.Signal, 1)
 		signal.Notify(ch, os.Interrupt, syscall.SIGTERM)
 		sig := <-ch
-		app.Shutdown(fmt.Sprintf("signal %v", sig))
+		app.Shutdown("received signal: " + sig.String())
 	}()
 
 	<-app.exitChan
 
+	// post OnAppStop event.
 	app.onAppStop(app.container)
 
+	// close container.
 	app.container.Close()
 
 	logger.Info("application exited")
@@ -158,8 +160,12 @@ func (app *App) getBanner(p *conf.Properties) string {
 }
 
 // printBanner print banner to console.
-func (app *App) printBanner(banner string) {
-	fmt.Println(banner)
+func (app *App) printBanner(p *conf.Properties) {
+	if showBanner, _ := strconv.ParseBool(p.Get("spring.config.banner", conf.Def("true"))); showBanner {
+		if banner := app.getBanner(p); len(banner) > 0 {
+			fmt.Println(banner)
+		}
+	}
 }
 
 // Shutdown close application.
@@ -180,8 +186,8 @@ func (app *App) OnProperty(key string, fn interface{}) {
 }
 
 // Property set property key/value
-func (app *App) Property(key string, value interface{}) {
-	app.container.Property(key, value)
+func (app *App) Property(key string, value interface{}) error {
+	return app.container.Property(key, value)
 }
 
 // Accept register bean to Ioc container.

gs/app_configuration.go

@@ -57,7 +57,9 @@ func (e *AppConfiguration) Load(props *conf.Properties) error {
 
 	// 从环境变量和参数获取的配置优先级更高
 	for _, k := range p.Keys() {
-		props.Set(k, p.Get(k))
+		if err := props.Set(k, p.Get(k)); nil != err {
+			return err
+		}
 	}
 	return nil
 }

gs/gs.go

@@ -54,14 +54,28 @@ var (
 
 type BeanSelector = utils.BeanSelector
 
+// Container provides interfaces for registering properties and beans before the IoC container starts up.
 type Container interface {
+	// Context return context of IoC container.
 	Context() context.Context
+	// OnProperty binding a callback when the property key loaded.
+	OnProperty(key string, fn interface{}) error
+	// Property sets the value of the property corresponding to the key. If the property value for the key already exists, the Set method will overwrite the old value.
+	// In addition to supporting string type property values, the Set method also supports other primitive data types such as int, uint, bool, and so on for property values.
+	Property(key string, value interface{}) error
+	// Properties return properties of IoC container.
 	Properties() *dync.Properties
+	// AllowCircularReferences enable circular-references.
 	AllowCircularReferences()
+	// Object register object bean to Ioc container.
 	Object(i interface{}) *BeanDefinition
+	// Provide register method bean to Ioc container.
 	Provide(ctor interface{}, args ...arg.Arg) *BeanDefinition
+	// Configuration scan that the object `i` has `NewXXX` methods to Ioc container.
 	Configuration(i interface{}) *BeanDefinition
+	// Refresh the container's beans, perform validity checks on beans, and complete property binding and dependency injection.
 	Refresh() error
+	// Close clos Ioc container.
 	Close()
 }
 
@@ -100,6 +114,8 @@ type tempContainer struct {
 	mapOfOnProperty map[string]interface{}
 }
 
+var _ Context = (*container)(nil)
+
 // The container is the cornerstone of the go-spring framework, implementing the concept of dependency injection mentioned in
 // Martin Fowler's article "Inversion of Control Containers and the Dependency Injection pattern."
 // However, the original article only refers to dependency injection as the handling of dependencies between objects,
@@ -118,20 +134,25 @@ type container struct {
 	dependencies            []*BeanDefinition
 	state                   refreshState
 	wg                      sync.WaitGroup
-	p                       *dync.Properties
+	properties              *dync.Properties
 	contextAware            bool
 	allowCircularReferences bool
 }
 
 // New make a IoC container.
 func New() Container {
+	return NewContainer(conf.New())
+}
+
+// NewContainer make a IoC container with Properties.
+func NewContainer(props *conf.Properties) Container {
 	ctx, cancel := context.WithCancel(context.Background())
 	return &container{
-		ctx:    ctx,
-		cancel: cancel,
-		p:      dync.New(),
+		ctx:        ctx,
+		cancel:     cancel,
+		properties: dync.New(),
 		tempContainer: &tempContainer{
-			props:           conf.New(),
+			props:           props,
 			beansByName:     make(map[string][]*BeanDefinition),
 			beansByType:     make(map[reflect.Type][]*BeanDefinition),
 			mapOfOnProperty: make(map[string]interface{}),
@@ -146,7 +167,7 @@ func (c *container) Context() context.Context {
 
 // Properties return properties of IoC container.
 func (c *container) Properties() *dync.Properties {
-	return c.p
+	return c.properties
 }
 
 func validOnProperty(fn interface{}) error {
@@ -161,16 +182,24 @@ func validOnProperty(fn interface{}) error {
 }
 
 // OnProperty binding a callback when the property key loaded.
-func (c *container) OnProperty(key string, fn interface{}) {
-	err := validOnProperty(fn)
-	utils.Panic(err).When(err != nil)
+func (c *container) OnProperty(key string, fn interface{}) error {
+	if c.state >= Refreshing {
+		return errors.New("should call before Refresh")
+	}
+	if err := validOnProperty(fn); nil != err {
+		return err
+	}
 	c.mapOfOnProperty[key] = fn
+	return nil
 }
 
 // Property sets the value of the property corresponding to the key. If the property value for the key already exists, the Set method will overwrite the old value.
 // In addition to supporting string type property values, the Set method also supports other primitive data types such as int, uint, bool, and so on for property values.
-func (c *container) Property(key string, value interface{}) {
-	c.props.Set(key, value)
+func (c *container) Property(key string, value interface{}) error {
+	if c.state >= Refreshing {
+		return errors.New("should call before Refresh")
+	}
+	return c.props.Set(key, value)
 }
 
 // Accept register bean to Ioc container.
@@ -367,16 +396,16 @@ func (c *container) clear() {
 }
 
 // Refresh the container's beans, perform validity checks on beans, and complete property binding and dependency injection.
-func (c *container) Refresh() error {
-	return c.refresh(true)
-}
-
-func (c *container) refresh(autoClear bool) (err error) {
+func (c *container) Refresh() (err error) {
 
 	if c.state != Unrefreshed {
 		return errors.New("container already refreshed")
 	}
 
+	if err = c.properties.Refresh(c.props); nil != err {
+		return err
+	}
+
 	start := time.Now()
 	c.state = RefreshInit
 
@@ -385,7 +414,7 @@ func (c *container) refresh(autoClear bool) (err error) {
 	for key, f := range c.mapOfOnProperty {
 		t := reflect.TypeOf(f)
 		in := reflect.New(t.In(0)).Elem()
-		if err = c.p.Bind(in, conf.Key(key)); err != nil {
+		if err = c.properties.Bind(in, conf.Key(key)); err != nil {
 			return err
 		}
 		reflect.ValueOf(f).Call([]reflect.Value{in})
@@ -458,7 +487,7 @@ func (c *container) refresh(autoClear bool) (err error) {
 	cost := time.Now().Sub(start)
 	c.logger.Info(fmt.Sprintf("refresh %d beans cost %v", len(beansById), cost))
 
-	if autoClear && !c.contextAware {
+	if !c.contextAware {
 		c.clear()
 	}
 
@@ -726,7 +755,7 @@ func (a *argContext) Matches(c cond.Condition) (bool, error) {
 }
 
 func (a *argContext) Bind(v reflect.Value, tag string) error {
-	return a.c.p.Bind(v, conf.Tag(tag))
+	return a.c.properties.Bind(v, conf.Tag(tag))
 }
 
 func (a *argContext) Wire(v reflect.Value, tag string) error {
@@ -817,7 +846,7 @@ func (c *container) wireStruct(v reflect.Value, t reflect.Type, param conf.BindP
 
 			// tag 预处理，可能通过属性值进行指定。
 			if strings.HasPrefix(tag, "${") {
-				s, err := c.p.Resolve(tag)
+				s, err := c.properties.Resolve(tag)
 				if nil != err {
 					return fmt.Errorf("field %s failed resolve logger name: %w", fieldPath, err)
 				}
@@ -879,7 +908,7 @@ func (c *container) wireStruct(v reflect.Value, t reflect.Type, param conf.BindP
 					return err
 				}
 			} else {
-				err = c.p.BindValue(fv.Addr(), subParam)
+				err = c.properties.BindValue(fv.Addr(), subParam)
 				if err != nil {
 					return err
 				}
@@ -901,7 +930,7 @@ func (c *container) wireByTag(v reflect.Value, tag string, stack *wiringStack) e
 
 	// tag 预处理，可能通过属性值进行指定。
 	if strings.HasPrefix(tag, "${") {
-		s, err := c.p.Resolve(tag)
+		s, err := c.properties.Resolve(tag)
 		if err != nil {
 			return err
 		}

gs/gs_context.go

@@ -27,23 +27,23 @@ import (
 )
 
 func (c *container) Keys() []string {
-	return c.p.Keys()
+	return c.properties.Keys()
 }
 
 func (c *container) Has(key string) bool {
-	return c.p.Has(key)
+	return c.properties.Has(key)
 }
 
 func (c *container) Prop(key string, opts ...conf.GetOption) string {
-	return c.p.Get(key, opts...)
+	return c.properties.Get(key, opts...)
 }
 
 func (c *container) Resolve(s string) (string, error) {
-	return c.p.Resolve(s)
+	return c.properties.Resolve(s)
 }
 
 func (c *container) Bind(i interface{}, args ...conf.BindArg) error {
-	return c.p.Bind(i, args...)
+	return c.properties.Bind(i, args...)
 }
 
 // Find the bean objects that meet the specified conditions. Note that this function can only guarantee that the returned beans are valid, i.e.,