root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity
21,168 Commits 18 Branches 337 Tags 369 MiB
Commit Graph

428 Commits

Author SHA1 Message Date
Juergen Hoeller 7e71749e34 Merge branch '5.2.x' 2020-06-23 23:26:52 +02:00
Juergen Hoeller b0cabb29f3 Polishing 2020-06-23 23:20:45 +02:00
Sam Brannen ab0e651547 Polish SerializationTestUtils, clean up warnings, etc. 2020-06-20 18:17:03 +02:00
Sam Brannen 9d5881e0ad Suppress warnings, remove unused code, etc. 2020-06-20 17:15:35 +02:00
Juergen Hoeller 3a653bd35f Deprecate JCA CCI support 
Closes gh-25287
 2020-06-19 19:19:14 +02:00
Sébastien Deleuze 6b355df903 Revert "Upgrade to Kotlin 1.4 M2" 
This reverts commit 2a74eff10f.

Some regressions require to wait at least Kotlin 1.4 M3.
 2020-06-18 14:06:39 +02:00
Juergen Hoeller 7f79a373c3 Merge branch '5.2.x' 
# Conflicts:
#	build.gradle
 2020-06-17 15:42:18 +02:00
Juergen Hoeller a08bf8c063 Avoid misleading log message for commit-triggering exception 
Closes gh-25253
 2020-06-17 15:39:41 +02:00
Mark Paluch 217b6e37a6 Rollback reactive transaction on cancel 
This commit introduces a change in reactive transaction semantics for
cancel signals. Canceling a subscription now rolls back a reactive transaction
to achieve a deterministic transaction outcome.

Previously, cancel signals committed a transaction which could
cause partially committed transactions depending on when the cancel happened.
 2020-06-17 15:04:54 +02:00
Juergen Hoeller 17cab9660c Deprecate TransactionSynchronizationAdapter 
Closes gh-21725
 2020-06-17 11:02:31 +02:00
Сергей Цыпанов 7949937655 Remove redundant assignment of default values to volatile fields 2020-06-17 10:50:51 +02:00
Sébastien Deleuze 2a74eff10f Upgrade to Kotlin 1.4 M2 
- The compiler is configured to retain compatibility with Kotlin 1.3.
- Explicit API mode is not yet enabled but could be in the future.
- A workaround for Gradle build is required for now, see
  https://youtrack.jetbrains.com/issue/KT-39610 for more details.
- Some exceptions thrown by Kotlin have changed to NullPointerException,
  see https://youtrack.jetbrains.com/issue/KT-22275 for more details.

Closes gh-24171
 2020-06-16 15:21:57 +02:00
Juergen Hoeller 663f2e8afd Merge branch '5.2.x' 2020-06-10 22:53:06 +02:00
Juergen Hoeller ae1ed9d458 Document exception handling limitations in TaskDecorator implementations 
Closes gh-25231
 2020-06-10 22:52:01 +02:00
Rossen Stoyanchev 150fe96a98 Merge branch '5.2.x' 2020-06-08 17:44:42 +01:00
Rossen Stoyanchev 9e1121fd8d Document behavior on reactive tx cancellation 
Closes gh-25091
 2020-06-08 17:43:52 +01:00
Juergen Hoeller e955e52f2f Refactor method name dispatching to switch statements 
Closes gh-25163
 2020-05-29 23:07:25 +02:00
Juergen Hoeller 42ff01b5aa Merge branch '5.2.x' 2020-05-29 15:57:32 +02:00
Juergen Hoeller cd4ef6f781 Consistently refer to FlushMode.MANUAL instead of outdated NEVER 
Closes gh-25158
 2020-05-29 15:51:54 +02:00
Juergen Hoeller 929244215c Merge branch '5.2.x' 
# Conflicts:
#	build.gradle
 2020-05-26 23:37:53 +02:00
Juergen Hoeller 1dea55dc20 WebSphereUowTransactionManager sets timeout for actual transaction only 
Closes gh-25132
 2020-05-26 23:34:36 +02:00
Juergen Hoeller 3c1ee64b7f Explicit nullability declarations for all AOP Alliance methods 
Includes consistent declarations in AOP Alliance related Spring AOP code.

Closes gh-24117
 2020-05-13 23:33:47 +02:00
Sam Brannen a16d178d72 Polish Javadoc for NameMatchTransactionAttributeSource 2020-05-13 13:29:07 +02:00
Juergen Hoeller dd0d0d51f6 Introduce resolvable timeout attribute on @Transactional and <tx:method> 
Placeholders get resolved in timeoutString, qualifier and labels now.

Closes gh-25052
 2020-05-12 21:55:22 +02:00
