Skip to content

Commit 5a32bcb

Browse files
committed
HHH-18976 Simplify MultiKeyLoadHelper#resolveArrayJdbcMapping
No functional impact, it's just less redundant.
1 parent 7ba3e8d commit 5a32bcb

File tree

5 files changed

+2
-13
lines changed

5 files changed

+2
-13
lines changed

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.hibernate.sql.exec.spi.JdbcParametersList;
3333
import org.hibernate.sql.results.internal.RowTransformerStandardImpl;
3434
import org.hibernate.sql.results.spi.ListResultsConsumer;
35-
import org.hibernate.type.BasicType;
3635

3736
import static org.hibernate.loader.ast.internal.MultiKeyLoadHelper.hasSingleId;
3837
import static org.hibernate.loader.ast.internal.MultiKeyLoadHelper.trimIdBatch;
@@ -74,11 +73,7 @@ public CollectionBatchLoaderArrayParam(
7473
.getClass();
7574
keyDomainType = getKeyType( keyDescriptor.getKeyPart() );
7675

77-
final BasicType<?> arrayBasicType = getSessionFactory().getTypeConfiguration()
78-
.getBasicTypeRegistry()
79-
.getRegisteredType( jdbcArrayClass );
8076
arrayJdbcMapping = MultiKeyLoadHelper.resolveArrayJdbcMapping(
81-
arrayBasicType,
8277
jdbcMapping,
8378
jdbcArrayClass,
8479
getSessionFactory()

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderArrayParam.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public EntityBatchLoaderArrayParam(
8080
final Class<?> arrayClass =
8181
Array.newInstance( identifierMapping.getJavaType().getJavaTypeClass(), 0 ).getClass();
8282
arrayJdbcMapping = MultiKeyLoadHelper.resolveArrayJdbcMapping(
83-
sessionFactory.getTypeConfiguration().getBasicTypeRegistry().getRegisteredType( arrayClass ),
8483
identifierMapping.getJdbcMapping(),
8584
arrayClass,
8685
sessionFactory

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderArrayParam.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public MultiIdEntityLoaderArrayParam(
5151
super( entityDescriptor, sessionFactory );
5252
final Class<?> idArrayClass = idArray.getClass();
5353
arrayJdbcMapping = resolveArrayJdbcMapping(
54-
getSessionFactory().getTypeConfiguration().getBasicTypeRegistry().getRegisteredType( idArrayClass ),
5554
getIdentifierMapping().getJdbcMapping(),
5655
idArrayClass,
5756
getSessionFactory()

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiKeyLoadHelper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ public static boolean supportsSqlArrayType(Dialect dialect) {
2727
}
2828

2929
public static JdbcMapping resolveArrayJdbcMapping(
30-
BasicType<?> arrayBasicType,
3130
JdbcMapping keyMapping,
3231
Class<?> arrayClass,
3332
SessionFactoryImplementor sessionFactory) {
33+
BasicType<?> arrayBasicType = sessionFactory.getTypeConfiguration().getBasicTypeRegistry()
34+
.getRegisteredType( arrayClass );
3435
if ( arrayBasicType != null ) {
3536
return arrayBasicType;
3637
}

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderArrayParam.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import org.hibernate.sql.exec.internal.JdbcParameterImpl;
2424
import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect;
2525
import org.hibernate.sql.exec.spi.JdbcParameterBindings;
26-
import org.hibernate.type.BasicType;
27-
import org.hibernate.type.BasicTypeRegistry;
2826

2927
/**
3028
* Standard MultiNaturalIdLoader implementation
@@ -77,10 +75,7 @@ public <K> List<E> multiLoad(K[] naturalIds, MultiNaturalIdLoadOptions loadOptio
7775
? LockOptions.NONE
7876
: loadOptions.getLockOptions();
7977

80-
final BasicTypeRegistry basicTypeRegistry = sessionFactory.getTypeConfiguration().getBasicTypeRegistry();
81-
final BasicType<?> arrayBasicType = basicTypeRegistry.getRegisteredType( keyArrayClass );
8278
final JdbcMapping arrayJdbcMapping = MultiKeyLoadHelper.resolveArrayJdbcMapping(
83-
arrayBasicType,
8479
getNaturalIdMapping().getSingleJdbcMapping(),
8580
keyArrayClass,
8681
sessionFactory

0 commit comments

Comments
 (0)