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
Stéphane Nicoll
c6b060a2eb Merge branch '6.2.x' 2025-01-16 10:06:31 +01:00
Stéphane Nicoll
4b0446fbef Next development version (v6.2.3-SNAPSHOT) 2025-01-16 10:06:12 +01:00
Sébastien Deleuze
94e3b54581 Fix the build 
This commit add missing compileOnly jsr305 dependencies.
 2025-01-16 08:11:49 +01:00
Johnny Lim
80a84945ef Fix depth for NullAway subsections in reference docs 
Closes gh-34267
Signed-off-by: Johnny Lim <izeye@naver.com>
 2025-01-16 07:48:11 +01:00
rstoyanchev
6873427aa7 Merge branch '6.2.x' 2025-01-15 19:04:57 +00:00
rstoyanchev
384d2749c6 Polishing in HttpServiceMethod 2025-01-15 19:03:00 +00:00
rstoyanchev
5150a9a6ad Polishing contribution 
Closes gh-34230
 2025-01-15 18:31:50 +00:00
Yanming Zhou
a8c5885aff Fix wrong document about RequestHeaderArgumentResolver 
Also test is added to verify that.

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>

See gh-34230
 2025-01-15 18:31:49 +00:00
rstoyanchev
3b1d14a64d Fix checkstyle warning 
See gh-34253
 2025-01-15 18:13:42 +00:00
rstoyanchev
75e2e2c3c7 Consistent formatting of forward for host 
Closes gh-34253
 2025-01-15 17:53:30 +00:00
Juergen Hoeller
c4fe18ca79 Fix merge result 2025-01-15 18:31:16 +01:00
Juergen Hoeller
38a41b6d01 Merge branch '6.2.x' 
# Conflicts:
#	framework-platform/framework-platform.gradle
 2025-01-15 18:29:30 +01:00
Juergen Hoeller
7d844274dc Upgrade to Jetty 12.0.16, Netty 4.1.117, Protobuf 4.29.3, Checkstyle 10.21.1 2025-01-15 18:27:49 +01:00
rstoyanchev
b8c51a2767 Additional theme removal updates 
See gh-33809
 2025-01-15 17:17:38 +00:00
Juergen Hoeller
70ceb3abdf Refer to local Consumer type instead of Kotlin test type 2025-01-15 17:41:22 +01:00
Sam Brannen
9cfece0d54 Fix compilation error in ResolvableTypeTests 2025-01-15 17:29:01 +01:00
rstoyanchev
4920086225 Remove deprecated web APIs 
See gh-33809
 2025-01-15 16:26:16 +00:00
rstoyanchev
83c020eea5 Remove deprecated HttpStatus codes 
See gh-33809
 2025-01-15 16:26:16 +00:00
rstoyanchev
9f77d5ff1f Remove deprecated ThemeResolver support 
See gh-33809
 2025-01-15 16:26:16 +00:00
rstoyanchev
9ddbf800b9 Remove deprecated APIs in spring-web 
See gh-33809
 2025-01-15 16:26:16 +00:00
Sam Brannen
00ee0ab99c Fix compilation error in ResolvableTypeTests 2025-01-15 17:20:19 +01:00
Sam Brannen
6a81de95ab Merge branch '6.2.x' 2025-01-15 17:16:51 +01:00
Sam Brannen
9181cce65f Support @⁠MockitoBean at the type level on test classes 
Prior to this commit, @⁠MockitoBean could only be declared on fields
within test classes, which prevented developers from being able to
easily reuse mock configuration across a test suite.

With this commit, @⁠MockitoBean is now supported at the type level on
test classes, their superclasses, and interfaces implemented by those
classes. @⁠MockitoBean is also supported on enclosing classes for
@⁠Nested test classes, their superclasses, and interfaces implemented
by those classes, while honoring @⁠NestedTestConfiguration semantics.

In addition, @⁠MockitoBean:

- has a new `types` attribute that can be used to declare the type or
  types to mock when @⁠MockitoBean is declared at the type level

- can be declared as a repeatable annotation at the type level

- can be declared as a meta-annotation on a custom composed annotation
  which can be reused across a test suite (see the @⁠SharedMocks
  example in the reference manual)

To support these new features, this commit also includes the following
changes.

- The `field` property in BeanOverrideHandler is now @⁠Nullable.

- BeanOverrideProcessor has a new `default` createHandlers() method
  which is invoked when a @⁠BeanOverride annotation is found at the
  type level.

- MockitoBeanOverrideProcessor implements the new createHandlers()
  method.

- The internal findHandlers() method in BeanOverrideHandler has been
  completely overhauled.

- The @⁠MockitoBean and @⁠MockitoSpyBean section of the reference
  manual has been completely overhauled.

Closes gh-33925
 2025-01-15 17:13:35 +01:00
