From e5d0e34268b33021413fefacbc6ee0530fc55269 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 5 Sep 2022 18:23:05 +0200 Subject: [PATCH] Adapt to recent changes in Spring Framework See https://github.com/spring-projects/spring-framework/issues/29082 See https://github.com/spring-projects/spring-framework/issues/28877 --- .../server/ChildManagementContextInitializerAotTests.java | 6 +++--- ...gurationPropertiesBeanRegistrationAotProcessorTests.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ChildManagementContextInitializerAotTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ChildManagementContextInitializerAotTests.java index 27d22d8e34..6afe39a0d7 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ChildManagementContextInitializerAotTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ChildManagementContextInitializerAotTests.java @@ -26,8 +26,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.aot.AotDetector; -import org.springframework.aot.test.generator.compile.CompileWithTargetClassAccess; -import org.springframework.aot.test.generator.compile.TestCompiler; +import org.springframework.aot.test.generate.TestGenerationContext; +import org.springframework.aot.test.generate.compile.CompileWithTargetClassAccess; +import org.springframework.aot.test.generate.compile.TestCompiler; import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration; @@ -43,7 +44,6 @@ import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.aot.ApplicationContextAotGenerator; import org.springframework.context.support.GenericApplicationContext; import org.springframework.javapoet.ClassName; -import org.springframework.test.aot.generate.TestGenerationContext; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.util.StringUtils; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanRegistrationAotProcessorTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanRegistrationAotProcessorTests.java index a9c7a521e8..d065132f23 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanRegistrationAotProcessorTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanRegistrationAotProcessorTests.java @@ -21,8 +21,9 @@ import java.util.function.Consumer; import org.junit.jupiter.api.Test; -import org.springframework.aot.test.generator.compile.CompileWithTargetClassAccess; -import org.springframework.aot.test.generator.compile.TestCompiler; +import org.springframework.aot.test.generate.TestGenerationContext; +import org.springframework.aot.test.generate.compile.CompileWithTargetClassAccess; +import org.springframework.aot.test.generate.compile.TestCompiler; import org.springframework.beans.factory.aot.AotServices; import org.springframework.beans.factory.aot.BeanRegistrationAotContribution; import org.springframework.beans.factory.aot.BeanRegistrationAotProcessor; @@ -38,7 +39,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.aot.ApplicationContextAotGenerator; import org.springframework.context.support.GenericApplicationContext; import org.springframework.javapoet.ClassName; -import org.springframework.test.aot.generate.TestGenerationContext; import org.springframework.test.context.support.TestPropertySourceUtils; import static org.assertj.core.api.Assertions.assertThat;