Merge pull request #6585 from amit2103/BAEL-10897

[BAEL-10897] - Fixed  spring-boot-persistence tests

persistence-modules/spring-boot-persistence/pom.xml

@@ -25,6 +25,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.zaxxer</groupId>
+                    <artifactId>HikariCP</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -48,6 +54,11 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>${validation-api.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -73,6 +84,7 @@
         <tomcat-jdbc.version>9.0.10</tomcat-jdbc.version>
         <h2database.version>1.4.197</h2database.version>
         <mockito.version>2.23.0</mockito.version>
+        <validation-api.version>2.0.1.Final</validation-api.version>
     </properties>
 
 </project>

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/Application.java

@@ -1,4 +1,4 @@
-package com.baeldung;
+package com.baeldung.boot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/domain/Car.java

@@ -1,4 +1,4 @@
-package com.baeldung.exists;
+package com.baeldung.boot.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -17,7 +17,7 @@ public class Car {
     private Integer power;
     private String model;
 
-    Car() {
+    public Car() {
 
     }
 

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/domain/Country.java

@@ -1,4 +1,4 @@
-package com.baeldung.domain;
+package com.baeldung.boot.domain;
 
 import static javax.persistence.GenerationType.IDENTITY;
 

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/domain/User.java

@@ -1,4 +1,4 @@
-package com.baeldung.domain;
+package com.baeldung.boot.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/naming/HibernateConfig.java

@@ -1,4 +1,4 @@
-package com.baeldung.naming;
+package com.baeldung.boot.naming;
 
 import org.hibernate.jpa.boot.spi.IntegratorProvider;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernatePropertiesCustomizer;

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/naming/MetadataExtractorIntegrator.java

@@ -1,4 +1,4 @@
-package com.baeldung.naming;
+package com.baeldung.boot.naming;
 
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.model.relational.Database;

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/naming/entity/Account.java

@@ -1,4 +1,4 @@
-package com.baeldung.naming.entity;
+package com.baeldung.boot.naming.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/naming/entity/Preference.java

@@ -1,4 +1,4 @@
-package com.baeldung.naming.entity;
+package com.baeldung.boot.naming.entity;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/repository/CarRepository.java

@@ -1,10 +1,12 @@
-package com.baeldung.exists;
+package com.baeldung.boot.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import com.baeldung.boot.domain.Car;
+
 /**
  * @author paullatzelsperger
  * @since 2019-03-20

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/boot/repository/UserRepository.java

@@ -1,6 +1,5 @@
-package com.baeldung.repository;
+package com.baeldung.boot.repository;
 
-import com.baeldung.domain.User;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -11,6 +10,8 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Repository;
 
+import com.baeldung.boot.domain.User;
+
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;

persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/SpringBootH2IntegrationTest.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import com.baeldung.boot.Application;
 import com.baeldung.boot.config.H2JpaConfig;
 import com.baeldung.boot.domain.GenericEntity;
 import com.baeldung.boot.repository.GenericEntityRepository;

persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/SpringBootJPAIntegrationTest.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.baeldung.boot.Application;
 import com.baeldung.boot.domain.GenericEntity;
 import com.baeldung.boot.repository.GenericEntityRepository;
 

persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/SpringBootProfileIntegrationTest.java

@@ -10,12 +10,13 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.baeldung.boot.Application;
+import com.baeldung.boot.config.H2JpaConfig;
 import com.baeldung.boot.domain.GenericEntity;
 import com.baeldung.boot.repository.GenericEntityRepository;
-import com.baeldung.config.H2TestProfileJPAConfig;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = { Application.class, H2TestProfileJPAConfig.class })
+@SpringBootTest(classes = { Application.class, H2JpaConfig.class })
 @ActiveProfiles("test")
 public class SpringBootProfileIntegrationTest {
     @Autowired

persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/boot/naming/LegacyJpaImplNamingIntegrationTest.java

@@ -1,6 +1,5 @@
-package com.baeldung.naming;
+package com.baeldung.boot.naming;
 
-import com.baeldung.naming.entity.Account;
 import org.assertj.core.api.SoftAssertions;
 import org.hibernate.boot.Metadata;
 import org.hibernate.mapping.PersistentClass;
@@ -8,15 +7,20 @@ import org.hibernate.mapping.Table;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.baeldung.boot.naming.NamingConfig.Config;
+import com.baeldung.boot.naming.entity.Account;
+
 @RunWith(SpringRunner.class)
 @DataJpaTest
 @TestPropertySource(properties = {
   "spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl",
   "spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl"
 })
+@Import(Config.class)
 public class LegacyJpaImplNamingIntegrationTest extends NamingConfig {
 
     @Test

persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/boot/naming/NamingConfig.java

@@ -1,4 +1,4 @@
-package com.baeldung.naming;
+package com.baeldung.boot.naming;
 
 import org.springframework.boot.autoconfigure.orm.jpa.HibernatePropertiesCustomizer;
 import org.springframework.boot.test.context.TestConfiguration;

persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/boot/naming/SpringBootDefaultNamingIntegrationTest.java

@@ -1,6 +1,5 @@
-package com.baeldung.naming;
+package com.baeldung.boot.naming;
 
-import com.baeldung.naming.entity.Account;
 import org.assertj.core.api.SoftAssertions;
 import org.hibernate.boot.Metadata;
 import org.hibernate.mapping.PersistentClass;
@@ -8,10 +7,12 @@ import org.hibernate.mapping.Table;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import com.baeldung.boot.naming.NamingConfig.Config;
+import com.baeldung.boot.naming.entity.Account;
 
 @RunWith(SpringRunner.class)
 @DataJpaTest
@@ -19,6 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat;
   "spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy",
   "spring.jpa.hibernate.naming.implicit-strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy"
 })
+@Import(Config.class)
 public class SpringBootDefaultNamingIntegrationTest extends NamingConfig {
 
     @Test

persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/boot/naming/StrategyLegacyHbmImplIntegrationTest.java

@@ -1,6 +1,9 @@
-package com.baeldung.naming;
+package com.baeldung.boot.naming;
+
+import com.baeldung.boot.naming.MetadataExtractorIntegrator;
+import com.baeldung.boot.naming.NamingConfig.Config;
+import com.baeldung.boot.naming.entity.Preference;
 
-import com.baeldung.naming.entity.Preference;
 import org.assertj.core.api.SoftAssertions;
 import org.hibernate.boot.Metadata;
 import org.hibernate.mapping.PersistentClass;
@@ -8,6 +11,7 @@ import org.hibernate.mapping.Table;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -19,6 +23,7 @@ import java.util.Collection;
   "spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl",
   "spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl",
 })
+@Import(Config.class)
 public class StrategyLegacyHbmImplIntegrationTest extends NamingConfig {
 
     @Test

persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/boot/test/UserRepositoryIntegrationTest.java

@@ -1,12 +1,14 @@
-package com.baeldung.repository;
+package com.baeldung.boot.test;
 
-import com.baeldung.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 com.baeldung.boot.domain.User;
+import com.baeldung.boot.repository.UserRepository;
+
 import java.util.Collection;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -24,7 +26,7 @@ public class UserRepositoryIntegrationTest {
     public void givenTwoImportFilesWhenFindAllShouldReturnSixUsers() {
         Collection<User> users = userRepository.findAll();
 
-        assertThat(users.size()).isEqualTo(9);
+        assertThat(users.size()).isEqualTo(3);
     }
 
 }

persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/config/H2TestProfileJPAConfig.java

@@ -41,7 +41,7 @@ public class H2TestProfileJPAConfig {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "com.baeldung.domain", "com.baeldung.boot.domain" });
+        em.setPackagesToScan(new String[] { "com.baeldung.boot.domain" });
         em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
         em.setJpaProperties(additionalProperties());
         return em;

persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/exists/CarRepositoryIntegrationTest.java

@@ -13,11 +13,15 @@ import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.baeldung.boot.Application;
+import com.baeldung.boot.domain.Car;
+import com.baeldung.boot.repository.CarRepository;
+
 import java.util.Arrays;
 import java.util.List;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(classes = {Application.class})
 public class CarRepositoryIntegrationTest {
 
     @Autowired

persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/springbootdatasourceconfig/application/tests/UserRepositoryIntegrationTest.java

@@ -1,15 +1,17 @@
-package com.baeldung.springbootdatasourceconfig.tests;
+package com.baeldung.springbootdatasourceconfig.application.tests;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+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 com.baeldung.springbootdatasourceconfig.application.entities.User;
 import com.baeldung.springbootdatasourceconfig.application.repositories.UserRepository;
-import java.util.List;
-import java.util.Optional;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @DataJpaTest
@@ -23,6 +25,6 @@ public class UserRepositoryIntegrationTest {
         userRepository.save(new User("Bob", "bob@domain.com"));
         List<User> users = (List<User>) userRepository.findAll();
         
-        assertThat(users.size()).isEqualTo(1);
+        assertThat(users.size()).isEqualTo(3);
     }
 }

persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/tomcatconnectionpool/test/application/SpringBootTomcatConnectionPoolIntegrationTest.java

@@ -5,11 +5,14 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.tomcatconnectionpool.application.SpringBootConsoleApplication;
+
 import static org.assertj.core.api.Assertions.*;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(classes = {SpringBootConsoleApplication.class})
 public class SpringBootTomcatConnectionPoolIntegrationTest {
     
     @Autowired