Skip to content

Commit 19818fb

Browse files
committed
Adapt to changes in Framework's Hibernate support
See gh-45487
1 parent 414117e commit 19818fb

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
import org.springframework.context.annotation.ImportRuntimeHints;
5656
import org.springframework.jdbc.support.SQLExceptionTranslator;
5757
import org.springframework.jndi.JndiLocatorDelegate;
58-
import org.springframework.orm.hibernate5.SpringBeanContainer;
58+
import org.springframework.orm.jpa.hibernate.SpringBeanContainer;
5959
import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter;
6060
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
6161
import org.springframework.transaction.jta.JtaTransactionManager;

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,9 @@ void hibernateDialectIsNotSetByDefault() {
240240
void shouldConfigureHibernateJpaDialectWithSqlExceptionTranslatorIfPresent() {
241241
SQLStateSQLExceptionTranslator sqlExceptionTranslator = new SQLStateSQLExceptionTranslator();
242242
contextRunner().withBean(SQLStateSQLExceptionTranslator.class, () -> sqlExceptionTranslator)
243-
.run(assertJpaVendorAdapter((adapter) -> assertThat(adapter.getJpaDialect())
244-
.hasFieldOrPropertyWithValue("jdbcExceptionTranslator", sqlExceptionTranslator)));
243+
.run(assertJpaVendorAdapter(
244+
(adapter) -> assertThat(adapter.getJpaDialect()).extracting("exceptionTranslator")
245+
.hasFieldOrPropertyWithValue("jdbcExceptionTranslator", sqlExceptionTranslator)));
245246
}
246247

247248
@Test
@@ -250,8 +251,9 @@ void shouldNotConfigureHibernateJpaDialectWithSqlExceptionTranslatorIfNotUnique(
250251
SQLStateSQLExceptionTranslator sqlExceptionTranslator2 = new SQLStateSQLExceptionTranslator();
251252
contextRunner().withBean("sqlExceptionTranslator1", SQLExceptionTranslator.class, () -> sqlExceptionTranslator1)
252253
.withBean("sqlExceptionTranslator2", SQLExceptionTranslator.class, () -> sqlExceptionTranslator2)
253-
.run(assertJpaVendorAdapter((adapter) -> assertThat(adapter.getJpaDialect())
254-
.hasFieldOrPropertyWithValue("jdbcExceptionTranslator", null)));
254+
.run(assertJpaVendorAdapter(
255+
(adapter) -> assertThat(adapter.getJpaDialect()).extracting("exceptionTranslator")
256+
.hasFieldOrPropertyWithValue("jdbcExceptionTranslator", null)));
255257
}
256258

257259
@Test

0 commit comments

Comments
 (0)