code refactor

Author: lvan100

gs/gs.go

@@ -25,7 +25,6 @@ import (
 	"github.com/go-spring/spring-core/gs/internal/gs"
 	"github.com/go-spring/spring-core/gs/internal/gs_app"
 	"github.com/go-spring/spring-core/gs/internal/gs_arg"
-	"github.com/go-spring/spring-core/gs/internal/gs_bean"
 	"github.com/go-spring/spring-core/gs/internal/gs_cond"
 	"github.com/go-spring/spring-core/gs/internal/gs_conf"
 	"github.com/go-spring/spring-core/gs/internal/gs_core"
@@ -166,8 +165,10 @@ type (
 )
 
 type (
-	BeanInit    = gs_bean.BeanInit
-	BeanDestroy = gs_bean.BeanDestroy
+	BeanInitFunc         = gs.BeanInitFunc
+	BeanDestroyFunc      = gs.BeanDestroyFunc
+	BeanInitInterface    = gs.BeanInitInterface
+	BeanDestroyInterface = gs.BeanDestroyInterface
 )
 
 type (

gs/internal/gs/gs.go

@@ -25,13 +25,23 @@ import (
 	"github.com/go-spring/spring-core/conf"
 )
 
-// InitFunc defines the prototype for initialization functions,
+// BeanInitFunc defines the prototype for initialization functions,
 // e.g., `func(bean)` or `func(bean) error`.
-type InitFunc = interface{}
+type BeanInitFunc = interface{}
 
-// DestroyFunc defines the prototype for destroy functions,
+// BeanDestroyFunc defines the prototype for destroy functions,
 // e.g., `func(bean)` or `func(bean) error`.
-type DestroyFunc = interface{}
+type BeanDestroyFunc = interface{}
+
+// BeanInitInterface defines an interface for bean initialization.
+type BeanInitInterface interface {
+	OnBeanInit(ctx Context) error
+}
+
+// BeanDestroyInterface defines an interface for bean destruction.
+type BeanDestroyInterface interface {
+	OnBeanDestroy()
+}
 
 // BeanSelectorInterface is an interface for selecting beans.
 type BeanSelectorInterface interface {
@@ -149,9 +159,9 @@ type BeanRegistration interface {
 	// SetName sets the name of the bean.
 	SetName(name string)
 	// SetInit sets the initialization function for the bean.
-	SetInit(fn InitFunc)
+	SetInit(fn BeanInitFunc)
 	// SetDestroy sets the destruction function for the bean.
-	SetDestroy(fn DestroyFunc)
+	SetDestroy(fn BeanDestroyFunc)
 	// SetCondition adds a condition for the bean.
 	SetCondition(conditions ...Condition)
 	// SetDependsOn sets the beans that this bean depends on.
@@ -192,13 +202,13 @@ func (d *beanBuilder[T]) Name(name string) *T {
 }
 
 // Init sets the initialization function for the bean.
-func (d *beanBuilder[T]) Init(fn InitFunc) *T {
+func (d *beanBuilder[T]) Init(fn BeanInitFunc) *T {
 	d.b.SetInit(fn)
 	return *(**T)(unsafe.Pointer(&d))
 }
 
 // Destroy sets the destruction function for the bean.
-func (d *beanBuilder[T]) Destroy(fn DestroyFunc) *T {
+func (d *beanBuilder[T]) Destroy(fn BeanDestroyFunc) *T {
 	d.b.SetDestroy(fn)
 	return *(**T)(unsafe.Pointer(&d))
 }

gs/internal/gs_bean/bean.go

@@ -62,21 +62,11 @@ func (status BeanStatus) String() string {
 	}
 }
 
-// BeanInit defines an interface for bean initialization.
-type BeanInit interface {
-	OnBeanInit(ctx gs.Context) error
-}
-
-// BeanDestroy defines an interface for bean destruction.
-type BeanDestroy interface {
-	OnBeanDestroy()
-}
-
 // BeanMetadata holds the metadata information of a bean.
 type BeanMetadata struct {
 	f          gs.Callable                // Callable for the bean (ctor or method).
-	init       interface{}                // Initialization function for the bean.
-	destroy    interface{}                // Destruction function for the bean.
+	init       gs.BeanInitFunc            // Initialization function for the bean.
+	destroy    gs.BeanDestroyFunc         // Destruction function for the bean.
 	dependsOn  []gs.BeanSelectorInterface // List of dependencies for the bean.
 	exports    []reflect.Type             // List of exported types for the bean.
 	conditions []gs.Condition             // List of conditions for the bean.
@@ -93,12 +83,12 @@ type BeanMetadata struct {
 }
 
 // Init returns the initialization function of the bean.
-func (d *BeanMetadata) Init() interface{} {
+func (d *BeanMetadata) Init() gs.BeanInitFunc {
 	return d.init
 }
 
 // Destroy returns the destruction function of the bean.
-func (d *BeanMetadata) Destroy() interface{} {
+func (d *BeanMetadata) Destroy() gs.BeanDestroyFunc {
 	return d.destroy
 }
 
@@ -249,7 +239,7 @@ func validLifeCycleFunc(fnType reflect.Type, beanType reflect.Type) bool {
 }
 
 // SetInit sets the initialization function for the bean.
-func (d *BeanDefinition) SetInit(fn gs.InitFunc) {
+func (d *BeanDefinition) SetInit(fn gs.BeanInitFunc) {
 	if validLifeCycleFunc(reflect.TypeOf(fn), d.Type()) {
 		d.init = fn
 		return
@@ -258,7 +248,7 @@ func (d *BeanDefinition) SetInit(fn gs.InitFunc) {
 }
 
 // SetDestroy sets the destruction function for the bean.
-func (d *BeanDefinition) SetDestroy(fn gs.DestroyFunc) {
+func (d *BeanDefinition) SetDestroy(fn gs.BeanDestroyFunc) {
 	if validLifeCycleFunc(reflect.TypeOf(fn), d.Type()) {
 		d.destroy = fn
 		return

gs/internal/gs_core/core.go

@@ -313,7 +313,7 @@ func (c *Container) Wire(objOrCtor interface{}, ctorArgs ...gs.Arg) (interface{}
 	}
 
 	// 如果 bean 实现了 BeanInit 接口，则执行其 OnInit 方法。
-	if f, ok := b.Interface().(gs_bean.BeanInit); ok {
+	if f, ok := b.Interface().(gs.BeanInitInterface); ok {
 		if err = f.OnBeanInit(c); err != nil {
 			return nil, err
 		}

gs/internal/gs_core/wire.go

@@ -139,7 +139,7 @@ func (s *WiringStack) getSortedDestroyers() ([]func(), error) {
 	destroy := func(v reflect.Value, fn interface{}) func() {
 		return func() {
 			if fn == nil {
-				v.Interface().(gs_bean.BeanDestroy).OnBeanDestroy()
+				v.Interface().(gs.BeanDestroyInterface).OnBeanDestroy()
 			} else {
 				fnValue := reflect.ValueOf(fn)
 				out := fnValue.Call([]reflect.Value{v})
@@ -525,7 +525,7 @@ func (c *Container) wireBean(b *gs_bean.BeanDefinition, stack *WiringStack) erro
 	}()
 
 	// Record the destroy function for the bean, if it exists.
-	if _, ok := b.Interface().(gs_bean.BeanDestroy); ok || b.Destroy() != nil {
+	if _, ok := b.Interface().(gs.BeanDestroyInterface); ok || b.Destroy() != nil {
 		haveDestroy = true
 		d := stack.saveDestroyer(b)
 		if i := stack.destroyers.Back(); i != nil {
@@ -615,7 +615,7 @@ func (c *Container) wireBean(b *gs_bean.BeanDefinition, stack *WiringStack) erro
 	}
 
 	// If the bean implements the BeanInit interface, execute its OnBeanInit method.
-	if f, ok := b.Interface().(gs_bean.BeanInit); ok {
+	if f, ok := b.Interface().(gs.BeanInitInterface); ok {
 		if err = f.OnBeanInit(c); err != nil {
 			return err
 		}