Skip to content

some refactoring in Binders #10811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 25, 2025
Merged

some refactoring in Binders #10811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d78d0f
some nice minor refactorings to binders
gavinking Aug 25, 2025
73cafff
minor cleanups to EmbeddableBinder
gavinking Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
import org.hibernate.mapping.Selectable;
import org.hibernate.mapping.SimpleValue;
import org.hibernate.mapping.SyntheticProperty;
import org.hibernate.mapping.ToOne;
import org.hibernate.mapping.Value;
Expand Down Expand Up @@ -65,6 +66,7 @@
import static org.hibernate.boot.model.internal.ForeignKeyType.NON_PRIMARY_KEY_REFERENCE;
import static org.hibernate.internal.log.DeprecationLogger.DEPRECATION_LOGGER;
import static org.hibernate.internal.util.StringHelper.isEmpty;
import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
import static org.hibernate.internal.util.StringHelper.qualifier;
import static org.hibernate.internal.util.StringHelper.qualify;
import static org.hibernate.internal.util.collections.ArrayHelper.isEmpty;
Expand Down Expand Up @@ -1003,7 +1005,7 @@ private static boolean checkReferencedClass(PersistentClass ownerClass, Persiste
return false;
}

public static boolean noConstraint(ForeignKey foreignKey, boolean noConstraintByDefault) {
static boolean noConstraint(ForeignKey foreignKey, boolean noConstraintByDefault) {
if ( foreignKey == null ) {
return false;
}
Expand All @@ -1014,6 +1016,31 @@ public static boolean noConstraint(ForeignKey foreignKey, boolean noConstraintBy
}
}

static void handleForeignKeyConstraint(
SimpleValue key,
ForeignKey foreignKey,
ForeignKey nestedForeignKey,
MetadataBuildingContext context) {
final boolean noConstraintByDefault = context.getBuildingOptions().isNoConstraintByDefault();
if ( noConstraint( foreignKey, noConstraintByDefault )
|| noConstraint( nestedForeignKey, noConstraintByDefault ) ) {
key.disableForeignKey();
}
else if ( foreignKey != null ) {
key.setForeignKeyName( nullIfEmpty( foreignKey.name() ) );
key.setForeignKeyDefinition( nullIfEmpty( foreignKey.foreignKeyDefinition() ) );
key.setForeignKeyOptions( foreignKey.options() );
}
else if ( noConstraintByDefault ) {
key.disableForeignKey();
}
else if ( nestedForeignKey != null ) {
key.setForeignKeyName( nullIfEmpty( nestedForeignKey.name() ) );
key.setForeignKeyDefinition( nullIfEmpty( nestedForeignKey.foreignKeyDefinition() ) );
key.setForeignKeyOptions( nestedForeignKey.options() );
}
}

/**
* Extract an annotation from the package-info for the package the given class is defined in
*
Expand Down
Loading