HHH-5024 - MetadataContext#registerAttribute does not recognize inherited fields

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/attribute/AbstractNameable.java

@@ -0,0 +1,51 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.ejb.test.metagen.mappedsuperclass.attribute;
+
+import javax.persistence.Column;
+import javax.persistence.MappedSuperclass;
+
+/**
+ * @author Steve Ebersole
+ */
+@MappedSuperclass
+public abstract class AbstractNameable {
+	private String name;
+
+	protected AbstractNameable() {
+	}
+
+	protected AbstractNameable(String name) {
+		this.name = name;
+	}
+
+	@Column(name = "name")
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java

@@ -0,0 +1,49 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.ejb.test.metagen.mappedsuperclass.attribute;
+
+import org.hibernate.ejb.Ejb3Configuration;
+
+import org.junit.Test;
+
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseUnitTestCase;
+
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * @author Steve Ebersole
+ */
+@TestForIssue( jiraKey = "HHH-5024" )
+public class MappedSuperclassWithAttributesTest extends BaseUnitTestCase {
+	@Test
+	public void testStaticMetamodel() {
+		new Ejb3Configuration().addAnnotatedClass( Product.class ).buildEntityManagerFactory();
+
+		assertNotNull( "'Product_.id' should not be null)", Product_.id );
+		assertNotNull( "'Product_.name' should not be null)", Product_.name );
+
+		assertNotNull( "'AbstractNameable_.name' should not be null)", AbstractNameable_.name );
+	}
+}

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/attribute/Product.java

@@ -0,0 +1,51 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.ejb.test.metagen.mappedsuperclass.attribute;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * @author Steve Ebersole
+ */
+@Entity
+public class Product extends AbstractNameable {
+	private Long id;
+
+	public Product() {
+	}
+
+	public Product(String name) {
+		super( name );
+	}
+
+	@Id
+	public Long getId() {
+		return id;
+	}
+
+	private void setId(Long id) {
+		this.id = id;
+	}
+}

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embedded/AbstractAddressable.java

@@ -0,0 +1,51 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.ejb.test.metagen.mappedsuperclass.embedded;
+
+import javax.persistence.Embedded;
+import javax.persistence.MappedSuperclass;
+
+/**
+ * @author Steve Ebersole
+ */
+@MappedSuperclass
+public abstract class AbstractAddressable {
+	private Address address;
+
+	protected AbstractAddressable() {
+	}
+
+	protected AbstractAddressable(Address address) {
+		this.address = address;
+	}
+
+	@Embedded
+	public Address getAddress() {
+		return address;
+	}
+
+	public void setAddress(Address address) {
+		this.address = address;
+	}
+}

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embedded/Address.java

@@ -0,0 +1,69 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.ejb.test.metagen.mappedsuperclass.embedded;
+
+import javax.persistence.Embeddable;
+
+/**
+ * @author Steve Ebersole
+ */
+@Embeddable
+public class Address {
+	private String street;
+	private String city;
+	private String state;
+	private String zip;
+
+	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 getZip() {
+		return zip;
+	}
+
+	public void setZip(String zip) {
+		this.zip = zip;
+	}
+}

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embedded/Company.java

@@ -0,0 +1,51 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.ejb.test.metagen.mappedsuperclass.embedded;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * @author Steve Ebersole
+ */
+@Entity
+public class Company extends AbstractAddressable {
+	private Long id;
+
+	public Company() {
+	}
+
+	public Company(Address address) {
+		super( address );
+	}
+
+	@Id
+	public Long getId() {
+		return id;
+	}
+
+	private void setId(Long id) {
+		this.id = id;
+	}
+}

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java

@@ -0,0 +1,51 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.ejb.test.metagen.mappedsuperclass.embedded;
+
+import org.hibernate.ejb.Ejb3Configuration;
+
+import org.junit.Test;
+
+import org.hibernate.testing.FailureExpected;
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseUnitTestCase;
+
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * @author Steve Ebersole
+ */
+public class MappedSuperclassWithEmbeddedTest extends BaseUnitTestCase {
+	@Test
+	@TestForIssue( jiraKey = "HHH-5024" )
+	@FailureExpected( jiraKey = "HHH-5024" )
+	public void testStaticMetamodel() {
+		new Ejb3Configuration().addAnnotatedClass( Company.class ).buildEntityManagerFactory();
+
+		assertNotNull( "'Company_.id' should not be null)", Company_.id );
+		assertNotNull( "'Company_.address' should not be null)", Company_.address );
+
+		assertNotNull( "'AbstractAddressable_.address' should not be null)", AbstractAddressable_.address );
+	}
+}

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embeddedid/AbstractProduct.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.metadata.mappedsuperclass.embeddedid;
+package org.hibernate.ejb.test.metagen.mappedsuperclass.embeddedid;
 
 import javax.persistence.EmbeddedId;
 import javax.persistence.MappedSuperclass;

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.metadata.mappedsuperclass.embeddedid;
+package org.hibernate.ejb.test.metagen.mappedsuperclass.embeddedid;
 
 import org.hibernate.ejb.Ejb3Configuration;
 
@@ -46,7 +46,7 @@ public class MappedSuperclassWithEmbeddedIdTest extends BaseUnitTestCase {
 		assertNotNull( "'Product_.description' should not be null)", Product_.description );
 		assertNotNull( "'Product_.id' should not be null)", Product_.id );
 
-		assertNotNull( "'Product_.id' should not be null)", AbstractProduct_.id );
+		assertNotNull( "'AbstractProduct_.id' should not be null)", AbstractProduct_.id );
 
 		assertNotNull( "'ProductId_.id' should not be null)", ProductId_.id );
 		assertNotNull( "'ProductId_.code' should not be null)", ProductId_.code );

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embeddedid/Product.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.metadata.mappedsuperclass.embeddedid;
+package org.hibernate.ejb.test.metagen.mappedsuperclass.embeddedid;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embeddedid/ProductId.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.metadata.mappedsuperclass.embeddedid;
+package org.hibernate.ejb.test.metagen.mappedsuperclass.embeddedid;
 
 import javax.persistence.Column;
 import javax.persistence.Embeddable;

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/AbstractAttribute.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.metadata.mappedsuperclass.idclass;
+package org.hibernate.ejb.test.metagen.mappedsuperclass.idclass;
 
 import java.io.Serializable;
 

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/AbstractAttributeId.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.metadata.mappedsuperclass.idclass;
+package org.hibernate.ejb.test.metagen.mappedsuperclass.idclass;
 
 import java.io.Serializable;
 

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.metadata.mappedsuperclass.idclass;
+package org.hibernate.ejb.test.metagen.mappedsuperclass.idclass;
 
 import static org.junit.Assert.assertNotNull;
 

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/ProductAttribute.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.metadata.mappedsuperclass.idclass;
+package org.hibernate.ejb.test.metagen.mappedsuperclass.idclass;
 
 import java.io.Serializable;
 

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/ProductAttributeId.java

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.ejb.test.metadata.mappedsuperclass.idclass;
+package org.hibernate.ejb.test.metagen.mappedsuperclass.idclass;
 
 /**
  * @author Alexis Bataille