Merge branch 'master' into master

2020-05-07 11:05:00 +08:00
parent c9ebd8e33e 847d6ab042
commit 7b80e93607
173 changed files with 1617 additions and 1008 deletions
@@ -14,7 +14,8 @@ public class BasicConnectionPool implements ConnectionPool {
    private final List<Connection> connectionPool;
    private final List<Connection> usedConnections = new ArrayList<>();
    private static final int INITIAL_POOL_SIZE = 10;
-    private final int MAX_POOL_SIZE = 20;
+    private static final int MAX_POOL_SIZE = 20;
+    private static final int MAX_TIMEOUT = 5;

    public static BasicConnectionPool create(String url, String user, String password) throws SQLException {
        List<Connection> pool = new ArrayList<>(INITIAL_POOL_SIZE);
@@ -42,6 +43,11 @@ public class BasicConnectionPool implements ConnectionPool {
        }

        Connection connection = connectionPool.remove(connectionPool.size() - 1);
+
+        if(!connection.isValid(MAX_TIMEOUT)){
+            connection = createConnection(url, user, password);
+        }
+
        usedConnections.add(connection);
        return connection;
    }
@@ -61,6 +61,7 @@
        <module>spring-data-jpa-2</module>
        <module>spring-data-jpa-3</module>
        <module>spring-data-jpa-4</module>
+        <module>spring-data-jpa-5</module>
        <module>spring-data-keyvalue</module>
        <module>spring-data-mongodb</module>
        <module>spring-data-neo4j</module>
@@ -1,4 +1,5 @@
 ### Relevant Articles: 
+
 - [Spring JPA @Embedded and @EmbeddedId](TBD)

 ### Eclipse Config 
@@ -9,3 +10,4 @@ This can be ignored:
 - Project -> Properties -> Java Persistance -> JPA -> Error/Warnings -> Select Ignore on "No persistence xml file found in project"
 Or: 
 - Eclipse -> Preferences - Validation - disable the "Build" execution of the JPA Validator 
+
@@ -33,5 +33,5 @@
            <artifactId>h2</artifactId>
        </dependency>
    </dependencies>
-
 </project>
+
@@ -0,0 +1,12 @@
+package com.baeldung.schemageneration;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class AccountApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(AccountApplication.class, args);
+    }
+}
@@ -0,0 +1,39 @@
+package com.baeldung.schemageneration;
+
+import com.baeldung.schemageneration.model.Account;
+import com.baeldung.schemageneration.model.AccountSetting;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.Environment;
+import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.hibernate.tool.schema.TargetType;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+public class HibernateUtil {
+
+    /**
+     * Generates database create commands for the specified entities using Hibernate native API, SchemaExport.
+     * Creation commands are exported into the create.sql file.
+     */
+    public static void generateSchema() {
+        Map<String, String> settings = new HashMap<>();
+        settings.put(Environment.URL, "jdbc:h2:mem:schema");
+
+        StandardServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(settings).build();
+
+        MetadataSources metadataSources = new MetadataSources(serviceRegistry);
+        metadataSources.addAnnotatedClass(Account.class);
+        metadataSources.addAnnotatedClass(AccountSetting.class);
+        Metadata metadata = metadataSources.buildMetadata();
+
+        SchemaExport schemaExport = new SchemaExport();
+        schemaExport.setFormat(true);
+        schemaExport.setOutputFile("create.sql");
+        schemaExport.createOnly(EnumSet.of(TargetType.SCRIPT), metadata);
+    }
+}
@@ -0,0 +1,74 @@
+package com.baeldung.schemageneration.model;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "accounts")
+public class Account {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @Column(nullable = false, length = 100)
+    private String name;
+
+    @Column(name = "email_address")
+    private String emailAddress;
+
+    @OneToMany(mappedBy = "account", cascade = CascadeType.ALL)
+    private List<AccountSetting> accountSettings = new ArrayList<>();
+
+    public Account() {
+    }
+
+    public Account(String name, String emailAddress) {
+        this.name = name;
+        this.emailAddress = emailAddress;
+    }
+
+    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 String getEmailAddress() {
+        return emailAddress;
+    }
+
+    public void setEmailAddress(String emailAddress) {
+        this.emailAddress = emailAddress;
+    }
+
+    public List<AccountSetting> getAccountSettings() {
+        return accountSettings;
+    }
+
+    public void setAccountSettings(List<AccountSetting> accountSettings) {
+        this.accountSettings = accountSettings;
+    }
+
+    public void addAccountSetting(AccountSetting setting) {
+        this.accountSettings.add(setting);
+        setting.setAccount(this);
+    }
+}
@@ -0,0 +1,68 @@
+package com.baeldung.schemageneration.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "account_settings")
+public class AccountSetting {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @Column(name = "name", nullable = false)
+    private String settingName;
+
+    @Column(name = "value", nullable = false)
+    private String settingValue;
+
+    @ManyToOne()
+    @JoinColumn(name ="account_id", nullable = false)
+    private Account account;
+
+    public AccountSetting() {
+    }
+
+    public AccountSetting(String settingName, String settingValue) {
+        this.settingName = settingName;
+        this.settingValue = settingValue;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getSettingName() {
+        return settingName;
+    }
+
+    public void setSettingName(String settingName) {
+        this.settingName = settingName;
+    }
+
+    public String getSettingValue() {
+        return settingValue;
+    }
+
+    public void setSettingValue(String settingValue) {
+        this.settingValue = settingValue;
+    }
+
+    public Account getAccount() {
+        return account;
+    }
+
+    public void setAccount(Account account) {
+        this.account = account;
+    }
+}
@@ -0,0 +1,8 @@
+package com.baeldung.schemageneration.repository;
+
+import com.baeldung.schemageneration.model.Account;
+import org.springframework.data.repository.CrudRepository;
+
+public interface AccountRepository extends CrudRepository<Account, Long> {
+    Account findByName(String name);
+}
@@ -0,0 +1,8 @@
+package com.baeldung.schemageneration.repository;
+
+import com.baeldung.schemageneration.model.AccountSetting;
+import org.springframework.data.repository.CrudRepository;
+
+public interface AccountSettingRepository extends CrudRepository<AccountSetting, Long> {
+    AccountSetting findByAccountId(Long accountId);
+}
@@ -1,2 +1,13 @@
+
+spring.datasource.url=jdbc:h2:mem:baeldung
+
+# JPA-Schema-Generation
+# Use below configuration to generate database schema create commands based on the entity models
+# and export them into the create.sql file
+#spring.jpa.properties.javax.persistence.schema-generation.scripts.action=create
+#spring.jpa.properties.javax.persistence.schema-generation.scripts.create-target=create.sql
+#spring.jpa.properties.javax.persistence.schema-generation.scripts.create-source=metadata
+#spring.jpa.properties.hibernate.format_sql=true
+
 spring.jpa.show-sql=true

@@ -0,0 +1,72 @@
+package com.baeldung.schemageneration;
+
+import com.baeldung.schemageneration.model.Account;
+import com.baeldung.schemageneration.model.AccountSetting;
+import com.baeldung.schemageneration.repository.AccountRepository;
+import com.baeldung.schemageneration.repository.AccountSettingRepository;
+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.test.context.junit4.SpringRunner;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = AccountApplication.class)
+public class AccountRepositoryIntegrationTest {
+
+    private static final String USER_NAME = "Eduard";
+    private static final String USER_EMAIL_ADDRESS = "eduard@gmx.com";
+    private static final String ACCOUNT_SETTING_NAME = "Timezone";
+    private static final String ACCOUNT_SETTING_VALUE = "UTC+02";
+
+    @Autowired
+    private AccountRepository accountRepository;
+
+    @Autowired
+    private AccountSettingRepository accountSettingRepository;
+
+    @After
+    public void tearDown() {
+        accountRepository.deleteAll();
+    }
+
+    @Test
+    public void givenNewAccount_whenSave_thenSuccess() {
+        Account account = new Account(USER_NAME, USER_EMAIL_ADDRESS);
+        accountRepository.save(account);
+
+        assertEquals(1, accountRepository.count());
+    }
+
+    @Test
+    public void givenSavedAccount_whenFindByName_thenFound() {
+        Account account = new Account(USER_NAME, USER_EMAIL_ADDRESS);
+        accountRepository.save(account);
+
+        Account accountFound = accountRepository.findByName(USER_NAME);
+
+        assertNotNull(accountFound);
+        assertEquals(USER_NAME, accountFound.getName());
+        assertEquals(USER_EMAIL_ADDRESS, accountFound.getEmailAddress());
+    }
+
+    @Test
+    public void givenSavedAccount_whenAccountSettingIsAdded_thenPersisted() {
+        Account account = new Account(USER_NAME, USER_EMAIL_ADDRESS);
+        account.addAccountSetting(new AccountSetting(ACCOUNT_SETTING_NAME, ACCOUNT_SETTING_VALUE));
+        accountRepository.save(account);
+
+        Account accountFound = accountRepository.findByName(USER_NAME);
+        assertNotNull(accountFound);
+        AccountSetting accountSetting = accountSettingRepository.findByAccountId(accountFound.getId());
+
+        assertNotNull(accountSetting);
+        assertEquals(ACCOUNT_SETTING_NAME, accountSetting.getSettingName());
+        assertEquals(ACCOUNT_SETTING_VALUE, accountSetting.getSettingValue());
+    }
+
+}
@@ -1 +1,3 @@
 spring.jpa.hibernate.ddl-auto=update
