Merge branch '3.5.x'

Closes gh-46635

Author: wilkinsona

module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesAutoConfiguration.java

@@ -22,6 +22,7 @@
 
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.boot.LazyInitializationExcludeFilter;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
@@ -93,6 +94,11 @@ EntityManagerFactoryBuilderCustomizer entityManagerFactoryBootstrapExecutorCusto
 		};
 	}
 
+	@Bean
+	static LazyInitializationExcludeFilter eagerJpaMetamodelCacheCleanup() {
+		return (name, definition, type) -> "org.springframework.data.jpa.util.JpaMetamodelCacheCleanup".equals(name);
+	}
+
 	private @Nullable AsyncTaskExecutor determineBootstrapExecutor(Map<String, AsyncTaskExecutor> taskExecutors) {
 		if (taskExecutors.size() == 1) {
 			return taskExecutors.values().iterator().next();

module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/AbstractJpaRepositoriesAutoConfigurationTests.java

@@ -16,9 +16,13 @@
 
 package org.springframework.boot.data.jpa.autoconfigure;
 
+import java.util.Map;
+
 import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.metamodel.Metamodel;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.LazyInitializationBeanFactoryPostProcessor;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
@@ -35,8 +39,10 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.data.jpa.util.JpaMetamodel;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.transaction.PlatformTransactionManager;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -133,6 +139,19 @@ void bootstrapModeIsDefaultByDefault() {
 				.isNull());
 	}
 
+	@Test
+	void whenLazyInitializationIsEnabledJpaMetamodelCacheIsClearedOnContextClose() {
+		this.contextRunner.withUserConfiguration(TestConfiguration.class)
+			.withBean(LazyInitializationBeanFactoryPostProcessor.class)
+			.run((context) -> assertThat(jpaMetamodelCache()).isNotEmpty());
+		assertThat(jpaMetamodelCache()).isEmpty();
+	}
+
+	@SuppressWarnings("unchecked")
+	private Map<Metamodel, JpaMetamodel> jpaMetamodelCache() {
+		return (Map<Metamodel, JpaMetamodel>) ReflectionTestUtils.getField(JpaMetamodel.class, "CACHE");
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	@EnableScheduling
 	@Import(TestConfiguration.class)