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

HHH-8533 - Add tests of JPA Metamodel handling for MappedSuperclass and mixed @Id/@IdClass declaration

This commit is contained in:
Steve Ebersole 2013-09-20 22:05:24 -05:00
parent 9360f4d9d4
commit 4d5174f55f
4 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java
View File

@ -945,12 +945,11 @@ public final class AnnotationBinder {
persistentClass.setIdentifierMapper( mapper );
//If id definition is on a mapped superclass, update the mapping
final org.hibernate.mapping.MappedSuperclass superclass =
BinderHelper.getMappedSuperclassOrNull(
inferredData.getDeclaringClass(),
inheritanceStatePerClass,
mappings
);
final org.hibernate.mapping.MappedSuperclass superclass = BinderHelper.getMappedSuperclassOrNull(
classWithIdClass,
inheritanceStatePerClass,
mappings
);
if ( superclass != null ) {
superclass.setDeclaredIdentifierMapper( mapper );
}

37
hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/AbstractIdentifiableType.java
View File

@ -31,6 +31,9 @@ import javax.persistence.metamodel.IdentifiableType;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.Type;
import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.mapping.Component;
/**
* Defines commonality for the JPA {@link IdentifiableType} types. JPA defines
* identifiable types as entities or mapped-superclasses. Basically things to which an
@ -46,14 +49,14 @@ public abstract class AbstractIdentifiableType<X>
extends AbstractManagedType<X>
implements IdentifiableType<X>, Serializable {
private final boolean hasIdClass;
private final boolean hasIdentifierProperty;
private final boolean isVersioned;
private final boolean hasIdClass;
private SingularAttributeImpl<X, ?> id;
private SingularAttributeImpl<X, ?> version;
private Set<SingularAttribute<? super X,?>> idClassAttributes;
private final boolean isVersioned;
private SingularAttributeImpl<X, ?> version;
public AbstractIdentifiableType(
Class<X> javaType,
String typeName,
@ -64,7 +67,7 @@ public abstract class AbstractIdentifiableType<X>
super( javaType, typeName, superType );
this.hasIdClass = hasIdClass;
this.hasIdentifierProperty = hasIdentifierProperty;
isVersioned = versioned;
this.isVersioned = versioned;
}
public boolean hasIdClass() {
@ -73,7 +76,7 @@ public abstract class AbstractIdentifiableType<X>
@Override
public boolean hasSingleIdAttribute() {
return !hasIdClass && hasIdentifierProperty;
return !hasIdClass() && hasIdentifierProperty;
}
@Override
@ -95,7 +98,7 @@ public abstract class AbstractIdentifiableType<X>
}
private void ensureNoIdClass() {
if ( hasIdClass ) {
if ( hasIdClass() ) {
throw new IllegalArgumentException(
"Illegal call to IdentifiableType#getId for class [" + getTypeName() + "] defined with @IdClass"
);
@ -158,9 +161,21 @@ public abstract class AbstractIdentifiableType<X>
}
@Override
@SuppressWarnings("unchecked")
public Type<?> getIdType() {
SingularAttributeImpl id = locateIdAttribute();
return id == null ? null : id.getType();
final SingularAttributeImpl id = locateIdAttribute();
if ( id != null ) {
return id.getType();
}
Set<SingularAttribute<? super X, ?>> idClassAttributes = getIdClassAttributesSafely();
if ( idClassAttributes != null ) {
if ( idClassAttributes.size() == 1 ) {
return idClassAttributes.iterator().next().getType();
}
}
return null;
}
/**
@ -169,7 +184,7 @@ public abstract class AbstractIdentifiableType<X>
* @return IdClass attributes or {@code null}
*/
public Set<SingularAttribute<? super X, ?>> getIdClassAttributesSafely() {
if ( !hasIdClass ) {
if ( !hasIdClass() ) {
return null;
}
final Set<SingularAttribute<? super X, ?>> attributes = new HashSet<SingularAttribute<? super X, ?>>();
@ -184,7 +199,7 @@ public abstract class AbstractIdentifiableType<X>
@Override
public Set<SingularAttribute<? super X, ?>> getIdClassAttributes() {
if ( !hasIdClass ) {
if ( !hasIdClass() ) {
throw new IllegalArgumentException( "This class [" + getJavaType() + "] does not define an IdClass" );
}

2
hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/metamodel/MappedSuperclassTypeImpl.java
View File

@ -38,7 +38,7 @@ public class MappedSuperclassTypeImpl<X> extends AbstractIdentifiableType<X> imp
AbstractIdentifiableType<? super X> superType) {
super(
javaType,
null,
javaType.getName(),
superType,
mappedSuperclass.getDeclaredIdentifierMapper() != null || ( superType != null && superType.hasIdClass() ),
mappedSuperclass.hasIdentifierProperty(),

7
hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/MixedIdAndIdClassHandling.java
View File

@ -39,6 +39,7 @@ import org.hibernate.testing.TestForIssue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
/**
@ -64,10 +65,12 @@ public class MixedIdAndIdClassHandling extends BaseEntityManagerFunctionalTestCa
catch (IllegalArgumentException expected) {
}
assertNotNull( entityType.getSupertype().getIdClassAttributes() );
assertEquals( 1, entityType.getSupertype().getIdClassAttributes().size() );
assertFalse( entityType.hasSingleIdAttribute() );
// this is questionable...
//assertEquals( String.class, entityType.getIdType().getJavaType() );
assertEquals( String.class, entityType.getIdType().getJavaType() );
}
@MappedSuperclass