diff --git a/spring-hibernate4/src/test/java/org/baeldung/persistence/service/FooSortingServiceTest.java b/spring-hibernate4/src/test/java/org/baeldung/persistence/service/FooSortingServiceTest.java index 9d6f3c355a..1532c3ef3f 100644 --- a/spring-hibernate4/src/test/java/org/baeldung/persistence/service/FooSortingServiceTest.java +++ b/spring-hibernate4/src/test/java/org/baeldung/persistence/service/FooSortingServiceTest.java @@ -1,26 +1,13 @@ package org.baeldung.persistence.service; -import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; +import static org.junit.Assert.assertNull; -import org.baeldung.persistence.model.Foo; -import org.baeldung.persistence.service.IFooService; -import org.baeldung.spring.PersistenceConfig; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.dao.DataAccessException; -import org.springframework.dao.DataIntegrityViolationException; -import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; -import static org.junit.Assert.*; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.After; import java.util.List; import java.util.Set; + +import org.baeldung.persistence.model.Bar; +import org.baeldung.persistence.model.Foo; +import org.baeldung.spring.PersistenceConfig; import org.hibernate.Criteria; import org.hibernate.NullPrecedence; import org.hibernate.Query; @@ -29,8 +16,13 @@ import org.hibernate.SessionFactory; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.Configuration; import org.hibernate.criterion.Order; -import com.cc.example.hibernate.Foo; -import com.cc.example.hibernate.Bar; +import org.junit.After; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.support.AnnotationConfigContextLoader; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class) diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/model/Bar.java b/spring-jpa/src/main/java/org/baeldung/persistence/model/Bar.java index b3e789b9ce..3f76680d3b 100644 --- a/spring-jpa/src/main/java/org/baeldung/persistence/model/Bar.java +++ b/spring-jpa/src/main/java/org/baeldung/persistence/model/Bar.java @@ -1,66 +1,70 @@ package org.baeldung.persistence.model; import java.io.Serializable; +import java.util.List; +import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.CascadeType; +import javax.persistence.OneToMany; +import javax.persistence.OrderBy; @Entity public class Bar implements Serializable { - + @Id @GeneratedValue(strategy = GenerationType.AUTO) private long id; - + @Column(nullable = false) private String name; - + @OneToMany(mappedBy = "bar", fetch = FetchType.EAGER, cascade = CascadeType.ALL) @OrderBy("name ASC") List fooList; - + public Bar() { super(); } - + public Bar(final String name) { super(); - + this.name = name; } - + // API - + 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; } - + public List getFooList() { return fooList; } - + public void setFooList(final List fooList) { this.fooList = fooList; } - + // - + @Override public int hashCode() { final int prime = 31; @@ -68,7 +72,7 @@ public class Bar implements Serializable { result = prime * result + ((name == null) ? 0 : name.hashCode()); return result; } - + @Override public boolean equals(final Object obj) { if (this == obj) @@ -85,12 +89,12 @@ public class Bar implements Serializable { return false; return true; } - + @Override public String toString() { final StringBuilder builder = new StringBuilder(); builder.append("Bar [name=").append(name).append("]"); return builder.toString(); } - + } diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingTests.java b/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingTests.java index e1ecbd2015..37ed1dc2f0 100644 --- a/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingTests.java +++ b/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingTests.java @@ -1,7 +1,9 @@ package org.baeldung.persistence.service; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNull; + import java.util.List; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.EntityTransaction; @@ -11,11 +13,13 @@ import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import com.google.common.collect.Lists; + +import org.baeldung.persistence.model.Bar; +import org.baeldung.persistence.model.Foo; import org.junit.BeforeClass; import org.junit.Test; -import com.cc.jpa.example.Foo; -import com.cc.jpa.example.Bar; + +import com.google.common.collect.Lists; public class FooServiceSortingTests { private static EntityManager entityManager; @@ -25,7 +29,6 @@ public class FooServiceSortingTests { @BeforeClass public static void before() { - emf = Persistence.createEntityManagerFactory("punit"); entityManager = emf.createEntityManager(); entityTransaction = entityManager.getTransaction(); @@ -35,43 +38,36 @@ public class FooServiceSortingTests { @Test public final void whenSortingByOneAttributeDefaultOrder_thenPrintSortedResult() { - final String jql = "Select f from Foo as f order by f.id"; final Query sortQuery = entityManager.createQuery(jql); final List fooList = sortQuery.getResultList(); for (final Foo foo : fooList) { System.out.println("Name:" + foo.getName() + "-------Id:" + foo.getId()); } - } @Test public final void whenSortingByOneAttributeSetOrder_thenSortedPrintResult() { - final String jql = "Select f from Foo as f order by f.id desc"; final Query sortQuery = entityManager.createQuery(jql); final List fooList = sortQuery.getResultList(); for (final Foo foo : fooList) { System.out.println("Name:" + foo.getName() + "-------Id:" + foo.getId()); } - } @Test public final void whenSortingByTwoAttributes_thenPrintSortedResult() { - final String jql = "Select f from Foo as f order by f.name asc, f.id desc"; final Query sortQuery = entityManager.createQuery(jql); final List fooList = sortQuery.getResultList(); for (final Foo foo : fooList) { System.out.println("Name:" + foo.getName() + "-------Id:" + foo.getId()); } - } @Test public final void whenSortingFooByBar_thenBarsSorted() { - final String jql = "Select f from Foo as f order by f.name, f.bar.id"; final Query barJoinQuery = entityManager.createQuery(jql); final List fooList = barJoinQuery.getResultList(); @@ -82,7 +78,6 @@ public class FooServiceSortingTests { @Test public final void whenSortinfBar_thenPrintBarsSortedWithFoos() { - final String jql = "Select b from Bar as b order by b.id"; final Query barQuery = entityManager.createQuery(jql); final List barList = barQuery.getResultList(); @@ -92,12 +87,10 @@ public class FooServiceSortingTests { System.out.println("FooName:" + foo.getName()); } } - } @Test public final void whenSortingByStringNullLast_thenLastNull() { - final String jql = "Select f from Foo as f order by f.name desc NULLS LAST"; final Query sortQuery = entityManager.createQuery(jql); final List fooList = sortQuery.getResultList(); @@ -109,7 +102,6 @@ public class FooServiceSortingTests { @Test public final void whenSortingByStringNullFirst_thenFirstNull() { - final Foo nullNameFoo = new Foo(); nullNameFoo.setName(null); @@ -133,7 +125,6 @@ public class FooServiceSortingTests { @Test public final void whenSortingFooWithCriteria_thenPrintSortedFoos() { - criteriaBuilder = entityManager.getCriteriaBuilder(); final CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(Foo.class); final Root from = criteriaQuery.from(Foo.class); @@ -144,12 +135,10 @@ public class FooServiceSortingTests { for (final Foo foo : fooList) { System.out.println("Name:" + foo.getName() + "--------Id:" + foo.getId()); } - } @Test public final void whenSortingFooWithCriteriaAndMultipleAttributes_thenPrintSortedFoos() { - criteriaBuilder = entityManager.getCriteriaBuilder(); final CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(Foo.class); final Root from = criteriaQuery.from(Foo.class);