diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java index 36b3649334..d6fca64eec 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java @@ -32,7 +32,6 @@ import org.hibernate.engine.jdbc.Size; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.engine.jdbc.internal.FormatStyle; -import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.jdbc.spi.SqlStatementLogger; import org.hibernate.engine.spi.SessionEventListenerManager; import org.hibernate.engine.spi.SharedSessionContractImplementor; @@ -555,8 +554,8 @@ private IntegralDataTypeHolder makeValue() { @Override public Object generate(final SharedSessionContractImplementor session, final Object obj) { - final SqlStatementLogger statementLogger = session.getFactory().getServiceRegistry() - .getService( JdbcServices.class ) + final SqlStatementLogger statementLogger = session. + getFactory().getJdbcServices() .getSqlStatementLogger(); final SessionEventListenerManager statsCollector = session.getEventListenerManager(); diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java index 63900ff66e..bc567a57ef 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java @@ -120,8 +120,7 @@ private IntegralDataTypeHolder makeValue() { @Override public AccessCallback buildCallback(final SharedSessionContractImplementor session) { - final SqlStatementLogger statementLogger = session.getFactory().getServiceRegistry() - .getService( JdbcServices.class ) + final SqlStatementLogger statementLogger = session.getFactory().getJdbcServices() .getSqlStatementLogger(); if ( selectQuery == null || updateQuery == null ) { throw new AssertionFailure( "SequenceStyleGenerator's TableStructure was not properly initialized" ); diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java index 1bd3247016..0cae639292 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java @@ -850,7 +850,7 @@ public static Map getEntityNameByTableNameMap( private MultiIdEntityLoader buildMultiIdLoader(PersistentClass persistentClass) { if ( persistentClass.getIdentifier() instanceof BasicValue - && MultiKeyLoadHelper.supportsSqlArrayType( factory.getServiceRegistry().getService( JdbcServices.class ).getDialect() ) ) { + && MultiKeyLoadHelper.supportsSqlArrayType( factory.getFastSessionServices().dialect ) ) { return new MultiIdEntityLoaderArrayParam<>( this, factory ); } return new MultiIdEntityLoaderStandard<>( this, persistentClass, factory );