root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

This commit is contained in:
Juergen Hoeller 2023-08-06 15:00:42 +02:00
parent 3804b1c602 c36174b263
commit 6090eb0b42
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
framework-docs/modules/ROOT/pages/data-access/transaction.adoc
View File

@ -12,19 +12,16 @@ management that delivers the following benefits:
than complex transaction APIs, such as JTA. than complex transaction APIs, such as JTA.
* Excellent integration with Spring's data access abstractions. * Excellent integration with Spring's data access abstractions.
The following sections describe the Spring Framework's transaction features and The following sections describe the Spring Framework's transaction features and technologies:
technologies:
* xref:data-access/transaction/motivation.adoc[Advantages of the Spring Framework's transaction support model] * xref:data-access/transaction/motivation.adoc[Advantages of the Spring Framework's transaction support model]
describes why you would use the Spring Framework's transaction abstraction describes why you would use the Spring Framework's transaction abstraction instead of EJB
instead of EJB Container-Managed Transactions (CMT) or choosing to drive local Container-Managed Transactions (CMT) or choosing to drive transactions through a proprietary API.
transactions through a proprietary API, such as Hibernate.
* xref:data-access/transaction/strategies.adoc[Understanding the Spring Framework transaction abstraction] * xref:data-access/transaction/strategies.adoc[Understanding the Spring Framework transaction abstraction]
outlines the core classes and describes how to configure and obtain `DataSource` outlines the core classes and describes how to configure and obtain `DataSource` instances
instances from a variety of sources. from a variety of sources.
* xref:data-access/transaction/tx-resource-synchronization.adoc[Synchronizing resources with transactions] describes * xref:data-access/transaction/tx-resource-synchronization.adoc[Synchronizing resources with transactions]
how the application code ensures that resources are created, reused, and cleaned up describes how the application code ensures that resources are created, reused, and cleaned up properly.
properly.
* xref:data-access/transaction/declarative.adoc[Declarative transaction management] describes support for * xref:data-access/transaction/declarative.adoc[Declarative transaction management] describes support for
declarative transaction management. declarative transaction management.
* xref:data-access/transaction/programmatic.adoc[Programmatic transaction management] covers support for * xref:data-access/transaction/programmatic.adoc[Programmatic transaction management] covers support for

3
spring-tx/src/main/java/org/springframework/transaction/ReactiveTransaction.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -30,6 +30,7 @@ package org.springframework.transaction;
* @since 5.2 * @since 5.2
* @see #setRollbackOnly() * @see #setRollbackOnly()
* @see ReactiveTransactionManager#getReactiveTransaction * @see ReactiveTransactionManager#getReactiveTransaction
* @see org.springframework.transaction.reactive.TransactionCallback#doInTransaction
*/ */
public interface ReactiveTransaction extends TransactionExecution { public interface ReactiveTransaction extends TransactionExecution {