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

HHH-8359 default-lazy from <hibernate-mapping> should be applied to all entities / attributes if no one provided from the sub element

This commit is contained in:
Strong Liu 2013-07-12 01:03:11 +08:00
parent 2bc611a20c
commit d8c13ca9aa
8 changed files with 67 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/jaxb/spi/hbm/EntityElement.java
View File

@ -33,7 +33,7 @@ public interface EntityElement extends MetaAttributeContainer {
public String getEntityName();
public boolean isAbstract();
public boolean isLazy();
public Boolean isLazy();
public String getProxy();
public int getBatchSize();
public boolean isDynamicInsert();

8
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/EntityHierarchyBuilder.java
View File

@ -52,6 +52,9 @@ import org.hibernate.metamodel.internal.source.annotations.RootEntitySourceImpl;
import org.hibernate.metamodel.internal.source.annotations.SubclassEntitySourceImpl;
import org.hibernate.metamodel.internal.source.annotations.entity.EntityClass;
import org.hibernate.metamodel.internal.source.annotations.entity.RootEntityClass;
import org.hibernate.metamodel.internal.source.annotations.n.ClassNode;
import org.hibernate.metamodel.internal.source.annotations.n.HierarchyBuilder;
import org.hibernate.metamodel.internal.source.annotations.n.TreeWalker;
import org.hibernate.metamodel.spi.binding.InheritanceType;
import org.hibernate.metamodel.spi.source.EntityHierarchy;
import org.hibernate.metamodel.spi.source.EntitySource;
@ -78,6 +81,11 @@ public class EntityHierarchyBuilder {
* @return a set of {@code EntityHierarchy} instances.
*/
public static Set<EntityHierarchy> createEntityHierarchies(AnnotationBindingContext bindingContext) {
HierarchyBuilder builder = new HierarchyBuilder( bindingContext );
ClassNode root = builder.create();
new TreeWalker().visit( root );
Set<EntityHierarchy> hierarchies = new HashSet<EntityHierarchy>();
Map<DotName,DotName> processedEntities = new HashMap<DotName, DotName>( );
Map<DotName, List<ClassInfo>> classToDirectSubClassMap = new HashMap<DotName, List<ClassInfo>>();

3
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/AbstractEntitySourceImpl.java
View File

@ -447,6 +447,9 @@ public abstract class AbstractEntitySourceImpl
@Override
public boolean isLazy() {
if(entityElement.isLazy()==null){
return getLocalBindingContext().getMappingDefaults().areAssociationsLazy();
}
return entityElement().isLazy();
}

2
hibernate-core/src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd
View File

@ -1576,7 +1576,7 @@ arbitrary number of queries, and import declarations of arbitrary classes.
<xs:attribute name="dynamic-update" default="false" type="xs:boolean"/>
<xs:attribute name="entity-name" type="xs:string"/>
<!-- default: none when toplevel, otherwise the nearest class definition -->
<xs:attribute name="lazy" default="true" type="xs:boolean"/>
<xs:attribute name="lazy" type="xs:boolean"/>
<xs:attribute name="name" type="xs:string"/>
<xs:attribute name="node" type="xs:string"/>
<xs:attribute name="persister" type="xs:string"/>

3
hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/Investment.java
View File

@ -26,6 +26,7 @@ package org.hibernate.test.annotations.embeddables.nested;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Embeddable;
import javax.persistence.Embedded;
/**
* @author Thomas Vanstals
@ -36,7 +37,7 @@ public class Investment {
private MonetaryAmount amount;
private String description;
private Date date;
@Embedded
public MonetaryAmount getAmount() {
return amount;
}

61
hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/NestedEmbeddableMetadataTest.java
View File

@ -34,6 +34,14 @@ import org.hibernate.mapping.Component;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
import org.hibernate.mapping.SimpleValue;
import org.hibernate.metamodel.spi.binding.AttributeBinding;
import org.hibernate.metamodel.spi.binding.CompositeAttributeBinding;
import org.hibernate.metamodel.spi.binding.CompositePluralAttributeElementBinding;
import org.hibernate.metamodel.spi.binding.EntityBinding;
import org.hibernate.metamodel.spi.binding.PluralAttributeBinding;
import org.hibernate.metamodel.spi.binding.PluralAttributeElementBinding;
import org.hibernate.metamodel.spi.binding.SingularAttributeBinding;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.hibernate.type.CustomType;
@ -43,21 +51,56 @@ import static org.junit.Assert.assertEquals;
/**
* @author Steve Ebersole
*/
public class NestedEmbeddableMetadataTest extends BaseUnitTestCase {
public class NestedEmbeddableMetadataTest extends BaseCoreFunctionalTestCase {
@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class[] { Customer.class, Investment.class, MonetaryAmount.class };
}
@Test
public void testEnumTypeInterpretation() {
Configuration cfg = new Configuration().addAnnotatedClass( Customer.class );
cfg.buildMappings();
Mapping mapping = cfg.buildMapping();
PersistentClass classMetadata = cfg.getClassMapping( Customer.class.getName() );
CustomType currencyType = getCurrencyAttributeType();
int[] currencySqlTypes = currencyType.sqlTypes( sessionFactory() );
assertEquals( 1, currencySqlTypes.length );
assertJdbcTypeCode( Types.VARCHAR, currencySqlTypes[0] );
}
private CustomType getCurrencyAttributeType() {
if ( isMetadataUsed() ) {
return getCustomTypeFromMetamodel();
}
else {
return getCustomTypeFromConfiguration();
}
}
private CustomType getCustomTypeFromMetamodel() {
EntityBinding entityBinding = getEntityBinding( Customer.class );
PluralAttributeBinding attributeBinding = (PluralAttributeBinding) entityBinding.locateAttributeBinding(
"investments"
);
CompositePluralAttributeElementBinding pluralAttributeElementBinding = (CompositePluralAttributeElementBinding) attributeBinding
.getPluralAttributeElementBinding();
CompositeAttributeBinding compositeAttributeBinding = (CompositeAttributeBinding) pluralAttributeElementBinding
.getCompositeAttributeBindingContainer()
.locateAttributeBinding( "amount" );
SingularAttributeBinding currencyAttributeBinding = (SingularAttributeBinding) compositeAttributeBinding.locateAttributeBinding(
"currency"
);
return (CustomType) currencyAttributeBinding.getHibernateTypeDescriptor().getResolvedTypeMapping();
}
private CustomType getCustomTypeFromConfiguration() {
PersistentClass classMetadata = configuration().getClassMapping( Customer.class.getName() );
Property investmentsProperty = classMetadata.getProperty( "investments" );
Collection investmentsValue = (Collection) investmentsProperty.getValue();
Component investmentMetadata = (Component) investmentsValue.getElement();
Component amountMetadata = (Component) investmentMetadata.getProperty( "amount" ).getValue();
SimpleValue currencyMetadata = (SimpleValue) amountMetadata.getProperty( "currency" ).getValue();
CustomType currencyType = (CustomType) currencyMetadata.getType();
int[] currencySqlTypes = currencyType.sqlTypes( mapping );
assertEquals( 1, currencySqlTypes.length );
assertJdbcTypeCode( Types.VARCHAR, currencySqlTypes[0] );
return (CustomType) currencyMetadata.getType();
}
}

3
hibernate-core/src/test/java/org/hibernate/test/legacy/MultiTableTest.java
View File

@ -23,7 +23,6 @@ import org.hibernate.criterion.Restrictions;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.engine.spi.SessionImplementor;
import org.hibernate.jdbc.Work;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
@ -241,7 +240,6 @@ public class MultiTableTest extends LegacyTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testMultiTable() throws Exception {
Session s = openSession();
Transaction t = s.beginTransaction();
@ -380,7 +378,6 @@ public class MultiTableTest extends LegacyTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testMultiTableGeneratedId() throws Exception {
Session s = openSession();
Transaction t = s.beginTransaction();

2
hibernate-core/src/test/java/org/hibernate/test/legacy/OneToOneCacheTest.java
View File

@ -29,7 +29,6 @@ import org.junit.Test;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.testing.FailureExpectedWithNewMetamodel;
import static org.junit.Assert.assertNotNull;
@ -47,7 +46,6 @@ public class OneToOneCacheTest extends LegacyTestCase {
}
@Test
@FailureExpectedWithNewMetamodel
public void testOneToOneCache() throws HibernateException {
//create a new MainObject