From 714781df786aaa52f0eab72f3cb120f202f84c6d Mon Sep 17 00:00:00 2001 From: Josh Cummings <3627351+jzheaux@users.noreply.github.com> Date: Fri, 15 Aug 2025 15:06:33 -0600 Subject: [PATCH] Isolate AOT Test to Security Components PR gh-17724 --- .../aot/EnableMethodSecurityAotTests.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/aot/EnableMethodSecurityAotTests.java b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/aot/EnableMethodSecurityAotTests.java index e0b63abd2d..78fd41048e 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/aot/EnableMethodSecurityAotTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/aot/EnableMethodSecurityAotTests.java @@ -18,6 +18,8 @@ package org.springframework.security.config.annotation.method.configuration.aot; import javax.sql.DataSource; +import jakarta.persistence.EntityManager; +import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -29,7 +31,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.aot.ApplicationContextAotGenerator; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; @@ -72,7 +74,6 @@ public class EnableMethodSecurityAotTests { @Configuration @EnableMethodSecurity - @EnableJpaRepositories static class AppConfig { @Bean @@ -92,6 +93,14 @@ public class EnableMethodSecurityAotTests { return factory; } + @Bean + JpaRepositoryFactoryBean<@NonNull MessageRepository, Message, Long> repo(EntityManager entityManager) { + JpaRepositoryFactoryBean<@NonNull MessageRepository, Message, Long> bean = new JpaRepositoryFactoryBean<>( + MessageRepository.class); + bean.setEntityManager(entityManager); + return bean; + } + } }