Sam Brannen
8b6523a35b Cross reference @⁠NestedTestConfiguration for Bean Overrides 2025-01-15 17:13:35 +01:00
Stéphane Nicoll
2c749ebdb7 Merge branch '6.2.x' 2025-01-15 17:08:09 +01:00
Stéphane Nicoll
e7f349328d Merge pull request #34086 from rPraml 
* pr/34086:
  Polish "Resolve base type in parameterized type if necessary"
  Resolve base type in parameterized type if necessary

Closes gh-34086
 2025-01-15 17:07:58 +01:00
Stéphane Nicoll
fe5f5d53b2 Polish "Resolve base type in parameterized type if necessary" 
See gh-34086
 2025-01-15 17:06:05 +01:00
Roland Praml
033d277bcf Resolve base type in parameterized type if necessary 
See gh-34086
 2025-01-15 17:03:20 +01:00
Juergen Hoeller
7e71001896 Merge branch '6.2.x' 2025-01-15 15:03:38 +01:00
Juergen Hoeller
227385083d Restrict lenient nested matching to immediate type variable 
Includes fix for matching multiple wildcard bounds properly.

Closes gh-34119
Closes gh-34234
 2025-01-15 15:02:46 +01:00
Simon Baslé
caf84ffe7d Revisit HttpHeadersAssert after HttpHeaders API changes 
- add various assertions to HttpHeadersAssert
 - improve assertion test coverage
 - remove niche size assertions

Closes gh-34168

Co-authored-by: Stephane Nicoll <stephane.nicoll@broadcom.com>
 2025-01-15 11:42:59 +01:00
Stéphane Nicoll
448d6c6ebf Merge branch '6.2.x' 2025-01-15 11:22:23 +01:00
Stéphane Nicoll
d280358e98 Fix typo in HttpHeadersAssert#doesNotContainHeaders 
This commit deprecates the existing doesNotContainsHeaders in favor of a
newly introduced method that does not have the typo.

Closes gh-34263
 2025-01-15 11:19:00 +01:00
Stéphane Nicoll
05d8604012 Merge branch '6.2.x' 2025-01-14 17:36:58 +01:00
Stéphane Nicoll
e08a7ece61 Merge pull request #34223 from remeio 
* pr/34223:
  Polish contribution
  Polish HttpEntityMethodProcessor

Closes gh-34223
 2025-01-14 17:36:45 +01:00
Stéphane Nicoll
24fa9ea394 Polish contribution 
See gh-34223
 2025-01-14 17:30:39 +01:00
Mengqi Xu
4acd9ee69b Polish HttpEntityMethodProcessor 
Signed-off-by: Mengqi Xu <2663479778@qq.com>

See gh-34223
 2025-01-14 17:28:00 +01:00
Stéphane Nicoll
46327d6e9b Merge branch '6.2.x' 2025-01-14 16:41:19 +01:00
Stéphane Nicoll
cd1aefa5e0 Upgrade to Reactor 2024.0.2 
Closes gh-34252
 2025-01-14 16:36:43 +01:00
Sébastien Deleuze
19f647ab8c Set -Xjdk-release=17 for Kotlin build 
Needed due to https://youtrack.jetbrains.com/issue/KT-49746.

See gh-34220
 2025-01-14 12:35:54 +01:00
Sébastien Deleuze
c71bfc7aed Update null-safety documentation 
Closes gh-34140
 2025-01-14 12:35:53 +01:00
Sébastien Deleuze
2f59701148 Specify generic type nullness in spring-webmvc 
See gh-34140
 2025-01-14 12:35:02 +01:00
Sébastien Deleuze
69bfb64dfd Specify generic type nullness in spring-webflux 
See gh-34140
 2025-01-14 12:35:02 +01:00
Sébastien Deleuze
380c9e318c Specify generic type nullness in spring-web 
See gh-34140
 2025-01-14 12:35:02 +01:00
Sébastien Deleuze
e2216ddc32 Specify generic type nullness in spring-test 
See gh-34140
 2025-01-14 12:35:02 +01:00
Sébastien Deleuze
5be36ce8ce Specify generic type nullness in spring-r2dbc 
See gh-34140
 2025-01-14 12:35:02 +01:00
Sébastien Deleuze
2f8ff7eb41 Specify generic type nullness in spring-orm 
See gh-34140
 2025-01-14 12:35:02 +01:00
Sébastien Deleuze
8b64e2735e Specify generic type nullness in spring-messaging 
See gh-34140
 2025-01-14 12:35:02 +01:00
Sébastien Deleuze
8299a617b9 Specify generic type nullness in spring-jdbc 
See gh-34140
 2025-01-14 12:35:02 +01:00
Sébastien Deleuze
4c988146bc Specify generic type nullness in spring-expression 
See gh-34140
 2025-01-14 12:35:02 +01:00