[hibernate-commits] Hibernate SVN: r18520 - in core/trunk/annotations/src/test/java/org/hibernate/test/annotations: override and 1 other directory.

Author: smarlow(a)redhat.com Date: 2010-01-12 14:40:17 -0500 (Tue, 12 Jan 2010) New Revision: 18520 Added: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/Addr.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/ContactInfo.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/Employee.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/SocialSite.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/SocialTouchPoints.java Removed: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Address.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/AssociationOverrideTest.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/ContactInfo.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Employee.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/PhoneNumber.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/SocialSite.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/SocialTouchPoints.java Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/Address.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java Log: HHH-4679 Make sure @AssociationOverride support the dot notation. Package name change. Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Address.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Address.java 2010-01-12 18:50:42 UTC (rev 18519) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Address.java 2010-01-12 19:40:17 UTC (rev 18520) @@ -1,67 +0,0 @@ -package org.hibernate.test.annotations.collectionelement; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; - -@Entity -public class Address { - - @Id - int id; - - private String street; - private String city; - private String state; - private String country; - private String zipcode; - - public String getStreet() { - return street; - } - - public void setStreet(String street) { - this.street = street; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public String getCountry() { - return country; - } - - public void setCountry(String country) { - this.country = country; - } - - public String getZipcode() { - return zipcode; - } - - public void setZipcode(String zipcode) { - this.zipcode = zipcode; - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - -} \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/AssociationOverrideTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/AssociationOverrideTest.java 2010-01-12 18:50:42 UTC (rev 18519) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/AssociationOverrideTest.java 2010-01-12 19:40:17 UTC (rev 18520) @@ -1,74 +0,0 @@ -package org.hibernate.test.annotations.collectionelement; - -import junit.framework.Assert; -import org.hibernate.Session; -import org.hibernate.Transaction; -import org.hibernate.test.annotations.TestCase; -import org.hibernate.test.util.SchemaUtil; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -public class AssociationOverrideTest extends TestCase { - - public void testDottedNotation() throws Exception { - assertTrue( SchemaUtil.isTablePresent( "Employee", getCfg() ) ); - assertTrue( "Overridden @JoinColumn fails", - SchemaUtil.isColumnPresent( "Employee", "fld_address_fk", getCfg() ) ); - - assertTrue( "Overridden @JoinTable name fails", SchemaUtil.isTablePresent( "tbl_empl_sites", getCfg() ) ); - assertTrue( "Overridden @JoinTable with default @JoinColumn fails", - SchemaUtil.isColumnPresent( "tbl_empl_sites", "employee_id", getCfg() ) ); - assertTrue( "Overridden @JoinTable.inverseJoinColumn fails", - SchemaUtil.isColumnPresent( "tbl_empl_sites", "to_website_fk", getCfg() ) ); - - Session s = openSession(); - Transaction tx = s.beginTransaction(); - ContactInfo ci = new ContactInfo(); - Address address = new Address(); - address.setCity("Boston"); - address.setCountry("USA"); - address.setState("MA"); - address.setStreet("27 School Street"); - address.setZipcode("02108"); - ci.setAddress(address); - List<PhoneNumber> phoneNumbers = new ArrayList(); - PhoneNumber num = new PhoneNumber(); - num.setNumber(5577188); - Employee e = new Employee(); - Collection employeeList = new ArrayList(); - employeeList.add(e); - e.setContactInfo(ci); - num.setEmployees(employeeList); - phoneNumbers.add(num); - ci.setPhoneNumbers(phoneNumbers); - SocialTouchPoints socialPoints = new SocialTouchPoints(); - List<SocialSite> sites = new ArrayList<SocialSite>(); - SocialSite site = new SocialSite(); - site.setEmployee(employeeList); - site.setWebsite("www.jboss.org"); - sites.add(site); - socialPoints.setWebsite(sites); - ci.setSocial(socialPoints); - s.persist(e); - tx.commit(); - - tx = s.beginTransaction(); - s.clear(); - e = (Employee) s.get(Employee.class,e.getId()); - tx.commit(); - s.close(); - } - - protected Class[] getMappings() { - return new Class[] { - Employee.class, - PhoneNumber.class, - Address.class, - SocialSite.class, - SocialTouchPoints.class - }; - } - -} \ No newline at end of file Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/ContactInfo.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/ContactInfo.java 2010-01-12 18:50:42 UTC (rev 18519) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/ContactInfo.java 2010-01-12 19:40:17 UTC (rev 18520) @@ -1,49 +0,0 @@ -package org.hibernate.test.annotations.collectionelement; - -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import java.util.List; - - -@Embeddable -public class ContactInfo { - @ManyToOne(cascade = CascadeType.ALL) - @JoinColumn(name="address_id_fk") - Address address; - - @ManyToMany(cascade = CascadeType.ALL) - List<PhoneNumber> phoneNumbers; - - @Embedded - SocialTouchPoints social; - - public Address getAddress() { - return address; - } - - public void setAddress(Address address) { - this.address = address; - } - - public List<PhoneNumber> getPhoneNumbers() { - return phoneNumbers; - } - - public void setPhoneNumbers(List<PhoneNumber> phoneNumbers) { - this.phoneNumbers = phoneNumbers; - } - - public SocialTouchPoints getSocial() { - return social; - } - - public void setSocial(SocialTouchPoints social) { - this.social = social; - } - -} Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Employee.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Employee.java 2010-01-12 18:50:42 UTC (rev 18519) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Employee.java 2010-01-12 19:40:17 UTC (rev 18520) @@ -1,55 +0,0 @@ -package org.hibernate.test.annotations.collectionelement; - -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; - -@Entity -public class Employee { - @Id - int id; - - @AssociationOverrides({ - @AssociationOverride( - name = "social.website", - joinTable = @JoinTable( - name = "tbl_empl_sites", - inverseJoinColumns = @JoinColumn(name = "to_website_fk") - ) - ), - @AssociationOverride( - name = "phoneNumbers", - joinTable = @JoinTable( - name = "tbl_empl_phone" - ) - ), - @AssociationOverride( - name="address", - joinColumns = @JoinColumn(name="fld_address_fk") - ) - }) - @Embedded - ContactInfo contactInfo; - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public ContactInfo getContactInfo() { - return contactInfo; - } - - public void setContactInfo(ContactInfo contactInfo) { - this.contactInfo = contactInfo; - } - -} - Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/PhoneNumber.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/PhoneNumber.java 2010-01-12 18:50:42 UTC (rev 18519) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/PhoneNumber.java 2010-01-12 19:40:17 UTC (rev 18520) @@ -1,43 +0,0 @@ -package org.hibernate.test.annotations.collectionelement; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import java.util.Collection; - -@Entity -public class PhoneNumber { - - @Id - int id; - - public void setId(int id) { - this.id = id; - } - - int number; - - @ManyToMany(mappedBy = "contactInfo.phoneNumbers", cascade = CascadeType.ALL) - Collection<Employee> employees; - - public Collection<Employee> getEmployees() { - return employees; - } - - public void setEmployees(Collection<Employee> employees) { - this.employees = employees; - } - - public int getNumber() { - return number; - } - - public void setNumber(int number) { - this.number = number; - } - - public int getId() { - return id; - } -} Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/SocialSite.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/SocialSite.java 2010-01-12 18:50:42 UTC (rev 18519) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/SocialSite.java 2010-01-12 19:40:17 UTC (rev 18520) @@ -1,42 +0,0 @@ -package org.hibernate.test.annotations.collectionelement; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import java.util.Collection; - -@Entity -public class SocialSite { - - @Id - int id; - - String website; - - @ManyToMany(mappedBy="contactInfo.social.website") - Collection<Employee> employee; - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getWebsite() { - return website; - } - - public void setWebsite(String website) { - this.website = website; - } - - public Collection<Employee> getEmployee() { - return employee; - } - - public void setEmployee(Collection<Employee> employee) { - this.employee = employee; - } -} Deleted: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/SocialTouchPoints.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/SocialTouchPoints.java 2010-01-12 18:50:42 UTC (rev 18519) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/SocialTouchPoints.java 2010-01-12 19:40:17 UTC (rev 18520) @@ -1,22 +0,0 @@ -package org.hibernate.test.annotations.collectionelement; - -import javax.persistence.CascadeType; -import javax.persistence.Embeddable; -import javax.persistence.ManyToMany; -import java.util.List; - -@Embeddable -public class SocialTouchPoints { - - // owning side of many to many - @ManyToMany(cascade= CascadeType.ALL) - List<SocialSite> website; - - public List<SocialSite> getWebsite() { - return website; - } - - public void setWebsite(List<SocialSite> website) { - this.website = website; - } -} Added: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/Addr.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/Addr.java (rev 0) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/Addr.java 2010-01-12 19:40:17 UTC (rev 18520) @@ -0,0 +1,67 @@ +package org.hibernate.test.annotations.override; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.OneToMany; + +@Entity +public class Addr { + + @Id + int id; + + private String street; + private String city; + private String state; + private String country; + private String zipcode; + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + public String getZipcode() { + return zipcode; + } + + public void setZipcode(String zipcode) { + this.zipcode = zipcode; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + +} \ No newline at end of file Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/Address.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/Address.java 2010-01-12 18:50:42 UTC (rev 18519) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/Address.java 2010-01-12 19:40:17 UTC (rev 18520) @@ -11,4 +11,29 @@ public String street; public String city; public String state; + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getStreet() { + + return street; + } + + public void setStreet(String street) { + this.street = street; + } } Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java 2010-01-12 18:50:42 UTC (rev 18519) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java 2010-01-12 19:40:17 UTC (rev 18520) @@ -5,7 +5,12 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.test.annotations.TestCase; +import org.hibernate.test.util.SchemaUtil; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + /** * @author Emmanuel Bernard */ @@ -37,11 +42,65 @@ } } + public void testDottedNotation() throws Exception { + assertTrue( SchemaUtil.isTablePresent( "Employee", getCfg() ) ); + assertTrue( "Overridden @JoinColumn fails", + SchemaUtil.isColumnPresent( "Employee", "fld_address_fk", getCfg() ) ); + + assertTrue( "Overridden @JoinTable name fails", SchemaUtil.isTablePresent( "tbl_empl_sites", getCfg() ) ); + assertTrue( "Overridden @JoinTable with default @JoinColumn fails", + SchemaUtil.isColumnPresent( "tbl_empl_sites", "employee_id", getCfg() ) ); + assertTrue( "Overridden @JoinTable.inverseJoinColumn fails", + SchemaUtil.isColumnPresent( "tbl_empl_sites", "to_website_fk", getCfg() ) ); + + Session s = openSession(); + Transaction tx = s.beginTransaction(); + ContactInfo ci = new ContactInfo(); + Addr address = new Addr(); + address.setCity("Boston"); + //address.setCountry("USA"); + address.setState("MA"); + address.setStreet("27 School Street"); + //address.setZipcode("02108"); + ci.setAddr(address); + List<PhoneNumber> phoneNumbers = new ArrayList(); + PhoneNumber num = new PhoneNumber(); + num.setNumber(5577188); + Employee e = new Employee(); + Collection employeeList = new ArrayList(); + employeeList.add(e); + e.setContactInfo(ci); + num.setEmployees(employeeList); + phoneNumbers.add(num); + ci.setPhoneNumbers(phoneNumbers); + SocialTouchPoints socialPoints = new SocialTouchPoints(); + List<SocialSite> sites = new ArrayList<SocialSite>(); + SocialSite site = new SocialSite(); + site.setEmployee(employeeList); + site.setWebsite("www.jboss.org"); + sites.add(site); + socialPoints.setWebsite(sites); + ci.setSocial(socialPoints); + s.persist(e); + tx.commit(); + + tx = s.beginTransaction(); + s.clear(); + e = (Employee) s.get(Employee.class,e.getId()); + tx.commit(); + s.close(); + } + protected Class[] getMappings() { return new Class[]{ + Employee.class, Location.class, Move.class, - Trip.class + Trip.class, + PhoneNumber.class, + Addr.class, + SocialSite.class, + SocialTouchPoints.class }; } } Copied: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/ContactInfo.java (from rev 18519, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/ContactInfo.java) =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/ContactInfo.java (rev 0) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/ContactInfo.java 2010-01-12 19:40:17 UTC (rev 18520) @@ -0,0 +1,48 @@ +package org.hibernate.test.annotations.override; + +import javax.persistence.CascadeType; +import javax.persistence.Embeddable; +import javax.persistence.Embedded; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; +import java.util.List; + + +@Embeddable +public class ContactInfo { + @ManyToOne(cascade = CascadeType.ALL) + @JoinColumn(name="address_id_fk") + Addr address; + + @ManyToMany(cascade = CascadeType.ALL) + List<PhoneNumber> phoneNumbers; + + @Embedded + SocialTouchPoints social; + + public Addr getAddress() { + return address; + } + + public void setAddr(Addr address) { + this.address = address; + } + + public List<PhoneNumber> getPhoneNumbers() { + return phoneNumbers; + } + + public void setPhoneNumbers(List<PhoneNumber> phoneNumbers) { + this.phoneNumbers = phoneNumbers; + } + + public SocialTouchPoints getSocial() { + return social; + } + + public void setSocial(SocialTouchPoints social) { + this.social = social; + } + +} Copied: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/Employee.java (from rev 18519, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/Employee.java) =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/Employee.java (rev 0) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/Employee.java 2010-01-12 19:40:17 UTC (rev 18520) @@ -0,0 +1,55 @@ +package org.hibernate.test.annotations.override; + +import javax.persistence.AssociationOverride; +import javax.persistence.AssociationOverrides; +import javax.persistence.Embedded; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; + +@Entity +public class Employee { + @Id + int id; + + @AssociationOverrides({ + @AssociationOverride( + name = "social.website", + joinTable = @JoinTable( + name = "tbl_empl_sites", + inverseJoinColumns = @JoinColumn(name = "to_website_fk") + ) + ), + @AssociationOverride( + name = "phoneNumbers", + joinTable = @JoinTable( + name = "tbl_empl_phone" + ) + ), + @AssociationOverride( + name="address", + joinColumns = @JoinColumn(name="fld_address_fk") + ) + }) + @Embedded + ContactInfo contactInfo; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public ContactInfo getContactInfo() { + return contactInfo; + } + + public void setContactInfo(ContactInfo contactInfo) { + this.contactInfo = contactInfo; + } + +} + Copied: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/SocialSite.java (from rev 18519, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/SocialSite.java) =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/SocialSite.java (rev 0) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/SocialSite.java 2010-01-12 19:40:17 UTC (rev 18520) @@ -0,0 +1,42 @@ +package org.hibernate.test.annotations.override; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToMany; +import java.util.Collection; + +@Entity +public class SocialSite { + + @Id + int id; + + String website; + + @ManyToMany(mappedBy="contactInfo.social.website") + Collection<Employee> employee; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + + public Collection<Employee> getEmployee() { + return employee; + } + + public void setEmployee(Collection<Employee> employee) { + this.employee = employee; + } +} Copied: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/SocialTouchPoints.java (from rev 18519, core/trunk/annotations/src/test/java/org/hibernate/test/annotations/collectionelement/SocialTouchPoints.java) =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/SocialTouchPoints.java (rev 0) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/override/SocialTouchPoints.java 2010-01-12 19:40:17 UTC (rev 18520) @@ -0,0 +1,24 @@ +package org.hibernate.test.annotations.override; + +import org.hibernate.test.annotations.override.SocialSite; + +import javax.persistence.CascadeType; +import javax.persistence.Embeddable; +import javax.persistence.ManyToMany; +import java.util.List; + +@Embeddable +public class SocialTouchPoints { + + // owning side of many to many + @ManyToMany(cascade= CascadeType.ALL) + List<SocialSite> website; + + public List<SocialSite> getWebsite() { + return website; + } + + public void setWebsite(List<SocialSite> website) { + this.website = website; + } +}