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

32987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Brannen
ad2931b51f Migrate away from AssertJ's catchThrowable() 
Closes gh-35003
 2025-06-06 15:01:26 +02:00
Sam Brannen
3aa3b81e1c Update copyright headers 2025-06-06 13:49:23 +02:00
Johnny Lim
7f6a7b806e Replace AssertionsForClassTypes with Assertions 
Closes gh-34821

Signed-off-by: Johnny Lim <izeye@naver.com>
 2025-06-06 13:49:23 +02:00
Sébastien Deleuze
977792009d Introduce hints in RestClient API 
This commit introduces hints in RestClient API for
SmartHttpMessageConverters supporting them.

Closes gh-34924
 2025-06-06 13:10:12 +02:00
Brian Clozel
72601b6948 Merge branch '6.2.x' 2025-06-06 12:06:08 +02:00
Brian Clozel
332c7f770c Remove Link to AspectJ Javadoc 
Closes gh-35000
 2025-06-06 12:05:44 +02:00
Juergen Hoeller
8d17afc28b Merge branch '6.2.x' 
# Conflicts:
#	framework-platform/framework-platform.gradle
 2025-06-06 09:25:25 +02:00
Juergen Hoeller
9f76ea13e3 Upgrade to Groovy 4.0.27, Mockito 5.18, Checkstyle 10.25 2025-06-06 09:21:37 +02:00
Juergen Hoeller
d9c103b7ff Remove unnecessary fallback to DefaultConversionService 
See gh-34936
 2025-06-06 09:21:21 +02:00
Juergen Hoeller
167350d408 Merge branch '6.2.x' 
# Conflicts:
#	spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
#	spring-aop/src/main/java/org/springframework/aop/aspectj/ShadowMatchUtils.java
 2025-06-05 20:39:20 +02:00
Juergen Hoeller
f1ddd051a3 Restore synchronization against AspectJ race condition behind PointcutExpression 
Closes gh-34735
 2025-06-05 20:36:10 +02:00
Juergen Hoeller
a266e1b403 Close JarFile only in case of useCaches=false 
Closes gh-34955
 2025-06-05 20:20:47 +02:00
Sébastien Deleuze
826041d2f7 Add Kotlin body advices 
This commit introduces KotlinRequestBodyAdvice and
KotlinResponseBodyAdvice in order to set a KType hint when relevant.

Closes gh-34923
 2025-06-05 18:53:31 +02:00
rstoyanchev
9f7a321c44 Support streaming with HTTP interfaces + RestClient 
Closes gh-32358
 2025-06-05 17:07:01 +01:00
Sam Brannen
02af9e5cee Revise core retry support 
This commit constitutes a first pass over the new core retry support.

- Fix code and Javadoc formatting

- Polish/fix Javadoc

- Fix default FixedBackOff configuration in RetryTemplate

- Consistent logging in RetryTemplate

- Fix listener handling in CompositeRetryListener, allowing addListener()
  to work

- Polish tests

- Ensure RetryTemplateTests do not take over 30 seconds to execute

See gh-34716
 2025-06-05 14:56:25 +02:00
Mahmoud Ben Hassine
3fb4a75ae4 Introduce minimal retry functionality as a core framework feature 
This commit introduces a minimal core retry feature. It is inspired
by Spring Retry, but redesigned and trimmed to the bare minimum to
cover most cases.

Closes gh-34716
 2025-06-05 14:56:25 +02:00
Violeta Georgieva
aefdda3490 Upgrade to Netty v4.2.2.Final and Reactor Netty 2025.0.0-SNAPSHOT 
Closes gh-34996
See gh-34997

Signed-off-by: Violeta Georgieva <696661+violetagg@users.noreply.github.com>
 2025-06-05 14:14:06 +02:00
Sébastien Deleuze
93ba10fa1a Merge branch '6.2.x' 2025-06-05 14:08:36 +02:00
Sébastien Deleuze
4d09eb569b Refine RequestResponseBodyMethodProcessorKotlinTests 
Improve read tests and fix copyright.

See gh-34992
 2025-06-05 14:07:27 +02:00
Sébastien Deleuze
b89c48e714 Merge branch '6.2.x' 2025-06-05 12:12:23 +02:00
Sébastien Deleuze
a439e9030f Fix collection support in AbstractKotlinSerializationHttpMessageConverter 
AbstractKotlinSerializationHttpMessageConverter#getSupportedMediaTypes(Class<?>)
currently invokes transitively supports(Class<?>) which always return false
with generic types.

This commit adds an override that just invokes getSupportedMediaTypes().

Closes gh-34992
 2025-06-05 12:02:22 +02:00
Brian Clozel
2d5d988ad4 Polishing contribution 
Closes gh-34645
 2025-06-05 11:34:34 +02:00
Kamil Doroszkiewicz
c1839938ea Add support for "application/*+x-protobuf" media type 
See gh-34645

Signed-off-by: Kamil Doroszkiewicz <kamil.doroszkiewicz@gmail.com>
 2025-06-05 11:34:34 +02:00
Brian Clozel
79a793e44c Merge branch '6.2.x' 2025-06-05 10:58:57 +02:00
James Yuzawa
aa5c0dcd72 Add caching headers to unmodified static resources 
per https://www.rfc-editor.org/rfc/rfc7232#section-4.1