+spring.datasource.url=jdbc:h2:mem:baeldung
+
@@ -132,13 +132,13 @@

    <properties>
        <!-- Spring -->
-        <org.springframework.version>5.2.5.RELEASE</org.springframework.version>
+        <org.springframework.version>5.2.6.RELEASE</org.springframework.version>

        <!-- persistence -->
        <hibernate.version>5.4.13.Final</hibernate.version>
        <mysql-connector-java.version>8.0.19</mysql-connector-java.version>
        <h2.version>1.4.200</h2.version>
-        <spring-data-jpa.version>2.2.6.RELEASE</spring-data-jpa.version>
+        <spring-data-jpa.version>2.2.7.RELEASE</spring-data-jpa.version>
        <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
        <jta.version>1.1</jta.version>
        <querydsl.version>4.2.1</querydsl.version>
@@ -11,7 +11,6 @@ import org.springframework.context.annotation.PropertySource;
 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.orm.hibernate5.HibernateTransactionManager;
 import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.orm.jpa.JpaTransactionManager;
@@ -26,7 +25,6 @@ import java.util.Properties;

@Configuration
@EnableTransactionManagement
-@EnableJpaRepositories(basePackages = { "com.baeldung.hibernate.dao" }, transactionManagerRef = "jpaTransactionManager")
@EnableJpaAuditing
@PropertySource({ "classpath:persistence-mysql.properties" })
@ComponentScan(basePackages = { "com.baeldung.persistence.dao", "com.baeldung.jpa.dao" })
@@ -97,7 +95,7 @@ public class PersistenceConfig {
        return new FooService();
    }

