Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-6159 - Create EntityManagerFactoryBuilder : remove explicit 'use metamodel' flag + fixed query imports from hbm processing

This commit is contained in:
Steve Ebersole 2012-07-25 15:24:23 -05:00
parent 61fe3b7457
commit e3a606e3db
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/HibernateMappingProcessor.java
View File

@ -264,9 +264,25 @@ public class HibernateMappingProcessor {
private void processEntityElementImport(EntityElement entityElement) { private void processEntityElementImport(EntityElement entityElement) {
final String qualifiedName = bindingContext().determineEntityName( entityElement ); final String qualifiedName = bindingContext().determineEntityName( entityElement );
metadata.addImport( entityElement.getEntityName() == null final String importName = entityElement.getEntityName() == null
? entityElement.getName() ? entityElement.getName()
: entityElement.getEntityName(), qualifiedName ); : entityElement.getEntityName();
metadata.addImport( importName, qualifiedName );
if ( JaxbClassElement.class.isInstance( entityElement ) ) {
processEntityElementsImport( ( (JaxbClassElement) entityElement ).getSubclass() );
processEntityElementsImport( ( (JaxbClassElement) entityElement ).getJoinedSubclass() );
processEntityElementsImport( ( (JaxbClassElement) entityElement ).getUnionSubclass() );
}
else if ( JaxbSubclassElement.class.isInstance( entityElement ) ) {
processEntityElementsImport( ( (JaxbSubclassElement) entityElement ).getSubclass() );
}
else if ( JaxbJoinedSubclassElement.class.isInstance( entityElement ) ) {
processEntityElementsImport( ( (JaxbJoinedSubclassElement) entityElement ).getJoinedSubclass() );
}
else if ( JaxbUnionSubclassElement.class.isInstance( entityElement ) ) {
processEntityElementsImport( ( (JaxbUnionSubclassElement) entityElement ).getUnionSubclass() );
}
} }
private void processResultSetMappings() { private void processResultSetMappings() {

7
hibernate-core/src/test/java/org/hibernate/test/discriminator/DiscriminatorTest.java
View File

@ -30,7 +30,6 @@ import org.junit.Test;
import org.hibernate.Hibernate; import org.hibernate.Hibernate;
import org.hibernate.Session; import org.hibernate.Session;
import org.hibernate.Transaction; import org.hibernate.Transaction;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;
import org.hibernate.criterion.Property; import org.hibernate.criterion.Property;
import org.hibernate.criterion.Restrictions; import org.hibernate.criterion.Restrictions;
@ -53,12 +52,6 @@ public class DiscriminatorTest extends BaseCoreFunctionalTestCase {
return new String[] { "discriminator/Person.hbm.xml" }; return new String[] { "discriminator/Person.hbm.xml" };
} }
@Override
protected void configure(Configuration configuration) {
super.configure( configuration );
configuration.setProperty( USE_NEW_METADATA_MAPPINGS, "true" );
}
@Test @Test
public void testDiscriminatorSubclass() { public void testDiscriminatorSubclass() {
Session s = openSession(); Session s = openSession();