The server generating a 304 response MUST generate any of the
following header fields that would have been sent in a 200 (OK)
response to the same request: Cache-Control, Content-Location, Date,
ETag, Expires, and Vary.

Closes gh-34614

Signed-off-by: James Yuzawa <jtyuzawa@gmail.com>
 2025-06-05 10:58:24 +02:00
Brian Clozel
5fbb81de10 Fix missing "since" attributes for Deprecated code 
See gh-34989
 2025-06-05 09:25:10 +02:00
Brian Clozel
1e9179a87c Enable SpringDeprecatedCheck Checkstyle rule 
This rules checks that `@Deprecated` annotations have a "since"
attribute.

Closes gh-34989
 2025-06-05 09:25:03 +02:00
Brian Clozel
fa6e32940c Merge branch '6.2.x' 2025-06-04 20:23:39 +02:00
Brian Clozel
4a46d957f3 Fix out of bounds exception for PathPattern#combine 
Prior to this commit, combining the "/*" and  "/x/y" path patterns
would result in a `StringIndexOutOfBoundsException`.

This commit fixes this problem and revisits the implementation for
better consistency:

* "/*" + "/x/y" is now "/x/y"
* "/x/*.html" + "/y/file.*" is now rejected because they don't share the
  same prefix.

This change also adds the relevant Javadoc to the `PathPattern#combine`
method.

Fixes gh-34986
 2025-06-04 20:18:33 +02:00
Sam Brannen
7e035f5c50 Polish ImportTests 2025-06-04 17:00:10 +02:00
Sam Brannen
4581324038 Polish support for @⁠Import on interfaces 
- Update @⁠Import Javadoc

- Move tests from ImportSelectorTests to ImportTests

See gh-34820
 2025-06-04 16:59:46 +02:00
Daeho Kwon
a4d5800a6c Support @⁠Import on interfaces 
See gh-34805
Closes gh-34820

Signed-off-by: Daeho Kwon <trewq231@naver.com>
 2025-06-04 16:47:50 +02:00
Sam Brannen
686705140e Polish Javadoc for @⁠Import 2025-06-04 16:47:50 +02:00
Sam Brannen
af4fc0118c Update copyright header 2025-06-04 14:53:31 +02:00
ChanHyeongLee
4f5e2eefe9 Remove thenReturn that fetches unused values 
Closes gh-34883

Signed-off-by: ChanHyeongLee <cksgud410@gmail.com>
 2025-06-04 13:46:22 +01:00
rstoyanchev
263af04508 Polishing contribution 
Closes gh-34877
 2025-06-04 13:46:22 +01:00
kssumin
8b9ae2b11c Update Jetty on WebFlux bootstrap in reference docs 
Replace deprecated JettyHttpHandlerAdapter with JettyCoreHttpHandlerAdapter
Update example to work with Jetty 12+
Add note about the deprecation

See gh-34877

Signed-off-by: kssumin <201566@jnu.ac.kr>
 2025-06-04 13:46:22 +01:00
rstoyanchev
230540b6da Polishing contribution 
Closes gh-34942
 2025-06-04 13:46:22 +01:00
Yanming Zhou
f9fa7cc93b Add missing "since" in @Deprecated 
See gh-34942

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-06-04 13:46:22 +01:00
Sam Brannen
b7dfd68d89 Merge branch '6.2.x' 2025-06-04 14:11:07 +02:00
Sam Brannen
4df93a825b Update copyright headers and fix test method name 2025-06-04 11:28:55 +02:00
rstoyanchev
b699b65b40 Merge branch '6.2.x' 2025-06-03 19:11:52 +01:00
rstoyanchev
be17315f63 Add mention of CompletionStage in "Async Requests" 
Closes gh-34991
 2025-06-03 19:10:03 +01:00
DongNyoung Lee
31903a9d92 Fix typo in MockClientHttpRequest Javadoc 
Closes gh-34856

Signed-off-by: DongNyoung Lee <121621378+Dongnyoung@users.noreply.github.com>
 2025-06-03 19:05:32 +01:00
rstoyanchev
06f69915cb Polishing contribution 
Closes gh-34885
 2025-06-03 19:04:17 +01:00
addoDev
d9459bdc74 Improve mvc-ann-async.adoc 
Added section for WebAsyncTask return type along with java and
kotlin example code

See gh-34885

Signed-off-by: addoDev <adityaraochokkadi@gmail.com>
 2025-06-03 18:57:40 +01:00
Tran Ngoc Nhan
3f0892b42c Fix typos 
Closes gh-34876

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
 2025-06-03 18:55:15 +01:00
rstoyanchev
72b42bbd55 Polishing in RestClientAdapterTests 2025-06-03 18:51:57 +01:00
Patrick Strawderman
9501bff1f0 Use HexFormat in CharacterEditor 
Use HexFormat to perform conversion for unicode-prefixed Strings in CharacterEditor.

Closes gh-34798

Signed-off-by: Patrick Strawderman <pstrawderman@netflix.com>
 2025-06-03 18:20:19 +02:00
Patrick Strawderman
542eb6f305 Use HexFormat in ContentDisposition 
Closes gh-34797

Signed-off-by: Patrick Strawderman <pstrawderman@netflix.com>
 2025-06-03 18:19:47 +02:00