spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-25 02:49:03 +00:00
Code Issues Projects Releases Wiki Activity

Adapt to changes in Framework's Hibernate support

Browse Source 
See gh-45487
This commit is contained in:
Andy Wilkinson
2025-06-25 21:30:51 +01:00
parent 414117ebac
commit 19818fb844
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java
+1 -1
View File
@@ -55,7 +55,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportRuntimeHints;
import org.springframework.jdbc.support.SQLExceptionTranslator;
import org.springframework.jndi.JndiLocatorDelegate;
import org.springframework.orm.hibernate5.SpringBeanContainer;
import org.springframework.orm.jpa.hibernate.SpringBeanContainer;
import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter;
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
import org.springframework.transaction.jta.JtaTransactionManager;
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
+6 -4
View File
@@ -240,8 +240,9 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes
void shouldConfigureHibernateJpaDialectWithSqlExceptionTranslatorIfPresent() {
SQLStateSQLExceptionTranslator sqlExceptionTranslator = new SQLStateSQLExceptionTranslator();
contextRunner().withBean(SQLStateSQLExceptionTranslator.class, () -> sqlExceptionTranslator)
.run(assertJpaVendorAdapter((adapter) -> assertThat(adapter.getJpaDialect())
.hasFieldOrPropertyWithValue("jdbcExceptionTranslator", sqlExceptionTranslator)));
.run(assertJpaVendorAdapter(
(adapter) -> assertThat(adapter.getJpaDialect()).extracting("exceptionTranslator")
.hasFieldOrPropertyWithValue("jdbcExceptionTranslator", sqlExceptionTranslator)));
}
@Test
@@ -250,8 +251,9 @@ class HibernateJpaAutoConfigurationTests extends AbstractJpaAutoConfigurationTes
SQLStateSQLExceptionTranslator sqlExceptionTranslator2 = new SQLStateSQLExceptionTranslator();
contextRunner().withBean("sqlExceptionTranslator1", SQLExceptionTranslator.class, () -> sqlExceptionTranslator1)
.withBean("sqlExceptionTranslator2", SQLExceptionTranslator.class, () -> sqlExceptionTranslator2)
.run(assertJpaVendorAdapter((adapter) -> assertThat(adapter.getJpaDialect())
.hasFieldOrPropertyWithValue("jdbcExceptionTranslator", null)));
.run(assertJpaVendorAdapter(
(adapter) -> assertThat(adapter.getJpaDialect()).extracting("exceptionTranslator")
.hasFieldOrPropertyWithValue("jdbcExceptionTranslator", null)));
}
@Test