code refactor

Author: lvan100

gs/internal/gs_bean/bean.go

@@ -192,15 +192,6 @@ func (d *BeanRuntime) Callable() gs.Callable {
 	return nil
 }
 
-// Match checks if the bean matches the given typeName and beanName.
-func (d *BeanRuntime) Match(beanName string) bool {
-	nameIsSame := false
-	if beanName == "" || d.name == beanName {
-		nameIsSame = true
-	}
-	return nameIsSame
-}
-
 // String returns a string representation of the bean.
 func (d *BeanRuntime) String() string {
 	return d.name

gs/internal/gs_core/core.go

@@ -57,7 +57,6 @@ type BeanRuntime interface {
 	Value() reflect.Value
 	Interface() interface{}
 	Callable() gs.Callable
-	Match(beanName string) bool
 	Status() gs_bean.BeanStatus
 	String() string
 }
@@ -574,11 +573,8 @@ func (c *resolvingStage) Find(s gs.BeanSelector) ([]gs.CondBean, error) {
 				}
 			}
 		}
-		if s.Name != "" {
-			ok := b.Match(s.Name)
-			if !ok {
-				continue
-			}
+		if s.Name != "" && s.Name != b.Name() {
+			continue
 		}
 		if err := c.resolveBean(b); err != nil {
 			return nil, err

gs/internal/gs_core/wire.go

@@ -285,7 +285,7 @@ func (c *Container) findBeans(s gs.BeanSelector) ([]BeanRuntime, error) {
 		}
 		var ret []BeanRuntime
 		for _, b := range beans {
-			if b.Match(s.Name) {
+			if s.Name == b.Name() {
 				ret = append(ret, b)
 			}
 		}
@@ -309,10 +309,9 @@ func (c *Container) getBean(t reflect.Type, tag wireTag, stack *WiringStack) (Be
 		if b.Status() == gs_bean.StatusDeleted {
 			continue
 		}
-		if !b.Match(tag.beanName) {
-			continue
+		if tag.beanName == "" || tag.beanName == b.Name() {
+			foundBeans = append(foundBeans, b)
 		}
-		foundBeans = append(foundBeans, b)
 	}
 
 	// When a specific bean name is provided, find it by name.
@@ -324,7 +323,7 @@ func (c *Container) getBean(t reflect.Type, tag wireTag, stack *WiringStack) (Be
 			if !b.Type().AssignableTo(t) {
 				continue
 			}
-			if !b.Match(tag.beanName) {
+			if tag.beanName != "" && tag.beanName != b.Name() {
 				continue
 			}
 
@@ -429,7 +428,7 @@ func (c *Container) getBeans(t reflect.Type, tags []wireTag, nullable bool, stac
 
 			var founds []int
 			for i, b := range beans {
-				if b.Match(item.beanName) {
+				if item.beanName == b.Name() {
 					founds = append(founds, i)
 				}
 			}