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

32657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Brannen
019f76468b Revise TestBeanForInheritanceIntegrationTests 
Amongst other refinements, this commit ensures that the "anotherBean"
use case is actually tested.
 2025-01-04 14:16:59 +02:00
Sébastien Deleuze
57c0d95007 Fix detection of JSpecify annotations on parameters 
See gh-28797
 2025-01-03 17:29:49 +01:00
Stéphane Nicoll
f136e27ccf Merge branch '6.2.x' 2025-01-03 16:54:32 +01:00
Stéphane Nicoll
f802c0cf24 Restore use of MethodSource 2025-01-03 16:53:54 +01:00
Sam Brannen
99bcd3a845 Remove unused code 2025-01-03 17:43:17 +02:00
Sam Brannen
e26c161ae9 Clean up warnings 2025-01-03 17:42:57 +02:00
Sam Brannen
087641c508 Merge branch '6.2.x' 2025-01-03 17:29:14 +02:00
Sam Brannen
0da4ae96b4 Rename internal MockitoBeans class to MockBeans 
This is a prerequisite for gh-33925 which will introduce a public
@MockitoBeans container annotation in the same package.
 2025-01-03 17:26:45 +02:00
Sam Brannen
2ba0022704 Polishing 2025-01-03 17:26:45 +02:00
Stéphane Nicoll
c59ca087b4 Backport tests for exact match resolution 
See gh-34124

(cherry picked from commit 898d3ec86a)
 2025-01-03 17:10:17 +02:00
Sam Brannen
bab8a8300b Merge branch '6.2.x' 2025-01-03 16:44:26 +02:00
Sam Brannen
9de2b947cb Upgrade to AssertJ 3.27.1 2025-01-03 16:42:07 +02:00
Sam Brannen
e73e7564d0 Upgrade to Mockito 5.15.2 2025-01-03 16:36:39 +02:00
Brian Clozel
b6de2b0611 Merge branch '6.2.x' 2025-01-02 20:12:14 +01:00
Brian Clozel
d927d64c40 Improve query params in uri KeyValue with HTTP interface client 
Prior to this commit, the HTTP interface client would create URI
templates and name query params like so:
"?{queryParam0}={queryParam0[0]}".
While technically correct, the URI template is further used in
observations as a KeyValue. This means that several service methods
could result in having the exact same URI template even if they produce
a different set of query params.

This commit improves the naming of query params in the generated URI
templates for better observability integration.

Closes gh-34176
 2025-01-02 20:00:38 +01:00
Stéphane Nicoll
69b7624629 Merge branch '6.2.x' 2025-01-01 10:08:45 +01:00
Stéphane Nicoll
8544435833 Merge pull request #34180 from v-perfilev 
* pr/34180:
  Polish "Fix broken link to Code of Conduct in CONTRIBUTING.md"
  Fix broken link to Code of Conduct in CONTRIBUTING.md

Closes gh-34180
 2025-01-01 10:08:39 +01:00
Stéphane Nicoll
80ea1f62b6 Polish "Fix broken link to Code of Conduct in CONTRIBUTING.md" 
See gh-34180
 2025-01-01 10:08:18 +01:00
Vladimir Perfilev
bc287918f2 Fix broken link to Code of Conduct in CONTRIBUTING.md 
See gh-34180
 2025-01-01 10:07:29 +01:00
Stéphane Nicoll
333dfd1577 Fix build failure 2024-12-31 10:02:00 +01:00
Stéphane Nicoll
067bbce1d3 Merge branch '6.2.x' 2024-12-31 09:49:53 +01:00
Stéphane Nicoll
c9436992c9 Update actions in CI build 2024-12-31 09:49:43 +01:00
rstoyanchev
48308aee26 Merge branch '6.2.x' 2024-12-30 14:48:04 +00:00
rstoyanchev
4350fc21b3 List constructor arg initialized correctly 
DataBinder now uses the calculated List size rather than
the number of indexes to initialize the list.

Closes gh-34145
 2024-12-30 14:47:26 +00:00
rstoyanchev
59ed4686c5 Create ParameterErrors for type level constraint 
Closes gh-34105
 2024-12-30 14:47:26 +00:00
Sébastien Deleuze
e0521fc1a1 Merge branch '6.2.x' 2024-12-30 12:15:46 +01:00
Sébastien Deleuze
d5bebd5ced Upgrade to Java 17.0.13 2024-12-30 12:15:24 +01:00
Sébastien Deleuze
08d7a38546 Merge branch '6.2.x' 2024-12-30 09:06:24 +01:00
Johnny Lim
6d86b23fbe Apply Checkstyle MethodParamPadCheck module 
This commit also fixes its violations.

