code refactor

Author: lvan100

gs/internal/gs/gs.go

@@ -33,6 +33,11 @@ type InitFunc = interface{}
 // e.g., `func(bean)` or `func(bean) error`.
 type DestroyFunc = interface{}
 
+// BeanSelectorInterface is an interface for selecting beans.
+type BeanSelectorInterface interface {
+	TypeAndName() (reflect.Type, string)
+}
+
 // BeanSelector is an identifier for a bean.
 type BeanSelector struct {
 	Type reflect.Type // Type of the bean
@@ -44,6 +49,11 @@ func BeanSelectorForType[T any]() BeanSelector {
 	return BeanSelector{Type: reflect.TypeFor[T]()}
 }
 
+// TypeAndName returns the type and name of the bean.
+func (s BeanSelector) TypeAndName() (reflect.Type, string) {
+	return s.Type, s.Name
+}
+
 func (s BeanSelector) String() string {
 	var sb strings.Builder
 	sb.WriteString("{")
@@ -82,7 +92,7 @@ type CondContext interface {
 	// Prop retrieves the value of a property from the IoC container.
 	Prop(key string, def ...string) string
 	// Find searches for bean definitions that match the provided BeanSelector.
-	Find(s BeanSelector) ([]CondBean, error)
+	Find(s BeanSelectorInterface) ([]CondBean, error)
 }
 
 // CondFunc is a function type that determines whether a condition is satisfied.
@@ -145,7 +155,7 @@ type BeanRegistration interface {
 	// SetCondition adds a condition for the bean.
 	SetCondition(conditions ...Condition)
 	// SetDependsOn sets the beans that this bean depends on.
-	SetDependsOn(selectors ...BeanSelector)
+	SetDependsOn(selectors ...BeanSelectorInterface)
 	// SetExport defines the interfaces to be exported by the bean.
 	SetExport(exports ...reflect.Type)
 	// SetConfiguration applies the bean configuration.
@@ -159,12 +169,15 @@ type beanBuilder[T any] struct {
 	b BeanRegistration
 }
 
-// BeanSelector returns the BeanSelector for the bean.
-func (d *beanBuilder[T]) BeanSelector() BeanSelector {
-	return BeanSelector{
-		Name: d.BeanRegistration().Name(),
-		Type: d.BeanRegistration().Type(),
-	}
+// TypeAndName returns the type and name of the bean.
+func (d *beanBuilder[T]) TypeAndName() (reflect.Type, string) {
+	r := d.BeanRegistration()
+	return r.Type(), r.Name()
+}
+
+// GetArgValue returns the value of the bean.
+func (d *beanBuilder[T]) GetArgValue(ctx ArgContext, t reflect.Type) (reflect.Value, error) {
+	return d.BeanRegistration().Value(), nil
 }
 
 // BeanRegistration returns the underlying BeanRegistration instance.
@@ -197,7 +210,7 @@ func (d *beanBuilder[T]) Condition(conditions ...Condition) *T {
 }
 
 // DependsOn sets the beans that this bean depends on.
-func (d *beanBuilder[T]) DependsOn(selectors ...BeanSelector) *T {
+func (d *beanBuilder[T]) DependsOn(selectors ...BeanSelectorInterface) *T {
 	d.b.SetDependsOn(selectors...)
 	return *(**T)(unsafe.Pointer(&d))
 }
@@ -232,10 +245,6 @@ func NewRegisteredBean(d BeanRegistration) *RegisteredBean {
 	}
 }
 
-func (r *RegisteredBean) GetArgValue(ctx ArgContext, t reflect.Type) (reflect.Value, error) {
-	return r.BeanRegistration().Value(), nil
-}
-
 // BeanDefinition represents a bean that has not yet been registered in the IoC container.
 type BeanDefinition struct {
 	beanBuilder[BeanDefinition]
@@ -248,10 +257,6 @@ func NewBeanDefinition(d BeanRegistration) *BeanDefinition {
 	}
 }
 
-func (r *BeanDefinition) GetArgValue(ctx ArgContext, t reflect.Type) (reflect.Value, error) {
-	return r.BeanRegistration().Value(), nil
-}
-
 /************************************ ioc ************************************/
 
 // Container represents the modifiable aspects of an IoC (Inversion of Control) container.

gs/internal/gs_bean/bean.go

@@ -74,13 +74,13 @@ type BeanDestroy interface {
 
 // 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.
-	dependsOn  []gs.BeanSelector // 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.
-	status     BeanStatus        // Current status of the bean.
+	f          gs.Callable                // Callable for the bean (ctor or method).
+	init       interface{}                // Initialization function for the bean.
+	destroy    interface{}                // 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.
+	status     BeanStatus                 // Current status of the bean.
 
 	file string // The file where the bean is defined.
 	line int    // The line number in the file where the bean is defined.
@@ -103,7 +103,7 @@ func (d *BeanMetadata) Destroy() interface{} {
 }
 
 // DependsOn returns the list of dependencies for the bean.
-func (d *BeanMetadata) DependsOn() []gs.BeanSelector {
+func (d *BeanMetadata) DependsOn() []gs.BeanSelectorInterface {
 	return d.dependsOn
 }
 
@@ -203,6 +203,11 @@ type BeanDefinition struct {
 	*BeanRuntime
 }
 
+// TypeAndName returns the type and name of the bean.
+func (d *BeanDefinition) TypeAndName() (reflect.Type, string) {
+	return d.Type(), d.Name()
+}
+
 // Callable returns the callable for the bean.
 func (d *BeanDefinition) Callable() gs.Callable {
 	return d.f
@@ -267,7 +272,7 @@ func (d *BeanDefinition) SetCondition(conditions ...gs.Condition) {
 }
 
 // SetDependsOn sets the list of dependencies for the bean.
-func (d *BeanDefinition) SetDependsOn(selectors ...gs.BeanSelector) {
+func (d *BeanDefinition) SetDependsOn(selectors ...gs.BeanSelectorInterface) {
 	d.dependsOn = append(d.dependsOn, selectors...)
 }
 

gs/internal/gs_cond/cond.go

@@ -166,11 +166,11 @@ func (c *onMissingProperty) String() string {
 // onBean checks for the existence of beans that match a selector.
 // It returns true if at least one bean matches the selector, and false otherwise.
 type onBean struct {
-	s gs.BeanSelector // The selector used to match beans in the context.
+	s gs.BeanSelectorInterface // The selector used to match beans in the context.
 }
 
 // OnBean creates a condition that evaluates to true if at least one bean matches the provided selector.
-func OnBean(s gs.BeanSelector) gs.Condition {
+func OnBean(s gs.BeanSelectorInterface) gs.Condition {
 	return &onBean{s: s}
 }
 
@@ -191,11 +191,11 @@ func (c *onBean) String() string {
 // onMissingBean checks for the absence of beans matching a selector.
 // It returns true if no beans match the selector, and false otherwise.
 type onMissingBean struct {
-	s gs.BeanSelector // The selector used to find beans.
+	s gs.BeanSelectorInterface // The selector used to find beans.
 }
 
 // OnMissingBean creates a condition that evaluates to true if no beans match the provided selector.
-func OnMissingBean(s gs.BeanSelector) gs.Condition {
+func OnMissingBean(s gs.BeanSelectorInterface) gs.Condition {
 	return &onMissingBean{s: s}
 }
 
@@ -216,11 +216,11 @@ func (c *onMissingBean) String() string {
 // onSingleBean checks if exactly one matching bean exists in the context.
 // It returns true if exactly one bean matches the selector, and false otherwise.
 type onSingleBean struct {
-	s gs.BeanSelector // The selector used to find beans.
+	s gs.BeanSelectorInterface // The selector used to find beans.
 }
 
 // OnSingleBean creates a condition that evaluates to true if exactly one bean matches the provided selector.
-func OnSingleBean(s gs.BeanSelector) gs.Condition {
+func OnSingleBean(s gs.BeanSelectorInterface) gs.Condition {
 	return &onSingleBean{s: s}
 }
 

gs/internal/gs_core/bean.go

@@ -101,20 +101,20 @@ func NewBean(objOrCtor interface{}, ctorArgs ...gs.Arg) *gs.BeanDefinition {
 		// Check if the function is a method and set a condition if needed
 		method := strings.LastIndexByte(fnInfo.Name(), ')') > 0
 		if method {
-			s := gs.BeanSelector{Type: in0}
+			var s gs.BeanSelectorInterface = gs.BeanSelector{Type: in0}
 			if len(ctorArgs) > 0 {
 				switch a := ctorArgs[0].(type) {
 				case *gs.RegisteredBean:
-					s = a.BeanSelector()
+					s = a
 				case *gs.BeanDefinition:
-					s = a.BeanSelector()
+					s = a
 				case gs_arg.IndexArg:
 					if a.Idx == 0 {
 						switch x := a.Arg.(type) {
 						case *gs.RegisteredBean:
-							s = x.BeanSelector()
+							s = x
 						case *gs.BeanDefinition:
-							s = x.BeanSelector()
+							s = x
 						default:
 							panic("the arg of IndexArg[0] should be *RegisteredBean or *BeanDefinition")
 						}

gs/internal/gs_core/core.go

@@ -514,9 +514,7 @@ func (c *resolvingStage) scanConfiguration(bd *gs_bean.BeanDefinition) ([]*gs_be
 				name := bd.Name() + "_" + m.Name
 				b := gs_bean.NewBean(v.Type(), v, f, name)
 				b.SetFileLine(file, line)
-				gs.NewBeanDefinition(b).Condition(gs_cond.OnBean(
-					gs.BeanSelector{Type: bd.Type(), Name: bd.Name()},
-				))
+				gs.NewBeanDefinition(b).Condition(gs_cond.OnBean(bd))
 				newBeans = append(newBeans, b)
 			}
 			break
@@ -553,13 +551,14 @@ func (c *resolvingStage) Prop(key string, def ...string) string {
 
 // Find 查找符合条件的 bean 对象，注意该函数只能保证返回的 bean 是有效的，
 // 即未被标记为删除的，而不能保证已经完成属性绑定和依赖注入。
-func (c *resolvingStage) Find(s gs.BeanSelector) ([]gs.CondBean, error) {
+func (c *resolvingStage) Find(s gs.BeanSelectorInterface) ([]gs.CondBean, error) {
+	t, name := s.TypeAndName()
 	var result []gs.CondBean
 	for _, b := range c.beans {
 		if b.Status() == gs_bean.StatusResolving || b.Status() == gs_bean.StatusDeleted {
 			continue
 		}
-		if t := s.Type; t != nil {
+		if t != nil {
 			if b.Type() != t {
 				foundType := false
 				for _, typ := range b.Exports() {
@@ -573,7 +572,7 @@ func (c *resolvingStage) Find(s gs.BeanSelector) ([]gs.CondBean, error) {
 				}
 			}
 		}
-		if s.Name != "" && s.Name != b.Name() {
+		if name != "" && name != b.Name() {
 			continue
 		}
 		if err := c.resolveBean(b); err != nil {

gs/internal/gs_core/wire.go

@@ -188,7 +188,7 @@ func (a *ArgContext) Prop(key string, def ...string) string {
 	return a.c.Prop(key, def...)
 }
 
-func (a *ArgContext) Find(s gs.BeanSelector) ([]gs.CondBean, error) {
+func (a *ArgContext) Find(s gs.BeanSelectorInterface) ([]gs.CondBean, error) {
 	beans, err := a.c.findBeans(s)
 	if err != nil {
 		return nil, err
@@ -271,21 +271,19 @@ func parseWireTag(p gs.Properties, str string, needResolve bool) (tag wireTag, e
 }
 
 // findBeans finds beans based on a given selector.
-func (c *Container) findBeans(s gs.BeanSelector) ([]BeanRuntime, error) {
+func (c *Container) findBeans(s gs.BeanSelectorInterface) ([]BeanRuntime, error) {
+	t, name := s.TypeAndName()
 	var beans []BeanRuntime
-	if t := s.Type; t != nil {
+	if t != nil {
 		beans = c.beansByType[t]
 	}
-	if s.Name != "" {
-		if s.Name == "" {
-			return nil, fmt.Errorf("bean name is empty")
-		}
+	if name != "" {
 		if beans == nil {
-			beans = c.beansByName[s.Name]
+			beans = c.beansByName[name]
 		}
 		var ret []BeanRuntime
 		for _, b := range beans {
-			if s.Name == b.Name() {
+			if name == b.Name() {
 				ret = append(ret, b)
 			}
 		}