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

HHH-18228: Fix hibernate-tool code generation (ClassNotFoundException) 

Foreign keys based on compound keys run into a check for java records.
But the to-be-generated classes do not exist on the classpath and
therefore the check fails.

`org.hibernate.mapping.Component#getComponentClass` is now used in a
lazy manner
This commit is contained in:
fanste 2024-06-17 14:22:46 +02:00
parent a17b241f40
commit 770925be34
1 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
hibernate-core/src/main/java/org/hibernate/type/ComponentType.java
View File

@ -13,6 +13,7 @@ import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Supplier;
import org.hibernate.FetchMode;
import org.hibernate.HibernateException;
@ -54,8 +55,8 @@ import static org.hibernate.metamodel.mapping.EntityDiscriminatorMapping.DISCRIM
* @author Gavin King
*/
public class ComponentType extends AbstractType implements CompositeTypeImplementor, ProcedureParameterExtractionAware {
private final Class<?> componentClass;
private final boolean mutable;
private Supplier<Class<?>> componentClass;
private Supplier<Boolean> mutable;
private final String[] propertyNames;
private final Type[] propertyTypes;
@ -79,14 +80,48 @@ public class ComponentType extends AbstractType implements CompositeTypeImplemen
}
public ComponentType(Component component, int[] originalPropertyOrder) {
this( component, originalPropertyOrder,
component.getComponentClassName() != null
&& !isRecord( component.getComponentClass() ) );
this( component, originalPropertyOrder, (Boolean) null);
}
public ComponentType(Component component, int[] originalPropertyOrder, boolean mutable) {
this.componentClass = component.isDynamic() ? Map.class : component.getComponentClass();
this.mutable = mutable;
this(component, originalPropertyOrder, (Boolean) mutable);
}
private ComponentType(final Component component, int[] originalPropertyOrder, Boolean mutable) {
// As mutable and componentClass are based on the actual component
// type, both variables must be lazily initialized in some cases.
// E.g. on code generation by hibernate-tools, the component type
// might not yet exist (compound keys), resulting in a
// ClassNotFoundException.
//
// The lazy initialization is performance optimized as far as possible.
if(mutable != null) {
this.mutable = () -> mutable;
}
else {
this.mutable = () -> {
final Class<?> clazz = component.getComponentClass();
final boolean mutableVal = ( clazz != null && !isRecord(clazz) );
this.mutable = () -> mutableVal;
return mutableVal;
};
}
if(component.isDynamic()) {
this.componentClass = () -> Map.class;
}
else {
this.componentClass = () -> {
final Class<?> clazz = component.getComponentClass();
this.componentClass = () -> clazz;
return clazz;
};
}
this.isAggregate = component.getAggregateColumn() != null;
this.isKey = component.isKey();
this.propertySpan = component.getPropertySpan();
@ -165,7 +200,7 @@ public class ComponentType extends AbstractType implements CompositeTypeImplemen
}
public Class<?> getReturnedClass() {
return componentClass;
return componentClass.get();
}
@Override
@ -585,7 +620,7 @@ public class ComponentType extends AbstractType implements CompositeTypeImplemen
@Override
public boolean isMutable() {
return mutable;
return mutable.get();
}
@Override
@ -822,7 +857,7 @@ public class ComponentType extends AbstractType implements CompositeTypeImplemen
if ( embeddableTypeDescriptor().isPolymorphic() ) {
final String compositeClassName = compositeInstance != null ?
compositeInstance.getClass().getName() :
componentClass.getName();
componentClass.get().getName();
return representationStrategy.getInstantiatorForClass( compositeClassName );
}
else {