Adjust @Import processing to prioritize local declarations

Closes gh-34805

Signed-off-by: Daeho Kwon <[email protected]>

Author: kwondh5217

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

@@ -550,7 +550,7 @@ private Set<SourceClass> getImports(SourceClass sourceClass) throws IOException
 	 * <p>For example, it is common for a {@code @Configuration} class to declare direct
 	 * {@code @Import}s in addition to meta-imports originating from an {@code @Enable}
 	 * annotation.
-	 * <p>In addition, {@code @Import} annotations declared on interfaces implemented by
+	 * <p>As of Spring Framework 7.0, {@code @Import} annotations declared on interfaces implemented by
 	 * the configuration class are also considered. This allows imports to be triggered
 	 * indirectly via marker interfaces or shared base interfaces.
 	 * @param sourceClass the class to search
@@ -562,17 +562,16 @@ private void collectImports(SourceClass sourceClass, Set<SourceClass> imports, S
 			throws IOException {
 
 		if (visited.add(sourceClass)) {
+			for (SourceClass ifc : sourceClass.getInterfaces()) {
+				collectImports(ifc, imports, visited);
+			}
 			for (SourceClass annotation : sourceClass.getAnnotations()) {
 				String annName = annotation.getMetadata().getClassName();
 				if (!annName.equals(Import.class.getName())) {
 					collectImports(annotation, imports, visited);
 				}
 			}
 			imports.addAll(sourceClass.getAnnotationAttributes(Import.class.getName(), "value"));
-
-			for (SourceClass ifc : sourceClass.getInterfaces()) {
-				collectImports(ifc, imports, visited);
-			}
 		}
 	}
 

spring-context/src/test/java/org/springframework/context/annotation/ImportSelectorTests.java

@@ -206,15 +206,24 @@ void invokeAwareMethodsInImportGroup() {
 
 	@Test
 	void importAnnotationOnImplementedInterfaceIsRespected() {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		context.register(InterfaceBasedConfig.class);
-		context.refresh();
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				InterfaceBasedConfig.class);
 
 		assertThat(context.getBean(ImportedConfig.class)).isNotNull();
 		assertThat(context.getBean(ImportedBean.class)).isNotNull();
 		assertThat(context.getBean(ImportedBean.class).name()).isEqualTo("imported");
 	}
 
+	@Test
+	void localImportShouldOverrideInterfaceImport() {
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
+				OverridingConfig.class);
+
+		assertThat(context.getBean(ImportedConfig.class)).isNotNull();
+		assertThat(context.getBean(ImportedBean.class)).isNotNull();
+		assertThat(context.getBean(ImportedBean.class).name()).isEqualTo("from class");
+	}
+
 	@Import(ImportedConfig.class)
 	interface ConfigImportMarker {
 	}
@@ -223,9 +232,28 @@ interface ConfigImportMarker {
 	static class InterfaceBasedConfig implements ConfigImportMarker {
 	}
 
+	@Configuration
+	static class OverridingConfig implements ConfigImportMarker {
+		@Bean
+		ImportedBean importedBean() {
+			return new ImportedBean("from class");
+		}
+	}
+
 	static class ImportedBean {
+
+		private final String name;
+
+		ImportedBean() {
+			this.name = "imported";
+		}
+
+		ImportedBean(String name) {
+			this.name = name;
+		}
+
 		String name() {
-			return "imported";
+			return name;
 		}
 	}
 
@@ -540,7 +568,7 @@ public static class ChildDeferredImportSelector1 implements DeferredImportSelect
 		@Override
 		public String[] selectImports(AnnotationMetadata importingClassMetadata) {
 			ImportSelectorTests.importFrom.put(getClass(), importingClassMetadata.getClassName());
-			return new String[] { DeferredImportedSelector3.class.getName() };
+			return new String[]{DeferredImportedSelector3.class.getName()};
 		}
 
 		@Override