#289 - Simplified EntityManager setup in multiple DataSources example.

We now use Spring Boot's EntityManagerFactoryBuilder to simplify the setup. Removed the manual exclusion of the HibernateJpaAutoConfiguration as it's not needed anymore.

Author: odrotbohm

jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/Application.java

@@ -24,7 +24,6 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.devtools.autoconfigure.DevToolsDataSourceAutoConfiguration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
@@ -44,8 +43,8 @@
  * @see example.springdata.jpa.multipleds.customer.CustomerConfig
  * @see example.springdata.jpa.multipleds.order.OrderConfig
  */
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
-		DataSourceTransactionManagerAutoConfiguration.class })
+@SpringBootApplication(
+		exclude = { DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class })
 @EnableTransactionManagement
 public class Application {
 

jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/customer/CustomerConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,56 +18,53 @@
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 
 /**
  * Configuration for the {@link Customer} slice of the system. A dedicated {@link DataSource},
- * {@link JpaTransactionManager} and {@link EntityManagerFactory}. Note that there could of course be some deduplication
- * with {@link example.springdata.jpa.multipleds.order.OrderConfig}. I just decided to keep it to focus on the
- * sepeartion of the two. Also, some overlaps might not even occur in real world scenarios (whether to create DDl or the
- * like).
+ * {@link JpaTransactionManager} and {@link EntityManagerFactory}. Note that there could of course be some
+ * de-duplication with {@link example.springdata.jpa.multipleds.order.OrderConfig}. I just decided to keep it to focus
+ * on the separation of the two. Also, some overlaps might not even occur in real world scenarios (whether to create DDl
+ * or the like).
  *
  * @author Oliver Gierke
  */
 @Configuration
-@EnableJpaRepositories(entityManagerFactoryRef = "customerEntityManagerFactory",
+@EnableJpaRepositories( //
+		entityManagerFactoryRef = "customerEntityManagerFactory", //
 		transactionManagerRef = "customerTransactionManager")
 class CustomerConfig {
 
 	@Bean
-	PlatformTransactionManager customerTransactionManager() {
-		return new JpaTransactionManager(customerEntityManagerFactory().getObject());
+	PlatformTransactionManager customerTransactionManager(
+			@Qualifier("customerEntityManagerFactory") EntityManagerFactory emf) {
+		return new JpaTransactionManager(emf);
 	}
 
 	@Bean
-	LocalContainerEntityManagerFactoryBean customerEntityManagerFactory() {
+	LocalContainerEntityManagerFactoryBean customerEntityManagerFactory(EntityManagerFactoryBuilder builder) {
 
-		HibernateJpaVendorAdapter jpaVendorAdapter = new HibernateJpaVendorAdapter();
-		jpaVendorAdapter.setGenerateDdl(true);
-
-		LocalContainerEntityManagerFactoryBean factoryBean = new LocalContainerEntityManagerFactoryBean();
-
-		factoryBean.setDataSource(customerDataSource());
-		factoryBean.setJpaVendorAdapter(jpaVendorAdapter);
-		factoryBean.setPackagesToScan(CustomerConfig.class.getPackage().getName());
-
-		return factoryBean;
+		return builder //
+				.dataSource(customerDataSource()) //
+				.packages(CustomerConfig.class) //
+				.build();
 	}
 
 	@Bean
 	DataSource customerDataSource() {
 
-		return new EmbeddedDatabaseBuilder().//
-				setType(EmbeddedDatabaseType.HSQL).//
-				setName("customers").//
-				build();
+		return new EmbeddedDatabaseBuilder() //
+				.setType(EmbeddedDatabaseType.HSQL) //
+				.setName("customers") //
+				.build();
 	}
 }

jpa/multiple-datasources/src/main/java/example/springdata/jpa/multipleds/order/OrderConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,48 +18,44 @@
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 
 /**
  * Configuration for the {@link Order} slice of the system. A dedicated {@link DataSource},
- * {@link JpaTransactionManager} and {@link EntityManagerFactory}. Note that there could of course be some deduplication
- * with {@link example.springdata.jpa.multipleds.customer.CustomerConfig}. I just decided to keep it to focus on the
- * sepeartion of the two. Also, some overlaps might not even occur in real world scenarios (whether to create DDl or the
- * like).
+ * {@link JpaTransactionManager} and {@link EntityManagerFactory}. Note that there could of course be some
+ * de-duplication with {@link example.springdata.jpa.multipleds.customer.CustomerConfig}. I just decided to keep it to
+ * focus on the separation of the two. Also, some overlaps might not even occur in real world scenarios (whether to
+ * create DDl or the like).
  *
  * @author Oliver Gierke
  */
 @Configuration
-@EnableJpaRepositories(entityManagerFactoryRef = "orderEntityManagerFactory",
+@EnableJpaRepositories(//
+		entityManagerFactoryRef = "orderEntityManagerFactory", //
 		transactionManagerRef = "orderTransactionManager")
 class OrderConfig {
 
 	@Bean
-	PlatformTransactionManager orderTransactionManager() {
-		return new JpaTransactionManager(orderEntityManagerFactory().getObject());
+	PlatformTransactionManager orderTransactionManager(@Qualifier("orderEntityManagerFactory") EntityManagerFactory emf) {
+		return new JpaTransactionManager(emf);
 	}
 
 	@Bean
-	LocalContainerEntityManagerFactoryBean orderEntityManagerFactory() {
+	LocalContainerEntityManagerFactoryBean orderEntityManagerFactory(EntityManagerFactoryBuilder builder) {
 
-		HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-		vendorAdapter.setGenerateDdl(true);
-
-		LocalContainerEntityManagerFactoryBean factoryBean = new LocalContainerEntityManagerFactoryBean();
-
-		factoryBean.setDataSource(orderDataSource());
-		factoryBean.setJpaVendorAdapter(vendorAdapter);
-		factoryBean.setPackagesToScan(OrderConfig.class.getPackage().getName());
-
-		return factoryBean;
+		return builder //
+				.dataSource(orderDataSource()) //
+				.packages(OrderConfig.class) //
+				.build();
 	}
 
 	@Bean