root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity
53,405 Commits 24 Branches 353 Tags 278 MiB
Commit Graph

508 Commits

Author SHA1 Message Date
Stéphane Nicoll 11cdc63560 Merge branch '3.4.x' 
Closes gh-44408
 2025-02-22 18:56:42 +01:00
Stéphane Nicoll 2c4ea4c749 Merge branch '3.3.x' into 3.4.x 
Closes gh-44407
 2025-02-22 18:56:34 +01:00
Stéphane Nicoll 2a94ee1586 Polish contribution 
See gh-44348
 2025-02-22 18:53:51 +01:00
Bernie Schelberg b9438bef9e Consider properties on outer class in nested @DataJpaTest tests 
See gh-44348

Signed-off-by: Bernie Schelberg <bernard.schelberg@invicara.com>
 2025-02-22 18:53:39 +01:00
Andy Wilkinson 2f29a49a1d Remove APIs deprecated for removal in 3.5 
Closes gh-43788
 2025-01-14 13:59:24 +00:00
Phillip Webb a49719d73e Use consistent exception messages in Assert calls 
Update `Assert` calls to consistently use messages of the form
"'item' must [not] ...".

Closes gh-43780
 2025-01-11 21:18:47 -08:00
Johnny Lim 4d15ee5bf0 Polish 
See gh-43498
 2024-12-13 13:29:20 -08:00
Andy Wilkinson 1e8b23e300 Merge branch '3.3.x' 
Closes gh-43072
 2024-11-08 11:04:29 +00:00
Andy Wilkinson 1ae9b8ea1b Merge branch '3.2.x' into 3.3.x 
Closes gh-43071
 2024-11-08 10:55:52 +00:00
Andy Wilkinson 5d63335a5c Polish "Use constants for well-known scope names" 
See gh-43065
 2024-11-08 10:53:11 +00:00
Phillip Webb 23607ee4c4 Add nullSafeValue method that accepts a mapper Function 
Update `JsonObjectDeserializer` with a `nullSafeValue` method that
accepts a mapper `Function`

Closes gh-42972
 2024-11-01 14:08:43 -07:00
Andy Wilkinson dcc88cb512 Merge branch '3.3.x' 
Closes gh-42786
 2024-10-18 15:03:16 +01:00
Andy Wilkinson 34eade32d7 Merge branch '3.2.x' into 3.3.x 
Closes gh-42785
 2024-10-18 15:02:18 +01:00
Andy Wilkinson 1020793198 Output condition evaluation report when app under test fails to start 
Closes gh-42185
 2024-10-18 14:52:47 +01:00
Andy Wilkinson e201b94d4f Merge branch '3.3.x' 
Closes gh-41616
 2024-07-25 16:17:52 +01:00
Andy Wilkinson c642f6d268 Merge branch '3.2.x' into 3.3.x 
Closes gh-41613
 2024-07-25 16:16:35 +01:00
Andy Wilkinson 5f666eec5b Reduce warnings reported by Eclipse 
Closes gh-41598
 2024-07-25 14:55:00 +01:00
Andy Wilkinson cddf92e047 Polish "Deprecate @MockBean and @SpyBean" 
See gh-39864
 2024-07-12 13:49:11 +01:00
Stéphane Nicoll 156237227c Migrate MockMvc tests to MockMvcTester 
See gh-41198
 2024-07-03 15:09:10 +02:00
Stéphane Nicoll e5859aedaf Add auto-configuration for MockMvcTester 
This commit adds auto-configuration and documentation for MockMvcTester,
a wrapper of MockMvc that provides AssertJ integration as well as a
fluent API to build requests. The main differences compared to the
regular MockMvc are as follows:

* No need for static imports for building requests and define assertions
* No need to handle unchecked exception as they can be asserted instead
* Support for converting the response body to data types

Closes gh-41198
 2024-07-03 15:09:10 +02:00
Andy Wilkinson 5b7365b63b Merge branch '3.3.x' 
Closes gh-41258
 2024-06-27 10:25:32 +01:00
Andy Wilkinson b0d4f1d356 Merge branch '3.2.x' into 3.3.x 
Closes gh-41257
 2024-06-27 10:16:36 +01:00
Andy Wilkinson 843de3adbc Update spring-boot-test-autoconfigure to use docker-test plugin 
See gh-41228
 2024-06-26 19:46:41 +01:00
Stéphane Nicoll 17ca0421e7 Upgrade to HtmlUnit 4.2.0 and Selenium HtmlUnit 4.20 
Closes gh-41178
Closes gh-41179
 2024-06-20 20:18:23 +01:00
Phillip Webb 905d6b96d0 Merge branch '3.2.x' 
Closes gh-41166
 2024-06-19 22:30:58 -07:00
