HHH-7917 : Add support for ordered sets

hibernate · Jan 10, 2013 · 413ca60 · 413ca60
1 parent bf5fabd
commit 413ca60
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 22 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/HibernateTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/HibernateTypeHelper.java
@@ -475,7 +475,9 @@ Type resolvePluralType(
 								pluralAttributeBinding.getComparator()
 						);
 					}
-					// TODO: else if ( pluralAttributeBinding.hasOrder() ) { orderedSet... }
+					else if ( pluralAttributeBinding.getOrderBy() != null ) {
+						return typeFactory().orderedSet( role, propertyRef );
+					}
 					else {
 						return typeFactory().set( role, propertyRef );
 					}

diff --git a/...nate-core/src/test/java/org/hibernate/test/annotations/collectionelement/OrderByTest.java b/...nate-core/src/test/java/org/hibernate/test/annotations/collectionelement/OrderByTest.java
@@ -34,7 +34,6 @@
 import org.hibernate.testing.FailureExpectedWithNewMetamodel;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
-@FailureExpectedWithNewMetamodel
 public class OrderByTest extends BaseCoreFunctionalTestCase {
 	@Test
 	public void testOrderByName() throws Exception {
@@ -47,17 +46,14 @@ public void testOrderByName() throws Exception {
 		Widgets widget = new Widgets();
 		widget.setName("hammer");
 		set.add(widget);
-		s.persist(widget);
 
 		widget = new Widgets();
 		widget.setName("axel");
 		set.add(widget);
-		s.persist(widget);
 
 		widget = new Widgets();
 		widget.setName("screwdriver");
 		set.add(widget);
-		s.persist(widget);
 
 		p.setWidgets(set);
 		s.persist(p);

diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Products.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Products.java
@@ -4,6 +4,7 @@
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.OneToMany;
 import javax.persistence.OrderBy;
 
 @SuppressWarnings({"unchecked", "serial"})

diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Widgets.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/Widgets.java
@@ -1,12 +1,9 @@
 package org.hibernate.test.annotations.collectionelement;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import javax.persistence.Embeddable;
 
-@Entity
+@Embeddable
 public class Widgets {
 	private String name;
-	private int id;
 
 	public Widgets() {
 
@@ -19,15 +16,4 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-
-	@Id
-	@GeneratedValue
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/test/ordered/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/test/ordered/OrderByTest.java
@@ -49,7 +49,6 @@ public String[] getMappings() {
 
 	@Test
 	@SuppressWarnings( {"unchecked"})
-	@FailureExpectedWithNewMetamodel
 	public void testOrderBy() {
 		Search s = new Search("Hibernate");
 		s.getSearchResults().add("jboss.com");