[hibernate-commits] Hibernate SVN: r16700 - core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement.

[hibernate-commits at lists.jboss.org]

Author: jcosta at redhat.com
Date: 2009-06-05 07:57:40 -0400 (Fri, 05 Jun 2009)
New Revision: 16700

Modified:
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java
   core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Matrix.java
Log:
ANN-840 - Reverted, as we don't want to hide the existing bug

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java	2009-06-05 10:51:53 UTC (rev 16699)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Boy.java	2009-06-05 11:57:40 UTC (rev 16700)
@@ -5,11 +5,9 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
 import javax.persistence.Column;
-import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
@@ -18,10 +16,10 @@
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
+import javax.persistence.ElementCollection;
 
 import org.hibernate.annotations.CollectionOfElements;
 import org.hibernate.annotations.IndexColumn;
-import org.hibernate.annotations.MapKey;
 
 /**
  * @author Emmanuel Bernard
@@ -81,7 +79,6 @@
 	@ElementCollection
 	@JoinTable(name = "ScorePerNickName", joinColumns = @JoinColumn(name = "BoyId"))
 	@Column(name = "score", nullable = false)
-	@MapKey(columns=@Column( name = "mapkey", nullable=false ))
 	public Map<String, Integer> getScorePerNickName() {
 		return scorePerNickName;
 	}

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java	2009-06-05 10:51:53 UTC (rev 16699)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/LocalizedString.java	2009-06-05 11:57:40 UTC (rev 16700)
@@ -33,7 +33,7 @@
 			new HashMap<String, String>( 1 );
 
 	@ElementCollection
-	@MapKey( columns = @Column( name = "language_code", nullable=false ) )
+	@MapKey( columns = @Column( name = "language_code" ) )
 	@Fetch( FetchMode.JOIN )
 	@Filter( name = "selectedLocale",
 			condition = " language_code = :param " )

Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Matrix.java
===================================================================
--- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Matrix.java	2009-06-05 10:51:53 UTC (rev 16699)
+++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Matrix.java	2009-06-05 11:57:40 UTC (rev 16700)
@@ -4,8 +4,6 @@
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
-
-import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -25,7 +23,7 @@
 	@GeneratedValue
 	private Integer id;
 	
-	@MapKey(type = @Type(type="integer"), columns=@Column( name = "mapkey", nullable=false ) )
+	@MapKey(type = @Type(type="integer") )
 	@ElementCollection
 	@Sort(type = SortType.NATURAL) 
 	@Type(type = "float")