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

HHH-16759 - ComponentType.isMutable should return false when component is record; replace method(s) should return original for immutable classes

This commit is contained in:
Cedomir Igaly 2023-06-08 14:14:03 +02:00 committed by Christian Beikov
parent a57567f984
commit 9a5652ba7b
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ import org.hibernate.engine.spi.Mapping;
import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.generator.Generator; import org.hibernate.generator.Generator;
import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.StringHelper;
import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.internal.util.collections.ArrayHelper;
import org.hibernate.mapping.Component; import org.hibernate.mapping.Component;
@ -49,6 +50,7 @@ import org.hibernate.usertype.CompositeUserType;
*/ */
public class ComponentType extends AbstractType implements CompositeTypeImplementor, ProcedureParameterExtractionAware { public class ComponentType extends AbstractType implements CompositeTypeImplementor, ProcedureParameterExtractionAware {
private final Class<?> componentClass; private final Class<?> componentClass;
private final boolean mutable;
private final String[] propertyNames; private final String[] propertyNames;
private final Type[] propertyTypes; private final Type[] propertyTypes;
@ -112,6 +114,7 @@ public class ComponentType extends AbstractType implements CompositeTypeImplemen
else { else {
this.compositeUserType = null; this.compositeUserType = null;
} }
this.mutable = !ReflectHelper.isRecord( componentClass ) && ( compositeUserType == null || compositeUserType.isMutable() );
} }
private boolean isAggregate() { private boolean isAggregate() {
@ -527,6 +530,9 @@ public class ComponentType extends AbstractType implements CompositeTypeImplemen
Object owner, Object owner,
Map<Object, Object> copyCache) { Map<Object, Object> copyCache) {
if ( !isMutable() ) {
return original;
}
if ( original == null ) { if ( original == null ) {
return null; return null;
} }
@ -575,6 +581,9 @@ public class ComponentType extends AbstractType implements CompositeTypeImplemen
Map<Object, Object> copyCache, Map<Object, Object> copyCache,
ForeignKeyDirection foreignKeyDirection) { ForeignKeyDirection foreignKeyDirection) {
if ( !isMutable() ) {
return original;
}
if ( original == null ) { if ( original == null ) {
return null; return null;
} }
@ -623,7 +632,7 @@ public class ComponentType extends AbstractType implements CompositeTypeImplemen
@Override @Override
public boolean isMutable() { public boolean isMutable() {
return compositeUserType == null || compositeUserType.isMutable(); return mutable;
} }
@Override @Override