Skip to content

Commit f7a8144

Browse files
gavinkinggavinking
committed
code cleanups to Binders
1 parent f1760ce commit f7a8144

File tree

8 files changed

+210
-185
lines changed

8 files changed

+210
-185
lines changed

‎hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java‎

Lines changed: 68 additions & 63 deletions
Large diffs are not rendered by default.

‎hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java‎

Lines changed: 96 additions & 76 deletions
Large diffs are not rendered by default.

‎hibernate-core/src/main/java/org/hibernate/boot/model/internal/ListBinder.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.hibernate.resource.beans.spi.ManagedBean;
2222
import org.hibernate.usertype.UserCollectionType;
2323

24+
import static org.hibernate.boot.model.internal.PropertyHolderBuilder.buildPropertyHolder;
2425
import static org.hibernate.internal.util.StringHelper.qualify;
2526

2627
/**
@@ -65,14 +66,8 @@ public void secondPass(Map<String, PersistentClass> persistentClasses) throws Ma
6566
}
6667

6768
private void bindIndex() {
68-
final PropertyHolder valueHolder = PropertyHolderBuilder.buildPropertyHolder(
69-
collection,
70-
qualify( collection.getRole(), "key" ),
71-
null,
72-
null,
73-
propertyHolder,
74-
getBuildingContext()
75-
);
69+
final PropertyHolder valueHolder =
70+
buildPropertyHolder( collection, getPath(), null, null, propertyHolder, buildingContext );
7671

7772
if ( !collection.isOneToMany() ) {
7873
indexColumn.forceNotNull();
@@ -94,6 +89,10 @@ private void bindIndex() {
9489
createBackref();
9590
}
9691

92+
private String getPath() {
93+
return qualify( collection.getRole(), "key" );
94+
}
95+
9796
private void createBackref() {
9897
if ( collection.isOneToMany()
9998
&& !collection.getKey().isNullable()

‎hibernate-core/src/main/java/org/hibernate/boot/model/internal/MapBinder.java‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -291,14 +291,8 @@ private CollectionPropertyHolder buildCollectionPropertyHolder(
291291
private CollectionPropertyHolder buildCollectionPropertyHolder(
292292
MemberDetails property,
293293
ClassDetails keyClass) {
294-
final CollectionPropertyHolder holder = buildPropertyHolder(
295-
collection,
296-
qualify( collection.getRole(), "mapkey" ),
297-
keyClass,
298-
property,
299-
propertyHolder,
300-
buildingContext
301-
);
294+
final CollectionPropertyHolder holder =
295+
buildPropertyHolder( collection, getPath(), keyClass, property, propertyHolder, buildingContext );
302296
// 'propertyHolder' is the PropertyHolder for the owner of the collection
303297
// 'holder' is the CollectionPropertyHolder.
304298
// 'property' is the collection XProperty
@@ -307,6 +301,10 @@ private CollectionPropertyHolder buildCollectionPropertyHolder(
307301
return holder;
308302
}
309303

304+
private String getPath() {
305+
return qualify( collection.getRole(), "mapkey" );
306+
}
307+
310308
private void handleForeignKey(MemberDetails property, ManyToOne element) {
311309
final ForeignKey foreignKey = getMapKeyForeignKey( property );
312310
if ( foreignKey != null ) {
@@ -472,20 +470,20 @@ private Value createFormulatedValue(
472470
Collection collection,
473471
PersistentClass associatedClass,
474472
PersistentClass targetPropertyPersistentClass) {
475-
if ( value instanceof Component ) {
476-
return createIndexComponent( collection, associatedClass, (Component) value );
473+
if ( value instanceof Component component ) {
474+
return createIndexComponent( collection, associatedClass, component );
477475
}
478476
else {
479477
// HHH-11005 - only if we are @OneToMany and location of map key property is
480478
// at a different level, need to add a select
481479
final Table mapKeyTable = !associatedClass.equals( targetPropertyPersistentClass )
482480
? targetPropertyPersistentClass.getTable()
483481
: associatedClass.getTable();
484-
if ( value instanceof BasicValue ) {
485-
return createDependantBasicValue( mapKeyTable, (BasicValue) value );
482+
if ( value instanceof BasicValue basicValue ) {
483+
return createDependantBasicValue( mapKeyTable, basicValue );
486484
}
487-
else if ( value instanceof SimpleValue ) {
488-
return createTargetValue( mapKeyTable, (SimpleValue) value );
485+
else if ( value instanceof SimpleValue simpleValue ) {
486+
return createTargetValue( mapKeyTable, simpleValue );
489487
}
490488
else {
491489
throw new AssertionFailure( "Unknown type encountered for map key: " + value.getClass() );
@@ -526,11 +524,11 @@ private DependantBasicValue createDependantBasicValue(Table mapKeyTable, BasicVa
526524
}
527525

528526
private static void addSelectable(SimpleValue targetValue, Selectable selectable) {
529-
if ( selectable instanceof Column ) {
530-
targetValue.addColumn( ( (Column) selectable).clone(), false, false );
527+
if ( selectable instanceof Column column ) {
528+
targetValue.addColumn( column.clone(), false, false );
531529
}
532-
else if ( selectable instanceof Formula ) {
533-
targetValue.addFormula( new Formula( ( (Formula) selectable).getFormula() ) );
530+
else if ( selectable instanceof Formula formula ) {
531+
targetValue.addFormula( new Formula( formula.getFormula() ) );
534532
}
535533
else {
536534
throw new AssertionFailure( "Unknown element in column iterator: " + selectable.getClass() );

‎hibernate-core/src/main/java/org/hibernate/boot/model/internal/NaturalIdBinder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ private static void addColumnsToUniqueKey(AnnotatedColumns columns, Identifier n
6060
final Property property = columns.resolveProperty();
6161
if ( property.isComposite() ) {
6262
for ( Selectable selectable : property.getValue().getSelectables() ) {
63-
if ( selectable instanceof org.hibernate.mapping.Column) {
64-
uniqueKey.addColumn( tableColumn( (org.hibernate.mapping.Column) selectable, table, collector ) );
63+
if ( selectable instanceof org.hibernate.mapping.Column column) {
64+
uniqueKey.addColumn( tableColumn( column, table, collector ) );
6565
}
6666
}
6767
}

‎hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -442,23 +442,23 @@ private void handleValueGeneration(Property property) {
442442
}
443443

444444
private void handleLob(Property property) {
445-
if ( this.memberDetails != null ) {
445+
if ( memberDetails != null ) {
446446
// HHH-4635 -- needed for dialect-specific property ordering
447-
property.setLob( this.memberDetails.hasDirectAnnotationUsage( Lob.class ) );
447+
property.setLob( memberDetails.hasDirectAnnotationUsage( Lob.class ) );
448448
}
449449
}
450450

451451
private void handleMutability(Property property) {
452-
if ( this.memberDetails != null && this.memberDetails.hasDirectAnnotationUsage( Immutable.class ) ) {
452+
if ( memberDetails != null && memberDetails.hasDirectAnnotationUsage( Immutable.class ) ) {
453453
updatable = false;
454454
}
455455
property.setInsertable( insertable );
456456
property.setUpdateable( updatable );
457457
}
458458

459459
private void handleOptional(Property property) {
460-
if ( this.memberDetails != null ) {
461-
property.setOptional( !isId && isOptional( this.memberDetails, this.holder ) );
460+
if ( memberDetails != null ) {
461+
property.setOptional( !isId && isOptional( memberDetails, holder ) );
462462
if ( property.isOptional() ) {
463463
final OptionalDeterminationSecondPass secondPass = persistentClasses -> {
464464
// Defer determining whether a property and its columns are nullable,
@@ -487,8 +487,8 @@ private void handleOptional(Property property) {
487487
}
488488

489489
private void handleNaturalId(Property property) {
490-
if ( this.memberDetails != null && entityBinder != null ) {
491-
final NaturalId naturalId = this.memberDetails.getDirectAnnotationUsage( NaturalId.class );
490+
if ( memberDetails != null && entityBinder != null ) {
491+
final NaturalId naturalId = memberDetails.getDirectAnnotationUsage( NaturalId.class );
492492
if ( naturalId != null ) {
493493
if ( !entityBinder.isRootEntity() ) {
494494
throw new AnnotationException( "Property '" + qualify( holder.getPath(), name )
@@ -505,11 +505,11 @@ private void handleNaturalId(Property property) {
505505

506506
private void inferOptimisticLocking(Property property) {
507507
// this is already handled for collections in CollectionBinder...
508-
if ( value instanceof Collection ) {
509-
property.setOptimisticLocked( ((Collection) value).isOptimisticLocked() );
508+
if ( value instanceof Collection collection ) {
509+
property.setOptimisticLocked( collection.isOptimisticLocked() );
510510
}
511-
else if ( this.memberDetails != null && this.memberDetails.hasDirectAnnotationUsage( OptimisticLock.class ) ) {
512-
final OptimisticLock optimisticLock = this.memberDetails.getDirectAnnotationUsage( OptimisticLock.class );
511+
else if ( memberDetails != null && memberDetails.hasDirectAnnotationUsage( OptimisticLock.class ) ) {
512+
final OptimisticLock optimisticLock = memberDetails.getDirectAnnotationUsage( OptimisticLock.class );
513513
final boolean excluded = optimisticLock.excluded();
514514
validateOptimisticLock( excluded );
515515
property.setOptimisticLocked( !excluded );

‎hibernate-core/src/main/java/org/hibernate/mapping/Collection.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ public boolean isValid(MappingContext mappingContext) {
533533
@Override
534534
public boolean isSame(Value other) {
535535
return this == other
536-
|| other instanceof Collection && isSame( (Collection) other );
536+
|| other instanceof Collection collection && isSame( collection );
537537
}
538538

539539
protected static boolean isSame(Value v1, Value v2) {
@@ -770,8 +770,8 @@ public void setTypeParameters(Properties parameterMap) {
770770

771771
@SuppressWarnings("rawtypes")
772772
public void setTypeParameters(java.util.Map typeParameters) {
773-
if ( typeParameters instanceof Properties ) {
774-
this.typeParameters = (Properties) typeParameters;
773+
if ( typeParameters instanceof Properties properties ) {
774+
this.typeParameters = properties;
775775
}
776776
else {
777777
this.typeParameters = new Properties();

‎hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@ protected IndexedCollection(IndexedCollection original) {
4040
public Value getIndex() {
4141
return index;
4242
}
43+
4344
public void setIndex(Value index) {
4445
this.index = index;
4546
}
47+
4648
public final boolean isIndexed() {
4749
return true;
4850
}
@@ -53,18 +55,18 @@ public boolean hasMapKeyProperty() {
5355

5456
@Override
5557
public boolean isSame(Collection other) {
56-
return other instanceof IndexedCollection
57-
&& isSame( (IndexedCollection) other );
58+
return other instanceof IndexedCollection indexedCollection
59+
&& isSame( indexedCollection );
5860
}
5961

6062
public boolean isSame(IndexedCollection other) {
6163
return super.isSame( other )
62-
&& isSame( index, other.index );
64+
&& isSame( index, other.index );
6365
}
6466

6567
void createPrimaryKey() {
6668
if ( !isOneToMany() ) {
67-
PrimaryKey pk = new PrimaryKey( getCollectionTable() );
69+
final PrimaryKey pk = new PrimaryKey( getCollectionTable() );
6870
pk.addColumns( getKey() );
6971

7072
// index should be last column listed
@@ -94,6 +96,7 @@ void createPrimaryKey() {
9496
// }
9597
}
9698

99+
@Deprecated
97100
public void validate(Mapping mapping) throws MappingException {
98101
validate( (MappingContext) mapping);
99102
}

0 commit comments

Comments
 (0)