fixed #25263 and #25350

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java

@@ -754,7 +754,7 @@ protected Class<?> getTypeForFactoryMethod(String beanName, RootBeanDefinition m
 					clazz -> ReflectionUtils.getUniqueDeclaredMethods(clazz, ReflectionUtils.USER_DECLARED_METHODS));
 
 			for (Method candidate : candidates) {
-				if (Modifier.isStatic(candidate.getModifiers()) == isStatic && mbd.isFactoryMethod(candidate) &&
+				if (Modifier.isStatic(candidate.getModifiers()) == isStatic && mbd.isFactoryMethod(candidate,beanName) &&
 						candidate.getParameterCount() >= minNrOfArgs) {
 					// Declared type variables to inspect?
 					if (candidate.getTypeParameters().length > 0) {

spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java

@@ -337,7 +337,7 @@ public void resolveFactoryMethodIfPossible(RootBeanDefinition mbd) {
 		Method[] candidates = getCandidateMethods(factoryClass, mbd);
 		Method uniqueCandidate = null;
 		for (Method candidate : candidates) {
-			if (Modifier.isStatic(candidate.getModifiers()) == isStatic && mbd.isFactoryMethod(candidate)) {
+			if (Modifier.isStatic(candidate.getModifiers()) == isStatic && mbd.isFactoryMethod(candidate,null)) {
 				if (uniqueCandidate == null) {
 					uniqueCandidate = candidate;
 				}
@@ -465,7 +465,7 @@ public BeanWrapper instantiateUsingFactoryMethod(
 				candidates = new ArrayList<>();
 				Method[] rawCandidates = getCandidateMethods(factoryClass, mbd);
 				for (Method candidate : rawCandidates) {
-					if (Modifier.isStatic(candidate.getModifiers()) == isStatic && mbd.isFactoryMethod(candidate)) {
+					if (Modifier.isStatic(candidate.getModifiers()) == isStatic && mbd.isFactoryMethod(candidate,beanName)) {
 						candidates.add(candidate);
 					}
 				}

spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java

@@ -396,7 +396,7 @@ public void setNonUniqueFactoryMethodName(String name) {
 	/**
 	 * Check whether the given candidate qualifies as a factory method.
 	 */
-	public boolean isFactoryMethod(Method candidate) {
+	public boolean isFactoryMethod(Method candidate,String beanName) {
 		return candidate.getName().equals(getFactoryMethodName());
 	}
 

spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java

@@ -442,8 +442,8 @@ public MethodMetadata getFactoryMethodMetadata() {
 		}
 
 		@Override
-		public boolean isFactoryMethod(Method candidate) {
-			return (super.isFactoryMethod(candidate) && BeanAnnotationHelper.isBeanAnnotated(candidate));
+		public boolean isFactoryMethod(Method candidate,String beanName) {
+			return (super.isFactoryMethod(candidate,beanName) && BeanAnnotationHelper.isBeanAnnotated(candidate) && (beanName == null ? true :BeanAnnotationHelper.determineBeanNameFor(candidate).equals(beanName)));
 		}
 
 		@Override

spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java

@@ -23,8 +23,12 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.foo.SomeBean;
+import org.springframework.context.annotation.foo.SomeConfig;
+import org.springframework.context.annotation.foo.SomeOtherBean;
 import org.springframework.util.ClassUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -64,6 +68,15 @@ public void autowiredConfigClassBeanMethodsRespectScopingWhenRegisteredViaConstr
 		autowiredConfigClassBeanMethodsRespectScoping(ConfigThatDoesNotImport.class, ConfigToBeAutowired.class);
 	}
 
+	@Test
+	public void checkOverloadedBean(){
+		ApplicationContext ctx = new AnnotationConfigApplicationContext("org.springframework.context.annotation.foo");
+		SomeOtherBean someOtherBean =(SomeOtherBean) ctx.getBean("other");
+		SomeBean someBean =(SomeBean) ctx.getBean("foo");
+		assertThat(someBean).isNotNull();
+		assertThat(someOtherBean).isNotNull();
+	}
+
 	private void autowiredConfigClassBeanMethodsRespectScoping(Class<?>... configClasses) {
 		ApplicationContext ctx = new AnnotationConfigApplicationContext(configClasses);
 		Config config = ctx.getBean(Config.class);
@@ -83,7 +96,6 @@ public void importingNonConfigurationClassCausesBeanDefinitionParsingException()
 	}
 
 
-
 	@Configuration
 	static class ConfigToBeAutowired {
 

spring-context/src/test/java/org/springframework/context/annotation/foo/SomeBean.java

@@ -0,0 +1,13 @@
+package org.springframework.context.annotation.foo;
+
+/**
+ * @author lifejwang11
+ * @since 5.2
+ */
+public class SomeBean {
+    private final SomeOtherBean other;
+
+    public SomeBean(SomeOtherBean other) {
+        this.other = other;
+    }
+}

spring-context/src/test/java/org/springframework/context/annotation/foo/SomeConfig.java

@@ -0,0 +1,27 @@
+package org.springframework.context.annotation.foo;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author lifejwang11
+ * @since 5.2
+ */
+@Configuration
+public class SomeConfig {
+
+    @Bean(name = "other")
+    public SomeOtherBean foo() {
+        System.out.println("constructing SomeOtherBean");
+        return new SomeOtherBean();
+    }
+
+    @Bean(name = "foo")
+    public SomeBean foo(@Autowired SomeOtherBean other) {
+        System.out.println("constructing SomeBean");
+        return new SomeBean(other);
+    }
+
+
+}

spring-context/src/test/java/org/springframework/context/annotation/foo/SomeOtherBean.java

@@ -0,0 +1,10 @@
+package org.springframework.context.annotation.foo;
+
+/**
+ * @author lifejwang11
+ * @since 5.2
+ */
+public class SomeOtherBean {
+    public SomeOtherBean() {
+    }
+}

spring-core/src/main/java/org/springframework/util/MimeType.java

@@ -377,6 +377,9 @@ else if (getType().equals(other.getType())) {
 			if (getSubtype().equals(other.getSubtype())) {
 				return true;
 			}
+			if (WILDCARD_TYPE.equals(other.getSubtype())){
+				return true;
+			}
 			// Wildcard with suffix? e.g. application/*+xml
 			if (isWildcardSubtype() || other.isWildcardSubtype()) {
 				int thisPlusIdx = getSubtype().lastIndexOf('+');

spring-core/src/test/java/org/springframework/util/MimeTypeTests.java

@@ -172,6 +172,10 @@ void isCompatible() {
 		assertThat(suffixXml.isCompatibleWith(applicationWildcardXml)).isTrue();
 
 		assertThat(applicationWildcardXml.isCompatibleWith(MimeTypeUtils.APPLICATION_JSON)).isFalse();
+
+		MimeType applicationJSON = new MimeType("application", "vnd+json");
+		MimeType applicationWildcardJSON = new MimeType("application", "*");
+		assertThat(applicationJSON.isCompatibleWith(applicationWildcardJSON)).isTrue();
 	}
 
 	@Test