25e2c1b7ce
Merge branch '6.1.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
# spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpConnector.java
2024-11-13 15:12:55 +01:00
14b9865de7
Remove ineffective JettyByteBufferIterator from WebSocket adapter
...
In JettyWebSocketHandlerAdapter, JettyByteBufferIterator does not actually add extra behavior (in contrast to JettyClientHttpConnector).
2024-11-13 15:10:32 +01:00
62eb21f938
Add note on declaring autowired fields as ObjectProvider
...
Closes gh-33834
2024-11-13 15:09:58 +01:00
01c85b1afb
Add explicit note on blocking in case of concurrency limit
...
Closes gh-33873
2024-11-13 15:09:02 +01:00
df376d9343
Upgrade to Micrometer 1.12.12 and Reactor 2023.0.12
...
Includes Netty 4.1.114, Jetty 12.0.15, Jetty Reactive HttpClient 4.0.8, RxJava 3.1.9, RSocket 1.1.4, Groovy 4.0.24, JRuby 9.4.9, Checkstyle 10.20.1
Closes gh-33877
Closes gh-33879
2024-11-13 15:08:40 +01:00
d92c57f7a5
Merge branch '6.1.x'
2024-11-13 14:23:52 +01:00
4d792d0e45
Remove mentions of Joda-Time support
...
Since Joda-Time support was removed in Spring Framework 6.0, this commit
removes obsolete mentions of Joda-Time in the reference guide and Javadoc.
See gh-27426
Closes gh-33881
2024-11-13 14:16:14 +01:00
4ca596b7bc
Upgrade to Micrometer 1.14.0 and Reactor 2024.0.0
...
Includes Netty 4.1.114, Jetty 12.0.15, Jetty Reactive HttpClient 4.0.8, RxJava 3.1.9, RSocket 1.1.4, HSQLDB 2.7.4, H2 2.3.232, SnakeYAML 2.3, Groovy 4.0.24, JRuby 9.4.9, Jackson 2.18.1, Gson 2.11, Protobuf 4.28.3, XStream 1.4.21, Woodstox 6.7, TestNG 7.10.2, Selenium 4.26, HtmlUnit 4.6, XMLUnit 2.10, Checkstyle 10.20.1
Closes gh-33876
Closes gh-33878
2024-11-13 13:34:43 +01:00
90ef7ac514
Cache singleton results for @Lazy injection points
...
Includes consistent use of unmodifiable collections.
Closes gh-33841
2024-11-13 13:29:20 +01:00
c3991392df
Merge branch '6.1.x'
2024-11-13 12:32:48 +01:00
0a5bd89129
Align JettyByteBufferIterator implementations
...
Both are now static nested classes.
2024-11-13 12:31:27 +01:00
357dbc0354
Add AOT support for container element constraints
...
This commit introduces support for bean validation container
element constraints, including transitive ones.
Transitive constraints in the parameterized types of a container
are not discoverable via the BeanDescriptor, so a complementary
type discovery is done on Spring side to cover the related use
case.
Closes gh-33842
2024-11-13 11:03:48 +01:00
525407e4b1
Merge branch '6.1.x'
2024-11-12 20:50:46 +01:00
53b9a2cb78
Fix formatting issue in validation section of reference guide
...
Closes gh-33871
2024-11-12 20:49:56 +01:00
cbe2f36106
Decode static resource path with UriUtils
...
See gh-33859
2024-11-12 11:39:22 +00:00
9dabfdf0bf
Remove obsolete AstUtilsTests
...
AstUtilsTests got accidentally reintroduced in 5b5a072351e3ba957431
2024-11-12 12:15:11 +01:00
942d2c5541
Merge branch '6.1.x'
2024-11-12 10:30:39 +00:00
e78179b96e
Decode static resource path with UriUtils
...
Closes gh-33859
2024-11-12 10:16:05 +00:00
5b5a072351
Merge branch '6.1.x'
2024-11-12 10:05:24 +01:00
85cf563741
Fix typo in reference documentation
...
See gh-33865
2024-11-12 10:04:06 +01:00
e3ba957431
Polish SpEL internals
2024-11-12 10:04:06 +01:00
caec8f4f36
Revise Javadoc for PropertyAccessor & IndexAccessor regarding ordering
...
Closes gh-33862
2024-11-12 10:04:06 +01:00
ae16a7fc08
Update tests for 6.2
...
See gh-33861
2024-11-12 10:04:06 +01:00
43e7921bcc
Introduce tests for SpEL PropertyAccessor ordering
...
Closes gh-33861
2024-11-12 10:04:06 +01:00
49a63e2c37
Add tests for gh-33867
...
Closes gh-33867
2024-11-12 10:02:48 +01:00
5666e363d1
Fix wrong uri tag for client observation convention
...
Prior to this commit, a client sending a request to
"https://example.org " would record the wrong URI tag as
"/https://example.org ".
This commit ensures that the scheme+host part is matched correctly in
the default client observation conventions.
See gh-33867
2024-11-12 10:02:39 +01:00
f06853a339
Merge pull request #33865 from ngocnhan-tran1996
...
* pr/33865:
Fix typo in reference documentation
Closes gh-33865
2024-11-10 14:45:49 +09:00
8afd01ba2c
Fix typo in reference documentation
...
See gh-33865
2024-11-10 14:45:19 +09:00
9724f9b9c8
Introduce tests for SpEL PropertyAccessor ordering
...
Closes gh-33861
2024-11-08 16:19:12 +01:00
8202282975
Polishing
2024-11-08 15:34:54 +01:00
d4719493bd
Empty string check after conversion in AbstractNamedValueArgumentResolver
...
Closes gh-33794
2024-11-08 09:21:08 +00:00
59ec871e76
Append trailing slash to static location
...
Closes gh-33815
2024-11-08 07:11:55 +00:00
37243f44e8
Refactor cookie support for Apache HttpClient
...
Closes gh-33822
2024-11-08 06:30:51 +00:00
e67f892e44
Use optimistic locking where possible in `ResponseBodyEmitter`
...
Closes gh-33831
2024-11-07 16:33:05 +01:00
1ced8c3856
Merge branch '6.1.x'
2024-11-07 12:26:21 +01:00
0d9033592b
Document that circular dependencies should be avoided in AOT mode
...
Closes gh-33786
2024-11-07 12:23:39 +01:00
fc7b8ae966
Fix anchor name, consistently use title case, and polish wording
...
(cherry picked from commit 2e6c8daec6
2024-11-07 12:22:25 +01:00
c457131f1c
Fix heading level for "Programmatic bean registration" in AOT chapter
...
(cherry picked from commit 9f0dbc4051
2024-11-07 12:22:02 +01:00
39cfe136da
Polishing
2024-11-07 11:49:22 +01:00
fd676ed932
Merge branch '6.1.x'
2024-11-07 10:44:47 +01:00
05a880e3b5
Fix XML bean reference example in reference manual
...
Closes gh-33855
2024-11-07 10:44:01 +01:00
715e38c44f
Merge branch '6.1.x'
2024-11-07 10:05:15 +01:00
c93af1f76d
Polishing: copyright header year
...
See gh-33823
2024-11-07 10:04:53 +01:00
2e6c8daec6
Fix anchor name, consistently use title case, and polish wording
2024-11-06 17:46:06 +01:00
c5f8dcc245
Merge branch '6.1.x'
2024-11-06 23:12:06 +09:00
541866fd70
Merge pull request #33850 from wilkinsona
...
* pr/33850:
Polish "Prefer modified resources over the originals in TestCompiler"
Prefer modified resources over the originals in TestCompiler
Closes gh-33850
2024-11-06 23:11:58 +09:00
0219ee656f
Polish "Prefer modified resources over the originals in TestCompiler"
...
See gh-33850
2024-11-06 23:03:11 +09:00
f6e1a5de09
Prefer modified resources over the originals in TestCompiler
...
Previously, when the test compiler had been seeded with a resource
file, any modifications to this resource performed during
compilation would be lost as this original content would always
be returned.
This commit updates the DynamicJavaFileManager to always store
the dynamic resource in the dynamicResourceFiles map, irrespective
of whether it's being created afresh or from some existing resource
content. This ensures that any modifications made to the resource
can be retrieved later on.
Similarly, DynamicClassLoader has been updated to prefer dynamic
resource files over any original resource files. This ensures that
the resource that it finds reflects any modifications that have
been made to it.
See gh-33850
2024-11-06 23:00:08 +09:00
72e7f1552b
Refine `@Contract` Javadoc
...
This commit refines `@Contract` Javadoc to mention
this and new return values.
Closes gh-33849
2024-11-06 12:03:19 +01:00
bbe90a57ba
Merge branch '6.1.x'
2024-11-06 11:40:46 +01:00
Juergen Hoeller
Sam Brannen
Sébastien Deleuze
Tran Ngoc Nhan
rstoyanchev
Brian Clozel
ZLATAN628
Stéphane Nicoll
longtanfei
Simon Baslé
Andy Wilkinson