Closes gh-34173
 2024-12-30 09:02:06 +01:00
Simon Baslé
a2bc1ded73 Polishing, fix checkstyle errors 2024-12-27 14:00:38 +01:00
Simon Baslé
eb9ee9fafa Polishing 
`@since` missing tags in some methods related to the HttpHeaders change
 2024-12-27 12:14:23 +01:00
Simon Baslé
f025d60b92 Merge branch '6.2.x' 2024-12-27 11:00:10 +01:00
Simon Baslé
0f38c28e91 Fix ServletRequestDataBinder ctor binding with []-indexed query params 
This change ensures that a request containing query parameters in the
array format `someArray[]=value` can be bound into a simple array in
constructors, even for cases where the array values don't have nested
properties.

The value resolver is directly called in the constructor case, before
any mutable properties are considered or even cleared (see
`WebDataBinder#adaptEmptyArrayIndices` method). As a result, we need to
accommodate the possibility that the request stores array elements under
the `name[]` key rather than `name`. This change attempts a secondary
lookup with the `[]` suffix if the type is a list or array, and the key
doesn't include an index.

Closes gh-34121
 2024-12-27 10:59:15 +01:00
Simon Baslé
3505c4bcad Ensure DataBinder can bind constructor with a Map with simple values 
This change ensures that DataBinder can bind constructor with a Map
parameter that has no nested properties, but just simple values like
a String: `someMap[0]=exampleString`.

Integration tests have been added to cover similar cases that use the
ServletRequestDataBinder.

Closes gh-34043
 2024-12-27 10:57:30 +01:00
Stéphane Nicoll
5aab947b6e Merge branch '6.2.x' 2024-12-27 09:33:18 +01:00
Stéphane Nicoll
58670db46e Merge pull request #34165 from brendenehlers 
* pr/34165:
  Polish contribution
  Fix grammatical structure in "Basic Concepts"

Closes gh-34165
 2024-12-27 09:31:47 +01:00
Stéphane Nicoll
0cdb8a1657 Polish contribution 
Using commas render better than em dashes.

See gh-34165
 2024-12-27 09:31:34 +01:00
Brenden Ehlers
fe8c70dddb Fix grammatical structure in "Basic Concepts" 
See gh-34165
 2024-12-27 09:30:43 +01:00
Sébastien Deleuze
6c86914709 Refine null-safety in the spring-webmvc module 
Closes gh-34164
 2024-12-26 19:23:33 +01:00
Sébastien Deleuze
b332920b17 Refine null-safety in the spring-webflux module 
Closes gh-34163
 2024-12-26 19:14:04 +01:00
Sébastien Deleuze
5fba926ab6 Refine null-safety in the spring-web module 
Closes gh-34162
 2024-12-26 18:50:17 +01:00
Sébastien Deleuze
a442c180f1 Refine null-safety in the spring-test module 
Closes gh-34161
 2024-12-26 17:49:17 +01:00
Sébastien Deleuze
7417bd0ac1 Refine null-safety in the spring-r2dbc module 
Closes gh-34160
 2024-12-26 16:29:27 +01:00
Sébastien Deleuze
73b24b6f7b Refine null-safety in the spring-orm module 
Closes gh-34159
 2024-12-26 16:21:17 +01:00
Sébastien Deleuze
abccba22f1 Refine null-safety in the spring-messaging module 
Closes gh-34158
 2024-12-26 16:00:24 +01:00
Sébastien Deleuze
4fa33dfece Refine null-safety in the spring-aop module 
See gh-34154
 2024-12-26 15:30:59 +01:00
Sébastien Deleuze
9516d9b822 Refine null-safety in the spring-jms module 
Closes gh-34157
 2024-12-26 15:18:27 +01:00
Sébastien Deleuze
be11e73d2c Refine null-safety in the spring-expression module 
Closes gh-34156
 2024-12-26 14:59:50 +01:00
Sébastien Deleuze
4747ab67e6 Refine null-safety in the spring-core module 
See gh-34150
 2024-12-26 14:56:34 +01:00
Sébastien Deleuze
c245e20e3f Refine null-safety in the spring-beans module 
See gh-34152
 2024-12-26 14:18:48 +01:00