cleanup work

eugenp · eugenp · commit 7b531f0ce6a9 · 2015-01-31T20:57:57.000+02:00
diff --git a/spring-jpa/src/main/java/org/baeldung/config/ProductConfig.java b/spring-jpa/src/main/java/org/baeldung/config/ProductConfig.java
@@ -29,8 +29,10 @@ public ProductConfig() {
         super();
     }
 
-    @Bean(name = "productEntityManager")
-    public LocalContainerEntityManagerFactoryBean productEntityManagerFactory() {
+    //
+
+    @Bean
+    public LocalContainerEntityManagerFactoryBean productEntityManager() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(productDataSource());
         em.setPackagesToScan(new String[] { "org.baeldung.persistence.multiple.model.product" });
@@ -56,10 +58,10 @@ public DataSource productDataSource() {
         return dataSource;
     }
 
-    @Bean(name = "productTransactionManager")
-    public PlatformTransactionManager transactionManager() {
+    @Bean
+    public PlatformTransactionManager productTransactionManager() {
         final JpaTransactionManager transactionManager = new JpaTransactionManager();
-        transactionManager.setEntityManagerFactory(productEntityManagerFactory().getObject());
+        transactionManager.setEntityManagerFactory(productEntityManager().getObject());
         return transactionManager;
     }
 
diff --git a/spring-jpa/src/main/java/org/baeldung/config/UserConfig.java b/spring-jpa/src/main/java/org/baeldung/config/UserConfig.java
@@ -30,8 +30,11 @@ public UserConfig() {
         super();
     }
 
-    @Bean(name = "userEntityManager")
-    public LocalContainerEntityManagerFactoryBean userEntityManagerFactory() {
+    //
+
+    @Primary
+    @Bean
+    public LocalContainerEntityManagerFactoryBean userEntityManager() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(userDataSource());
         em.setPackagesToScan(new String[] { "org.baeldung.persistence.multiple.model.user" });
@@ -46,6 +49,7 @@ public LocalContainerEntityManagerFactoryBean userEntityManagerFactory() {
         return em;
     }
 
+    @Primary
     @Bean
     public DataSource userDataSource() {
         final DriverManagerDataSource dataSource = new DriverManagerDataSource();
@@ -58,10 +62,10 @@ public DataSource userDataSource() {
     }
 
     @Primary
-    @Bean(name = "userTransactionManager")
-    public PlatformTransactionManager transactionManager() {
+    @Bean
+    public PlatformTransactionManager userTransactionManager() {
         final JpaTransactionManager transactionManager = new JpaTransactionManager();
-        transactionManager.setEntityManagerFactory(userEntityManagerFactory().getObject());
+        transactionManager.setEntityManagerFactory(userEntityManager().getObject());
         return transactionManager;
     }
 
