Skip to content

Commit 120da93

Browse files
author
eugenp
committed
persistence cleanup work
1 parent 092b321 commit 120da93

File tree

4 files changed

+34
-69
lines changed

4 files changed

+34
-69
lines changed

spring-hibernate4/src/test/java/org/baeldung/persistence/hibernate/FooSortingPersistenceServiceData.java renamed to spring-hibernate4/src/test/java/org/baeldung/persistence/hibernate/FooFixtures.java

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,21 @@
88
import org.hibernate.Session;
99
import org.hibernate.SessionFactory;
1010
import org.hibernate.Transaction;
11-
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
12-
import org.hibernate.cfg.AvailableSettings;
13-
import org.hibernate.cfg.Configuration;
14-
import org.hibernate.service.ServiceRegistry;
1511

1612
import com.google.common.collect.Lists;
1713

18-
public class FooSortingPersistenceServiceData {
19-
private static ServiceRegistry serviceRegistry;
20-
private static SessionFactory sessionFactory;
21-
private static Configuration configuration;
22-
private static StandardServiceRegistryBuilder builder;
14+
public class FooFixtures {
15+
private SessionFactory sessionFactory;
2316

24-
public FooSortingPersistenceServiceData() {
17+
public FooFixtures(final SessionFactory sessionFactory) {
2518
super();
19+
20+
this.sessionFactory = sessionFactory;
2621
}
2722

28-
public void createBars() {
23+
// API
2924

30-
configWork();
25+
public void createBars() {
3126
Session session = null;
3227
Transaction tx = null;
3328
session = sessionFactory.openSession();
@@ -66,8 +61,6 @@ public void createBars() {
6661
}
6762

6863
public void createFoos() {
69-
70-
configWork();
7164
Session session = null;
7265
Transaction tx = null;
7366
session = sessionFactory.openSession();
@@ -105,15 +98,4 @@ public void createFoos() {
10598
}
10699
}
107100

108-
public void configWork() {
109-
configuration = new Configuration();
110-
configuration.setProperty("hibernate.dialect", "org.hibernate.dialect.MySQLDialect");
111-
configuration.setProperty("dialect", "org.hibernate.dialect.MySQLDialect");
112-
configuration.setProperty(AvailableSettings.DRIVER, "com.mysql.jdbc.Driver");
113-
configuration.setProperty(AvailableSettings.URL, "jdbc:mysql://localhost:3306/HIBERTEST2_TEST");
114-
configuration.setProperty(AvailableSettings.USER, "root");
115-
configuration.setProperty(AvailableSettings.PASS, "");
116-
builder = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties());
117-
sessionFactory = configuration.addPackage("com.cc.example.hibernate").addAnnotatedClass(Foo.class).addAnnotatedClass(Bar.class).configure().buildSessionFactory(builder.build());
118-
}
119101
}

‎spring-hibernate4/src/test/java/org/baeldung/persistence/hibernate/FooPaginationPersistenceIntegrationTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
public class FooPaginationPersistenceIntegrationTest {
3535

3636
@Autowired
37-
private SessionFactory sessionFactory;
37+
private IFooService fooService;
3838

3939
@Autowired
40-
private IFooService fooService;
40+
private SessionFactory sessionFactory;
4141

4242
private Session session;
4343

@@ -140,8 +140,9 @@ public final void givenUsingTheScrollableApi_whenRetrievingPaginatedData_thenCor
140140
int i = 0;
141141
while (pageSize > i++) {
142142
fooPage.add((Foo) resultScroll.get(0));
143-
if (!resultScroll.next())
143+
if (!resultScroll.next()) {
144144
break;
145+
}
145146
}
146147

147148
assertThat(fooPage, hasSize(lessThan(10 + 1)));

‎spring-hibernate4/src/test/java/org/baeldung/persistence/hibernate/FooSortingPersistenceServiceTest.java‎

Lines changed: 23 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import java.util.List;
66
import java.util.Set;
77

8-
import javax.imageio.spi.ServiceRegistry;
9-
108
import org.baeldung.persistence.model.Bar;
119
import org.baeldung.persistence.model.Foo;
1210
import org.baeldung.spring.PersistenceConfig;
@@ -15,14 +13,12 @@
1513
import org.hibernate.Query;
1614
import org.hibernate.Session;
1715
import org.hibernate.SessionFactory;
18-
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
19-
import org.hibernate.cfg.AvailableSettings;
20-
import org.hibernate.cfg.Configuration;
2116
import org.hibernate.criterion.Order;
2217
import org.junit.After;
2318
import org.junit.Before;
2419
import org.junit.Test;
2520
import org.junit.runner.RunWith;
21+
import org.springframework.beans.factory.annotation.Autowired;
2622
import org.springframework.test.context.ContextConfiguration;
2723
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
2824
import org.springframework.test.context.support.AnnotationConfigContextLoader;
@@ -31,40 +27,32 @@
3127
@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
3228
@SuppressWarnings("unchecked")
3329
public class FooSortingPersistenceServiceTest {
34-
private SessionFactory sf;
35-
private Session sess;
36-
private static ServiceRegistry serviceRegistry;
37-
private static Configuration configuration;
38-
private static StandardServiceRegistryBuilder builder;
30+
31+
@Autowired
32+
private SessionFactory sessionFactory;
33+
34+
private Session session;
3935

4036
@Before
4137
public void before() {
38+
session = sessionFactory.openSession();
39+
40+
session.beginTransaction();
4241

43-
final FooSortingPersistenceServiceData fooData = new FooSortingPersistenceServiceData();
42+
final FooFixtures fooData = new FooFixtures(sessionFactory);
4443
fooData.createBars();
45-
configuration = new Configuration();
46-
configuration.setProperty("hibernate.dialect", "org.hibernate.dialect.MySQLDialect");
47-
configuration.setProperty("dialect", "org.hibernate.dialect.MySQLDialect");
48-
configuration.setProperty(AvailableSettings.DRIVER, "com.mysql.jdbc.Driver");
49-
configuration.setProperty(AvailableSettings.URL, "jdbc:mysql://localhost:3306/HIBERTEST2_TEST");
50-
configuration.setProperty(AvailableSettings.USER, "root");
51-
configuration.setProperty(AvailableSettings.PASS, "");
52-
configuration.setProperty("hibernate.show_sql", "true");
53-
builder = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties());
54-
sf = configuration.addPackage("org.baeldung.persistence.model").addAnnotatedClass(Foo.class).addAnnotatedClass(Bar.class).configure().buildSessionFactory(builder.build());
55-
sess = sf.openSession();
56-
sess.beginTransaction();
5744
}
5845

5946
@After
6047
public void after() {
61-
sess.getTransaction().commit();
48+
session.getTransaction().commit();
49+
session.close();
6250
}
6351

6452
@Test
6553
public final void whenHQlSortingByOneAttribute_thenPrintSortedResults() {
6654
final String hql = "FROM Foo f ORDER BY f.name";
67-
final Query query = sess.createQuery(hql);
55+
final Query query = session.createQuery(hql);
6856
final List<Foo> fooList = query.list();
6957
for (final Foo foo : fooList) {
7058
System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
@@ -74,7 +62,7 @@ public final void whenHQlSortingByOneAttribute_thenPrintSortedResults() {
7462
@Test
7563
public final void whenHQlSortingByStringNullLast_thenLastNull() {
7664
final String hql = "FROM Foo f ORDER BY f.name NULLS LAST";
77-
final Query query = sess.createQuery(hql);
65+
final Query query = session.createQuery(hql);
7866
final List<Foo> fooList = query.list();
7967

8068
assertNull(fooList.get(fooList.toArray().length - 1).getName());
@@ -86,7 +74,7 @@ public final void whenHQlSortingByStringNullLast_thenLastNull() {
8674
@Test
8775
public final void whenSortingByStringNullsFirst_thenReturnNullsFirst() {
8876
final String hql = "FROM Foo f ORDER BY f.name NULLS FIRST";
89-
final Query query = sess.createQuery(hql);
77+
final Query query = session.createQuery(hql);
9078
final List<Foo> fooList = query.list();
9179
assertNull(fooList.get(0).getName());
9280
for (final Foo foo : fooList) {
@@ -98,7 +86,7 @@ public final void whenSortingByStringNullsFirst_thenReturnNullsFirst() {
9886
@Test
9987
public final void whenHQlSortingByOneAttribute_andOrderDirection_thenPrintSortedResults() {
10088
final String hql = "FROM Foo f ORDER BY f.name ASC";
101-
final Query query = sess.createQuery(hql);
89+
final Query query = session.createQuery(hql);
10290
final List<Foo> fooList = query.list();
10391
for (final Foo foo : fooList) {
10492
System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
@@ -108,7 +96,7 @@ public final void whenHQlSortingByOneAttribute_andOrderDirection_thenPrintSorted
10896
@Test
10997
public final void whenHQlSortingByMultipleAttributes_thenSortedResults() {
11098
final String hql = "FROM Foo f ORDER BY f.name, f.id";
111-
final Query query = sess.createQuery(hql);
99+
final Query query = session.createQuery(hql);
112100
final List<Foo> fooList = query.list();
113101
for (final Foo foo : fooList) {
114102
System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
@@ -118,7 +106,7 @@ public final void whenHQlSortingByMultipleAttributes_thenSortedResults() {
118106
@Test
119107
public final void whenHQlSortingByMultipleAttributes_andOrderDirection_thenPrintSortedResults() {
120108
final String hql = "FROM Foo f ORDER BY f.name DESC, f.id ASC";
121-
final Query query = sess.createQuery(hql);
109+
final Query query = session.createQuery(hql);
122110
final List<Foo> fooList = query.list();
123111
for (final Foo foo : fooList) {
124112
System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId());
@@ -127,7 +115,7 @@ public final void whenHQlSortingByMultipleAttributes_andOrderDirection_thenPrint
127115

128116
@Test
129117
public final void whenHQLCriteriaSortingByOneAttr_thenPrintSortedResults() {
130-
final Criteria criteria = sess.createCriteria(Foo.class, "FOO");
118+
final Criteria criteria = session.createCriteria(Foo.class, "FOO");
131119
criteria.addOrder(Order.asc("id"));
132120
final List<Foo> fooList = criteria.list();
133121
for (final Foo foo : fooList) {
@@ -137,7 +125,7 @@ public final void whenHQLCriteriaSortingByOneAttr_thenPrintSortedResults() {
137125

138126
@Test
139127
public final void whenHQLCriteriaSortingByMultipAttr_thenSortedResults() {
140-
final Criteria criteria = sess.createCriteria(Foo.class, "FOO");
128+
final Criteria criteria = session.createCriteria(Foo.class, "FOO");
141129
criteria.addOrder(Order.asc("name"));
142130
criteria.addOrder(Order.asc("id"));
143131
final List<Foo> fooList = criteria.list();
@@ -148,7 +136,7 @@ public final void whenHQLCriteriaSortingByMultipAttr_thenSortedResults() {
148136

149137
@Test
150138
public final void whenCriteriaSortingStringNullsLastAsc_thenNullsLast() {
151-
final Criteria criteria = sess.createCriteria(Foo.class, "FOO");
139+
final Criteria criteria = session.createCriteria(Foo.class, "FOO");
152140
criteria.addOrder(Order.asc("name").nulls(NullPrecedence.LAST));
153141
final List<Foo> fooList = criteria.list();
154142
assertNull(fooList.get(fooList.toArray().length - 1).getName());
@@ -159,7 +147,7 @@ public final void whenCriteriaSortingStringNullsLastAsc_thenNullsLast() {
159147

160148
@Test
161149
public final void whenCriteriaSortingStringNullsFirstDesc_thenNullsFirst() {
162-
final Criteria criteria = sess.createCriteria(Foo.class, "FOO");
150+
final Criteria criteria = session.createCriteria(Foo.class, "FOO");
163151
criteria.addOrder(Order.desc("name").nulls(NullPrecedence.FIRST));
164152
final List<Foo> fooList = criteria.list();
165153
assertNull(fooList.get(0).getName());
@@ -171,7 +159,7 @@ public final void whenCriteriaSortingStringNullsFirstDesc_thenNullsFirst() {
171159
@Test
172160
public final void whenSortingBars_thenBarsWithSortedFoos() {
173161
final String hql = "FROM Bar b ORDER BY b.id";
174-
final Query query = sess.createQuery(hql);
162+
final Query query = session.createQuery(hql);
175163
final List<Bar> barList = query.list();
176164
for (final Bar bar : barList) {
177165
final Set<Foo> fooSet = bar.getFooSet();

‎spring-hibernate4/src/test/java/org/baeldung/persistence/service/ParentServicePersistenceIntegrationTest.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
import org.baeldung.persistence.model.Child;
44
import org.baeldung.persistence.model.Parent;
5-
import org.baeldung.persistence.service.IChildService;
6-
import org.baeldung.persistence.service.IParentService;
75
import org.baeldung.spring.PersistenceConfig;
8-
import org.hibernate.SessionFactory;
96
import org.junit.Test;
107
import org.junit.runner.RunWith;
118
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,9 +21,6 @@ public class ParentServicePersistenceIntegrationTest {
2421
@Autowired
2522
private IChildService childService;
2623

27-
@Autowired
28-
private SessionFactory sessionFactory;
29-
3024
// tests
3125

3226
@Test

0 commit comments

Comments
 (0)