Merge branch '6.2.x'

spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ package org.springframework.orm.jpa;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityTransaction;
 import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.transaction.TransactionDefinition;
@@ -33,33 +34,37 @@ import static org.mockito.Mockito.mock;
 /**
  * @author Costin Leau
  * @author Phillip Webb
+ * @author Juergen Hoeller
  */
 class DefaultJpaDialectTests {
 
-	private JpaDialect dialect = new DefaultJpaDialect();
+	private final JpaDialect dialect = new DefaultJpaDialect();
 
-	@Test
-	void testDefaultTransactionDefinition() {
-		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
-		definition.setIsolationLevel(TransactionDefinition.ISOLATION_REPEATABLE_READ);
-		assertThatExceptionOfType(TransactionException.class).isThrownBy(() ->
-				dialect.beginTransaction(null, definition));
-	}
 
 	@Test
 	void testDefaultBeginTransaction() throws Exception {
 		TransactionDefinition definition = new DefaultTransactionDefinition();
 		EntityManager entityManager = mock();
 		EntityTransaction entityTx = mock();
-
 		given(entityManager.getTransaction()).willReturn(entityTx);
 
 		dialect.beginTransaction(entityManager, definition);
 	}
 
 	@Test
-	void testTranslateException() {
-		OptimisticLockException ex = new OptimisticLockException();
-		assertThat(dialect.translateExceptionIfPossible(ex).getCause()).isEqualTo(EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(ex).getCause());
+	void testCustomIsolationLevel() {
+		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
+		definition.setIsolationLevel(TransactionDefinition.ISOLATION_REPEATABLE_READ);
+
+		assertThatExceptionOfType(TransactionException.class).isThrownBy(() ->
+				dialect.beginTransaction(null, definition));
 	}
+
+	@Test
+	void testTranslateException() {
+		PersistenceException ex = new OptimisticLockException();
+		assertThat(dialect.translateExceptionIfPossible(ex))
+				.isInstanceOf(JpaOptimisticLockingFailureException.class).hasCause(ex);
+	}
+
 }

spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateJpaDialectTests.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2002-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.orm.jpa.hibernate;
+
+import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
+import org.hibernate.HibernateException;
+import org.hibernate.dialect.lock.OptimisticEntityLockException;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.orm.ObjectOptimisticLockingFailureException;
+import org.springframework.orm.jpa.JpaDialect;
+import org.springframework.orm.jpa.JpaOptimisticLockingFailureException;
+import org.springframework.orm.jpa.vendor.HibernateJpaDialect;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Juergen Hoeller
+ */
+class HibernateJpaDialectTests {
+
+	private final JpaDialect dialect = new HibernateJpaDialect();
+
+
+	@Test
+	void testTranslateException() {
+		// Plain JPA exception
+		PersistenceException ex = new OptimisticLockException();
+		assertThat(dialect.translateExceptionIfPossible(ex))
+				.isInstanceOf(JpaOptimisticLockingFailureException.class).hasCause(ex);
+
+		// Hibernate-specific exception
+		ex = new OptimisticEntityLockException("", "");
+		assertThat(dialect.translateExceptionIfPossible(ex))
+				.isInstanceOf(ObjectOptimisticLockingFailureException.class).hasCause(ex);
+
+		// Nested Hibernate-specific exception
+		ex = new HibernateException(new OptimisticEntityLockException("", ""));
+		assertThat(dialect.translateExceptionIfPossible(ex))
+				.isInstanceOf(ObjectOptimisticLockingFailureException.class).hasCause(ex);
+	}
+
+}