Adapt to upstream Spring Framework AOT changes

This commit is contained in:
Phillip Webb
2022-07-27 21:44:18 +01:00
parent b68e43f5fd
commit 57e967576e
4 changed files with 10 additions and 15 deletions

View File

@@ -36,7 +36,7 @@ import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.TypeHint;
import org.springframework.aot.hint.TypeReference;
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
import org.springframework.beans.factory.aot.AotFactoriesLoader;
import org.springframework.beans.factory.aot.AotServices;
import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
import org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor;
import org.springframework.beans.factory.aot.BeanFactoryInitializationCode;
@@ -63,9 +63,8 @@ class ConfigurationPropertiesBeanFactoryInitializationAotProcessorTests {
@Test
void configurationPropertiesBeanFactoryInitializationAotProcessorIsRegistered() {
assertThat(new AotFactoriesLoader(new DefaultListableBeanFactory())
.load(BeanFactoryInitializationAotProcessor.class))
.anyMatch(ConfigurationPropertiesBeanFactoryInitializationAotProcessor.class::isInstance);
assertThat(AotServices.factories().load(BeanFactoryInitializationAotProcessor.class))
.anyMatch(ConfigurationPropertiesBeanFactoryInitializationAotProcessor.class::isInstance);
}
@Test

View File

@@ -18,7 +18,7 @@ package org.springframework.boot.context.properties;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.aot.AotFactoriesLoader;
import org.springframework.beans.factory.aot.AotServices;
import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
import org.springframework.beans.factory.aot.BeanRegistrationAotProcessor;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -40,7 +40,7 @@ class ConfigurationPropertiesBeanRegistrationAotProcessorTests {
@Test
void configurationPropertiesBeanRegistrationAotProcessorIsRegistered() {
assertThat(new AotFactoriesLoader(new DefaultListableBeanFactory()).load(BeanRegistrationAotProcessor.class))
assertThat(AotServices.factories().load(BeanRegistrationAotProcessor.class))
.anyMatch(ConfigurationPropertiesBeanRegistrationAotProcessor.class::isInstance);
}