Merge pull request #5140 from FDPro/master

[BAEL-2048] dupirefr <dupire.francois+pro@gmail.com> Moving Spring Data JPA articles into new spring-data-jpa module

persistence-modules/spring-jpa/src/main/java/org/baeldung/config/StudentJPAH2Config.java

@@ -1,69 +0,0 @@
-package org.baeldung.config;
-
-import java.util.Properties;
-
-import javax.persistence.EntityManagerFactory;
-import javax.sql.DataSource;
-
-import org.baeldung.extended.persistence.dao.ExtendedRepositoryImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.env.Environment;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-@Configuration
-@EnableJpaRepositories(basePackages = "org.baeldung.extended.persistence.dao", repositoryBaseClass = ExtendedRepositoryImpl.class)
-@PropertySource("persistence-student-h2.properties")
-@EnableTransactionManagement
-public class StudentJPAH2Config {
-
-    @Autowired
-    private Environment env;
-
-    @Bean
-    public DataSource dataSource() {
-        final DriverManagerDataSource dataSource = new DriverManagerDataSource();
-        dataSource.setDriverClassName(env.getProperty("jdbc.driverClassName"));
-        dataSource.setUrl(env.getProperty("jdbc.url"));
-        dataSource.setUsername(env.getProperty("jdbc.user"));
-        dataSource.setPassword(env.getProperty("jdbc.pass"));
-
-        return dataSource;
-    }
-
-    @Bean
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
-        final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
-        em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "org.baeldung.inmemory.persistence.model" });
-        em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
-        em.setJpaProperties(additionalProperties());
-        return em;
-    }
-
-    @Bean
-    JpaTransactionManager transactionManager(EntityManagerFactory entityManagerFactory) {
-        JpaTransactionManager transactionManager = new JpaTransactionManager();
-        transactionManager.setEntityManagerFactory(entityManagerFactory);
-        return transactionManager;
-    }
-
-    final Properties additionalProperties() {
-        final Properties hibernateProperties = new Properties();
-
-        hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
-        hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
-        hibernateProperties.setProperty("hibernate.show_sql", env.getProperty("hibernate.show_sql"));
-        hibernateProperties.setProperty("hibernate.cache.use_second_level_cache", env.getProperty("hibernate.cache.use_second_level_cache"));
-        hibernateProperties.setProperty("hibernate.cache.use_query_cache", env.getProperty("hibernate.cache.use_query_cache"));
-
-        return hibernateProperties;
-    }
-}

persistence-modules/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedStudentRepository.java

@@ -1,6 +0,0 @@
-package org.baeldung.extended.persistence.dao;
-
-import org.baeldung.inmemory.persistence.model.Student;
-
-public interface ExtendedStudentRepository extends ExtendedRepository<Student, Long> {
-}

persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/model/User.java

@@ -1,49 +0,0 @@
-package org.baeldung.persistence.model;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "users")
-public class User {
-
-    @Id
-    @GeneratedValue
-    private Integer id;
-    private String name;
-    private Integer status;
-
-    public User() {
-    }
-
-    public User(String name, Integer status) {
-        this.name = name;
-        this.status = status;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-}

persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/multiple/dao/user/UserRepository.java

@@ -1,8 +0,0 @@
-package org.baeldung.persistence.multiple.dao.user;
-
-import org.baeldung.persistence.multiple.model.user.User;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface UserRepository extends JpaRepository<User, Integer> {
-
-}

persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/multiple/model/user/Possession.java

@@ -1,10 +1,6 @@
 package org.baeldung.persistence.multiple.model.user;
 
-import javax.persistence.Entity;
+import javax.persistence.*;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
 
 @Entity
 @Table(schema = "spring_jpa_user")

persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/multiple/model/user/User.java

@@ -1,15 +1,8 @@
 package org.baeldung.persistence.multiple.model.user;
 
+import javax.persistence.*;
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
 @Entity
 @Table(schema = "spring_jpa_user")
 public class User {

persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java

@@ -8,7 +8,6 @@ import org.junit.runners.Suite;
     FooPaginationPersistenceIntegrationTest.class
     ,FooServicePersistenceIntegrationTest.class
     ,FooServiceSortingIntegrationTest.class
-    ,JpaMultipleDBIntegrationTest.class
     ,FooServiceSortingWitNullsManualIntegrationTest.class
 }) // @formatter:on
 public class PersistenceTestSuite {

spring-boot/src/main/java/org/baeldung/repository/UserRepository.java

@@ -24,8 +24,6 @@ public interface UserRepository extends JpaRepository<User, Integer> {
 
     Optional<User> findOneByName(String name);
 
-    Stream<User> findAllByName(String name);
-
     @Async
     CompletableFuture<User> findOneByStatus(Integer status);
 

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

@@ -52,30 +52,6 @@ public class UserRepositoryIntegrationTest {
           .getName()).isEqualTo(USER_NAME_ADAM);
     }
 
-    @Test
-    @Transactional
-    public void givenUsersWithSameNameInDBWhenFindAllByNameThenReturnStreamOfUsers() {
-        User user1 = new User();
-        user1.setName(USER_NAME_ADAM);
-        userRepository.save(user1);
-
-        User user2 = new User();
-        user2.setName(USER_NAME_ADAM);
-        userRepository.save(user2);
-
-        User user3 = new User();
-        user3.setName(USER_NAME_ADAM);
-        userRepository.save(user3);
-
-        User user4 = new User();
-        user4.setName("SAMPLE");
-        userRepository.save(user4);
-
-        try (Stream<User> foundUsersStream = userRepository.findAllByName(USER_NAME_ADAM)) {
-            assertThat(foundUsersStream.count()).isEqualTo(3l);
-        }
-    }
-
     @Test
     public void givenUserInDBWhenFindOneByStatusAsyncThenReturnCompletableFutureUser() throws ExecutionException, InterruptedException {
         User user = new User();

spring-data-jpa/pom.xml

@@ -17,10 +17,30 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-ehcache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>21.0</version>
+        </dependency>
     </dependencies>
 
 </project>

spring-data-jpa/src/main/java/com/baeldung/Application.java

@@ -1,14 +1,17 @@
 package com.baeldung;
 
+import com.baeldung.dao.repositories.impl.ExtendedRepositoryImpl;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContext;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication
+@EnableJpaRepositories(repositoryBaseClass = ExtendedRepositoryImpl.class)
 public class Application {
-    private static ApplicationContext applicationContext;
 
     public static void main(String[] args) {
-        applicationContext = SpringApplication.run(Application.class, args);
+        SpringApplication.run(Application.class, args);
     }
+
 }

spring-data-jpa/src/main/java/com/baeldung/config/PersistenceConfiguration.java

@@ -0,0 +1,102 @@
+package com.baeldung.config;
+
+import com.baeldung.services.IBarService;
+import com.baeldung.services.impl.BarSpringDataJpaService;
+import com.google.common.base.Preconditions;
+import com.baeldung.dao.repositories.impl.ExtendedRepositoryImpl;
+import com.baeldung.services.IFooService;
+import com.baeldung.services.impl.FooService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.*;
+import org.springframework.core.env.Environment;
+import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.JpaVendorAdapter;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.sql.DataSource;
+import java.util.Properties;
+
+@Configuration
+@ComponentScan({"com.baeldung.dao", "com.baeldung.services"})
+@EnableTransactionManagement
+@EnableJpaRepositories(basePackages = {"com.baeldung.dao"}, repositoryBaseClass = ExtendedRepositoryImpl.class)
+@EnableJpaAuditing
+@PropertySource("classpath:persistence.properties")
+public class PersistenceConfiguration {
+
+    @Autowired
+    private Environment env;
+
+    public PersistenceConfiguration() {
+        super();
+    }
+
+    @Bean
+    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
+        final LocalContainerEntityManagerFactoryBean emf = new LocalContainerEntityManagerFactoryBean();
+        emf.setDataSource(dataSource());
+        emf.setPackagesToScan("com.baeldung.domain");
+
+        final JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+        emf.setJpaVendorAdapter(vendorAdapter);
+        emf.setJpaProperties(hibernateProperties());
+
+        return emf;
+    }
+
+    @Bean
+    public DataSource dataSource() {
+        final DriverManagerDataSource dataSource = new DriverManagerDataSource();
+        dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));
+        dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url")));
+        dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user")));
+        dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass")));
+
+        return dataSource;
+    }
+
+    @Bean
+    public PlatformTransactionManager transactionManager() {
+        final JpaTransactionManager transactionManager = new JpaTransactionManager();
+        transactionManager.setEntityManagerFactory(entityManagerFactory().getObject());
+        return transactionManager;
+    }
+
+    @Bean
+    public PersistenceExceptionTranslationPostProcessor exceptionTranslation() {
+        return new PersistenceExceptionTranslationPostProcessor();
+    }
+
+    @Bean
+    public IBarService barSpringDataJpaService() {
+        return new BarSpringDataJpaService();
+    }
+
+    @Bean
+    public IFooService fooService() {
+        return new FooService();
+    }
+
+    private final Properties hibernateProperties() {
+        final Properties hibernateProperties = new Properties();
+        hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
+        hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
+
+        hibernateProperties.setProperty("hibernate.show_sql", "true");
+        // hibernateProperties.setProperty("hibernate.format_sql", "true");
+        // hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
+
+        // Envers properties
+        hibernateProperties.setProperty("org.hibernate.envers.audit_table_suffix", env.getProperty("envers.audit_table_suffix"));
+
+        return hibernateProperties;
+    }
+
+}

