Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,657 Commits 18 Branches 0 Tags
39e263fe5d8ba767d22e594cffd02420bab43f2a
Commit Graph

2302 Commits

Author SHA1 Message Date
Juergen Hoeller
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
Juergen Hoeller
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
Sam Brannen
c3991392df Merge branch '6.1.x' 2024-11-13 12:32:48 +01:00
Sam Brannen
0a5bd89129 Align JettyByteBufferIterator implementations 
Both are now static nested classes.
 2024-11-13 12:31:27 +01:00
rstoyanchev
cbe2f36106 Decode static resource path with UriUtils 
See gh-33859
 2024-11-12 11:39:22 +00:00
rstoyanchev
e78179b96e Decode static resource path with UriUtils 
Closes gh-33859
 2024-11-12 10:16:05 +00:00
Brian Clozel
5b5a072351 Merge branch '6.1.x' 2024-11-12 10:05:24 +01:00
Brian Clozel
49a63e2c37 Add tests for gh-33867 
Closes gh-33867
 2024-11-12 10:02:48 +01:00
ZLATAN628
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
rstoyanchev
59ec871e76 Append trailing slash to static location 
Closes gh-33815
 2024-11-08 07:11:55 +00:00
Sébastien Deleuze
7e1d6fe934 Merge branch '6.1.x' 2024-11-05 10:27:22 +01:00
Johnny Lim
0beb56a58c Fix indentation to use tabs in Kotlin source files 
Closes gh-33840
 2024-11-05 10:24:02 +01:00
Juergen Hoeller
c979eddab1 Consistent deprecation markers for 6.2 2024-10-30 16:45:00 +01:00
rstoyanchev
73e5aa38ec Polishing contribution 
See gh-33697
 2024-10-23 11:38:19 +01:00
Sébastien Deleuze
5abe5e1167 Merge branch '6.1.x' 2024-10-18 11:15:00 +02:00
Sébastien Deleuze
5e28a25a30 Add a WebFlux integration test 
This commit adds a WebFlux integration test with a request
body and a delayed response in order to test a use case
where we found a regression with Undertow 2.3.18.Final.

For now, Undertow 2.3.17.Final is still used.

Closes gh-33739
 2024-10-18 11:13:09 +02:00
Sébastien Deleuze
4c44b91cf9 Speedup WebFlux tests by reducing the interval period 
In WebFlux, we have various tests using a period of 50 or 100ms.
We should use a smaller value like 1ms to speedup tests.

Closes gh-33738
 2024-10-18 11:12:08 +02:00
rstoyanchev
bdcfbee7df Merge branch '6.1.x' 2024-10-16 12:11:23 +01:00
rstoyanchev
23656aebc6 Use Locale.ROOT consistently for toLower/toUpperCase 
See gh-33708
 2024-10-16 12:05:54 +01:00
rstoyanchev
a63cf06496 Update Javadoc snippets for static resource locations 
Switch to FileUrlResource, the same as what is used get with
the "file:" prefix in webmvc and webflux config.

See gh-33712
 2024-10-15 19:23:07 +01:00
rstoyanchev
789d7effa9 Assert static resource location 
Closes gh-33712
 2024-10-15 19:23:07 +01:00
rstoyanchev
7d3a3d35ce Update valid path checks for double encoding 
See gh-33687
 2024-10-14 18:14:01 +01:00
rstoyanchev
fb7890d739 Update processPath for double encoding 
See gh-33689
 2024-10-14 18:13:55 +01:00
rstoyanchev
cff6db02b4 Merge branch '6.1.x' 2024-10-14 16:00:48 +01:00
rstoyanchev
1a0b577bfc Do not support relative static resource paths 
Closes gh-33687
 2024-10-14 15:54:59 +01:00
rstoyanchev
3bfbe30a78 Normalize static resource path early 
Rather than leaving it to the Resource implementation, and
potentially normalizing twice, we apply it once as part of the
initial processPath checks.

Closes gh-33689
 2024-10-14 15:52:15 +01:00
Johnny Lim
1ec9a115a8 Replace RFC 7807 with RFC 9457 in documentation 
See gh-33594
 2024-10-08 13:32:33 +01:00
