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
30,921 Commits 18 Branches 337 Tags 374 MiB
Commit Graph

30921 Commits

Author SHA1 Message Date
Brian Clozel c5f51aab67 Merge branch '6.1.x' 2024-08-22 09:32:11 +02:00
alfredo-toledano aca5db817d Fix link to core container introduction in ref docs 
Closes gh-33417
 2024-08-22 09:30:47 +02:00
Sébastien Deleuze c71409821d Polishing 
Closes gh-33402
 2024-08-20 18:32:37 +02:00
dev-chpark a9cbb01a45 Rename test method to clarify its purpose 
See gh-33402
 2024-08-20 18:32:30 +02:00
Sam Brannen 4a099d213e Add missing @⁠TestMethodOrder declarations 2024-08-19 14:46:21 +02:00
Sam Brannen 9f0417fb33 Merge branch '6.1.x' 2024-08-19 13:58:31 +02:00
Sam Brannen b2c1f978a4 Stop logging result in WebAsyncManager 
Closes gh-33406
 2024-08-19 13:53:06 +02:00
Brian Clozel 96573ee5e1 Merge branch '6.1.x' 2024-08-19 11:48:36 +02:00
Brian Clozel 50be08480d Open observation scope in RestClient 
Prior to this commit, the `RestClient` instrumentation would create and
close observations for HTTP requests, but would not open an observation
scope for the lifetime of the exchange.
This means that custom `ClientHttpRequestInterceptor` and
`ResponseErrorHandler` would not get access to the current observation
scope in case of tracing, possibly leading to missing trace ids in logs.

This commit ensures that an observation scope is managed for the
lifetime of the HTTP exchange.

Fixes gh-33397
 2024-08-19 11:48:26 +02:00
Simon Baslé 107ae6159b Add tests for MockitoBean reset of mocks/spies from a FactoryBean 
Closes gh-33405
 2024-08-19 11:10:19 +02:00
Sébastien Deleuze 94d8fc7af8 Merge branch '6.1.x' 2024-08-19 10:46:54 +02:00
Sébastien Deleuze 0101945708 Prevent a leak in WebTestClient 
This commit applies the same kind of processing for
Void.class element type in the ParameterizedTypeReference
variant of WebTestClient.ResponseSpec#returnResult than
in the Class variant.

Closes gh-33389
 2024-08-19 10:46:47 +02:00
Sébastien Deleuze eb7a95cfdb Merge branch '6.1.x' 2024-08-19 09:47:08 +02:00
Sébastien Deleuze d41ca095ab Add native support for Kotlin default values in controllers 
Closes gh-33384
 2024-08-19 09:46:53 +02:00
Sam Brannen 346b6f740a Polish contribution 
See gh-33401
 2024-08-18 14:58:05 +02:00
tafjwr 4ffeddb099 Add tests for ControllerAdviceBean#resolveBean() and revise existing tests 
Closes gh-33401
 2024-08-18 14:52:05 +02:00
Sam Brannen 59c779d8fe Enforce order of Javadoc tags for records introduced in 6.2 
See gh-33403
 2024-08-18 13:12:47 +02:00
Sam Brannen 04271c3ead Merge branch '6.1.x' 2024-08-18 13:04:21 +02:00
Sam Brannen 143736e59b Enforce order of Javadoc tags for records 
Closes gh-33403
 2024-08-18 13:01:43 +02:00
Sam Brannen e50383e921 Improve Javadoc for SpEL's Expression API 2024-08-17 15:59:00 +02:00
Sébastien Deleuze f854800043 Merge branch '6.1.x' 2024-08-16 17:05:23 +02:00
Sébastien Deleuze e0cb7aa0a0 Build documentation branches only for 6.1 and later 
To avoid a duplication error caused by a conflict between the
6.0.x branch and the v6.0.23 tag.

Closes gh-33398
 2024-08-16 17:04:55 +02:00
Sam Brannen de33056c83 Use new features from JUnit Jupiter 5.11 
This commit migrates additional parameterized tests (that were missed in
the previous commit) to the new argumentSet() feature.

See gh-33395
 2024-08-16 15:48:47 +02:00
