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

HHH-15602 Javassist implementation of proper bidirectional handling

This commit is contained in:
Christian Beikov 2023-04-25 08:13:48 +02:00
parent 712b6c7668
commit 0df923f0cc
3 changed files with 233 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates.java
View File

@ -510,7 +510,7 @@ class CodeTemplates {
// If this is the inverse side or the old collection is already initialized,
// we must remove self from the respective old collection elements inverse collections,
// because only the owning side is responsible for persisting the state.
if ( ( inverseSide || Hibernate.isInitialized( argument ) ) && getterSelf() != null ) {
if ( ( inverseSide || Hibernate.isInitialized( field ) ) && getterSelf() != null ) {
Object[] array = field.toArray();
for ( int i = 0; i < array.length; i++ ) {
if ( ( inverseSide || Hibernate.isPropertyInitialized( array[i], bidirectionalAttribute ) ) && ( argument == null || !argument.contains( array[i] ) ) ) {

328
hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/javassist/PersistentAttributesEnhancer.java
View File

@ -332,7 +332,15 @@ public class PersistentAttributesEnhancer extends EnhancerImpl {
return;
}
final String mappedBy = PersistentAttributesHelper.getMappedBy( persistentField, targetEntity, enhancementContext );
if ( mappedBy == null || mappedBy.isEmpty() ) {
String bidirectionalAttributeName;
if ( mappedBy == null ) {
bidirectionalAttributeName = PersistentAttributesHelper.getMappedByFromTargetEntity( persistentField, targetEntity, enhancementContext );
}
else {
bidirectionalAttributeName = mappedBy;
}
if ( bidirectionalAttributeName == null || bidirectionalAttributeName.isEmpty() ) {
log.infof(
"Could not find bi-directional association for field [%s#%s]",
managedCtClass.getName(),
@ -342,57 +350,97 @@ public class PersistentAttributesEnhancer extends EnhancerImpl {
}
// create a temporary getter and setter on the target entity to be able to compile our code
final String mappedByGetterName = EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX + mappedBy;
final String mappedBySetterName = EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX + mappedBy;
final String getterName = EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX + persistentField.getName();
final String bidirectionalGetterName = EnhancerConstants.PERSISTENT_FIELD_READER_PREFIX + bidirectionalAttributeName;
final String bidirectionalSetterName = EnhancerConstants.PERSISTENT_FIELD_WRITER_PREFIX + bidirectionalAttributeName;
CtMethod getter;
CtMethod setter;
boolean tmpTargetMethods = false;
try {
getter = targetEntity.getDeclaredMethod( mappedByGetterName );
setter = targetEntity.getDeclaredMethod( mappedByGetterName );
getter = targetEntity.getDeclaredMethod( bidirectionalGetterName );
setter = targetEntity.getDeclaredMethod( bidirectionalGetterName );
}
catch ( NotFoundException nfe ) {
getter = MethodWriter.addGetter( targetEntity, mappedBy, mappedByGetterName );
setter = MethodWriter.addSetter( targetEntity, mappedBy, mappedBySetterName );
getter = MethodWriter.addGetter( targetEntity, bidirectionalAttributeName, bidirectionalGetterName );
setter = MethodWriter.addSetter( targetEntity, bidirectionalAttributeName, bidirectionalSetterName );
tmpTargetMethods = true;
}
// code fragments to check loaded state. We don't want to trigger lazy loading in association management code
String getterSelfNotNull = String.format(
"this.%s() != null",
getterName
);
String currentAssociationLoaded = String.format(
"%s.isInitialized(this.%s)",
Hibernate.class.getName(),
persistentField.getName()
);
String targetElementLoaded = String.format(
"%s.isInitialized(target)",
Hibernate.class.getName()
);
String newAssociationLoaded = String.format(
"%s.isInitialized($1)",
Hibernate.class.getName()
);
String currentAssociationInverseLoaded = String.format(
"%s.isPropertyInitialized(this.%s, \"%s\")",
Hibernate.class.getName(),
persistentField.getName(),
mappedBy
bidirectionalAttributeName
);
String targetElementLoaded = String.format(
String targetElementInverseLoaded = String.format(
"%s.isPropertyInitialized(target, \"%s\")",
Hibernate.class.getName(),
mappedBy
bidirectionalAttributeName
);
String newAssociationLoaded = String.format(
String newAssociationInverseLoaded = String.format(
"%s.isPropertyInitialized($1, \"%s\")",
Hibernate.class.getName(),
mappedBy
bidirectionalAttributeName
);
final boolean inverseSide = mappedBy != null;
if ( PersistentAttributesHelper.hasAnnotation( persistentField, OneToOne.class ) ) {
// only unset when $1 != null to avoid recursion
fieldWriter.insertBefore(
String.format(
" if (this.%1$s != null && %2$s && $1 != null) { this.%1$s.%3$s(null); }%n",
persistentField.getName(),
currentAssociationLoaded,
mappedBySetterName
)
);
fieldWriter.insertAfter(
String.format(
" if ($1 != null && %s && $1.%s() != this) { $1.%s(this); }%n",
newAssociationLoaded,
mappedByGetterName,
mappedBySetterName
)
);
if ( inverseSide ) {
fieldWriter.insertBefore(
String.format(
" if (%1$s) { %2$s copy = this.%3$s; this.%3$s = null; copy.%4$s(null); }%n",
getterSelfNotNull,
persistentField.getType().getName(),
persistentField.getName(),
bidirectionalSetterName
)
);
fieldWriter.insertAfter(
String.format(
" if ($1 != null && $1.%s() != this) { $1.%s(this); }%n",
bidirectionalGetterName,
bidirectionalSetterName
)
);
}
else {
fieldWriter.insertBefore(
String.format(
" if (%1$s && %2$s) { %3$s copy = this.%4$s; this.%4$s = null; copy.%5$s(null); }%n",
currentAssociationLoaded,
getterSelfNotNull,
persistentField.getType().getName(),
persistentField.getName(),
bidirectionalSetterName
)
);
fieldWriter.insertAfter(
String.format(
" if ($1 != null && %s.isInitialized($1) && $1.%s() != this) { $1.%s(this); }%n",
Hibernate.class.getName(),
bidirectionalGetterName,
bidirectionalSetterName
)
);
}
}
if ( PersistentAttributesHelper.hasAnnotation( persistentField, OneToMany.class ) ) {
boolean isMap = PersistentAttributesHelper.isAssignable( persistentField.getType(), Map.class.getName() );
@ -400,47 +448,87 @@ public class PersistentAttributesEnhancer extends EnhancerImpl {
// only remove elements not in the new collection or else we would loose those elements
// don't use iterator to avoid ConcurrentModException
fieldWriter.insertBefore(
String.format(
" if (this.%3$s != null && %1$s) {%n" +
" Object[] array = this.%3$s.%2$s;%n" +
" for (int i = 0; i < array.length; i++) {%n" +
" %4$s target = (%4$s) array[i];%n" +
" if ($1 == null || !$1.contains(target)) { target.%5$s(null); }%n" +
" }%n" +
" }%n",
currentAssociationLoaded,
toArrayMethod,
persistentField.getName(),
targetEntity.getName(),
mappedBySetterName
)
);
fieldWriter.insertAfter(
String.format(
" if ($1 != null && %1$s) {%n" +
" Object[] array = $1.%2$s;%n" +
" for (int i = 0; i < array.length; i++) {%n" +
" %4$s target = (%4$s) array[i];%n" +
" if (%3$s && target.%5$s() != this) { target.%6$s(this); }%n" +
" }%n" +
" }%n",
newAssociationLoaded,
toArrayMethod,
targetElementLoaded,
targetEntity.getName(),
mappedByGetterName,
mappedBySetterName
)
);
if ( inverseSide ) {
fieldWriter.insertBefore(
String.format(
" if (%1$s) {%n" +
" Object[] array = this.%3$s.%2$s;%n" +
" for (int i = 0; i < array.length; i++) {%n" +
" %4$s target = (%4$s) array[i];%n" +
" if ($1 == null || !$1.%6$s(target)) { target.%5$s(null); }%n" +
" }%n" +
" }%n",
getterSelfNotNull,
toArrayMethod,
persistentField.getName(),
targetEntity.getName(),
bidirectionalSetterName,
isMap ? "containsValue" : "contains"
)
);
fieldWriter.insertAfter(
String.format(
" if ($1 != null) {%n" +
" Object[] array = $1.%1$s;%n" +
" for (int i = 0; i < array.length; i++) {%n" +
" %2$s target = (%2$s) array[i];%n" +
" if (target.%3$s() != this) { target.%4$s(this); }%n" +
" }%n" +
" }%n",
toArrayMethod,
targetEntity.getName(),
bidirectionalGetterName,
bidirectionalSetterName
)
);
}
else {
fieldWriter.insertBefore(
String.format(
" if (%1$s && %2$s) {%n" +
" Object[] array = this.%4$s.%3$s;%n" +
" for (int i = 0; i < array.length; i++) {%n" +
" %5$s target = (%5$s) array[i];%n" +
" if (%7$s.isInitialized(target) && ($1 == null || !$1.%8$s(target))) { target.%6$s(null); }%n" +
" }%n" +
" }%n",
currentAssociationLoaded,
getterSelfNotNull,
toArrayMethod,
persistentField.getName(),
targetEntity.getName(),
bidirectionalSetterName,
Hibernate.class.getName(),
isMap ? "containsValue" : "contains"
)
);
fieldWriter.insertAfter(
String.format(
" if ($1 != null && %1$s) {%n" +
" Object[] array = $1.%2$s;%n" +
" for (int i = 0; i < array.length; i++) {%n" +
" %4$s target = (%4$s) array[i];%n" +
" if (%3$s && target.%5$s() != this) { target.%6$s(this); }%n" +
" }%n" +
" }%n",
newAssociationLoaded,
toArrayMethod,
targetElementLoaded,
targetEntity.getName(),
bidirectionalGetterName,
bidirectionalSetterName
)
);
}
}
if ( PersistentAttributesHelper.hasAnnotation( persistentField, ManyToOne.class ) ) {
fieldWriter.insertBefore(
String.format(
" if (this.%2$s != null && %1$s && this.%2$s.%3$s() != null) { this.%2$s.%3$s().remove(this); }%n",
currentAssociationLoaded,
" if (%1$s && %2$s) { java.util.Collection c = this.%3$s.%4$s(); if (c != null) { c.remove(this); } }%n",
getterSelfNotNull,
currentAssociationInverseLoaded,
persistentField.getName(),
mappedByGetterName
bidirectionalGetterName
)
);
// check .contains(this) to avoid double inserts (but preventing duplicates)
@ -450,14 +538,14 @@ public class PersistentAttributesEnhancer extends EnhancerImpl {
" java.util.Collection c = $1.%s();%n" +
" if (c != null && !c.contains(this)) { c.add(this); }%n" +
" }%n",
newAssociationLoaded,
mappedByGetterName
newAssociationInverseLoaded,
bidirectionalGetterName
)
);
}
if ( PersistentAttributesHelper.hasAnnotation( persistentField, ManyToMany.class ) ) {
if ( PersistentAttributesHelper.isAssignable( persistentField.getType(), Map.class.getName() ) ||
PersistentAttributesHelper.isAssignable( targetEntity.getField( mappedBy ).getType(), Map.class.getName() ) ) {
PersistentAttributesHelper.isAssignable( targetEntity.getField( bidirectionalAttributeName ).getType(), Map.class.getName() ) ) {
log.infof(
"Bi-directional association for field [%s#%s] not managed: @ManyToMany in java.util.Map attribute not supported ",
managedCtClass.getName(),
@ -465,40 +553,76 @@ public class PersistentAttributesEnhancer extends EnhancerImpl {
);
return;
}
fieldWriter.insertBefore(
String.format(
" if (this.%2$s != null && %1$s) {%n" +
" Object[] array = this.%2$s.toArray();%n" +
" for (int i = 0; i < array.length; i++) {%n" +
" %3$s target = (%3$s) array[i];%n" +
" if ($1 == null || !$1.contains(target)) { target.%4$s().remove(this); }%n" +
" }%n" +
" }%n",
currentAssociationLoaded,
persistentField.getName(),
targetEntity.getName(),
mappedByGetterName
)
);
fieldWriter.insertAfter(
String.format(
" if ($1 != null && %s) {%n" +
" Object[] array = $1.toArray();%n" +
" for (int i = 0; i < array.length; i++) {%n" +
" %s target = (%s) array[i];%n" +
" if (%s) {%n" +
" java.util.Collection c = target.%s();%n" +
" if (c != this && c != null) { c.add(this); }%n" +
" }%n" +
" }%n" +
" }%n",
newAssociationLoaded,
targetEntity.getName(),
targetEntity.getName(),
targetElementLoaded,
mappedByGetterName
)
);
if ( inverseSide ) {
fieldWriter.insertBefore(
String.format(
" if (%1$s) {%n" +
" Object[] array = this.%2$s.toArray();%n" +
" for (int i = 0; i < array.length; i++) {%n" +
" %3$s target = (%3$s) array[i];%n" +
" if ($1 == null || !$1.contains(target)) { target.%4$s().remove(this); }%n" +
" }%n" +
" }%n",
getterSelfNotNull,
persistentField.getName(),
targetEntity.getName(),
bidirectionalGetterName
)
);
fieldWriter.insertAfter(
String.format(
" if ($1 != null) {%n" +
" Object[] array = $1.toArray();%n" +
" for (int i = 0; i < array.length; i++) {%n" +
" %s target = (%s) array[i];%n" +
" java.util.Collection c = target.%s();%n" +
" if (c != null && !c.contains(this)) { c.add(this); }%n" +
" }%n" +
" }%n",
targetEntity.getName(),
targetEntity.getName(),
bidirectionalGetterName
)
);
}
else {
fieldWriter.insertBefore(
String.format(
" if (%1$s && %2$s) {%n" +
" Object[] array = this.%3$s.toArray();%n" +
" for (int i = 0; i < array.length; i++) {%n" +
" %4$s target = (%4$s) array[i];%n" +
" if (%5$s && ($1 == null || !$1.contains(target))) { target.%6$s().remove(this); }%n" +
" }%n" +
" }%n",
currentAssociationLoaded,
getterSelfNotNull,
persistentField.getName(),
targetEntity.getName(),
targetElementInverseLoaded,
bidirectionalGetterName
)
);
fieldWriter.insertAfter(
String.format(
" if ($1 != null && %s) {%n" +
" Object[] array = $1.toArray();%n" +
" for (int i = 0; i < array.length; i++) {%n" +
" %s target = (%s) array[i];%n" +
" if (%s) {%n" +
" java.util.Collection c = target.%s();%n" +
" if (c != null && !c.contains(this)) { c.add(this); }%n" +
" }%n" +
" }%n" +
" }%n",
newAssociationLoaded,
targetEntity.getName(),
targetEntity.getName(),
targetElementInverseLoaded,
bidirectionalGetterName
)
);
}
}
// implementation note: association management @OneToMany and @ManyToMay works for add() operations but for remove() a snapshot of the collection is needed so we know what associations to break.
// another approach that could force that behavior would be to return Collections.unmodifiableCollection() ...

9
hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/javassist/PersistentAttributesHelper.java
View File

@ -208,8 +208,11 @@ public class PersistentAttributesHelper {
}
public static String getMappedBy(CtField persistentField, CtClass targetEntity, JavassistEnhancementContext context) throws NotFoundException {
final String local = getMappedByFromAnnotation( persistentField );
return local.isEmpty() ? getMappedByFromTargetEntity( persistentField, targetEntity, context ) : local;
final String mappedBy = getMappedByFromAnnotation( persistentField );
if ( mappedBy == null || mappedBy.isEmpty() ) {
return null;
}
return mappedBy;
}
private static String getMappedByFromAnnotation(CtField persistentField) {
@ -230,7 +233,7 @@ public class PersistentAttributesHelper {
return mtm == null ? "" : mtm.mappedBy();
}
private static String getMappedByFromTargetEntity(
public static String getMappedByFromTargetEntity(
CtField persistentField,
CtClass targetEntity,
JavassistEnhancementContext context) throws NotFoundException {