Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Sam Brannen
2022-05-16 10:53:35 +02:00
parent bf8a54decf
commit fe7c6f075b
4 changed files with 48 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-beans/src/main/java/org/springframework/beans/factory/aot/AotFactoriesLoader.java
View File

@@ -30,8 +30,8 @@ import org.springframework.util.Assert;
/**
* AOT specific factory loading mechanism for internal use within the framework.
* <p>
* Loads and instantiates factories of a given type from
*
* <p>Loads and instantiates factories of a given type from
* {@value #FACTORIES_RESOURCE_LOCATION} and merges them with matching beans
* from a {@link ListableBeanFactory}.
*

18
spring-beans/src/test/java/org/springframework/beans/factory/aot/AotFactoriesLoaderTests.java
View File

@@ -56,22 +56,14 @@ class AotFactoriesLoaderTests {
beanFactory.registerSingleton("b1", new TestFactoryImpl(0, "b1"));
beanFactory.registerSingleton("b2", new TestFactoryImpl(2, "b2"));
MockSpringFactoriesLoader springFactoriesLoader = new MockSpringFactoriesLoader();
springFactoriesLoader.addInstance(TestFactory.class,
new TestFactoryImpl(1, "l1"));
springFactoriesLoader.addInstance(TestFactory.class,
new TestFactoryImpl(3, "l2"));
AotFactoriesLoader loader = new AotFactoriesLoader(beanFactory,
springFactoriesLoader);
springFactoriesLoader.addInstance(TestFactory.class, new TestFactoryImpl(1, "l1"));
springFactoriesLoader.addInstance(TestFactory.class, new TestFactoryImpl(3, "l2"));
AotFactoriesLoader loader = new AotFactoriesLoader(beanFactory, springFactoriesLoader);
List<TestFactory> loaded = loader.load(TestFactory.class);
assertThat(loaded).hasSize(4);
assertThat(loaded.get(0)).hasToString("b1");
assertThat(loaded.get(1)).hasToString("l1");
assertThat(loaded.get(2)).hasToString("b2");
assertThat(loaded.get(3)).hasToString("l2");
assertThat(loaded).map(Object::toString).containsExactly("b1", "l1", "b2", "l2");
}
static interface TestFactory {
interface TestFactory {
}
static class TestFactoryImpl implements TestFactory, Ordered {