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

HHH-17041 Embeddable and Generics throws IllegalArgumentException

This commit is contained in:
Andrea Boriero 2023-08-08 17:16:36 +02:00 committed by Andrea Boriero
parent 0f5008ca3f
commit 18de71edff
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java
View File

@ -363,14 +363,19 @@ public class ClassPropertyHolder extends AbstractPropertyHolder {
actualProperty.setValue( context.getMetadataCollector().getGenericComponent( componentClass ) ); actualProperty.setValue( context.getMetadataCollector().getGenericComponent( componentClass ) );
} }
else { else {
final Iterator<Property> propertyIterator = component.getPropertyIterator(); if ( componentClass == Object.class ) {
while ( propertyIterator.hasNext() ) { // Object is not a valid component class, but that is what we get when using a type variable
Property property = propertyIterator.next(); component.getProperties().clear();
try { }
property.getGetter( componentClass ); else {
} final Iterator<Property> propertyIterator = component.getPropertyIterator();
catch (PropertyNotFoundException e) { while ( propertyIterator.hasNext() ) {
propertyIterator.remove(); try {
propertyIterator.next().getGetter( componentClass );
}
catch (PropertyNotFoundException e) {
propertyIterator.remove();
}
} }
} }
} }

1
hibernate-core/src/main/java/org/hibernate/metamodel/internal/EmbeddableRepresentationStrategyPojo.java
View File

@ -32,7 +32,6 @@ import org.hibernate.property.access.internal.PropertyAccessStrategyIndexBackRef
import org.hibernate.property.access.spi.BuiltInPropertyAccessStrategies; import org.hibernate.property.access.spi.BuiltInPropertyAccessStrategies;
import org.hibernate.property.access.spi.PropertyAccess; import org.hibernate.property.access.spi.PropertyAccess;
import org.hibernate.property.access.spi.PropertyAccessStrategy; import org.hibernate.property.access.spi.PropertyAccessStrategy;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.type.descriptor.java.JavaType;
import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry; import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry;
import org.hibernate.type.internal.CompositeUserTypeJavaTypeWrapper; import org.hibernate.type.internal.CompositeUserTypeJavaTypeWrapper;