Juergen Hoeller
5c68f3f4ef
Reject @Bean method with method-level @Autowired declaration
...
Closes gh-33051
2024-06-17 21:08:21 +02:00
Juergen Hoeller
a58e27eded
Use CollectionFactory#newLinkedHashSet for method arguments
...
See gh-32291
2024-06-17 18:50:31 +02:00
Juergen Hoeller
6d5c312027
Merge branch '6.1.x'
2024-06-17 18:44:50 +02:00
Juergen Hoeller
9a56a8877f
Polishing
2024-06-17 18:42:37 +02:00
Juergen Hoeller
e79a9a5bff
Correct and consistent event class names in constructor javadoc
...
Closes gh-33032
2024-06-17 18:42:30 +02:00
Juergen Hoeller
2c3c3831c1
Consistently ignore bridge method on generated subclass for visibility purposes
...
Closes gh-33030
2024-06-17 18:42:20 +02:00
Stéphane Nicoll
1582f5f7d1
Handle URI as candidate for a merge from a parent builder
...
Closes gh-33057
2024-06-17 17:06:10 +02:00
Stéphane Nicoll
b8790077b9
Polish
2024-06-17 16:47:37 +02:00
Arjen Poutsma
b65b3350be
Merge branch '6.1.x'
2024-06-17 14:20:05 +02:00
Arjen Poutsma
c38e9896c7
Remove use of ServletException in ModelFactory
...
This commit changes the use of HttpSessionRequiredException in
ModelFactory::initModel to an IllegalStateException, because the former
extends ServletException and cannot be used in WebFlux.
Closes gh-33043
2024-06-17 14:19:19 +02:00
Stéphane Nicoll
e4c881be73
Merge branch '6.1.x'
2024-06-17 13:43:23 +02:00
Stéphane Nicoll
3e0849a566
Fix typo
...
Closes gh-33050
2024-06-17 13:39:18 +02:00
Brian Clozel
7658a8064d
Merge branch '6.1.x'
...
Closes gh-33049
2024-06-17 12:55:31 +02:00
github-actions[bot]
f3a605b92c
Update Antora Spring UI to v0.4.16
2024-06-17 10:06:47 +00:00
Stéphane Nicoll
5edb4cb2c9
Merge branch '6.1.x'
2024-06-16 16:51:15 +02:00
Stéphane Nicoll
6fdff201e9
Fix property name in Container Extension Points section
...
Closes gh-33037
2024-06-16 16:47:36 +02:00
Stéphane Nicoll
e9d5d68628
Merge branch '6.1.x'
2024-06-16 09:59:21 +02:00
Stéphane Nicoll
c42778a05b
Merge pull request #33036 from tafjwr
...
* pr/33036:
Polish "Fix typo in comment"
Fix typo in comment
Closes gh-33036
2024-06-16 09:59:15 +02:00
Stéphane Nicoll
f140df881d
Polish "Fix typo in comment"
...
See gh-33036
2024-06-16 09:57:24 +02:00
tafjwr
12cf654c98
Fix typo in comment
...
See gh-33036
2024-06-16 09:56:58 +02:00
Juergen Hoeller
4b58626fa4
Merge branch '6.1.x'
2024-06-14 22:09:31 +02:00
Juergen Hoeller
089e4e69f1
Do not attempt to load pre-enhanced class for reloadable classes
...
Closes gh-33024
2024-06-14 22:07:46 +02:00
Stéphane Nicoll
9db24d23ae
Merge branch '6.1.x'
2024-06-14 19:56:08 +02:00
Stéphane Nicoll
77755ff2fa
Remove repo-specific code of conduct
...
This will allow us to inherit the org's CoC instead.
Closes gh-33031
2024-06-14 18:58:49 +02:00
Stéphane Nicoll
4fac6a91c7
Merge branch '6.1.x'
2024-06-13 14:10:53 +02:00
Stéphane Nicoll
d0aa7ad524
Fix invalid character in Javadoc of BeanFactory
2024-06-13 14:06:19 +02:00
Spring Builds
072fc80cdb
Next development version (v6.1.10-SNAPSHOT)
2024-06-13 10:27:57 +00:00
Arjen Poutsma
df01b013fa
Merge branch '6.1.x'
2024-06-13 11:11:13 +02:00
Arjen Poutsma
6f32ff489a
Use null stream in ReactorNettyClientResponse if no body is available
...
Closes gh-32805
2024-06-13 11:10:50 +02:00
Stéphane Nicoll
69c44dee99
Add support for conversion of the whole JSON document
...
Closes gh-33018
2024-06-13 00:12:33 +02:00
Johnny Lim
f3d390a95f
Fix package description for org.springframework.validation.annotation
...
See gh-32532
2024-06-12 17:45:32 +02:00
Juergen Hoeller
b196167f19
Merge branch '6.1.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
2024-06-12 14:28:53 +02:00
Juergen Hoeller
24c8dfea1f
Remove duplicated javadoc paragraph
2024-06-12 14:23:26 +02:00
Juergen Hoeller
cdfe5816c8
Upgrade to Netty 4.1.111 and Awaitility 4.2.1
2024-06-12 14:23:14 +02:00
Juergen Hoeller
8b8604db73
Align after merge from 6.1.x
2024-06-12 13:34:53 +02:00
Juergen Hoeller
4bb755e2d2
Merge branch '6.1.x'
2024-06-12 13:31:38 +02:00
Juergen Hoeller
0ff200b2f1
Trigger cancellation on context close for non-managed objects only
...
Specifically for prototype/scoped beans and FactoryBean-exposed objects.
Closes gh-33009
2024-06-12 13:31:00 +02:00
Juergen Hoeller
7a7f34f4ad
Defensive access to volatile ScheduledFuture field
...
Includes defensive test arrangement for isInThePast() with at least 1 ms having passed.
See gh-24560
2024-06-12 13:01:58 +02:00
Arjen Poutsma
099d016857
Handle trailing semicolon in Accept-Language
...
Closes gh-32259
2024-06-12 12:28:26 +02:00
Stéphane Nicoll
1d0af7e5d3
Move TestBeanFactory to example package
2024-06-12 11:05:22 +02:00
Stéphane Nicoll
3f2d9c372d
Migrate "Failing" test cases to regular tests
...
This commit replaces the use of EngineTestKit to test scenarios where
bean override could not process the test class. There is no need to
run an actual test for this as:
1. Regular integration tests are already validating that adding the
annotation triggers the processing as part of executing the test.
2. The entry point is a ContextCustomizer that can easily be invoked
in a regular test.
As part of harmonizing this, AbstractTestBeanIntegrationTestCase can
be nested, and BeanOverrideTestSuite serve no purpose. The tests can
be executed in an IDE without any special setup.
2024-06-12 11:03:14 +02:00
Stéphane Nicoll
1318f65223
Harmonize test class names
...
This commit harmonizes the class names of the bean override support by
using a consistent prefix for integration test, inspire from the one
that was used in Spring Boot
2024-06-12 08:54:24 +02:00
Stéphane Nicoll
2d48371c6d
Revert polish on Bean Override support
...
This commit revers the removal of the `private` keyword in the examples
of the reference documentation and the tests for consistency. While the
default visibility makes the example more concise, it could imply to the
reader that the field (or the factory method) cannot be private.
Also, there is no need to multiply anything returned from `Objects.hash`
as its very distinct on its own already.
2024-06-12 08:11:18 +02:00
Brian Clozel
dc2c8d6094
Add execution metadata to tasks and scheduled tasks
...
This commit adds new information about the execution and scheduling of
tasks.
The `Task` type now exposes the `TaskExecutionOutcome` of the latest
execution; this includes the instant the execution started, the
execution outcome and any thrown exception.
The `ScheduledTask` contract can now provide the time when the next
execution is scheduled.
Closes gh-24560
2024-06-11 19:34:41 +02:00
Sam Brannen
46dccd8f97
Polishing
2024-06-11 16:39:24 +02:00
Sam Brannen
a4912dd5b1
Remove obsolete field
...
See gh-32992
2024-06-11 16:35:13 +02:00
Sam Brannen
f35c39fe1e
Clean up warnings in Gradle build
2024-06-11 16:32:14 +02:00
Sam Brannen
f481a4b60b
Polish reference documentation
2024-06-11 16:31:56 +02:00
Arjen Poutsma
60b5bbe334
Introduce request attributes in RestClient
...
This commit introduces request attributes in the RestClient and
underlying infrastructure (i.e. HttpRequest).
Closes gh-32027
2024-06-11 15:51:29 +02:00
Stéphane Nicoll
c36e270481
Upgrade to Reactor 2024.0.0-M3
...
Closes gh-33006
2024-06-11 14:47:40 +02:00
