BAEL-1924 (#4590)

* Revert "BAEL-1924 (#4573)"

This reverts commit b1b34e2fca.

* BAEL-1924 move code to new spring-boot-persistence module

* BAEL-1924 add new spring-boot-persistence module

spring-boot/src/test/java/org/baeldung/boot/repository/UserRepositoryDataJpaIntegrationTest.java

@@ -1,30 +0,0 @@
-package org.baeldung.boot.repository;
-
-import org.baeldung.boot.domain.User;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.Collection;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Created by adam.
- */
-@RunWith(SpringRunner.class)
-@DataJpaTest
-public class UserRepositoryDataJpaIntegrationTest {
-
-    @Autowired private UserRepository userRepository;
-
-    @Test
-    public void givenTwoImportFilesWhenFindAllShouldReturnSixUsers() {
-        Collection<User> users = userRepository.findAll();
-
-        assertThat(users.size()).isEqualTo(6);
-    }
-
-}

spring-boot/src/test/java/org/baeldung/repository/UserRepositoryIntegrationTest.java

@@ -1,7 +1,7 @@
-package org.baeldung.boot.repository;
+package org.baeldung.repository;
 
 import org.baeldung.boot.config.H2JpaConfig;
-import org.baeldung.boot.domain.User;
+import org.baeldung.model.User;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,7 +27,8 @@ public class UserRepositoryIntegrationTest {
     private final String USER_NAME_ADAM = "Adam";
     private final Integer ACTIVE_STATUS = 1;
 
-    @Autowired private UserRepository userRepository;
+    @Autowired
+    private UserRepository userRepository;
 
     @Test
     public void givenEmptyDBWhenFindOneByNameThenReturnEmptyOptional() {

spring-boot/src/test/resources/application-integrationtest.properties

@@ -2,5 +2,3 @@ spring.datasource.url=jdbc:mysql://localhost:3306/employee_int_test
 spring.datasource.username=root
 spring.datasource.password=root
 
-spring.jpa.hibernate.ddl-auto=update
-spring.datasource.data=import_*_users.sql

spring-boot/src/test/resources/application.properties

@@ -16,6 +16,4 @@ hibernate.show_sql=true
 hibernate.hbm2ddl.auto=create-drop
 hibernate.cache.use_second_level_cache=true
 hibernate.cache.use_query_cache=true
-hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory
-
-spring.jpa.properties.hibernate.hbm2ddl.import_files=import_active_users.sql,import_inactive_users.sql
+hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory

spring-boot/src/test/resources/import_active_users.sql

@@ -1,3 +0,0 @@
-insert into USERS(name, status, id) values('Peter', 1, 1);
-insert into USERS(name, status, id) values('David', 1, 2);
-insert into USERS(name, status, id) values('Ed', 1, 3);

spring-boot/src/test/resources/import_inactive_users.sql

@@ -1,3 +0,0 @@
-insert into users(name, status, id) values('Monica', 0, 4);
-insert into users(name, status, id) values('Paul', 0, 5);
-insert into users(name, status, id) values('George', 0, 6);