Sébastien Deleuze a9a1798012 Merge branch '6.1.x' 2024-08-16 14:37:56 +02:00
Sébastien Deleuze 46c29b9175 Support Boolean property in BindingReflectionHintsRegistrar 
Closes gh-33380
 2024-08-16 14:37:12 +02:00
Sam Brannen d749d2949d Use new features from JUnit Jupiter 5.11 
This commit primarily migrates to the new argumentSet() feature but also
applies additional polishing to our use of parameterized tests.

See gh-33395
 2024-08-16 13:48:19 +02:00
Sam Brannen 2eff5cb463 Upgrade to JUnit 5.11 
Closes gh-33395
 2024-08-15 18:15:15 +02:00
Stéphane Nicoll 6cc0561625 Merge branch '6.1.x' 2024-08-14 13:27:57 +02:00
Stéphane Nicoll 1634e63506 Next development version (v6.1.13-SNAPSHOT) 2024-08-14 13:27:42 +02:00
rstoyanchev 974dec262c Merge branch '6.1.x' 2024-08-14 07:33:15 +03:00
rstoyanchev bb17ad8314 Efficient ETag parsing 2024-08-14 07:19:59 +03:00
Juergen Hoeller e1cf203295 Merge branch '6.1.x' 
# Conflicts:
#	framework-platform/framework-platform.gradle
 2024-08-13 19:05:20 +02:00
Juergen Hoeller 63486bf19c Upgrade to Tomcat 10.1.28, Jetty 12.0.12, Netty 4.1.112, Undertow 2.3.15 2024-08-13 18:52:15 +02:00
Juergen Hoeller d0bff584d7 Polishing 2024-08-13 18:51:02 +02:00
Juergen Hoeller 8be5010f5d LocaleEditor supports BCP 47 language tags as well 
Closes gh-33348
 2024-08-13 18:50:30 +02:00
Juergen Hoeller 552936627a Reject method name mismatch in case of bean name overloading 
Closes gh-33330
 2024-08-13 18:22:34 +02:00
Stéphane Nicoll 599fc8796b Upgrade to Reactor 2024.0.0-M5 
Closes gh-33328
 2024-08-13 18:07:31 +02:00
Stéphane Nicoll 57171143b9 Upgrade to Micrometer 1.14.0-M2 
Closes gh-33327
 2024-08-13 18:07:08 +02:00
Stéphane Nicoll 50c927b649 Merge branch '6.1.x' 2024-08-13 17:30:16 +02:00
Stéphane Nicoll 86761cd233 Upgrade to Reactor 2023.0.9 
Closes gh-33326
 2024-08-13 17:27:02 +02:00
Stéphane Nicoll 07cdef410e Upgrade to Micrometer 1.12.9 
Closes gh-33325
 2024-08-13 17:26:38 +02:00
Sam Brannen 1aea01687a Merge branch '6.1.x' 2024-08-13 17:40:13 +03:00
Sam Brannen e74406afd0 Introduce withAssignmentDisabled() option for SimpleEvaluationContext 
To support additional use cases, this commit introduces a
withAssignmentDisabled() method in the Builder for
SimpleEvaluationContext.

Closes gh-33319
 2024-08-13 17:26:34 +03:00
rstoyanchev 5fee796659 Merge branch '6.1.x' 2024-08-13 16:59:32 +03:00
rstoyanchev fe4fd00429 Polishing contribution 
Closes gh-33374
 2024-08-13 16:59:13 +03:00
Riley Park 1703b71563 Fix incorrect weak ETag assertion 
See gh-33374
 2024-08-13 16:31:14 +03:00
rstoyanchev cef1b7ea6d Polishing in HTTP interface argument resolvers 2024-08-12 21:01:03 +03:00
Olga Maciaszek-Sharma 51de84e148 Reject null for non-optional arguments 
Closes gh-33339
 2024-08-12 21:01:03 +03:00
Stéphane Nicoll 4ac4c1b868 Revert "Merge pull request #33366 from kashike" 
This reverts commit a1ec7669f6, reversing
changes made to e27192e8ad.

See gh-33366
 2024-08-12 17:47:35 +02:00
Sébastien Deleuze bb4a96f227 Merge branch '6.1.x' 2024-08-12 17:32:53 +02:00