Sam Brannen
8f56b4a8ae
Fix logic error hidden by auto-boxing
2024-03-18 18:19:34 +01:00
Sam Brannen
2ca10e20ca
Simplify implementation of BeanOverrideParser
...
See gh-29917
2024-03-18 18:13:36 +01:00
Sam Brannen
0ef5a4090b
Support non-public BeanOverrideProcessors in the TestContext framework
...
Closes gh-32485
2024-03-18 18:02:51 +01:00
Juergen Hoeller
6df27644eb
Merge branch '6.1.x'
2024-03-18 16:04:26 +01:00
Juergen Hoeller
cd7ba1835c
Propagate JMS IllegalStateException from commit/rollbackIfNecessary
...
Closes gh-32473
2024-03-18 16:03:13 +01:00
Juergen Hoeller
5dc6a16c0b
Nullability refinements
...
See gh-32475
2024-03-18 16:03:00 +01:00
Juergen Hoeller
2f2c4188e5
Nullability refinements
...
See gh-32475
2024-03-18 15:49:20 +01:00
Sam Brannen
ccebaa6b0c
Merge branch '6.1.x'
2024-03-18 15:18:06 +01:00
Sam Brannen
42a4f28962
Avoid unnecessary Annotation array cloning in TypeDescriptor
...
Closes gh-32476
2024-03-18 15:17:04 +01:00
Brian Clozel
ae5cff1705
Merge branch '6.1.x'
2024-03-18 14:37:21 +01:00
Brian Clozel
521d4f24d0
Remove flaky test in JMS observation
...
There is no way to consistently test this use case because listener
container implementations have different behavior for unhandled errors
and might retry or close the container altogether.
See gh-32458
2024-03-18 14:35:42 +01:00
Stéphane Nicoll
3e102e5d8e
Merge branch '6.1.x'
2024-03-18 14:11:02 +01:00
Stéphane Nicoll
039cbb3466
Merge pull request #32474 from izeye
...
* pr/32474:
Add Javadoc since to AbstractClientHttpRequestFactoryWrapper.getDelegate()
Closes gh-32474
2024-03-18 14:10:58 +01:00
Johnny Lim
d50c94fca9
Add Javadoc since to AbstractClientHttpRequestFactoryWrapper.getDelegate()
...
See gh-32474
2024-03-18 14:08:59 +01:00
Brian Clozel
9cd4d32195
Merge branch '6.1.x'
2024-03-18 12:18:29 +01:00
Brian Clozel
c1424acb94
Fix flaky test in JMS observability
...
See gh-32458
2024-03-18 12:17:57 +01:00
Stéphane Nicoll
73a1c2d509
Polish
2024-03-18 08:59:22 +01:00
Juergen Hoeller
2b56ca08d4
Restore canonical name representation for 6.2
...
See gh-32405
2024-03-17 21:03:02 +01:00
Juergen Hoeller
b89cf2b16a
Merge branch '6.1.x'
2024-03-17 21:00:00 +01:00
Juergen Hoeller
36d1bc57d7
Upgrade to Checkstyle 10.14.2
2024-03-17 20:54:54 +01:00
Juergen Hoeller
b1c3b6e34b
Restore original toString representation (revert accidental backport)
...
See gh-32405
2024-03-17 20:42:29 +01:00
Johnny Lim
99e1b0d117
Make SimpleAliasRegistry.aliasNames final
2024-03-17 13:33:31 +01:00
Juergen Hoeller
89d563097f
Merge branch '6.1.x'
...
# Conflicts:
# spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
2024-03-16 23:24:51 +01:00
Juergen Hoeller
eb8b7c4331
Remove superfluous @NonNull declarations
2024-03-16 14:22:17 +01:00
Juergen Hoeller
58bd057a24
Avoid cloning empty Annotation array in TypeDescriptor (backport)
...
Closes gh-32405
2024-03-16 14:21:34 +01:00
Brian Clozel
10e8039de8
Merge branch '6.1.x'
2024-03-15 22:48:12 +01:00
Brian Clozel
a78704af24
Record unhanlded JMS exceptions as observation errors
...
Prior to this commit, when using the `DefaultMessageListenerContainer`
as a backing listener container for JMS messages, the instrumentation
would not record JMS exceptions as observation errors when they were not
handled by configured `ErrorHandler`.
This commit ensures that this is the case.
Fixes gh-32458
2024-03-15 22:45:36 +01:00
Juergen Hoeller
2086cda296
Merge branch '6.1.x'
2024-03-15 21:30:55 +01:00
Juergen Hoeller
d2000efbd8
Polishing
2024-03-15 21:17:01 +01:00
Juergen Hoeller
c23fd784a0
Consistently apply TaskDecorator to ManagedExecutorService as well
...
Closes gh-32455
2024-03-15 21:16:37 +01:00
Juergen Hoeller
66235fa8c8
Consistent TaskDecorator and ErrorHandler support in schedulers
...
Closes gh-23755
Closes gh-32460
2024-03-15 21:07:59 +01:00
Sam Brannen
cf31d088e2
Polish AssertJ support for MockMvc
...
See gh-21178
2024-03-15 17:15:32 +01:00
Stéphane Nicoll
4a74e1fc2d
Add AssertJ support for MockMvc
...
Closes gh-21178
2024-03-15 13:32:49 +01:00
Stéphane Nicoll
e7d7cb8641
Add AssertJ support for MockMvc
...
This commit adds a new way to use MockMvc by returning a MvcResult that
is AssertJ compatible. Compared to the existing MockMvc infrastructure,
this new model has the following advantages:
* Can be created from a MockMvc instance
* Dedicated builder methods for easier setup
* Assertions use familiar AssertJ syntax with discoverable assertions
through a DSL
* Improved exception message
See gh-21178
Co-authored-by: Brian Clozel <brian.clozel@broadcom.com >
2024-03-15 13:30:32 +01:00
Stéphane Nicoll
555d4a6004
Add AssertJ support for cookies
...
This commit adds AssertJ compatible assertions for cookies
See gh-21178
Co-authored-by: Brian Clozel <brian.clozel@broadcom.com >
2024-03-15 13:28:12 +01:00
Stéphane Nicoll
1cdbcc58f3
Add AssertJ support for the Model
...
This commit adds AssertJ compatible assertions for the Model that is
generated from an HTTP request.
See gh-21178
2024-03-15 13:28:12 +01:00
Stéphane Nicoll
b46e528922
Add AssertJ support for the HTTP handler
...
This commit adds AssertJ compatible assertions for the component that
produces the result from the request.
See gh-21178
2024-03-15 13:28:12 +01:00
Stéphane Nicoll
e97ae434fb
Add AssertJ support for HTTP requests and responses
...
This commit adds AssertJ compatible assertions for HTTP request and
responses, including headers, media type, and response body. The latter
delegate to the recently included JSON assert support.
See gh-21178
2024-03-15 13:28:11 +01:00
Stéphane Nicoll
76f45c4289
Add support for JSON assertions using JSON path
...
This commit moves JSON path AssertJ support from Spring Boot.
See gh-21178
Co-authored-by: Brian Clozel <brian.clozel@broadcom.com >
2024-03-15 13:28:11 +01:00
Stéphane Nicoll
97ebc43ea9
Add support for JSON assertions using JSON compare
...
This commit moves JSON content AssertJ support from Spring Boot.
See gh-21178
Co-authored-by: Brian Clozel <brian.clozel@broadcom.com >
2024-03-15 13:28:11 +01:00
Stéphane Nicoll
214a54dd6f
Run CI on main only once a day
2024-03-15 08:40:09 +01:00
Stéphane Nicoll
875037c431
Merge branch '6.1.x'
2024-03-15 08:28:24 +01:00
Stéphane Nicoll
68a3993897
Merge pull request #32446 from LinorDolev
...
* pr/32446:
Polish "Fix default strategy description of ProblemDetail error codes"
Fix default strategy description of ProblemDetail error codes
Closes gh-32446
2024-03-15 08:28:19 +01:00
Stéphane Nicoll
dfc1b839f3
Polish "Fix default strategy description of ProblemDetail error codes"
...
See gh-32446
2024-03-15 08:27:59 +01:00
Linor Dolev
302c24aaa8
Fix default strategy description of ProblemDetail error codes
...
See gh-32446
2024-03-15 08:02:20 +01:00
Stéphane Nicoll
35e8ae2a84
Merge branch '6.1.x'
2024-03-14 17:47:51 +01:00
Stéphane Nicoll
7357812b4e
Polish "Only include production branches for docs deployment"
...
See gh-32434
2024-03-14 17:47:12 +01:00
Stéphane Nicoll
26cab0616e
Merge branch '6.1.x'
2024-03-14 17:43:32 +01:00
Stéphane Nicoll
30087e1aea
Only include production branches for docs deployment
...
Closes gh-32434
2024-03-14 17:42:02 +01:00
Sam Brannen
e1b1435a00
Stop referring to JDK 1.5 plus polishing
2024-03-14 16:00:51 +01:00
