fixup! Create spring-boot-jpa module

Author: wilkinsona

spring-boot-project/spring-boot-flyway/build.gradle

@@ -18,7 +18,6 @@ dependencies {
 	optional("org.flywaydb:flyway-database-postgresql")
 	optional("org.flywaydb:flyway-sqlserver")
 
-	testImplementation(project(":spring-boot-project:spring-boot-jpa"))
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
 	testImplementation("jakarta.persistence:jakarta.persistence-api")

spring-boot-project/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/FlywayAutoConfigurationTests.java

@@ -67,12 +67,10 @@
 import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration.PostgresqlFlywayConfigurationCustomizer;
 import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration.SqlServerFlywayConfigurationCustomizer;
 import org.springframework.boot.jdbc.DataSourceBuilder;
-import org.springframework.boot.jdbc.EmbeddedDatabaseConnection;
 import org.springframework.boot.jdbc.SchemaManagement;
 import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties;
 import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
 import org.springframework.boot.jdbc.autoconfigure.JdbcConnectionDetails;
-import org.springframework.boot.jpa.EntityManagerFactoryBuilder;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -1065,10 +1063,11 @@ FlywayMigrationInitializer customFlywayMigrationInitializer(Flyway flyway) {
 
 		@Bean
 		LocalContainerEntityManagerFactoryBean entityManagerFactoryBean(DataSource dataSource) {
-			return new EntityManagerFactoryBuilder(new HibernateJpaVendorAdapter(), (ds) -> configureJpaProperties(),
-					null)
-				.dataSource(dataSource)
-				.build();
+			LocalContainerEntityManagerFactoryBean localContainerEntityManagerFactoryBean = new LocalContainerEntityManagerFactoryBean();
+			localContainerEntityManagerFactoryBean.setDataSource(dataSource);
+			localContainerEntityManagerFactoryBean.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
+			localContainerEntityManagerFactoryBean.setJpaPropertyMap(configureJpaProperties());
+			return localContainerEntityManagerFactoryBean;
 		}
 
 	}
@@ -1089,50 +1088,11 @@ Flyway customFlyway() {
 
 		@Bean
 		LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() {
-			return new EntityManagerFactoryBuilder(new HibernateJpaVendorAdapter(),
-					(datasource) -> configureJpaProperties(), null)
-				.dataSource(this.dataSource)
-				.build();
-		}
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	static class JpaWithMultipleDataSourcesConfiguration {
-
-		@Bean
-		@Primary
-		DataSource normalDataSource() {
-			return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseConnection.HSQLDB.getType())
-				.generateUniqueName(true)
-				.build();
-		}
-
-		@Bean
-		@Primary
-		LocalContainerEntityManagerFactoryBean normalEntityManagerFactory(EntityManagerFactoryBuilder builder,
-				DataSource normalDataSource) {
-			Map<String, Object> properties = new HashMap<>();
-			properties.put("configured", "normal");
-			properties.put("hibernate.transaction.jta.platform", NoJtaPlatform.INSTANCE);
-			return builder.dataSource(normalDataSource).properties(properties).build();
-		}
-
-		@Bean
-		@FlywayDataSource
-		DataSource flywayDataSource() {
-			return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseConnection.HSQLDB.getType())
-				.generateUniqueName(true)
-				.build();
-		}
-
-		@Bean
-		LocalContainerEntityManagerFactoryBean flywayEntityManagerFactory(EntityManagerFactoryBuilder builder,
-				@FlywayDataSource DataSource flywayDataSource) {
-			Map<String, Object> properties = new HashMap<>();
-			properties.put("configured", "flyway");
-			properties.put("hibernate.transaction.jta.platform", NoJtaPlatform.INSTANCE);
-			return builder.dataSource(flywayDataSource).properties(properties).build();
+			LocalContainerEntityManagerFactoryBean localContainerEntityManagerFactoryBean = new LocalContainerEntityManagerFactoryBean();
+			localContainerEntityManagerFactoryBean.setDataSource(this.dataSource);
+			localContainerEntityManagerFactoryBean.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
+			localContainerEntityManagerFactoryBean.setJpaPropertyMap(configureJpaProperties());
+			return localContainerEntityManagerFactoryBean;
 		}
 
 	}

spring-boot-project/spring-boot-jpa/build.gradle

@@ -20,7 +20,6 @@ dependencies {
 	optional("jakarta.servlet:jakarta.servlet-api")
 	optional("org.springframework:spring-webmvc")
 
-	testImplementation(project(":spring-boot-project:spring-boot-autoconfigure-all"))
 	testImplementation(project(":spring-boot-project:spring-boot-flyway"))
 	testImplementation(project(":spring-boot-project:spring-boot-liquibase"))
 	testImplementation(project(":spring-boot-project:spring-boot-test"))

spring-boot-project/spring-boot-jpa/src/test/java/org/springframework/boot/jpa/autoconfigure/hibernate/Hibernate2ndLevelCacheIntegrationTests.java

@@ -16,14 +16,18 @@
 
 package org.springframework.boot.jpa.autoconfigure.hibernate;
 
+import javax.cache.CacheManager;
+import javax.cache.Caching;
+
 import org.ehcache.jsr107.EhcacheCachingProvider;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration;
 import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.jcache.JCacheCacheManager;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -36,8 +40,8 @@
 class Hibernate2ndLevelCacheIntegrationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(CacheAutoConfiguration.class, DataSourceAutoConfiguration.class,
-				HibernateJpaAutoConfiguration.class))
+		.withConfiguration(
+				AutoConfigurations.of(DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class))
 		.withUserConfiguration(TestConfiguration.class);
 
 	@Test
@@ -54,6 +58,16 @@ void hibernate2ndLevelCacheWithJCacheAndEhCache() {
 	@EnableCaching
 	static class TestConfiguration {
 
+		@Bean
+		CacheManager cacheManager() {
+			return Caching.getCachingProvider(EhcacheCachingProvider.class.getName()).getCacheManager();
+		}
+
+		@Bean
+		JCacheCacheManager jcacheCacheManager(CacheManager cacheManager) {
+			return new JCacheCacheManager(cacheManager);
+		}
+
 	}
 
 }