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

HHH-10956 an exception has to thrown when the composite key is an association and its value is null

This commit is contained in:
Andrea Boriero 2020-04-24 11:06:07 +01:00
parent 114e16f64f
commit 2db3ce2643
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hibernate-core/src/main/java/org/hibernate/tuple/entity/AbstractEntityTuplizer.java
View File

@ -39,6 +39,7 @@ import org.hibernate.proxy.ProxyFactory;
import org.hibernate.tuple.IdentifierProperty; import org.hibernate.tuple.IdentifierProperty;
import org.hibernate.tuple.Instantiator; import org.hibernate.tuple.Instantiator;
import org.hibernate.type.AssociationType; import org.hibernate.type.AssociationType;
import org.hibernate.type.BasicType;
import org.hibernate.type.ComponentType; import org.hibernate.type.ComponentType;
import org.hibernate.type.CompositeType; import org.hibernate.type.CompositeType;
import org.hibernate.type.EntityType; import org.hibernate.type.EntityType;
@ -371,24 +372,23 @@ public abstract class AbstractEntityTuplizer implements EntityTuplizer {
final Type[] copierSubTypes = mappedIdentifierType.getSubtypes(); final Type[] copierSubTypes = mappedIdentifierType.getSubtypes();
final int length = subTypes.length; final int length = subTypes.length;
for ( int i = 0; i < length; i++ ) { for ( int i = 0; i < length; i++ ) {
final Type subType = subTypes[i];
if ( propertyValues[i] == null ) { if ( propertyValues[i] == null ) {
try { if ( subType.isAssociationType() ) {
throw new HibernateException( "No part of a composite identifier may be null" );
}
final String name = names[i]; final String name = names[i];
final Property p = ((Component) identifier).getProperty(name); final Property p = ( (Component) identifier ).getProperty( name );
final SimpleValue v = (SimpleValue) p.getValue(); final SimpleValue v = (SimpleValue) p.getValue();
if ( v.getIdentifierGenerator() == null ) { if ( v.getIdentifierGenerator() == null ) {
throw new NullPointerException("No IdentifierGenerator found for property "+name); throw new HibernateException( "No part of a composite identifier may be null" );
}
}
catch (Throwable t) {
throw new HibernateException( "No part of a composite identifier may be null", t );
} }
} }
//JPA 2 @MapsId + @IdClass points to the pk of the entity //JPA 2 @MapsId + @IdClass points to the pk of the entity
if ( subTypes[i].isAssociationType() && !copierSubTypes[i].isAssociationType() ) { if ( subType.isAssociationType() && !copierSubTypes[i].isAssociationType() ) {
propertyValues[i] = determineEntityId( propertyValues[i] = determineEntityId(
propertyValues[i], propertyValues[i],
(AssociationType) subTypes[i], (AssociationType) subType,
session, session,
sessionFactory sessionFactory
); );