Sam Brannen 715e8c9ef6 Align TransactionManagementConfigurer support in TCF with production 
This commit picks up where 613bd3be1d
left off by ensuring that a transaction manager configured via the
TransactionManagementConfigurer API takes precedence over any
transaction manager configured as a bean in the ApplicationContext
unless @Transactional is configured with a qualifier for the explicit
transaction manager to use in tests.

Closes gh-24869
 2020-05-11 13:59:34 +02:00
Sam Brannen 65acda8d3e Polishing 2020-05-11 12:26:13 +02:00
Sam Brannen 3f30dcae80 Merge branch '5.2.x' 2020-05-10 15:44:57 +02:00
Yanming Zhou 50a4fdac6e
Use Map::computeIfAbsent to simplify scope implementations 
Closes gh-25038
 2020-05-10 15:41:00 +02:00
Sam Brannen 2dc9020f80 Merge branch '5.2.x' 2020-05-09 13:57:41 +02:00
Sam Brannen f5d011cb82 Filter reactive tx managers in TransactionAttributeSourceClassFilter 
Prior to this commit, the TransactionAttributeSourceClassFilter
filtered out PlatformTransactionManager but not
ReactiveTransactionManager implementations.

TransactionAttributeSourceClassFilter now filters out any
TransactionManager implementation, covering both imperative and
reactive transaction managers.
 2020-05-09 13:57:03 +02:00
Sam Brannen 29fe8cecbb Merge branch '5.2.x' 2020-05-08 19:49:56 +02:00
Sam Brannen ec3d647d1d Update spring-tx.xsd regarding reactive tx mgmt support 
Closes gh-25030
 2020-05-08 19:49:00 +02:00
Sam Brannen 8f7debc769 Merge branch '5.2.x' 2020-05-08 19:26:00 +02:00
Sam Brannen 0f22a5e409 Update Javadoc regarding reactive tx mgmt support 
See gh-25030
 2020-05-08 19:25:22 +02:00
Mark Paluch 2aa8aef216 Extend transaction attributes with labels 
TransactionAttribute now exposes a labels attribute that associates a
descriptive array of labels with a transaction.

Labels may be of a pure descriptive nature or may get evaluated by
transaction managers to associate technology-specific behavior
with the actual transaction.
 2020-05-06 16:28:21 +02:00
Sam Brannen 1d0c5195bc Polish Javadoc for TransactionManagementConfigurer 2020-04-06 15:31:48 +02:00
Sam Brannen 144b0e1437 Test status quo for @Primary + TransactionManagementConfigurer 
This commit introduces tests for the status quo in production support
for multiple transaction managers registered as @Primary and via the
TransactionManagementConfigurer API.

See gh-24869
 2020-04-06 15:16:31 +02:00
Sam Brannen f8ab19dc68 Ensure @EnableTxMgmt tests actually test something 2020-04-06 14:32:34 +02:00
Sam Brannen e26764d249 Remove duplicate words in documentation and polish Javadoc 2020-03-31 12:17:58 +02:00
Qimiao Chen 70581d1ea2
Improve javadoc in RollbackRuleAttribute regarding nested classes 
Closes gh-24682

Co-authored-by: Sam Brannen <sbrannen@pivotal.io>
 2020-03-15 12:06:16 +01:00
Juergen Hoeller 193f419520 Deprecate PTM-based constructors in favor of generic TransactionManager 
Closes gh-24612
 2020-03-11 14:52:03 +01:00
Rossen Stoyanchev adc13f2030 Polishing contribution 
See gh-24493
 2020-02-20 17:58:47 +00:00
陈其苗 a09f02f64e Minor refactoring in AbstractPlatformTransactionManager 
See gh-24493
 2020-02-20 17:33:18 +00:00
Juergen Hoeller d1c7083e77 Consistent ROLE_INFRASTRUCTURE declarations for configuration classes 
Closes gh-24509
 2020-02-12 16:49:02 +01:00
Michael Simons 711fafc924
Improve assertion message in PersistenceExceptionTranslationInterceptor 
Closes gh-24484
 2020-02-06 15:41:33 +01:00
Sam Brannen 5581f3b77b Use Gradle test fixture support for spring-tx 
See gh-23550
 2020-01-02 16:01:35 +01:00
Sam Brannen 726b1bb1d0 Rename test fixture package in spring-context 
See gh-23550
 2020-01-02 16:01:35 +01:00
Sam Brannen 7cd4ddf5fc Rename test fixture package in spring-beans 
See gh-23550
 2020-01-02 16:01:35 +01:00
Sam Brannen 4260c34b47 Rename test fixture package in spring-core 
See gh-23550
 2020-01-02 16:01:34 +01:00
Sam Brannen 61d4ee594d Use Gradle test fixture support for spring-beans and spring-context 
See gh-23550
 2020-01-02 16:01:34 +01:00