spring-data-jpa/src/main/java/com/baeldung/config/PersistenceProductConfiguration.java

@@ -1,9 +1,6 @@
-package org.baeldung.config;
+package com.baeldung.config;
-
-import java.util.HashMap;
-
-import javax.sql.DataSource;
 
+import com.google.common.base.Preconditions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -16,16 +13,17 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 
-import com.google.common.base.Preconditions;
+import javax.sql.DataSource;
+import java.util.HashMap;
 
 @Configuration
-@PropertySource({ "classpath:persistence-multiple-db.properties" })
+@PropertySource({"classpath:persistence-multiple-db.properties"})
-@EnableJpaRepositories(basePackages = "org.baeldung.persistence.multiple.dao.product", entityManagerFactoryRef = "productEntityManager", transactionManagerRef = "productTransactionManager")
+@EnableJpaRepositories(basePackages = "com.baeldung.dao.repositories.product", entityManagerFactoryRef = "productEntityManager", transactionManagerRef = "productTransactionManager")
-public class ProductConfig {
+public class PersistenceProductConfiguration {
     @Autowired
     private Environment env;
 
-    public ProductConfig() {
+    public PersistenceProductConfiguration() {
         super();
     }
 
@@ -35,7 +33,7 @@ public class ProductConfig {
     public LocalContainerEntityManagerFactoryBean productEntityManager() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(productDataSource());
-        em.setPackagesToScan(new String[] { "org.baeldung.persistence.multiple.model.product" });
+        em.setPackagesToScan("com.baeldung.domain.product");
 
         final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         em.setJpaVendorAdapter(vendorAdapter);

spring-data-jpa/src/main/java/com/baeldung/config/PersistenceUserConfiguration.java

@@ -1,9 +1,6 @@
-package org.baeldung.config;
+package com.baeldung.config;
-
-import java.util.HashMap;
-
-import javax.sql.DataSource;
 
+import com.google.common.base.Preconditions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -17,16 +14,17 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 
-import com.google.common.base.Preconditions;
+import javax.sql.DataSource;
+import java.util.HashMap;
 
 @Configuration
-@PropertySource({ "classpath:persistence-multiple-db.properties" })
+@PropertySource({"classpath:persistence-multiple-db.properties"})
-@EnableJpaRepositories(basePackages = "org.baeldung.persistence.multiple.dao.user", entityManagerFactoryRef = "userEntityManager", transactionManagerRef = "userTransactionManager")
+@EnableJpaRepositories(basePackages = "com.baeldung.dao.repositories.user", entityManagerFactoryRef = "userEntityManager", transactionManagerRef = "userTransactionManager")
-public class UserConfig {
+public class PersistenceUserConfiguration {
     @Autowired
     private Environment env;
 
-    public UserConfig() {
+    public PersistenceUserConfiguration() {
         super();
     }
 
@@ -37,7 +35,7 @@ public class UserConfig {
     public LocalContainerEntityManagerFactoryBean userEntityManager() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(userDataSource());
-        em.setPackagesToScan(new String[] { "org.baeldung.persistence.multiple.model.user" });
+        em.setPackagesToScan("com.baeldung.domain.user");
 
         final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         em.setJpaVendorAdapter(vendorAdapter);

spring-data-jpa/src/main/java/com/baeldung/dao/IFooDao.java

@@ -0,0 +1,12 @@
+package com.baeldung.dao;
+
+import com.baeldung.domain.Foo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+public interface IFooDao extends JpaRepository<Foo, Long> {
+
+    @Query("SELECT f FROM Foo f WHERE LOWER(f.name) = LOWER(:name)")
+    Foo retrieveByName(@Param("name") String name);
+}

spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ArticleRepository.java

@@ -1,4 +1,4 @@
-package com.baeldung.repository;
+package com.baeldung.dao.repositories;
 
 import com.baeldung.domain.Article;
 import org.springframework.data.jpa.repository.JpaRepository;

spring-data-jpa/src/main/java/com/baeldung/dao/repositories/CustomItemRepository.java

@@ -1,15 +1,15 @@
-package com.baeldung.repository;
+package com.baeldung.dao.repositories;
-
+
-import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Repository;
-
+
-import com.baeldung.domain.Item;
+import com.baeldung.domain.Item;
-
+
-@Repository
+@Repository
-public interface CustomItemRepository {
+public interface CustomItemRepository {
-
+
-    void deleteCustom(Item entity);
+    void deleteCustom(Item entity);
-
+
-    Item findItemById(Long id);
+    Item findItemById(Long id);
-
+
-    void findThenDelete(Long id);
+    void findThenDelete(Long id);
-}
+}

spring-data-jpa/src/main/java/com/baeldung/dao/repositories/CustomItemTypeRepository.java

@@ -1,13 +1,13 @@
-package com.baeldung.repository;
+package com.baeldung.dao.repositories;
-
+
-import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Repository;
-
+
-import com.baeldung.domain.ItemType;
+import com.baeldung.domain.ItemType;
-
+
-@Repository
+@Repository
-public interface CustomItemTypeRepository {
+public interface CustomItemTypeRepository {
-
+
-    void deleteCustom(ItemType entity);
+    void deleteCustom(ItemType entity);
-
+
-    void findThenDelete(Long id);
+    void findThenDelete(Long id);
-}
+}

spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ExtendedRepository.java

@@ -1,4 +1,4 @@
-package org.baeldung.extended.persistence.dao;
+package com.baeldung.dao.repositories;
 
 import java.io.Serializable;
 import java.util.List;
@@ -8,5 +8,7 @@ import org.springframework.data.repository.NoRepositoryBean;
 
 @NoRepositoryBean
 public interface ExtendedRepository<T, ID extends Serializable> extends JpaRepository<T, ID> {
-    public List<T> findByAttributeContainsText(String attributeName, String text);
+
+    List<T> findByAttributeContainsText(String attributeName, String text);
+
 }

spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ExtendedStudentRepository.java

@@ -0,0 +1,6 @@
+package com.baeldung.dao.repositories;
+
+import com.baeldung.domain.Student;
+
+public interface ExtendedStudentRepository extends ExtendedRepository<Student, Long> {
+}

spring-data-jpa/src/main/java/com/baeldung/dao/repositories/IBarCrudRepository.java

@@ -0,0 +1,10 @@
+package com.baeldung.dao.repositories;
+
+import com.baeldung.domain.Bar;
+import org.springframework.data.repository.CrudRepository;
+
+import java.io.Serializable;
+
+public interface IBarCrudRepository extends CrudRepository<Bar, Serializable> {
+    //
+}

spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ItemTypeRepository.java

@@ -1,10 +1,10 @@
-package com.baeldung.repository;
+package com.baeldung.dao.repositories;
-
+
-import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Repository;
-
+
-import com.baeldung.domain.ItemType;
+import com.baeldung.domain.ItemType;
-
+
-@Repository
+@Repository
-public interface ItemTypeRepository extends JpaRepository<ItemType, Long>, CustomItemTypeRepository, CustomItemRepository {
+public interface ItemTypeRepository extends JpaRepository<ItemType, Long>, CustomItemTypeRepository, CustomItemRepository {
-}
+}

spring-data-jpa/src/main/java/com/baeldung/dao/repositories/LocationRepository.java

@@ -1,4 +1,4 @@
-package com.baeldung.repository;
+package com.baeldung.dao.repositories;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

spring-data-jpa/src/main/java/com/baeldung/dao/repositories/ReadOnlyLocationRepository.java

@@ -1,15 +1,15 @@
-package com.baeldung.repository;
+package com.baeldung.dao.repositories;
-
+
-import java.util.Optional;
+import java.util.Optional;
-
+
-import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.Repository;
-
+
-import com.baeldung.domain.Location;
+import com.baeldung.domain.Location;
-
+
-@org.springframework.stereotype.Repository
+@org.springframework.stereotype.Repository
-public interface ReadOnlyLocationRepository extends Repository<Location, Long> {
+public interface ReadOnlyLocationRepository extends Repository<Location, Long> {
-
+
-    Optional<Location> findById(Long id);
+    Optional<Location> findById(Long id);
-
+
-    Location save(Location location);
+    Location save(Location location);
-}
+}

spring-data-jpa/src/main/java/com/baeldung/dao/repositories/StoreRepository.java

@@ -1,13 +1,13 @@
-package com.baeldung.repository;
+package com.baeldung.dao.repositories;
-
+
-import java.util.List;
+import java.util.List;
-
+
-import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Repository;
-
+
-import com.baeldung.domain.Store;
+import com.baeldung.domain.Store;
-
+
-@Repository
+@Repository
-public interface StoreRepository extends JpaRepository<Store, Long> {
+public interface StoreRepository extends JpaRepository<Store, Long> {
-    List<Store> findStoreByLocationId(Long locationId);
+    List<Store> findStoreByLocationId(Long locationId);
-}
+}

spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/CustomItemRepositoryImpl.java

@@ -1,32 +1,32 @@
-package com.baeldung.repository.impl;
+package com.baeldung.dao.repositories.impl;
-
+
-import javax.persistence.EntityManager;
+import javax.persistence.EntityManager;
-
+
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Repository;
-
+
-import com.baeldung.domain.Item;
+import com.baeldung.domain.Item;
-import com.baeldung.repository.CustomItemRepository;
+import com.baeldung.dao.repositories.CustomItemRepository;
-
+
-@Repository
+@Repository
-public class CustomItemRepositoryImpl implements CustomItemRepository {
+public class CustomItemRepositoryImpl implements CustomItemRepository {
-
+
-    @Autowired
+    @Autowired
-    private EntityManager entityManager;
+    private EntityManager entityManager;
-
+
-    @Override
+    @Override
-    public void deleteCustom(Item item) {
+    public void deleteCustom(Item item) {
-        entityManager.remove(item);
+        entityManager.remove(item);
-    }
+    }
-
+
-    @Override
+    @Override
-    public Item findItemById(Long id) {
+    public Item findItemById(Long id) {
-        return entityManager.find(Item.class, id);
+        return entityManager.find(Item.class, id);
-    }
+    }
-
+
-    @Override
+    @Override
-    public void findThenDelete(Long id) {
+    public void findThenDelete(Long id) {
-        final Item item = entityManager.find(Item.class, id);
+        final Item item = entityManager.find(Item.class, id);
-        entityManager.remove(item);
+        entityManager.remove(item);
-    }
+    }
-}
+}

spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/CustomItemTypeRepositoryImpl.java

@@ -1,31 +1,31 @@
-package com.baeldung.repository.impl;
+package com.baeldung.dao.repositories.impl;
-
+
-import javax.persistence.EntityManager;
+import javax.persistence.EntityManager;
-
+
-import org.slf4j.Logger;
+import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Repository;
-
+
-import com.baeldung.domain.ItemType;
+import com.baeldung.domain.ItemType;
-import com.baeldung.repository.CustomItemTypeRepository;
+import com.baeldung.dao.repositories.CustomItemTypeRepository;
-
+
-@Repository
+@Repository
-public class CustomItemTypeRepositoryImpl implements CustomItemTypeRepository {
+public class CustomItemTypeRepositoryImpl implements CustomItemTypeRepository {
-
+
-    private static final Logger LOGGER = LoggerFactory.getLogger(CustomItemTypeRepositoryImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CustomItemTypeRepositoryImpl.class);
-
+
-    @Autowired
+    @Autowired
-    private EntityManager entityManager;
+    private EntityManager entityManager;
-
+
-    @Override
+    @Override
-    public void deleteCustom(ItemType itemType) {
+    public void deleteCustom(ItemType itemType) {
-        entityManager.remove(itemType);
+        entityManager.remove(itemType);
-    }
+    }
-
+
-    @Override
+    @Override
-    public void findThenDelete(Long id) {
+    public void findThenDelete(Long id) {
-        ItemType itemTypeToDelete = entityManager.find(ItemType.class, id);
+        ItemType itemTypeToDelete = entityManager.find(ItemType.class, id);
-        entityManager.remove(itemTypeToDelete);
+        entityManager.remove(itemTypeToDelete);
-    }
+    }
-}
+}

spring-data-jpa/src/main/java/com/baeldung/dao/repositories/impl/ExtendedRepositoryImpl.java

@@ -1,4 +1,4 @@
-package org.baeldung.extended.persistence.dao;
+package com.baeldung.dao.repositories.impl;
 
 import java.io.Serializable;
 import java.util.List;
@@ -10,6 +10,7 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Root;
 import javax.transaction.Transactional;
 
+import com.baeldung.dao.repositories.ExtendedRepository;
 import org.springframework.data.jpa.repository.support.JpaEntityInformation;
 import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
 

spring-data-jpa/src/main/java/com/baeldung/dao/repositories/product/ProductRepository.java

@@ -1,6 +1,6 @@
-package org.baeldung.persistence.multiple.dao.product;
+package com.baeldung.dao.repositories.product;
 
-import org.baeldung.persistence.multiple.model.product.Product;
+import com.baeldung.domain.product.Product;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ProductRepository extends JpaRepository<Product, Integer> {

spring-data-jpa/src/main/java/com/baeldung/dao/repositories/user/PossessionRepository.java

@@ -1,6 +1,6 @@
-package org.baeldung.persistence.multiple.dao.user;
+package com.baeldung.dao.repositories.user;
 
-import org.baeldung.persistence.multiple.model.user.Possession;
+import com.baeldung.domain.user.Possession;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface PossessionRepository extends JpaRepository<Possession, Long> {

spring-data-jpa/src/main/java/com/baeldung/dao/repositories/user/UserRepository.java

@@ -1,6 +1,6 @@
-package org.baeldung.persistence.repository;
+package com.baeldung.dao.repositories.user;
 
-import org.baeldung.persistence.model.User;
+import com.baeldung.domain.user.User;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -8,24 +8,25 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Stream;
 
-@Repository("userRepository")
 public interface UserRepository extends JpaRepository<User, Integer> {
 
+    Stream<User> findAllByName(String name);
+
     @Query("SELECT u FROM User u WHERE u.status = 1")
     Collection<User> findAllActiveUsers();
 
-    @Query(value = "SELECT * FROM USERS u WHERE u.status = 1", nativeQuery = true)
+    @Query(value = "SELECT * FROM USERS.USERS u WHERE u.status = 1", nativeQuery = true)
     Collection<User> findAllActiveUsersNative();
 
     @Query("SELECT u FROM User u WHERE u.status = ?1")
     User findUserByStatus(Integer status);
 
-    @Query(value = "SELECT * FROM Users u WHERE u.status = ?1", nativeQuery = true)
+    @Query(value = "SELECT * FROM USERS.Users u WHERE u.status = ?1", nativeQuery = true)
     User findUserByStatusNative(Integer status);
 
     @Query("SELECT u FROM User u WHERE u.status = ?1 and u.name = ?2")
@@ -34,7 +35,7 @@ public interface UserRepository extends JpaRepository<User, Integer> {
     @Query("SELECT u FROM User u WHERE u.status = :status and u.name = :name")
     User findUserByStatusAndNameNamedParams(@Param("status") Integer status, @Param("name") String name);
 
-    @Query(value = "SELECT * FROM Users u WHERE u.status = :status AND u.name = :name", nativeQuery = true)
+    @Query(value = "SELECT * FROM USERS.Users u WHERE u.status = :status AND u.name = :name", nativeQuery = true)
     User findUserByStatusAndNameNamedParamsNative(@Param("status") Integer status, @Param("name") String name);
 
     @Query("SELECT u FROM User u WHERE u.status = :status and u.name = :name")
@@ -46,7 +47,7 @@ public interface UserRepository extends JpaRepository<User, Integer> {
     @Query("SELECT u FROM User u WHERE u.name like :name%")
     User findUserByNameLikeNamedParam(@Param("name") String name);
 
-    @Query(value = "SELECT * FROM users u WHERE u.name LIKE ?1%", nativeQuery = true)
+    @Query(value = "SELECT * FROM USERS.users u WHERE u.name LIKE ?1%", nativeQuery = true)
     User findUserByNameLikeNative(String name);
 
     @Query(value = "SELECT u FROM User u")
@@ -55,7 +56,7 @@ public interface UserRepository extends JpaRepository<User, Integer> {
     @Query(value = "SELECT u FROM User u ORDER BY id")
     Page<User> findAllUsersWithPagination(Pageable pageable);
 
-    @Query(value = "SELECT * FROM Users ORDER BY id \n-- #pageable\n", countQuery = "SELECT count(*) FROM Users", nativeQuery = true)
+    @Query(value = "SELECT * FROM USERS.Users ORDER BY id", countQuery = "SELECT count(*) FROM USERS.Users", nativeQuery = true)
     Page<User> findAllUsersWithPaginationNative(Pageable pageable);
 
     @Modifying
@@ -63,7 +64,6 @@ public interface UserRepository extends JpaRepository<User, Integer> {
     int updateUserSetStatusForName(@Param("status") Integer status, @Param("name") String name);
 
     @Modifying
-    @Query(value = "UPDATE Users u SET u.status = ? WHERE u.name = ?", nativeQuery = true)
+    @Query(value = "UPDATE USERS.Users u SET u.status = ? WHERE u.name = ?", nativeQuery = true)
     int updateUserSetStatusForNameNative(Integer status, String name);
-
 }

spring-data-jpa/src/main/java/com/baeldung/domain/Bar.java

@@ -0,0 +1,220 @@
+package com.baeldung.domain;
+
+import com.google.common.collect.Sets;
+import org.hibernate.annotations.OrderBy;
+import org.hibernate.envers.Audited;
+import org.jboss.logging.Logger;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Set;
+
+@Entity
+@NamedQuery(name = "Bar.findAll", query = "SELECT b FROM Bar b")
+@Audited
+@EntityListeners(AuditingEntityListener.class)
+public class Bar implements Serializable {
+
+    private static Logger logger = Logger.getLogger(Bar.class);
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private int id;
+
+    @Column(name = "name")
+    private String name;
+    @OneToMany(mappedBy = "bar", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @OrderBy(clause = "NAME DESC")
+    // @NotAudited
+    private Set<Foo> fooSet = Sets.newHashSet();
+    @Column(name = "operation")
+    private String operation;
+    @Column(name = "timestamp")
+    private long timestamp;
+    @Column(name = "created_date", updatable = false, nullable = false)
+    @CreatedDate
+    private long createdDate;
+    @Column(name = "modified_date")
+    @LastModifiedDate
+    private long modifiedDate;
+    @Column(name = "created_by")
+    @CreatedBy
+    private String createdBy;
+    @Column(name = "modified_by")
+    @LastModifiedBy
+    private String modifiedBy;
+
+    public Bar() {
+        super();
+    }
+
+    public Bar(final String name) {
+        super();
+
+        this.name = name;
+    }
+
+    public Set<Foo> getFooSet() {
+        return fooSet;
+    }
+
+    // API
+
+    public void setFooSet(final Set<Foo> fooSet) {
+        this.fooSet = fooSet;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(final int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public OPERATION getOperation() {
+        return OPERATION.parse(operation);
+    }
+
+    public void setOperation(final String operation) {
+        this.operation = operation;
+    }
+
+    public void setOperation(final OPERATION operation) {
+        this.operation = operation.getValue();
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(final long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public long getCreatedDate() {
+        return createdDate;
+    }
+
+    public void setCreatedDate(final long createdDate) {
+        this.createdDate = createdDate;
+    }
+
+    public long getModifiedDate() {
+        return modifiedDate;
+    }
+
+    public void setModifiedDate(final long modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(final String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public String getModifiedBy() {
+        return modifiedBy;
+    }
+
+    public void setModifiedBy(final String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        final Bar other = (Bar) obj;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("Bar [name=").append(name).append("]");
+        return builder.toString();
+    }
+
+    @PrePersist
+    public void onPrePersist() {
+        logger.info("@PrePersist");
+        audit(OPERATION.INSERT);
+    }
+
+    @PreUpdate
+    public void onPreUpdate() {
+        logger.info("@PreUpdate");
+        audit(OPERATION.UPDATE);
+    }
+
+    @PreRemove
+    public void onPreRemove() {
+        logger.info("@PreRemove");
+        audit(OPERATION.DELETE);
+    }
+
+    private void audit(final OPERATION operation) {
+        setOperation(operation);
+        setTimestamp((new Date()).getTime());
+    }
+
+    public enum OPERATION {
+        INSERT, UPDATE, DELETE;
+        private String value;
+
+        OPERATION() {
+            value = toString();
+        }
+
+        public static OPERATION parse(final String value) {
+            OPERATION operation = null;
+            for (final OPERATION op : OPERATION.values()) {
+                if (op.getValue().equals(value)) {
+                    operation = op;
+                    break;
+                }
+            }
+            return operation;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+
+}

spring-data-jpa/src/main/java/com/baeldung/domain/Foo.java

@@ -0,0 +1,94 @@
+package com.baeldung.domain;
+
+import org.hibernate.envers.Audited;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@NamedNativeQueries({@NamedNativeQuery(name = "callGetAllFoos", query = "CALL GetAllFoos()", resultClass = Foo.class), @NamedNativeQuery(name = "callGetFoosByName", query = "CALL GetFoosByName(:fooName)", resultClass = Foo.class)})
+@Entity
+@Audited
+// @Proxy(lazy = false)
+public class Foo implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id")
+    private long id;
+
+    @Column(name = "name", nullable = false)
+    private String name;
+
+    @ManyToOne(targetEntity = Bar.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @JoinColumn(name = "BAR_ID")
+    private Bar bar = new Bar();
+
+    public Foo() {
+        super();
+    }
+
+    public Foo(final String name) {
+        super();
+        this.name = name;
+    }
+
+    //
+
+    public Bar getBar() {
+        return bar;
+    }
+
+    public void setBar(final Bar bar) {
+        this.bar = bar;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(final long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    //
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        final Foo other = (Foo) obj;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("Foo [name=").append(name).append("]");
+        return builder.toString();
+    }
+}

spring-data-jpa/src/main/java/com/baeldung/domain/KVTag.java

@@ -0,0 +1,34 @@
+package com.baeldung.domain;
+
+import javax.persistence.Embeddable;
+
+@Embeddable
+public class KVTag {
+    private String key;
+    private String value;
+
+    public KVTag() {
+    }
+
+    public KVTag(String key, String value) {
+        super();
+        this.key = key;
+        this.value = value;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

spring-data-jpa/src/main/java/com/baeldung/domain/SkillTag.java

@@ -0,0 +1,30 @@
+package com.baeldung.domain;
+
+import javax.persistence.Embeddable;
+
+@Embeddable
+public class SkillTag {
+    private String name;
+    private int value;
+
+    public SkillTag() {
+    }
+
+    public SkillTag(String name, int value) {
+        super();
+        this.name = name;
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

spring-data-jpa/src/main/java/com/baeldung/domain/Student.java

@@ -0,0 +1,74 @@
+package com.baeldung.domain;
+
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+public class Student {
+
+    @Id
+    private long id;
+    private String name;
+
+    @ElementCollection
+    private List<String> tags = new ArrayList<>();
+
+    @ElementCollection
+    private List<SkillTag> skillTags = new ArrayList<>();
+
+    @ElementCollection
+    private List<KVTag> kvTags = new ArrayList<>();
+
+    public Student() {
+    }
+
+    public Student(long id, String name) {
+        super();
+        this.id = id;
+        this.name = name;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<String> getTags() {
+        return tags;
+    }
+
+    public void setTags(List<String> tags) {
+        this.tags.addAll(tags);
+    }
+
+    public List<SkillTag> getSkillTags() {
+        return skillTags;
+    }
+
+    public void setSkillTags(List<SkillTag> skillTags) {
+        this.skillTags.addAll(skillTags);
+    }
+
+    public List<KVTag> getKVTags() {
+        return this.kvTags;
+    }
+
+    public void setKVTags(List<KVTag> kvTags) {
+        this.kvTags.addAll(kvTags);
+    }
+
+}

spring-data-jpa/src/main/java/com/baeldung/domain/product/Product.java

@@ -1,11 +1,11 @@
-package org.baeldung.persistence.multiple.model.product;
+package com.baeldung.domain.product;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
 @Entity
-@Table(schema = "spring_jpa_product")
+@Table(schema = "products")
 public class Product {
 
     @Id

spring-data-jpa/src/main/java/com/baeldung/domain/user/Possession.java

@@ -0,0 +1,86 @@
+package com.baeldung.domain.user;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(schema = "users")
+public class Possession {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    private String name;
+
+    public Possession() {
+        super();
+    }
+
+    public Possession(final String name) {
+        super();
+
+        this.name = name;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(final int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = (prime * result) + (int) (id ^ (id >>> 32));
+        result = (prime * result) + ((name == null) ? 0 : name.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Possession other = (Possession) obj;
+        if (id != other.id) {
+            return false;
+        }
+        if (name == null) {
+            if (other.name != null) {
+                return false;
+            }
+        } else if (!name.equals(other.name)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("Possesion [id=").append(id).append(", name=").append(name).append("]");
+        return builder.toString();
+    }
+
+}

spring-data-jpa/src/main/java/com/baeldung/domain/user/User.java

@@ -0,0 +1,86 @@
+package com.baeldung.domain.user;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Entity
+@Table(name = "users", schema = "users")
+public class User {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int id;
+    private String name;
+    private int age;
+    @Column(unique = true, nullable = false)
+    private String email;
+    private Integer status;
+    @OneToMany
+    List<Possession> possessionList;
+
+    public User() {
+        super();
+    }
+
+    public User(String name, String email, Integer status) {
+        this.name = name;
+        this.email = email;
+        this.status = status;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(final int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(final String email) {
+        this.email = email;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(final int age) {
+        this.age = age;
+    }
+
+    public List<Possession> getPossessionList() {
+        return possessionList;
+    }
+
+    public void setPossessionList(List<Possession> possessionList) {
+        this.possessionList = possessionList;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder builder = new StringBuilder();
+        builder.append("User [name=").append(name).append(", id=").append(id).append("]");
+        return builder.toString();
+    }
+
+}

spring-data-jpa/src/main/java/com/baeldung/services/IBarService.java

@@ -0,0 +1,7 @@
+package com.baeldung.services;
+
+import com.baeldung.domain.Bar;
+
+public interface IBarService extends IOperations<Bar> {
+    //
+}

spring-data-jpa/src/main/java/com/baeldung/services/IFooService.java

@@ -0,0 +1,13 @@
+package com.baeldung.services;
+
+import com.baeldung.domain.Foo;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface IFooService extends IOperations<Foo> {
+
+    Foo retrieveByName(String name);
+    
+    Page<Foo> findPaginated(Pageable pageable);
+
+}

spring-data-jpa/src/main/java/com/baeldung/services/IOperations.java

@@ -0,0 +1,26 @@
+package com.baeldung.services;
+
+import org.springframework.data.domain.Page;
+
+import java.io.Serializable;
+import java.util.List;
+
+public interface IOperations<T extends Serializable> {
+
+    T findOne(final long id);
+
+    List<T> findAll();
+
+    Page<T> findPaginated(int page, int size);
+
+    // write
+
+    T create(final T entity);
+
+    T update(final T entity);
+
+    void delete(final T entity);
+
+    void deleteById(final long entityId);
+
+}

spring-data-jpa/src/main/java/com/baeldung/services/impl/AbstractService.java

@@ -0,0 +1,61 @@
+package com.baeldung.services.impl;
+
+import com.baeldung.services.IOperations;
+import com.google.common.collect.Lists;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Transactional
+public abstract class AbstractService<T extends Serializable> implements IOperations<T> {
+
+    // read - one
+
+    @Override
+    @Transactional(readOnly = true)
+    public T findOne(final long id) {
+        return getDao().findById(id).orElse(null);
+    }
+
+    // read - all
+
+    @Override
+    @Transactional(readOnly = true)
+    public List<T> findAll() {
+        return Lists.newArrayList(getDao().findAll());
+    }
+
+    @Override
+    public Page<T> findPaginated(final int page, final int size) {
+        return getDao().findAll(new PageRequest(page, size));
+    }
+
+    // write
+
+    @Override
+    public T create(final T entity) {
+        return getDao().save(entity);
+    }
+
+    @Override
+    public T update(final T entity) {
+        return getDao().save(entity);
+    }
+
+    @Override
+    public void delete(final T entity) {
+        getDao().delete(entity);
+    }
+
+    @Override
+    public void deleteById(final long entityId) {
+        getDao().deleteById(entityId);
+    }
+
+    protected abstract PagingAndSortingRepository<T, Long> getDao();
+
+}

spring-data-jpa/src/main/java/com/baeldung/services/impl/AbstractSpringDataJpaService.java

@@ -0,0 +1,45 @@
+package com.baeldung.services.impl;
+
+import com.baeldung.services.IOperations;
+import com.google.common.collect.Lists;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Transactional(value = "transactionManager")
+public abstract class AbstractSpringDataJpaService<T extends Serializable> implements IOperations<T> {
+
+    @Override
+    public T findOne(final long id) {
+        return getDao().findById(id).orElse(null);
+    }
+
+    @Override
+    public List<T> findAll() {
+        return Lists.newArrayList(getDao().findAll());
+    }
+
+    @Override
+    public T create(final T entity) {
+        return getDao().save(entity);
+    }
+
+    @Override
+    public T update(final T entity) {
+        return getDao().save(entity);
+    }
+
+    @Override
+    public void delete(final T entity) {
+        getDao().delete(entity);
+    }
+
+    @Override
+    public void deleteById(final long entityId) {
+        getDao().deleteById(entityId);
+    }
+
+    protected abstract CrudRepository<T, Serializable> getDao();
+}

spring-data-jpa/src/main/java/com/baeldung/services/impl/BarSpringDataJpaService.java

@@ -0,0 +1,30 @@
+package com.baeldung.services.impl;
+
+import com.baeldung.domain.Bar;
+import com.baeldung.dao.repositories.IBarCrudRepository;
+import com.baeldung.services.IBarService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.repository.CrudRepository;
+
+import java.io.Serializable;
+
+public class BarSpringDataJpaService extends AbstractSpringDataJpaService<Bar> implements IBarService {
+
+    @Autowired
+    private IBarCrudRepository dao;
+
+    public BarSpringDataJpaService() {
+        super();
+    }
+
+    @Override
+    protected CrudRepository<Bar, Serializable> getDao() {
+        return dao;
+    }
+
+    @Override
+    public Page<Bar> findPaginated(int page, int size) {
+        throw new UnsupportedOperationException("Not implemented yet");
+    }
+}

spring-data-jpa/src/main/java/com/baeldung/services/impl/FooService.java

@@ -0,0 +1,54 @@
+package com.baeldung.services.impl;
+
+import com.google.common.collect.Lists;
+import com.baeldung.dao.IFooDao;
+import com.baeldung.domain.Foo;
+import com.baeldung.services.IFooService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional
+public class FooService extends AbstractService<Foo> implements IFooService {
+
+    @Autowired
+    private IFooDao dao;
+
+    public FooService() {
+        super();
+    }
+
+    // API
+
+    @Override
+    protected PagingAndSortingRepository<Foo, Long> getDao() {
+        return dao;
+    }
+
+    // custom methods
+
+    @Override
+    public Foo retrieveByName(final String name) {
+        return dao.retrieveByName(name);
+    }
+
+    // overridden to be secured
+
+    @Override
+    @Transactional(readOnly = true)
+    public List<Foo> findAll() {
+        return Lists.newArrayList(getDao().findAll());
+    }
+
+    @Override
+    public Page<Foo> findPaginated(Pageable pageable) {
+        return dao.findAll(pageable);
+    }
+
+}

spring-data-jpa/src/main/resources/persistence-multiple-db.properties

@@ -1,7 +1,7 @@
 # jdbc.X
 jdbc.driverClassName=org.h2.Driver
-user.jdbc.url=jdbc:h2:mem:spring_jpa_user;DB_CLOSE_DELAY=-1;INIT=CREATE SCHEMA IF NOT EXISTS SPRING_JPA_USER
+user.jdbc.url=jdbc:h2:mem:spring_jpa_user;DB_CLOSE_DELAY=-1;INIT=CREATE SCHEMA IF NOT EXISTS USERS
-product.jdbc.url=jdbc:h2:mem:spring_jpa_product;DB_CLOSE_DELAY=-1;INIT=CREATE SCHEMA IF NOT EXISTS SPRING_JPA_PRODUCT
+product.jdbc.url=jdbc:h2:mem:spring_jpa_product;DB_CLOSE_DELAY=-1;INIT=CREATE SCHEMA IF NOT EXISTS PRODUCTS
 jdbc.user=sa
 jdbc.pass=
 

spring-data-jpa/src/main/resources/persistence.properties

@@ -0,0 +1,16 @@
+# jdbc.X
+jdbc.driverClassName=org.h2.Driver
+jdbc.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;INIT=CREATE SCHEMA IF NOT EXISTS USERS
+jdbc.user=sa
+jdbc.pass=
+
+# hibernate.X
+hibernate.dialect=org.hibernate.dialect.H2Dialect
+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
+
+# envers.X
+envers.audit_table_suffix=_audit_log

spring-data-jpa/src/test/java/com/baeldung/dao/repositories/ArticleRepositoryIntegrationTest.java

@@ -1,7 +1,9 @@
-package com.baeldung.repository;
+package com.baeldung.dao.repositories;
 
+import com.baeldung.config.PersistenceConfiguration;
+import com.baeldung.config.PersistenceProductConfiguration;
+import com.baeldung.config.PersistenceUserConfiguration;
 import com.baeldung.domain.Article;
-import com.baeldung.repository.ArticleRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +18,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(SpringRunner.class)
-@DataJpaTest
+@DataJpaTest(excludeAutoConfiguration = {PersistenceConfiguration.class, PersistenceUserConfiguration.class, PersistenceProductConfiguration.class})
 public class ArticleRepositoryIntegrationTest {
 
     @Autowired

spring-data-jpa/src/test/java/com/baeldung/dao/repositories/ExtendedStudentRepositoryIntegrationTest.java

@@ -1,23 +1,21 @@
-package org.baeldung.persistence.repository;
+package com.baeldung.dao.repositories;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import com.baeldung.config.PersistenceConfiguration;
-
+import com.baeldung.domain.Student;
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.baeldung.config.StudentJPAH2Config;
-import org.baeldung.extended.persistence.dao.ExtendedStudentRepository;
-import org.baeldung.inmemory.persistence.model.Student;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+import javax.annotation.Resource;
-@ContextConfiguration(classes = { StudentJPAH2Config.class })
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = {PersistenceConfiguration.class})
 @DirtiesContext
 public class ExtendedStudentRepositoryIntegrationTest {
     @Resource

spring-data-jpa/src/test/java/com/baeldung/dao/repositories/JpaRepositoriesIntegrationTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.repository;
+package com.baeldung.dao.repositories;
 
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
@@ -9,10 +9,19 @@ import static junit.framework.TestCase.assertTrue;
 import java.util.List;
 import java.util.Optional;
 
+import com.baeldung.config.PersistenceConfiguration;
+import com.baeldung.config.PersistenceProductConfiguration;
+import com.baeldung.config.PersistenceUserConfiguration;
+import com.baeldung.dao.repositories.ItemTypeRepository;
+import com.baeldung.dao.repositories.LocationRepository;
+import com.baeldung.dao.repositories.ReadOnlyLocationRepository;
+import com.baeldung.dao.repositories.StoreRepository;
 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.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import com.baeldung.domain.Item;
@@ -21,7 +30,7 @@ import com.baeldung.domain.Location;
 import com.baeldung.domain.Store;
 
 @RunWith(SpringRunner.class)
-@DataJpaTest
+@DataJpaTest(excludeAutoConfiguration = {PersistenceConfiguration.class, PersistenceUserConfiguration.class, PersistenceProductConfiguration.class})
 public class JpaRepositoriesIntegrationTest {
     @Autowired
     private LocationRepository locationRepository;

spring-data-jpa/src/test/java/com/baeldung/dao/repositories/UserRepositoryIntegrationTest.java

@@ -1,23 +1,25 @@
-package org.baeldung.persistence.repository;
+package com.baeldung.dao.repositories;
 
-import org.baeldung.config.PersistenceJPAConfigL2Cache;
+import com.baeldung.config.PersistenceConfiguration;
-import org.baeldung.persistence.model.User;
+import com.baeldung.dao.repositories.user.UserRepository;
+import com.baeldung.domain.user.User;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.JpaSort;
 import org.springframework.data.mapping.PropertyReferenceException;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -25,32 +27,71 @@ import static org.assertj.core.api.Assertions.assertThat;
  * Created by adam.
  */
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = PersistenceJPAConfigL2Cache.class)
+@SpringBootTest(classes = PersistenceConfiguration.class)
 @DirtiesContext
 public class UserRepositoryIntegrationTest {
 
     private final String USER_NAME_ADAM = "Adam";
     private final String USER_NAME_PETER = "Peter";
+
+    private final String USER_EMAIL = "email@example.com";
+    private final String USER_EMAIL2 = "email2@example.com";
+    private final String USER_EMAIL3 = "email3@example.com";
+    private final String USER_EMAIL4 = "email4@example.com";
+    private final String USER_EMAIL5 = "email5@example.com";
+    private final String USER_EMAIL6 = "email6@example.com";
+
     private final Integer INACTIVE_STATUS = 0;
     private final Integer ACTIVE_STATUS = 1;
 
     @Autowired
     private UserRepository userRepository;
 
+    @Test
+    @Transactional
+    public void givenUsersWithSameNameInDBWhenFindAllByNameThenReturnStreamOfUsers() {
+        User user1 = new User();
+        user1.setName(USER_NAME_ADAM);
+        user1.setEmail(USER_EMAIL);
+        userRepository.save(user1);
+
+        User user2 = new User();
+        user2.setName(USER_NAME_ADAM);
+        user2.setEmail(USER_EMAIL2);
+        userRepository.save(user2);
+
+        User user3 = new User();
+        user3.setName(USER_NAME_ADAM);
+        user3.setEmail(USER_EMAIL3);
+        userRepository.save(user3);
+
+        User user4 = new User();
+        user4.setName("SAMPLE");
+        user4.setEmail(USER_EMAIL4);
+        userRepository.save(user4);
+
+        try (Stream<User> foundUsersStream = userRepository.findAllByName(USER_NAME_ADAM)) {
+            assertThat(foundUsersStream.count()).isEqualTo(3l);
+        }
+    }
+
     @Test
     public void givenUsersInDBWhenFindAllWithQueryAnnotationThenReturnCollectionWithActiveUsers() {
         User user1 = new User();
         user1.setName(USER_NAME_ADAM);
+        user1.setEmail(USER_EMAIL);
         user1.setStatus(ACTIVE_STATUS);
         userRepository.save(user1);
 
         User user2 = new User();
         user2.setName(USER_NAME_ADAM);
+        user2.setEmail(USER_EMAIL2);
         user2.setStatus(ACTIVE_STATUS);
         userRepository.save(user2);
 
         User user3 = new User();
         user3.setName(USER_NAME_ADAM);
+        user3.setEmail(USER_EMAIL3);
         user3.setStatus(INACTIVE_STATUS);
         userRepository.save(user3);
 
@@ -63,16 +104,19 @@ public class UserRepositoryIntegrationTest {
     public void givenUsersInDBWhenFindAllWithQueryAnnotationNativeThenReturnCollectionWithActiveUsers() {
         User user1 = new User();
         user1.setName(USER_NAME_ADAM);
+        user1.setEmail(USER_EMAIL);
         user1.setStatus(ACTIVE_STATUS);
         userRepository.save(user1);
 
         User user2 = new User();
         user2.setName(USER_NAME_ADAM);
+        user2.setEmail(USER_EMAIL2);
         user2.setStatus(ACTIVE_STATUS);
         userRepository.save(user2);
 
         User user3 = new User();
         user3.setName(USER_NAME_ADAM);
+        user3.setEmail(USER_EMAIL3);
         user3.setStatus(INACTIVE_STATUS);
         userRepository.save(user3);
 
@@ -85,6 +129,7 @@ public class UserRepositoryIntegrationTest {
     public void givenUserInDBWhenFindUserByStatusWithQueryAnnotationThenReturnActiveUser() {
         User user = new User();
         user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
         user.setStatus(ACTIVE_STATUS);
         userRepository.save(user);
 
@@ -97,6 +142,7 @@ public class UserRepositoryIntegrationTest {
     public void givenUserInDBWhenFindUserByStatusWithQueryAnnotationNativeThenReturnActiveUser() {
         User user = new User();
         user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
         user.setStatus(ACTIVE_STATUS);
         userRepository.save(user);
 
@@ -109,11 +155,13 @@ public class UserRepositoryIntegrationTest {
     public void givenUsersInDBWhenFindUserByStatusAndNameWithQueryAnnotationIndexedParamsThenReturnOneUser() {
         User user = new User();
         user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
         user.setStatus(ACTIVE_STATUS);
         userRepository.save(user);
 
         User user2 = new User();
         user2.setName(USER_NAME_PETER);
+        user2.setEmail(USER_EMAIL2);
         user2.setStatus(ACTIVE_STATUS);
         userRepository.save(user2);
 
@@ -126,11 +174,13 @@ public class UserRepositoryIntegrationTest {
     public void givenUsersInDBWhenFindUserByStatusAndNameWithQueryAnnotationNamedParamsThenReturnOneUser() {
         User user = new User();
         user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
         user.setStatus(ACTIVE_STATUS);
         userRepository.save(user);
 
         User user2 = new User();
         user2.setName(USER_NAME_PETER);
+        user2.setEmail(USER_EMAIL2);
         user2.setStatus(ACTIVE_STATUS);
         userRepository.save(user2);
 
@@ -143,11 +193,13 @@ public class UserRepositoryIntegrationTest {
     public void givenUsersInDBWhenFindUserByStatusAndNameWithQueryAnnotationNativeNamedParamsThenReturnOneUser() {
         User user = new User();
         user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
         user.setStatus(ACTIVE_STATUS);
         userRepository.save(user);
 
         User user2 = new User();
         user2.setName(USER_NAME_PETER);
+        user2.setEmail(USER_EMAIL2);
         user2.setStatus(ACTIVE_STATUS);
         userRepository.save(user2);
 
@@ -160,11 +212,13 @@ public class UserRepositoryIntegrationTest {
     public void givenUsersInDBWhenFindUserByStatusAndNameWithQueryAnnotationNamedParamsCustomNamesThenReturnOneUser() {
         User user = new User();
         user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
         user.setStatus(ACTIVE_STATUS);
         userRepository.save(user);
 
         User user2 = new User();
         user2.setName(USER_NAME_PETER);
+        user2.setEmail(USER_EMAIL2);
         user2.setStatus(ACTIVE_STATUS);
         userRepository.save(user2);
 
@@ -177,6 +231,7 @@ public class UserRepositoryIntegrationTest {
     public void givenUsersInDBWhenFindUserByNameLikeWithQueryAnnotationIndexedParamsThenReturnUser() {
         User user = new User();
         user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
         user.setStatus(ACTIVE_STATUS);
         userRepository.save(user);
 
@@ -189,6 +244,7 @@ public class UserRepositoryIntegrationTest {
     public void givenUsersInDBWhenFindUserByNameLikeWithQueryAnnotationNamedParamsThenReturnUser() {
         User user = new User();
         user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
         user.setStatus(ACTIVE_STATUS);
         userRepository.save(user);
 
@@ -201,6 +257,7 @@ public class UserRepositoryIntegrationTest {
     public void givenUsersInDBWhenFindUserByNameLikeWithQueryAnnotationNativeThenReturnUser() {
         User user = new User();
         user.setName(USER_NAME_ADAM);
+        user.setEmail(USER_EMAIL);
         user.setStatus(ACTIVE_STATUS);
         userRepository.save(user);
 
@@ -211,9 +268,9 @@ public class UserRepositoryIntegrationTest {
 
     @Test
     public void givenUsersInDBWhenFindAllWithSortByNameThenReturnUsersSorted() {
-        userRepository.save(new User(USER_NAME_ADAM, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_ADAM, USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User(USER_NAME_PETER, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL3, INACTIVE_STATUS));
 
         List<User> usersSortByName = userRepository.findAll(new Sort(Sort.Direction.ASC, "name"));
 
@@ -224,9 +281,9 @@ public class UserRepositoryIntegrationTest {
 
     @Test(expected = PropertyReferenceException.class)
     public void givenUsersInDBWhenFindAllSortWithFunctionThenThrowException() {
-        userRepository.save(new User(USER_NAME_ADAM, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_ADAM, USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User(USER_NAME_PETER, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL3, INACTIVE_STATUS));
 
         userRepository.findAll(new Sort(Sort.Direction.ASC, "name"));
 
@@ -239,9 +296,9 @@ public class UserRepositoryIntegrationTest {
 
     @Test
     public void givenUsersInDBWhenFindAllSortWithFunctionQueryAnnotationJPQLThenReturnUsersSorted() {
-        userRepository.save(new User(USER_NAME_ADAM, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_ADAM, USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User(USER_NAME_PETER, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL3, INACTIVE_STATUS));
 
         userRepository.findAllUsers(new Sort("name"));
 
@@ -254,12 +311,12 @@ public class UserRepositoryIntegrationTest {
 
     @Test
     public void givenUsersInDBWhenFindAllWithPageRequestQueryAnnotationJPQLThenReturnPageOfUsers() {
-        userRepository.save(new User(USER_NAME_ADAM, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_ADAM, USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User(USER_NAME_PETER, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL3, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE1", INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", USER_EMAIL4, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE2", INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE2", USER_EMAIL5, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE3", INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", USER_EMAIL6, INACTIVE_STATUS));
 
         Page<User> usersPage = userRepository.findAllUsersWithPagination(new PageRequest(1, 3));
 
@@ -271,12 +328,12 @@ public class UserRepositoryIntegrationTest {
 
     @Test
     public void givenUsersInDBWhenFindAllWithPageRequestQueryAnnotationNativeThenReturnPageOfUsers() {
-        userRepository.save(new User(USER_NAME_ADAM, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_ADAM, USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User(USER_NAME_PETER, ACTIVE_STATUS));
+        userRepository.save(new User(USER_NAME_PETER, USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL3, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE1", INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", USER_EMAIL4, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE2", INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE2", USER_EMAIL5, INACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE3", INACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", USER_EMAIL6, INACTIVE_STATUS));
 
         Page<User> usersSortByNameLength = userRepository.findAllUsersWithPaginationNative(new PageRequest(1, 3));
 
@@ -289,10 +346,10 @@ public class UserRepositoryIntegrationTest {
     @Test
     @Transactional
     public void givenUsersInDBWhenUpdateStatusForNameModifyingQueryAnnotationJPQLThenModifyMatchingUsers() {
-        userRepository.save(new User("SAMPLE", ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE1", ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL3, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE3", ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", USER_EMAIL4, ACTIVE_STATUS));
 
         int updatedUsersSize = userRepository.updateUserSetStatusForName(INACTIVE_STATUS, "SAMPLE");
 
@@ -302,10 +359,10 @@ public class UserRepositoryIntegrationTest {
     @Test
     @Transactional
     public void givenUsersInDBWhenUpdateStatusForNameModifyingQueryAnnotationNativeThenModifyMatchingUsers() {
-        userRepository.save(new User("SAMPLE", ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE1", ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE1", USER_EMAIL2, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE", ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE", USER_EMAIL3, ACTIVE_STATUS));
-        userRepository.save(new User("SAMPLE3", ACTIVE_STATUS));
+        userRepository.save(new User("SAMPLE3", USER_EMAIL4, ACTIVE_STATUS));
         userRepository.flush();
 
         int updatedUsersSize = userRepository.updateUserSetStatusForNameNative(INACTIVE_STATUS, "SAMPLE");

spring-data-jpa/src/test/java/com/baeldung/services/AbstractServicePersistenceIntegrationTest.java

@@ -0,0 +1,251 @@
+package com.baeldung.services;
+
+import com.baeldung.domain.Foo;
+import com.baeldung.util.IDUtil;
+import org.hamcrest.Matchers;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.springframework.dao.DataAccessException;
+
+import java.io.Serializable;
+import java.util.List;
+
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.*;
+
+public abstract class AbstractServicePersistenceIntegrationTest<T extends Serializable> {
+
+    // tests
+
+    // find - one
+
+    @Test
+    /**/public final void givenResourceDoesNotExist_whenResourceIsRetrieved_thenNoResourceIsReceived() {
+        // When
+        final Foo createdResource = getApi().findOne(IDUtil.randomPositiveLong());
+
+        // Then
+        assertNull(createdResource);
+    }
+
+    @Test
+    public void givenResourceExists_whenResourceIsRetrieved_thenNoExceptions() {
+        final Foo existingResource = persistNewEntity();
+        getApi().findOne(existingResource.getId());
+    }
+
+    @Test
+    public void givenResourceDoesNotExist_whenResourceIsRetrieved_thenNoExceptions() {
+        getApi().findOne(IDUtil.randomPositiveLong());
+    }
+
+    @Test
+    public void givenResourceExists_whenResourceIsRetrieved_thenTheResultIsNotNull() {
+        final Foo existingResource = persistNewEntity();
+        final Foo retrievedResource = getApi().findOne(existingResource.getId());
+        assertNotNull(retrievedResource);
+    }
+
+    @Test
+    public void givenResourceExists_whenResourceIsRetrieved_thenResourceIsRetrievedCorrectly() {
+        final Foo existingResource = persistNewEntity();
+        final Foo retrievedResource = getApi().findOne(existingResource.getId());
+        assertEquals(existingResource, retrievedResource);
+    }
+
+    // find - one - by name
+
+    // find - all
+
+    @Test
+    /**/public void whenAllResourcesAreRetrieved_thenNoExceptions() {
+        getApi().findAll();
+    }
+
+    @Test
+    /**/public void whenAllResourcesAreRetrieved_thenTheResultIsNotNull() {
+        final List<Foo> resources = getApi().findAll();
+
+        assertNotNull(resources);
+    }
+
+    @Test
+    /**/public void givenAtLeastOneResourceExists_whenAllResourcesAreRetrieved_thenRetrievedResourcesAreNotEmpty() {
+        persistNewEntity();
+
+        // When
+        final List<Foo> allResources = getApi().findAll();
+
+        // Then
+        assertThat(allResources, not(Matchers.<Foo> empty()));
+    }
+
+    @Test
+    /**/public void givenAnResourceExists_whenAllResourcesAreRetrieved_thenTheExistingResourceIsIndeedAmongThem() {
+        final Foo existingResource = persistNewEntity();
+
+        final List<Foo> resources = getApi().findAll();
+
+        assertThat(resources, hasItem(existingResource));
+    }
+
+    @Test
+    /**/public void whenAllResourcesAreRetrieved_thenResourcesHaveIds() {
+        persistNewEntity();
+
+        // When
+        final List<Foo> allResources = getApi().findAll();
+
+        // Then
+        for (final Foo resource : allResources) {
+            assertNotNull(resource.getId());
+        }
+    }
+
+    // create
+
+    @Test(expected = RuntimeException.class)
+    /**/public void whenNullResourceIsCreated_thenException() {
+        getApi().create(null);
+    }
+
+    @Test
+    /**/public void whenResourceIsCreated_thenNoExceptions() {
+        persistNewEntity();
+    }
+
+    @Test
+    /**/public void whenResourceIsCreated_thenResourceIsRetrievable() {
+        final Foo existingResource = persistNewEntity();
+
+        assertNotNull(getApi().findOne(existingResource.getId()));
+    }
+
+    @Test
+    /**/public void whenResourceIsCreated_thenSavedResourceIsEqualToOriginalResource() {
+        final Foo originalResource = createNewEntity();
+        final Foo savedResource = getApi().create(originalResource);
+
+        assertEquals(originalResource, savedResource);
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void whenResourceWithFailedConstraintsIsCreated_thenException() {
+        final Foo invalidResource = createNewEntity();
+        invalidate(invalidResource);
+
+        getApi().create(invalidResource);
+    }
+
+    /**
+     * -- specific to the persistence engine
+     */
+    @Test(expected = DataAccessException.class)
+    @Ignore("Hibernate simply ignores the id silently and still saved (tracking this)")
+    public void whenResourceWithIdIsCreated_thenDataAccessException() {
+        final Foo resourceWithId = createNewEntity();
+        resourceWithId.setId(IDUtil.randomPositiveLong());
+
+        getApi().create(resourceWithId);
+    }
+
+    // update
+
+    @Test(expected = RuntimeException.class)
+    /**/public void whenNullResourceIsUpdated_thenException() {
+        getApi().update(null);
+    }
+
+    @Test
+    /**/public void givenResourceExists_whenResourceIsUpdated_thenNoExceptions() {
+        // Given
+        final Foo existingResource = persistNewEntity();
+
+        // When
+        getApi().update(existingResource);
+    }
+
+    /**
+     * - can also be the ConstraintViolationException which now occurs on the update operation will not be translated; as a consequence, it will be a TransactionSystemException
+     */
+    @Test(expected = RuntimeException.class)
+    public void whenResourceIsUpdatedWithFailedConstraints_thenException() {
+        final Foo existingResource = persistNewEntity();
+        invalidate(existingResource);
+
+        getApi().update(existingResource);
+    }
+
+    @Test
+    /**/public void givenResourceExists_whenResourceIsUpdated_thenUpdatesArePersisted() {
+        // Given
+        final Foo existingResource = persistNewEntity();
+
+        // When
+        change(existingResource);
+        getApi().update(existingResource);
+
+        final Foo updatedResource = getApi().findOne(existingResource.getId());
+
+        // Then
+        assertEquals(existingResource, updatedResource);
+    }
+
+    // delete
+
+    // @Test(expected = RuntimeException.class)
+    // public void givenResourceDoesNotExists_whenResourceIsDeleted_thenException() {
+    // // When
+    // getApi().delete(IDUtil.randomPositiveLong());
+    // }
+    //
+    // @Test(expected = RuntimeException.class)
+    // public void whenResourceIsDeletedByNegativeId_thenException() {
+    // // When
+    // getApi().delete(IDUtil.randomNegativeLong());
+    // }
+    //
+    // @Test
+    // public void givenResourceExists_whenResourceIsDeleted_thenNoExceptions() {
+    // // Given
+    // final Foo existingResource = persistNewEntity();
+    //
+    // // When
+    // getApi().delete(existingResource.getId());
+    // }
+    //
+    // @Test
+    // /**/public final void givenResourceExists_whenResourceIsDeleted_thenResourceNoLongerExists() {
+    // // Given
+    // final Foo existingResource = persistNewEntity();
+    //
+    // // When
+    // getApi().delete(existingResource.getId());
+    //
+    // // Then
+    // assertNull(getApi().findOne(existingResource.getId()));
+    // }
+
+    // template method
+
+    protected Foo createNewEntity() {
+        return new Foo(randomAlphabetic(6));
+    }
+
+    protected abstract IOperations<Foo> getApi();
+
+    private final void invalidate(final Foo entity) {
+        entity.setName(null);
+    }
+
+    private final void change(final Foo entity) {
+        entity.setName(randomAlphabetic(6));
+    }
+
+    protected Foo persistNewEntity() {
+        return getApi().create(createNewEntity());
+    }
+
+}

spring-data-jpa/src/test/java/com/baeldung/services/FooServicePersistenceIntegrationTest.java

@@ -0,0 +1,75 @@
+package com.baeldung.services;
+
+import com.baeldung.config.PersistenceConfiguration;
+import com.baeldung.domain.Foo;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = {PersistenceConfiguration.class}, loader = AnnotationConfigContextLoader.class)
+public class FooServicePersistenceIntegrationTest extends AbstractServicePersistenceIntegrationTest<Foo> {
+
+    @Autowired
+    private IFooService service;
+
+    // tests
+
+    @Test
+    public final void whenContextIsBootstrapped_thenNoExceptions() {
+        //
+    }
+
+    @Test
+    public final void whenEntityIsCreated_thenNoExceptions() {
+        service.create(new Foo(randomAlphabetic(6)));
+    }
+
+    @Test(expected = DataIntegrityViolationException.class)
+    public final void whenInvalidEntityIsCreated_thenDataException() {
+        service.create(new Foo());
+    }
+
+    @Test(expected = DataIntegrityViolationException.class)
+    public final void whenEntityWithLongNameIsCreated_thenDataException() {
+        service.create(new Foo(randomAlphabetic(2048)));
+    }
+
+    // custom Query method
+
+    @Test
+    public final void givenUsingCustomQuery_whenRetrievingEntity_thenFound() {
+        final String name = randomAlphabetic(6);
+        service.create(new Foo(name));
+
+        final Foo retrievedByName = service.retrieveByName(name);
+        assertNotNull(retrievedByName);
+    }
+
+    // work in progress
+
+    @Test(expected = InvalidDataAccessApiUsageException.class)
+    @Ignore("Right now, persist has saveOrUpdate semantics, so this will no longer fail")
+    public final void whenSameEntityIsCreatedTwice_thenDataException() {
+        final Foo entity = new Foo(randomAlphabetic(8));
+        service.create(entity);
+        service.create(entity);
+    }
+
+    // API
+
+    @Override
+    protected final IOperations<Foo> getApi() {
+        return service;
+    }
+
+}

spring-data-jpa/src/test/java/com/baeldung/services/JpaMultipleDBIntegrationTest.java

@@ -1,19 +1,13 @@
-package org.baeldung.persistence.service;
+package com.baeldung.services;
 
-import static org.junit.Assert.assertNotNull;
+import com.baeldung.config.PersistenceProductConfiguration;
-import static org.junit.Assert.assertTrue;
+import com.baeldung.config.PersistenceUserConfiguration;
-import static org.junit.Assert.fail;
+import com.baeldung.dao.repositories.user.PossessionRepository;
-
+import com.baeldung.dao.repositories.product.ProductRepository;
-import java.util.Arrays;
+import com.baeldung.dao.repositories.user.UserRepository;
-
+import com.baeldung.domain.user.Possession;
-import org.baeldung.config.ProductConfig;
+import com.baeldung.domain.product.Product;
-import org.baeldung.config.UserConfig;
+import com.baeldung.domain.user.User;
-import org.baeldung.persistence.multiple.dao.product.ProductRepository;
-import org.baeldung.persistence.multiple.dao.user.PossessionRepository;
-import org.baeldung.persistence.multiple.dao.user.UserRepository;
-import org.baeldung.persistence.multiple.model.product.Product;
-import org.baeldung.persistence.multiple.model.user.Possession;
-import org.baeldung.persistence.multiple.model.user.User;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,11 +15,17 @@ import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+import java.util.Collections;
-@ContextConfiguration(classes = { UserConfig.class, ProductConfig.class })
+import java.util.Optional;
+
+import static org.junit.Assert.*;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = {PersistenceUserConfiguration.class, PersistenceProductConfiguration.class})
 @EnableTransactionManagement
 @DirtiesContext
 public class JpaMultipleDBIntegrationTest {
@@ -50,12 +50,12 @@ public class JpaMultipleDBIntegrationTest {
         user.setAge(20);
         Possession p = new Possession("sample");
         p = possessionRepository.save(p);
-        user.setPossessionList(Arrays.asList(p));
+        user.setPossessionList(Collections.singletonList(p));
         user = userRepository.save(user);
-        final User result = userRepository.findOne(user.getId());
+        final Optional<User> result = userRepository.findById(user.getId());
-        assertNotNull(result);
+        assertTrue(result.isPresent());
-        System.out.println(result.getPossessionList());
+        System.out.println(result.get().getPossessionList());
-        assertTrue(result.getPossessionList().size() == 1);
+        assertEquals(1, result.get().getPossessionList().size());
     }
 
     @Test
@@ -66,7 +66,7 @@ public class JpaMultipleDBIntegrationTest {
         user1.setEmail("john@test.com");
         user1.setAge(20);
         user1 = userRepository.save(user1);
-        assertNotNull(userRepository.findOne(user1.getId()));
+        assertTrue(userRepository.findById(user1.getId()).isPresent());
 
         User user2 = new User();
         user2.setName("Tom");
@@ -92,7 +92,7 @@ public class JpaMultipleDBIntegrationTest {
         product.setPrice(20);
         product = productRepository.save(product);
 
-        assertNotNull(productRepository.findOne(product.getId()));
+        assertTrue(productRepository.findById(product.getId()).isPresent());
     }
 
 }

spring-data-jpa/src/test/java/com/baeldung/services/SpringDataJPABarAuditIntegrationTest.java

@@ -0,0 +1,72 @@
+package com.baeldung.services;
+
+import com.baeldung.config.PersistenceConfiguration;
+import com.baeldung.domain.Bar;
+import org.junit.*;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = { PersistenceConfiguration.class }, loader = AnnotationConfigContextLoader.class)
+public class SpringDataJPABarAuditIntegrationTest {
+
+    private static Logger logger = LoggerFactory.getLogger(SpringDataJPABarAuditIntegrationTest.class);
+
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception {
+        logger.info("setUpBeforeClass()");
+    }
+
+    @AfterClass
+    public static void tearDownAfterClass() throws Exception {
+        logger.info("tearDownAfterClass()");
+    }
+
+    @Autowired
+    @Qualifier("barSpringDataJpaService")
+    private IBarService barService;
+
+    @Autowired
+    private EntityManagerFactory entityManagerFactory;
+
+    private EntityManager em;
+
+    @Before
+    public void setUp() throws Exception {
+        logger.info("setUp()");
+        em = entityManagerFactory.createEntityManager();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        logger.info("tearDown()");
+        em.close();
+    }
+
+    @Test
+    @WithMockUser(username = "tutorialuser")
+    public final void whenBarsModified_thenBarsAudited() {
+        Bar bar = new Bar("BAR1");
+        barService.create(bar);
+        assertEquals(bar.getCreatedDate(), bar.getModifiedDate());
+        assertEquals("tutorialuser", bar.getCreatedBy(), bar.getModifiedBy());
+        bar.setName("BAR2");
+        bar = barService.update(bar);
+        assertTrue(bar.getCreatedDate() < bar.getModifiedDate());
+        assertEquals("tutorialuser", bar.getCreatedBy(), bar.getModifiedBy());
+    }
+}

spring-data-jpa/src/test/java/com/baeldung/util/IDUtil.java

@@ -0,0 +1,33 @@
+package com.baeldung.util;
+
+import java.util.Random;
+
+public final class IDUtil {
+
+    private IDUtil() {
+        throw new AssertionError();
+    }
+
+    // API
+
+    public static String randomPositiveLongAsString() {
+        return Long.toString(randomPositiveLong());
+    }
+
+    public static String randomNegativeLongAsString() {
+        return Long.toString(randomNegativeLong());
+    }
+
+    public static long randomPositiveLong() {
+        long id = new Random().nextLong() * 10000;
+        id = (id < 0) ? (-1 * id) : id;
+        return id;
+    }
+
+    private static long randomNegativeLong() {
+        long id = new Random().nextLong() * 10000;
+        id = (id > 0) ? (-1 * id) : id;
+        return id;
+    }
+
+}