-    private final Properties hibernateProperties() {
+    private 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"));
@@ -8,7 +8,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-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;
@@ -24,7 +23,6 @@ import java.util.Properties;
@EnableTransactionManagement
@PropertySource({ "classpath:persistence-h2.properties" })
@ComponentScan({ "com.baeldung.persistence","com.baeldung.jpa.dao" })
-@EnableJpaRepositories(basePackages = "com.baeldung.jpa.dao")
 public class PersistenceJPAConfig {

    @Autowired
@@ -1,9 +1,6 @@
 package com.baeldung.spring.data.persistence.config;

-import java.util.Properties;
-
-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.ComponentScan;
@@ -19,14 +16,15 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;

-import com.google.common.base.Preconditions;
+import javax.sql.DataSource;
+import java.util.Properties;

@Configuration
@EnableTransactionManagement
@PropertySource({ "classpath:persistence-${envTarget:h2}.properties" })
@ComponentScan({ "com.baeldung.spring.data.persistence" })
-// @ImportResource("classpath*:springDataPersistenceConfig.xml")
-@EnableJpaRepositories(basePackages = { "com.baeldung.spring.data.persistence.dao", "com.baeldung.spring.data.persistence.jpaquery" })
+//@ImportResource("classpath*:*springDataJpaRepositoriesConfig.xml")
+@EnableJpaRepositories("com.baeldung.spring.data.persistence.repository")
 public class PersistenceConfig {

    @Autowired
@@ -40,10 +38,9 @@ public class PersistenceConfig {
    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
        final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
        em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "com.baeldung.spring.data.persistence.model" });
+        em.setPackagesToScan("com.baeldung.spring.data.persistence.model");

        final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-        // vendorAdapter.set
        em.setJpaVendorAdapter(vendorAdapter);
        em.setJpaProperties(additionalProperties());

@@ -78,7 +75,7 @@ public class PersistenceConfig {
        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.globally_quoted_identifiers", "true");
+
        return hibernateProperties;
    }

@@ -1,7 +1,6 @@
 package com.baeldung.spring.data.persistence.model;

 import javax.persistence.*;
-
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Objects;
@@ -13,14 +12,22 @@ public class User {
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    private int id;
+
    private String name;
+
    private LocalDate creationDate;
+
    private LocalDate lastLoginDate;
+
    private boolean active;
+
    private int age;
+
    @Column(unique = true, nullable = false)
    private String email;
+
    private Integer status;
+
    @OneToMany
    List<Possession> possessionList;

@@ -28,7 +35,7 @@ public class User {
        super();
    }

-    public User(String name,  LocalDate creationDate,String email, Integer status) {
+    public User(String name, LocalDate creationDate, String email, Integer status) {
        this.name = name;
        this.creationDate = creationDate;
        this.email = email;
@@ -75,7 +82,7 @@ public class User {
    public void setAge(final int age) {
        this.age = age;
    }
-    
+
    public LocalDate getCreationDate() {
        return creationDate;
    }
@@ -94,18 +101,18 @@ public class User {
        builder.append("User [name=").append(name).append(", id=").append(id).append("]");
        return builder.toString();
    }
-    
+
    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        User user = (User) o;
        return id == user.id &&
-          age == user.age &&
-          Objects.equals(name, user.name) &&
-          Objects.equals(creationDate, user.creationDate) &&
-          Objects.equals(email, user.email) &&
-          Objects.equals(status, user.status);
+                age == user.age &&
+                Objects.equals(name, user.name) &&
+                Objects.equals(creationDate, user.creationDate) &&
+                Objects.equals(email, user.email) &&
+                Objects.equals(status, user.status);
    }

    @Override
@@ -1,11 +1,13 @@
-package com.baeldung.spring.data.persistence.dao;
+package com.baeldung.spring.data.persistence.repository;

 import com.baeldung.spring.data.persistence.model.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);
+
 }
@@ -1,9 +1,4 @@
-package com.baeldung.spring.data.persistence.jpaquery;
-
-import java.time.LocalDate;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Stream;
+package com.baeldung.spring.data.persistence.repository;

 import com.baeldung.spring.data.persistence.model.User;
 import org.springframework.data.domain.Page;
@@ -14,13 +9,18 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

+import java.time.LocalDate;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Stream;
+
 public interface UserRepository extends JpaRepository<User, Integer>, UserRepositoryCustom {

    Stream<User> findAllByName(String name);

    @Query("SELECT u FROM User u WHERE u.status = 1")
    Collection<User> findAllActiveUsers();
-    
+
    @Query("select u from User u where u.email like '%@gmail.com'")
    List<User> findUsersWithGmailAddress();

@@ -74,14 +74,14 @@ public interface UserRepository extends JpaRepository<User, Integer>, UserReposi
    @Query(value = "INSERT INTO Users (name, age, email, status, active) VALUES (:name, :age, :email, :status, :active)", nativeQuery = true)
    @Modifying
    void insertUser(@Param("name") String name, @Param("age") Integer age, @Param("email") String email, @Param("status") Integer status, @Param("active") boolean active);
-    
+
    @Modifying
    @Query(value = "UPDATE Users u SET status = ? WHERE u.name = ?", nativeQuery = true)
    int updateUserSetStatusForNameNativePostgres(Integer status, String name);
-    
+
    @Query(value = "SELECT u FROM User u WHERE u.name IN :names")
-	  List<User> findUserByNameList(@Param("names") Collection<String> names);
-    
+    List<User> findUserByNameList(@Param("names") Collection<String> names);
+
    void deleteAllByCreationDateAfter(LocalDate date);

    @Modifying(clearAutomatically = true, flushAutomatically = true)
@@ -1,14 +1,16 @@
-package com.baeldung.spring.data.persistence.jpaquery;
+package com.baeldung.spring.data.persistence.repository;
+
+import com.baeldung.spring.data.persistence.model.User;

 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Predicate;

-import com.baeldung.spring.data.persistence.model.User;
-
 public interface UserRepositoryCustom {
+
    List<User> findUserByEmails(Set<String> emails);
    
    List<User> findAllUsersByPredicates(Collection<Predicate<User>> predicates);
+
 }
@@ -1,5 +1,10 @@
-package com.baeldung.spring.data.persistence.jpaquery;
+package com.baeldung.spring.data.persistence.repository;

+import com.baeldung.spring.data.persistence.model.User;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.criteria.*;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -7,16 +12,6 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import com.baeldung.spring.data.persistence.model.User;
-
 public class UserRepositoryCustomImpl implements UserRepositoryCustom {

    @PersistenceContext
@@ -2,7 +2,7 @@ package com.baeldung.spring.data.persistence.service.impl;


 import com.baeldung.spring.data.persistence.model.Foo;
-import com.baeldung.spring.data.persistence.dao.IFooDao;
+import com.baeldung.spring.data.persistence.repository.IFooDao;
 import com.baeldung.spring.data.persistence.service.IFooService;
 import com.baeldung.spring.data.persistence.service.common.AbstractService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-    xsi:schemaLocation="
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:jpa="http://www.springframework.org/schema/data/jpa"
+       xsi:schemaLocation="
    http://www.springframework.org/schema/beans 
    http://www.springframework.org/schema/beans/spring-beans.xsd
    http://www.springframework.org/schema/data/jpa 
    http://www.springframework.org/schema/data/jpa/spring-jpa.xsd"
 >

-    <jpa:repositories base-package="com.baeldung.persistence.dao"/>
+    <jpa:repositories base-package="com.baeldung.spring.data.persistence.repository"/>

 </beans>
@@ -1,4 +1,4 @@
-package com.baeldung.spring.data.persistence.jpaquery;
+package com.baeldung.spring.data.persistence.repository;

 import com.baeldung.spring.data.persistence.config.PersistenceConfig;
 import com.baeldung.spring.data.persistence.model.User;
@@ -1,8 +1,4 @@
-package com.baeldung.spring.data.persistence.jpaquery;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.time.LocalDate;
+package com.baeldung.spring.data.persistence.repository;

 import com.baeldung.spring.data.persistence.config.PersistenceConfig;
 import com.baeldung.spring.data.persistence.model.User;
@@ -14,9 +10,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 import org.springframework.transaction.annotation.Transactional;

-/**
- * Created by adam.
- */
+import java.time.LocalDate;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
@DirtiesContext