Skip to content

More Binder cleanups #9520

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 4 commits into from
Dec 31, 2024
Merged

More Binder cleanups #9520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1aee49c
more cleanups to binders, focussed on FkSecondPass stuff
gavinking Dec 31, 2024
5e6e3ae
more cleanups to binders, focussed PropertyBinder
gavinking Dec 31, 2024
5ad2b38
more cleanups to binders, make anon class static
gavinking Dec 31, 2024
44f6a5f
improve the error message and add comments
gavinking Dec 31, 2024
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
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,7 +1928,7 @@ private void buildRecursiveOrderedFkSecondPasses(
final Set<FkSecondPass> dependencies = isADependencyOf.get( currentTable );
if ( dependencies != null ) {
for ( FkSecondPass pass : dependencies ) {
String dependentTable = pass.getValue().getTable().getQualifiedTableName().render();
final String dependentTable = pass.getValue().getTable().getQualifiedTableName().render();
if ( dependentTable.compareTo( startTable ) != 0 ) {
buildRecursiveOrderedFkSecondPasses( orderedFkSecondPasses, isADependencyOf, startTable, dependentTable );
}
Expand Down
5 changes: 5 additions & 0 deletions .../hibernate/boot/model/convert/internal/AutoApplicableConverterDescriptorBypassedImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ public class AutoApplicableConverterDescriptorBypassedImpl implements AutoApplic
private AutoApplicableConverterDescriptorBypassedImpl() {
}

@Override
public boolean isAutoApplicable() {
return false;
}

@Override
public ConverterDescriptor getAutoAppliedConverterDescriptorForAttribute(
MemberDetails memberDetails,
Expand Down
13 changes: 9 additions & 4 deletions .../hibernate/boot/model/convert/internal/AutoApplicableConverterDescriptorStandardImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ public AutoApplicableConverterDescriptorStandardImpl(ConverterDescriptor linkedC
this.linkedConverterDescriptor = linkedConverterDescriptor;
}

@Override
public boolean isAutoApplicable() {
return true;
}

@Override
public ConverterDescriptor getAutoAppliedConverterDescriptorForAttribute(
MemberDetails memberDetails,
Expand All @@ -51,16 +56,16 @@ public ConverterDescriptor getAutoAppliedConverterDescriptorForCollectionElement
final ResolvedMember<?> collectionMember = resolveMember( memberDetails, context );

final ResolvedType elementType;
Class<?> erasedType = collectionMember.getType().getErasedType();
final Class<?> erasedType = collectionMember.getType().getErasedType();
if ( Map.class.isAssignableFrom( erasedType ) ) {
List<ResolvedType> typeArguments = collectionMember.getType().typeParametersFor(Map.class);
final List<ResolvedType> typeArguments = collectionMember.getType().typeParametersFor(Map.class);
if ( typeArguments.size() < 2 ) {
return null;
}
elementType = typeArguments.get( 1 );
}
else if ( Collection.class.isAssignableFrom( erasedType ) ) {
List<ResolvedType> typeArguments = collectionMember.getType().typeParametersFor(Collection.class);
final List<ResolvedType> typeArguments = collectionMember.getType().typeParametersFor(Collection.class);
if ( typeArguments.isEmpty() ) {
return null;
}
Expand All @@ -87,7 +92,7 @@ public ConverterDescriptor getAutoAppliedConverterDescriptorForMapKey(
final ResolvedType keyType;

if ( Map.class.isAssignableFrom( collectionMember.getType().getErasedType() ) ) {
List<ResolvedType> typeArguments = collectionMember.getType().typeParametersFor(Map.class);
final List<ResolvedType> typeArguments = collectionMember.getType().typeParametersFor(Map.class);
if ( typeArguments.isEmpty() ) {
return null;
}
Expand Down
1 change: 1 addition & 0 deletions ...src/main/java/org/hibernate/boot/model/convert/spi/AutoApplicableConverterDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* @author Steve Ebersole
*/
public interface AutoApplicableConverterDescriptor {
boolean isAutoApplicable();
ConverterDescriptor getAutoAppliedConverterDescriptorForAttribute(MemberDetails memberDetails, MetadataBuildingContext context);
ConverterDescriptor getAutoAppliedConverterDescriptorForCollectionElement(MemberDetails memberDetails, MetadataBuildingContext context);
ConverterDescriptor getAutoAppliedConverterDescriptorForMapKey(MemberDetails memberDetails, MetadataBuildingContext context);
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/boot/model/internal/AbstractPropertyHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public abstract class AbstractPropertyHolder implements PropertyHolder {

@Override
public ConverterDescriptor resolveAttributeConverterDescriptor(MemberDetails attributeMember) {
AttributeConversionInfo info = locateAttributeConversionInfo( attributeMember );
final AttributeConversionInfo info = locateAttributeConversionInfo( attributeMember );
if ( info != null ) {
if ( info.isConversionDisabled() ) {
return null;
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/boot/model/internal/AggregateComponentBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ public static void processAggregate(
component.setStructColumnNames( determineStructAttributeNames( inferredData, componentClassDetails ) );

// Determine the aggregate column
BasicValueBinder basicValueBinder = new BasicValueBinder( BasicValueBinder.Kind.ATTRIBUTE, component, context );
basicValueBinder.setPropertyName( inferredData.getPropertyName() );
final BasicValueBinder basicValueBinder =
new BasicValueBinder( BasicValueBinder.Kind.ATTRIBUTE, component, context );
basicValueBinder.setReturnedClassName( inferredData.getClassOrElementType().getName() );
basicValueBinder.setColumns( columns );
basicValueBinder.setPersistentClassName( propertyHolder.getClassName() );
Expand Down
Loading
Loading