Merge pull request eugenp#6993 from eugenp/BAEL-12800-v2

lor6 · web-flow · commit 362e78032f94 · 2019-05-20T23:08:53.000+03:00
update db properties
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/MultipleDbApplication.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/MultipleDbApplication.java
@@ -9,6 +9,6 @@ public class MultipleDbApplication {
     public static void main(String[] args) {
         SpringApplication.run(MultipleDbApplication.class, args);
     }
-
+    
 }
 
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceProductAutoConfiguration.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceProductAutoConfiguration.java
@@ -54,9 +54,9 @@ public LocalContainerEntityManagerFactoryBean productEntityManager() {
 
         return em;
     }
-
+    
     @Bean
-    @ConfigurationProperties(prefix="spring.product")
+    @ConfigurationProperties(prefix="spring.second-datasource")
     public DataSource productDataSource() {
         return DataSourceBuilder.create().build();
     }
diff --git a/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceUserAutoConfiguration.java b/persistence-modules/spring-data-jpa/src/main/java/com/baeldung/multipledb/PersistenceUserAutoConfiguration.java
@@ -43,7 +43,6 @@ public PersistenceUserAutoConfiguration() {
     @Primary
     @Bean
     public LocalContainerEntityManagerFactoryBean userEntityManager() {
-        System.out.println("loading config");
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(userDataSource());
         em.setPackagesToScan("com.baeldung.multipledb.model.user");
@@ -58,9 +57,9 @@ public LocalContainerEntityManagerFactoryBean userEntityManager() {
         return em;
     }
 
-    @Primary
     @Bean
-    @ConfigurationProperties(prefix="spring.user")
+    @Primary
+    @ConfigurationProperties(prefix="spring.datasource")
     public DataSource userDataSource() {
         return DataSourceBuilder.create().build();
     }
diff --git a/persistence-modules/spring-data-jpa/src/main/resources/persistence-multiple-db-boot.properties b/persistence-modules/spring-data-jpa/src/main/resources/persistence-multiple-db-boot.properties
@@ -1,18 +1,11 @@
-# user data source
-spring.user.driverClassName=org.h2.Driver
-spring.user.jdbc-url=jdbc:h2:mem:spring_jpa_user;DB_CLOSE_DELAY=-1;INIT=CREATE SCHEMA IF NOT EXISTS USERS
-spring.user.username=sa
-spring.user.password=sa
-
-# product data source
-spring.product.driverClassName=org.h2.Driver
-spring.product.jdbc-url=jdbc:h2:mem:spring_jpa_product;DB_CLOSE_DELAY=-1;INIT=CREATE SCHEMA IF NOT EXISTS PRODUCTS
-spring.product.username=sa
-spring.product.password=sa
-
-# hibernate.X
-hibernate.dialect=org.hibernate.dialect.H2Dialect
-hibernate.show_sql=false
 hibernate.hbm2ddl.auto=create-drop
 hibernate.cache.use_second_level_cache=false
-hibernate.cache.use_query_cache=false
+hibernate.cache.use_query_cache=false
+
+spring.datasource.jdbcUrl=jdbc:h2:mem:spring_jpa_user;DB_CLOSE_DELAY=-1;INIT=CREATE SCHEMA IF NOT EXISTS USERS
+spring.datasource.username=sa
+spring.datasource.password=sa
+
+spring.second-datasource.jdbcUrl=jdbc:h2:mem:spring_jpa_product;DB_CLOSE_DELAY=-1;INIT=CREATE SCHEMA IF NOT EXISTS PRODUCTS
+spring.second-datasource.username=sa
+spring.second-datasource.password=sa
diff --git a/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/multipledb/JpaMultipleDBIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/com/baeldung/multipledb/JpaMultipleDBIntegrationTest.java
@@ -12,7 +12,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ public class MultipleDbApplication {`
`9`	`9`	`public static void main(String[] args) {`
`10`	`10`	`SpringApplication.run(MultipleDbApplication.class, args);`
`11`	`11`	`}`
`12`		`-`
	`12`	`+`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,9 @@ public LocalContainerEntityManagerFactoryBean productEntityManager() {`
`54`	`54`
`55`	`55`	`return em;`
`56`	`56`	`}`
`57`		`-`
	`57`	`+`
`58`	`58`	`@Bean`
`59`		`- @ConfigurationProperties(prefix="spring.product")`
	`59`	`+ @ConfigurationProperties(prefix="spring.second-datasource")`
`60`	`60`	`public DataSource productDataSource() {`
`61`	`61`	`return DataSourceBuilder.create().build();`
`62`	`62`	`}`