Support @⁠Import on interfaces

See gh-34805
Closes gh-34820

Signed-off-by: Daeho Kwon <trewq231@naver.com>
This commit is contained in:
Daeho Kwon
2025-04-25 03:29:00 +09:00
committed by Sam Brannen
parent 686705140e
commit a4d5800a6c
2 changed files with 74 additions and 1 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -62,6 +62,7 @@ import static org.mockito.Mockito.spy;
*
* @author Phillip Webb
* @author Stephane Nicoll
* @author Daeho Kwon
*/
@SuppressWarnings("resource")
public class ImportSelectorTests {
@@ -203,6 +204,71 @@ public class ImportSelectorTests {
assertThat(TestImportGroup.environment).isEqualTo(context.getEnvironment());
}
@Test
void importAnnotationOnImplementedInterfaceIsRespected() {
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 {
}
@Configuration
static class InterfaceBasedConfig implements ConfigImportMarker {
}
@Configuration
@Import(OverridingImportedConfig.class)
static class OverridingConfig implements ConfigImportMarker {
}
@Configuration
static class OverridingImportedConfig {
@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 name;
}
}
@Configuration
static class ImportedConfig {
@Bean
ImportedBean importedBean() {
return new ImportedBean();
}
}
@Configuration
@Import(SampleImportSelector.class)