Andy Wilkinson 491f34d25c Improve container test code 
Replace `DockerImageNames` with a enum and relocate it from the
`testcontainers` to `container` package. The enum now also
becomes a common location that we can use to apply container
configuration such as timeouts.

Closes gh-41164

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
 2024-06-19 20:10:03 -07:00
Moritz Halbritter 6bb8a11295 Merge branch '3.2.x' 
Closes gh-40517
 2024-04-25 11:07:36 +02:00
Moritz Halbritter 26f1bbb634 Merge branch '3.1.x' into 3.2.x 
Closes gh-40516
 2024-04-25 11:07:25 +02:00
Moritz Halbritter 2e906c4720 Catch exceptions thrown during String format when collecting diagnostics 
Registers the LoggingLinesWriter only if debug logging is actually
enabled.

Closes gh-40500
 2024-04-25 11:06:31 +02:00
Andy Wilkinson a01e068059 Start building against Micrometer 1.13.0 snapshots 
See gh-39889
 2024-03-12 09:28:27 +00:00
Scott Frederick 720e9cef16 Make RestTemplateBuilder more compatible with RestClient.Builder 
When Spring Framework builds a `RestClient` from a `RestTemplate`, it
will use any `UriTemplateHandler` that has been set on the
`RestTemplate` if the provided `UriTemplateHandler` is also a
`UriBuilderFactory`. Prior to this commit, Spring Boot's
`RestTemplateBuilder#rootUri` set a `UriTemplateHandler` on the created
`RestTemplate`, but it was not a `UriBuilderFactory` so `RestClient`
would not consider it.

With this commit, `RestTemplateBuilder#rootUri` sets a
`UriTemplateHandler` that is also a `UriBuilderFactory` so that any
root URI that is set on the `RestTemplateBuilder` will be applied to a
`RestClient` also.

Fixes gh-39317
 2024-02-13 13:10:55 -06:00
Scott Frederick dbfd038a4d Validate combined RestTemplate and RestClient usage in mock REST config 
Fixes gh-38820
 2024-01-17 12:05:18 -06:00
Moritz Halbritter 198dbb4a45 Auto-configure observatibility beans in sliced tests 
If @AutoConfigureObservability is applied to a sliced test, it
auto-configures:

- An in-memory MeterRegistry
- A no-op Tracer
- An ObservationRegistry

Closes gh-38568
 2023-12-12 11:29:43 +01:00
Johnny Lim 175b6473c7 Polish 
See gh-38389
 2023-11-22 10:16:19 +01:00
Andy Wilkinson 0950d4416a Pass in filter's name when adding to MockMvc 
Closes gh-38001
 2023-10-24 12:39:42 +01:00
Andy Wilkinson daa903ab31 Add filters to MockMvc with their init params and dispatcher types 
Closes gh-37835
 2023-10-17 17:54:36 +01:00
Scott Frederick ff99de49c4 Configure a RestClient.Builder with RestClientTest 
This commit adds support for configuring a `RestClient.Builder` and
`MockRestServiceServer` support for the `RestClient` when using
`@RestClientTest` sliced tests.

Closes gh-37033
 2023-09-29 15:07:38 -05:00
Phillip Webb f55184a998 Update copyright year of changed files 2023-09-20 17:16:31 -07:00
Phillip Webb 2075f6c685 Merge branch '3.1.x' 2023-09-20 17:16:13 -07:00
Phillip Webb 78eb8f90d1 Merge branch '3.0.x' into 3.1.x 2023-09-20 17:12:27 -07:00
Phillip Webb 9b5062e5bb Merge branch '2.7.x' into 3.0.x 2023-09-20 17:06:55 -07:00
Phillip Webb b83e7b42bb Update copyright year of changed files 2023-09-20 16:05:44 -07:00
Moritz Halbritter bced103517 Merge branch '3.1.x' 
Closes gh-37208
 2023-09-06 14:44:21 +02:00
Moritz Halbritter 768dfb2c63 Merge branch '3.0.x' into 3.1.x 
Closes gh-37207
 2023-09-06 14:44:13 +02:00
Moritz Halbritter ffed8b0502 Merge branch '2.7.x' into 3.0.x 
Closes gh-37206
 2023-09-06 14:43:36 +02:00
Yanming Zhou 4c39cc2314 Continue polishing 
See commit 947e330e9d

See gh-37166
 2023-09-06 14:38:57 +02:00
Moritz Halbritter 8f78acd548 Merge branch '3.1.x' 2023-09-05 15:28:23 +02:00
Moritz Halbritter 1962f4ecb7 Merge branch '3.0.x' into 3.1.x 2023-09-05 15:24:25 +02:00
Moritz Halbritter a69ff3bd59 Merge branch '2.7.x' into 3.0.x 2023-09-05 15:21:51 +02:00
Moritz Halbritter 76e51bc92f Only enable needed Couchbase services in integration tests 2023-09-05 15:10:12 +02:00