Juergen Hoeller
8ab965c981 Merge branch '6.1.x' 
# Conflicts:
#	spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java
#	spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractNamedValueArgumentResolver.java
 2024-09-30 11:17:55 +02:00
Juergen Hoeller
95f181352f Defensively check MethodParameter.getMethod() in KotlinDelegate 
Closes gh-33609
 2024-09-30 11:13:26 +02:00
Yanming Zhou
8941e2876e Replace 'e.g.' with 'for example' in documentation and comments 
Closes gh-33515
 2024-09-26 14:11:17 +02:00
Sébastien Deleuze
a1613d1352 Merge branch '6.1.x' 2024-09-25 12:15:06 +02:00
Sébastien Deleuze
2ab0101b8a Add coroutine context tests for WebClientExtensions 
Closes gh-33548
 2024-09-25 12:14:50 +02:00
Illia Sorokoumov
478aa250a0 Preserve coroutine context in WebClientExtensions 
See gh-33548
 2024-09-25 11:46:30 +02:00
rstoyanchev
c6fa180602 Extract shared resource handling utility methods 
Closes: gh-33574
 2024-09-20 19:25:12 +01:00
Johnny Lim
159e23730c Fix Javadoc @⁠since tags in JettyCoreRequestUpgradeStrategy 
See gh-32097
Closes gh-33569
 2024-09-20 11:34:39 +02:00
rstoyanchev
6120076437 Merge branch '6.1.x' 2024-09-20 09:33:09 +01:00
Andrey Popov
94c04821ff Use correct method to check encoded resource path 
Closes: gh-33568
 2024-09-20 09:32:24 +01:00
Brian Clozel
6f09c21f05 Merge branch '6.1.x' 2024-09-18 11:21:03 +02:00
Brian Clozel
776811bdb8 Defer ExchangeFilterFunction execution in WebClient 
Prior to this commit, the `DefaultWebClient` would execute the configured
`ExchangeFilterFunction` as the reactive pipeline is assembled during
subscription. This means that if imperative code is executed in a filter
function, it won't be aware of the current observation through the local
scope.

For example, when automatic context propagation is enabled for Reactor
operators, the logger MDC will not know about the current
traceId/spanId.

This commit ensures that client filter functions execution is deferred
during the actual client exchange.

Fixes gh-33559
 2024-09-18 11:18:17 +02:00
Sam Brannen
16d8df8c2f Merge branch '6.1.x' 2024-09-13 15:29:33 +02:00
Sam Brannen
b388ff60dd Fix parameterized test display names and polishing 2024-09-13 15:26:56 +02:00
rstoyanchev
398e5528a1 Merge branch '6.1.x' 2024-09-12 08:40:58 +01:00
rstoyanchev
d86bf8b205 Align RouterFunctions resource handling 
Closes: gh-33434
 2024-09-12 08:33:37 +01:00
rstoyanchev
88ff5e1dcc Remove unused imports 2024-09-10 13:36:16 +01:00
rstoyanchev
ebef599146 Fix checkstyle violations 2024-09-10 13:05:57 +01:00
rstoyanchev
19700d07b1 Quote ETag if not quoted in HttpHeaders#setETag 
This aligns HttpHeaders with other places like ServletWebRequest and
DefaultWebExchange where an ETag is accepted as input.

It also allows us to remove quoting from places that delegate to
HttpHeaders#setETag since it now does that internally.

Closes gh-33412
 2024-09-10 09:17:56 +01:00
rstoyanchev
1b26122e64 Polishing and minor refactoring 
Update checks whether quoting is needed to be more complete
than what we've used so far, making sure the there is both
opening and closing quotes independent of each other.

See gh-33412
 2024-09-10 08:56:01 +01:00
hyunmin0317
80b264ba82 Refactor eTag formatting into utility method 
See gh-33412
 2024-09-10 08:55:39 +01:00
Sam Brannen
d5f1e055d5 Merge branch '6.1.x' 2024-09-09 15:35:36 +02:00
Sam Brannen
4e1756d738 Polishing 2024-09-09 15:34:00 +02:00