Merge branch '6.1.x'

spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java

@@ -107,32 +107,32 @@ class TransactionAspectTests {
 	void defaultCommitOnAnnotatedClass() {
 		Exception ex = new Exception();
 		assertThatException()
-			.isThrownBy(() -> testRollback(() -> annotationOnlyOnClassWithNoInterface.echo(ex), false))
+				.isThrownBy(() -> testRollback(() -> annotationOnlyOnClassWithNoInterface.echo(ex), false))
-			.isSameAs(ex);
+				.isSameAs(ex);
 	}
 
 	@Test
 	void defaultRollbackOnAnnotatedClass() {
 		RuntimeException ex = new RuntimeException();
 		assertThatRuntimeException()
-			.isThrownBy(() -> testRollback(() -> annotationOnlyOnClassWithNoInterface.echo(ex), true))
+				.isThrownBy(() -> testRollback(() -> annotationOnlyOnClassWithNoInterface.echo(ex), true))
-			.isSameAs(ex);
+				.isSameAs(ex);
 	}
 
 	@Test
 	void defaultCommitOnSubclassOfAnnotatedClass() {
 		Exception ex = new Exception();
 		assertThatException()
-			.isThrownBy(() -> testRollback(() -> new SubclassOfClassWithTransactionalAnnotation().echo(ex), false))
+				.isThrownBy(() -> testRollback(() -> new SubclassOfClassWithTransactionalAnnotation().echo(ex), false))
-			.isSameAs(ex);
+				.isSameAs(ex);
 	}
 
 	@Test
 	void defaultCommitOnSubclassOfClassWithTransactionalMethodAnnotated() {
 		Exception ex = new Exception();
 		assertThatException()
-			.isThrownBy(() -> testRollback(() -> new SubclassOfClassWithTransactionalMethodAnnotation().echo(ex), false))
+				.isThrownBy(() -> testRollback(() -> new SubclassOfClassWithTransactionalMethodAnnotation().echo(ex), false))
-			.isSameAs(ex);
+				.isSameAs(ex);
 	}
 
 	@Test
@@ -168,8 +168,8 @@ class TransactionAspectTests {
 		txManager.clear();
 		assertThat(txManager.begun).isEqualTo(0);
 		assertThatExceptionOfType(Throwable.class)
-			.isThrownBy(toc::performTransactionalOperation)
+				.isThrownBy(toc::performTransactionalOperation)
-			.isSameAs(expected);
+				.isSameAs(expected);
 		assertThat(txManager.begun).isEqualTo(0);
 	}
 

spring-context/src/main/java/org/springframework/validation/AbstractErrors.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.

spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -28,11 +28,12 @@ import org.springframework.transaction.interceptor.DefaultTransactionAttribute;
 import org.springframework.transaction.interceptor.TransactionAttribute;
 
 /**
- * Strategy implementation for parsing EJB3's {@link jakarta.ejb.TransactionAttribute}
+ * Strategy implementation for parsing EJB3's {@link jakarta.ejb.TransactionAttribute} annotation.
- * annotation.
  *
  * @author Juergen Hoeller
  * @since 2.5
+ * @see SpringTransactionAnnotationParser
+ * @see JtaTransactionAnnotationParser
  */
 @SuppressWarnings("serial")
 public class Ejb3TransactionAnnotationParser implements TransactionAnnotationParser, Serializable {

spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -35,6 +35,8 @@ import org.springframework.transaction.interceptor.TransactionAttribute;
  *
  * @author Juergen Hoeller
  * @since 4.0
+ * @see SpringTransactionAnnotationParser
+ * @see Ejb3TransactionAnnotationParser
  */
 @SuppressWarnings("serial")
 public class JtaTransactionAnnotationParser implements TransactionAnnotationParser, Serializable {
@@ -65,7 +67,7 @@ public class JtaTransactionAnnotationParser implements TransactionAnnotationPars
 		RuleBasedTransactionAttribute rbta = new RuleBasedTransactionAttribute();
 
 		rbta.setPropagationBehaviorName(
-				RuleBasedTransactionAttribute.PREFIX_PROPAGATION + attributes.getEnum("value").toString());
+				RuleBasedTransactionAttribute.PREFIX_PROPAGATION + attributes.getEnum("value"));
 
 		List<RollbackRuleAttribute> rollbackRules = new ArrayList<>();
 		for (Class<?> rbRule : attributes.getClassArray("rollbackOn")) {

spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -39,6 +39,8 @@ import org.springframework.util.StringUtils;
  * @author Juergen Hoeller
  * @author Mark Paluch
  * @since 2.5
+ * @see JtaTransactionAnnotationParser
+ * @see Ejb3TransactionAnnotationParser
  */
 @SuppressWarnings("serial")
 public class SpringTransactionAnnotationParser implements TransactionAnnotationParser, Serializable {

spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java

@@ -117,7 +117,7 @@ public class RuleBasedTransactionAttribute extends DefaultTransactionAttribute i
 	/**
 	 * Winning rule is the shallowest rule (that is, the closest in the
 	 * inheritance hierarchy to the exception). If no rule applies (-1),
-	 * return false.
+	 * return {@code false}.
 	 * @see TransactionAttribute#rollbackOn(java.lang.Throwable)
 	 */
 	@Override

spring-tx/src/testFixtures/java/org/springframework/transaction/testfixture/TestTransactionExecutionListener.java

@@ -49,34 +49,34 @@ public class TestTransactionExecutionListener implements TransactionExecutionLis
 
 
 	@Override
-	public void beforeBegin(TransactionExecution transactionState) {
+	public void beforeBegin(TransactionExecution transaction) {
 		this.beforeBeginCalled = true;
 	}
 
 	@Override
-	public void afterBegin(TransactionExecution transactionState, @Nullable Throwable beginFailure) {
+	public void afterBegin(TransactionExecution transaction, @Nullable Throwable beginFailure) {
 		this.afterBeginCalled = true;
 		this.beginFailure = beginFailure;
 	}
 
 	@Override
-	public void beforeCommit(TransactionExecution transactionState) {
+	public void beforeCommit(TransactionExecution transaction) {
 		this.beforeCommitCalled = true;
 	}
 
 	@Override
-	public void afterCommit(TransactionExecution transactionState, @Nullable Throwable commitFailure) {
+	public void afterCommit(TransactionExecution transaction, @Nullable Throwable commitFailure) {
 		this.afterCommitCalled = true;
 		this.commitFailure = commitFailure;
 	}
 
 	@Override
-	public void beforeRollback(TransactionExecution transactionState) {
+	public void beforeRollback(TransactionExecution transaction) {
 		this.beforeRollbackCalled = true;
 	}
 
 	@Override
-	public void afterRollback(TransactionExecution transactionState, @Nullable Throwable rollbackFailure) {
+	public void afterRollback(TransactionExecution transaction, @Nullable Throwable rollbackFailure) {
 		this.afterRollbackCalled = true;
 		this.rollbackFailure = rollbackFailure;
 	}