Skip to content

Commit cbac5e3

Browse files
lor6lor6
committed
BAEL-12937
1 parent 47e6077 commit cbac5e3

41 files changed

Lines changed: 89 additions & 101 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎persistence-modules/spring-persistence-simple/pom.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@
1818
<groupId>org.springframework</groupId>
1919
<artifactId>spring-orm</artifactId>
2020
<version>${org.springframework.version}</version>
21-
<exclusions>
22-
<exclusion>
23-
<artifactId>commons-logging</artifactId>
24-
<groupId>commons-logging</groupId>
25-
</exclusion>
26-
</exclusions>
2721
</dependency>
2822
<dependency>
2923
<groupId>org.springframework</groupId>
@@ -108,12 +102,6 @@
108102
<artifactId>querydsl-apt</artifactId>
109103
<version>${querydsl.version}</version>
110104
</dependency>
111-
<dependency>
112-
<groupId>org.hsqldb</groupId>
113-
<artifactId>hsqldb</artifactId>
114-
<version>${hsqldb.version}</version>
115-
<scope>test</scope>
116-
</dependency>
117105
</dependencies>
118106

119107
<build>
@@ -156,7 +144,6 @@
156144
<tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
157145
<jta.version>1.1</jta.version>
158146
<querydsl.version>4.2.1</querydsl.version>
159-
<hsqldb.version>2.4.1</hsqldb.version>
160147

161148
<!-- util -->
162149
<guava.version>21.0</guava.version>

persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/config/PersistenceConfig.java renamed to persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/config/PersistenceConfig.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
package org.baeldung.config;
1+
package com.baeldung.config;
22

33
import java.util.Properties;
44

55
import javax.sql.DataSource;
66

77
import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
8-
import org.baeldung.persistence.dao.IFooDao;
98
import org.springframework.beans.factory.annotation.Autowired;
109
import org.springframework.context.annotation.Bean;
1110
import org.springframework.context.annotation.ComponentScan;
@@ -24,15 +23,16 @@
2423
import org.springframework.transaction.PlatformTransactionManager;
2524
import org.springframework.transaction.annotation.EnableTransactionManagement;
2625

27-
import com.baeldung.persistence.dao.impl.FooDao;
26+
import com.baeldung.hibernate.dao.FooDao;
27+
import com.baeldung.jpa.dao.IFooDao;
2828
import com.google.common.base.Preconditions;
2929

3030
@Configuration
3131
@EnableTransactionManagement
32-
@EnableJpaRepositories(basePackages = { "com.baeldung.persistence" }, transactionManagerRef = "jpaTransactionManager")
32+
@EnableJpaRepositories(basePackages = { "com.baeldung.hibernate.dao" }, transactionManagerRef = "jpaTransactionManager")
3333
@EnableJpaAuditing
3434
@PropertySource({ "classpath:persistence-mysql.properties" })
35-
@ComponentScan({ "com.baeldung.persistence" })
35+
@ComponentScan({ "com.baeldung.persistence", "com.baeldung.hibernate.dao" })
3636
public class PersistenceConfig {
3737

3838
@Autowired

persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/config/PersistenceJPAConfig.java renamed to persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/config/PersistenceJPAConfig.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.config;
1+
package com.baeldung.config;
22

33
import java.util.Properties;
44

@@ -25,8 +25,8 @@
2525
@Configuration
2626
@EnableTransactionManagement
2727
@PropertySource({ "classpath:persistence-h2.properties" })
28-
@ComponentScan({ "org.baeldung.persistence" })
29-
@EnableJpaRepositories(basePackages = "org.baeldung.persistence.dao")
28+
@ComponentScan({ "com.baeldung.persistence","com.baeldung.jpa.dao" })
29+
@EnableJpaRepositories(basePackages = "com.baeldung.jpa.dao")
3030
public class PersistenceJPAConfig {
3131

3232
@Autowired
@@ -42,7 +42,7 @@ public PersistenceJPAConfig() {
4242
public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
4343
final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
4444
em.setDataSource(dataSource());
45-
em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
45+
em.setPackagesToScan(new String[] { "com.baeldung.persistence.model" });
4646

4747
final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
4848
em.setJpaVendorAdapter(vendorAdapter);

persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/persistence/dao/impl/FooDao.java renamed to persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/hibernate/dao/FooDao.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.baeldung.persistence.dao.impl;
1+
package com.baeldung.hibernate.dao;
22

3-
import org.baeldung.persistence.dao.IFooDao;
4-
import org.baeldung.persistence.model.Foo;
3+
import com.baeldung.persistence.model.Foo;
54
import org.springframework.stereotype.Repository;
65

6+
import com.baeldung.jpa.dao.IFooDao;
77
import com.baeldung.persistence.dao.common.AbstractHibernateDao;
88

99
@Repository

persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/jdbc/CustomSQLErrorCodeTranslator.java renamed to persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jdbc/CustomSQLErrorCodeTranslator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.jdbc;
1+
package com.baeldung.jdbc;
22

33
import java.sql.SQLException;
44

@@ -10,7 +10,7 @@ public class CustomSQLErrorCodeTranslator extends SQLErrorCodeSQLExceptionTransl
1010

1111
@Override
1212
protected DataAccessException customTranslate(final String task, final String sql, final SQLException sqlException) {
13-
if (sqlException.getErrorCode() == -104) {
13+
if (sqlException.getErrorCode() == 23505) {
1414
return new DuplicateKeyException("Custome Exception translator - Integrity contraint voilation.", sqlException);
1515
}
1616
return null;

persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/jdbc/Employee.java renamed to persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jdbc/Employee.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.jdbc;
1+
package com.baeldung.jdbc;
22

33
public class Employee {
44
private int id;

persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/jdbc/EmployeeDAO.java renamed to persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jdbc/EmployeeDAO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.jdbc;
1+
package com.baeldung.jdbc;
22

33
import java.sql.PreparedStatement;
44
import java.sql.SQLException;

persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/jdbc/EmployeeRowMapper.java renamed to persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jdbc/EmployeeRowMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.jdbc;
1+
package com.baeldung.jdbc;
22

33
import java.sql.ResultSet;
44
import java.sql.SQLException;

persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/jdbc/config/SpringJdbcConfig.java renamed to persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jdbc/config/SpringJdbcConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.jdbc.config;
1+
package com.baeldung.jdbc.config;
22

33
import javax.sql.DataSource;
44

@@ -10,12 +10,12 @@
1010
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
1111

1212
@Configuration
13-
@ComponentScan("org.baeldung.jdbc")
13+
@ComponentScan("com.baeldung.jdbc")
1414
public class SpringJdbcConfig {
1515

1616
@Bean
1717
public DataSource dataSource() {
18-
return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL).addScript("classpath:jdbc/schema.sql").addScript("classpath:jdbc/test-data.sql").build();
18+
return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2).addScript("classpath:jdbc/schema.sql").addScript("classpath:jdbc/test-data.sql").build();
1919
}
2020

2121
// @Bean

persistence-modules/spring-persistence-simple/src/main/java/org/baeldung/persistence/dao/AbstractJpaDAO.java renamed to persistence-modules/spring-persistence-simple/src/main/java/com/baeldung/jpa/dao/AbstractJpaDAO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.persistence.dao;
1+
package com.baeldung.jpa.dao;
22

33
import java.io.Serializable;
44
import java.util.List;

0 commit comments

Comments
 (0)