Skip to content

Commit 3613432

Browse files
author
eugenp
committed
quick updates and cleanup
1 parent b08f53c commit 3613432

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceConfig.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import javax.sql.DataSource;
66

77
import org.apache.tomcat.dbcp.dbcp.BasicDataSource;
8+
import org.hibernate.SessionFactory;
89
import org.springframework.beans.factory.annotation.Autowired;
910
import org.springframework.context.annotation.Bean;
1011
import org.springframework.context.annotation.ComponentScan;
@@ -53,9 +54,10 @@ public DataSource dataSource() {
5354
}
5455

5556
@Bean
56-
public HibernateTransactionManager transactionManager() {
57+
@Autowired
58+
public HibernateTransactionManager transactionManager(final SessionFactory sessionFactory) {
5759
final HibernateTransactionManager txManager = new HibernateTransactionManager();
58-
txManager.setSessionFactory(sessionFactory().getObject());
60+
txManager.setSessionFactory(sessionFactory);
5961

6062
return txManager;
6163
}

spring-hibernate4/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188

189189
<!-- persistence -->
190190
<hibernate.version>4.3.0.Final</hibernate.version>
191-
<mysql-connector-java.version>5.1.27</mysql-connector-java.version>
191+
<mysql-connector-java.version>5.1.28</mysql-connector-java.version>
192192
<tomcat-dbcp.version>7.0.42</tomcat-dbcp.version>
193193

194194
<!-- logging -->

spring-hibernate4/src/main/java/org/baeldung/spring/PersistenceConfig.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import javax.sql.DataSource;
66

77
import org.apache.tomcat.dbcp.dbcp.BasicDataSource;
8+
import org.hibernate.SessionFactory;
89
import org.springframework.beans.factory.annotation.Autowired;
910
import org.springframework.context.annotation.Bean;
1011
import org.springframework.context.annotation.ComponentScan;
@@ -53,9 +54,10 @@ public DataSource restDataSource() {
5354
}
5455

5556
@Bean
56-
public HibernateTransactionManager transactionManager() {
57+
@Autowired
58+
public HibernateTransactionManager transactionManager(final SessionFactory sessionFactory) {
5759
final HibernateTransactionManager txManager = new HibernateTransactionManager();
58-
txManager.setSessionFactory(sessionFactory().getObject());
60+
txManager.setSessionFactory(sessionFactory);
5961

6062
return txManager;
6163
}

0 commit comments

Comments
 (0)