root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
54,496 Commits 23 Branches 345 Tags 287 MiB
Commit Graph

852 Commits

Author SHA1 Message Date
Andy Wilkinson 93c8513a78 Merge branch '3.2.x' 
See gh-40224
 2024-04-11 16:56:41 +01:00
Andy Wilkinson 7d3ea3f06f Merge branch '3.1.x' into 3.2.x 
See gh-40212
 2024-04-11 16:56:22 +01:00
Andy Wilkinson 3b76165f4e Revert "Exclude unwanted javax.inject dependency from Data Couchbase" 
This reverts commit 06f5ab162f. The
dependency has been removed in Data Couchbase, making the exclude
unnecessary.

See gh-40200
 2024-04-11 16:55:24 +01:00
Andy Wilkinson 3699bcfb87 Merge branch '3.2.x' 
See gh-40224
 2024-04-09 09:09:12 +01:00
Andy Wilkinson 3bb7baf90f Merge branch '3.1.x' into 3.2.x 
See gh-40212
 2024-04-09 09:07:52 +01:00
Andy Wilkinson 06f5ab162f Exclude unwanted javax.inject dependency from Data Couchbase 
See gh-40200
 2024-04-09 09:07:13 +01:00
Johnny Lim 412b8dd548 Polish 
See gh-39910
 2024-03-15 11:25:16 +01:00
Andy Wilkinson a01e068059 Start building against Micrometer 1.13.0 snapshots 
See gh-39889
 2024-03-12 09:28:27 +00:00
Phillip Webb f8a1dae835 Merge branch '3.2.x' 2024-02-21 15:27:57 -08:00
Phillip Webb 12de6aa46a Merge branch '3.1.x' into 3.2.x 2024-02-21 15:27:27 -08:00
Wzy19930507 4a1a98c037 Apply @AutoConfigureJson to test slices 
See gh-39253
 2024-02-16 10:10:20 +01:00
Scott Frederick 51991d6f41 Merge branch '3.2.x' 
Closes gh-39536
 2024-02-13 13:11:50 -06: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
Moritz Halbritter 7f55cae90f Merge branch '3.2.x' 2024-02-12 10:19:46 +01:00
Moritz Halbritter 4387b79831 Merge branch '3.1.x' into 3.2.x 2024-02-12 10:18:46 +01:00
Moritz Halbritter 8ffcfc9b77 Harmonize style of igored exceptions across the codebase 2024-02-12 10:14:20 +01:00
Phillip Webb 8f1a330dd5 Update copyright header of cleaned up code 
See gh-39259
 2024-01-23 10:18:50 -08:00
Phillip Webb ddb769bf7f Polish 'Simplify conditionals' 
See gh-39259
 2024-01-23 09:47:07 -08:00
Tobias Lippert 65a1ff84e6 Simplify conditionals 
See gh-39259
 2024-01-23 09:07:40 -08:00
Tobias Lippert def7523398 Inline redundant if statements 
See gh-39259
 2024-01-23 09:07:35 -08: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
Andy Wilkinson 7087897507 Merge branch '3.1.x' into 3.2.x 
Closes gh-39091
 2024-01-11 10:33:57 +00:00
Andy Wilkinson 45c32854a5 Fix Checkstyle upgrade 
Closes gh-38746
 2024-01-10 15:37:38 +00: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
Phillip Webb 0ef87f5102 Merge branch '3.1.x' 2023-11-13 10:42:56 -08:00
Phillip Webb b902bf6aca Merge branch '3.0.x' into 3.1.x 2023-11-13 10:42:32 -08:00
Phillip Webb 09e5a2f24a Update copyright year of changed files 2023-11-13 10:42:26 -08:00
Moritz Halbritter d59b385304 Merge branch '3.1.x' 
Closes gh-38226
 2023-11-06 10:27:50 +01:00
Moritz Halbritter 3560a13d57 Merge branch '3.0.x' into 3.1.x 
Closes gh-38225
 2023-11-06 10:27:42 +01:00
Yanming Zhou d7ab153559 Use switch expression where feasible 
See gh-38217
 2023-11-06 10:27:04 +01:00
Phillip Webb 77218a644e Merge branch '3.1.x' 2023-11-02 14:16:37 -07:00
Phillip Webb afa4d274c2 Merge branch '3.0.x' into 3.1.x 2023-11-02 14:14:19 -07:00
Phillip Webb 8d53caa1c6 Merge branch '2.7.x' into 3.0.x 2023-11-02 14:13:47 -07:00
Phillip Webb 54313d1962 Update copyright year of changed files 2023-11-02 14:13:38 -07:00
Moritz Halbritter 607ed86edb Merge branch '3.0.x' into 3.1.x 2023-10-31 10:23:01 +01:00
Moritz Halbritter 1f41179a88 Polish SpringBootMockMvcBuilderCustomizer 2023-10-31 09:49:01 +01:00
Andy Wilkinson 97c2311dee Merge branch '3.1.x' 
Closes gh-38114
 2023-10-30 11:14:01 +00:00
Andy Wilkinson 3be8475089 Merge branch '3.0.x' into 3.1.x 
Closes gh-38113
 2023-10-30 11:13:43 +00:00
Andy Wilkinson aaa26c90a8 Merge branch '2.7.x' into 3.0.x 
Closes gh-38112
 2023-10-30 11:13:25 +00:00
Andy Wilkinson f78dcac56f Clarify that @AutoConfigureWebTestClient uses mock infrastructure 
Closes gh-29890
 2023-10-30 11:13:03 +00: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
Stephane Nicoll 77a85fd180 Fix deprecation in Spring Framework 2023-09-13 18:04:55 +02: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
Moritz Halbritter 947e330e9d Polish "Include JdbcClientAutoConfiguration in @JdbcTest and @DataJpaTest slices" 
See gh-37122
 2023-08-31 13:15:50 +02:00
Yanming Zhou b8eec2a8a4 Include JdbcClientAutoConfiguration in @JdbcTest and @DataJpaTest slices 
See gh-37122
 2023-08-31 13:07:10 +02:00
Andy Wilkinson f6c88662b4 Merge branch '3.1.x' 
Closes gh-37144
 2023-08-30 13:36:01 +01:00
Andy Wilkinson e6fcde4af5 Merge branch '3.0.x' into 3.1.x 
Closes gh-37143
 2023-08-30 13:35:40 +01:00
Andy Wilkinson a8e37b5cc5 Merge branch '2.7.x' into 3.0.x 
Closes gh-37142
 2023-08-30 13:34:12 +01:00
Andy Wilkinson 2de98a84bc Polish "Polish code and javadoc" 
See gh-37112
 2023-08-30 13:31:58 +01:00
hakan-krgn 6d9ce8a3b5 Polish code and javadoc 
See gh-37112
 2023-08-30 13:31:58 +01:00
Phillip Webb 8edec21a6f Update copyright year of changed files 2023-08-13 20:44:44 -07:00
Andy Wilkinson dc45532c94 Avoid triggering second context creation when first attempt failed 
Closes gh-24888
 2023-08-10 14:39:28 +01:00
Moritz Halbritter b5a48e926d Handle timeout of latch await in tests 2023-08-08 13:12:48 +02:00
Moritz Halbritter de57b5f4a4 Call remove() on ThreadLocal in SpringBootMockMvcBuilderCustomizer 2023-08-08 13:12:48 +02:00
Stephane Nicoll f5b3bc7a9f Merge branch '3.1.x' 
Closes gh-36775
 2023-08-07 16:49:18 +02:00
Stephane Nicoll 3e72b8625d Merge branch '3.0.x' into 3.1.x 
Closes gh-36774
 2023-08-07 16:48:50 +02:00
Stephane Nicoll 56535d804c Rename WebDriverContextCustomizerFactory's customizer 
Closes gh-36416
 2023-08-07 16:44:16 +02:00
Moritz Halbritter 1a8b8ce26e Revert "Revise synchronized blocks" 
This reverts commit 497bbf9c2d.
 2023-08-03 17:26:31 +02:00
Moritz Halbritter 497bbf9c2d Revise synchronized blocks 
- Replace synchronized with Lock when guarding long-running operations
- Remove unnecessary synchronization in FileSystemWatcher
- Replace HashMap with ConcurrentHashMap in Restarter
- Remove unnecessary locking on AtomicBoolean in
  SpringApplicationBuilder
- Remove unnecessary locking in SimpleFormatter

Closes gh-36670
 2023-08-03 09:23:46 +02:00
Andy Wilkinson 0646eabd4a Merge branch '3.1.x' 
Closes gh-36665
 2023-08-01 20:03:25 +01:00
Andy Wilkinson 92361b5545 Merge branch '3.0.x' into 3.1.x 
Closes gh-36664
 2023-08-01 20:03:01 +01:00
Andy Wilkinson 51b81ced6f Merge branch '2.7.x' into 3.0.x 
Closes gh-36663
 2023-08-01 20:01:20 +01:00
Andy Wilkinson 28b3054a9e Try to stabilize DataCouchbaseTestIntegrationTests 
Closes gh-36662
 2023-08-01 19:58:28 +01:00
Andy Wilkinson 806aa45279 Merge branch '3.1.x' 
Closes gh-36661
 2023-08-01 18:14:03 +01:00
Andy Wilkinson 0d646d7c26 Polish "Support ServiceConnection beans in slice tests" 
See gh-36037
 2023-08-01 18:12:53 +01:00
Eddú Meléndez 4dfb60c9a3 Support ServiceConnection beans in slice tests 
Previously, to use `@ServiceConnection` on a `@Bean` method in a sliced
test required ServiceConnectionAutoConfiguration to be imported using
`@ImportAutoConfiguration`. This commit removes the need for this
import by registering ServiceConnectionAutoConfiguration in specific
slice test annotations.

See gh-36037
 2023-08-01 18:09:57 +01:00
Johnny Lim 96c9915f12 Polish 
See gh-36565
 2023-07-26 10:00:56 +02:00
Andy Wilkinson 5a9ca67fba Start building against Spring Framework 6.2.0-M2 snapshots 
See gh-36198
 2023-07-04 10:20:33 +01:00
Scott Frederick 47cc65d912 Merge branch '3.1.x' 
Closes gh-36056
 2023-06-23 16:12:58 -06:00
Eddú Meléndez 321c526bf7 Add SslAutoConfiguration to slice test annotations 
`SslAutoConfiguration` has been added to `cassandra`, `couchbase`,
`elasticsearch`, `mongo` and `redis` slice test annotations.

See gh-36038
 2023-06-23 15:51:42 -06:00
Andy Wilkinson b645eb32ac Remove deprecated code that was to be removed in 3.2 
Closes gh-36034
 2023-06-23 18:14:22 +01:00
Andy Wilkinson 357c67a999 Merge branch '3.1.x' 2023-06-23 15:58:51 +01:00
Andy Wilkinson 3f7fe25cb9 Merge branch '3.0.x' into 3.1.x 
Closes gh-36044
 2023-06-23 15:58:36 +01:00
Andy Wilkinson 2fae5de245 Merge branch '2.7.x' into 3.0.x 
Closes gh-36043
 2023-06-23 15:50:02 +01:00
Andy Wilkinson d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking" 
See gh-35915
 2023-06-23 12:38:12 +01:00
ThomazPassarelli f9da30faf1 Replace calls to verifyComplete() to avoid indefinite blocking 
See gh-35915
 2023-06-23 12:16:26 +01:00
Moritz Halbritter 27add2bbe3 Rework @AutoConfigureObservability and tracing auto-configurations 
@ConditionalOnEnabledTracing is now applied to the minimal amount of
beans. The beans which are annotated with it are beans that will lead
to span sending to backends.

This leaves the majority of the Micrometer Tracing, Brave and
OpenTelemetry infrastructure untouched in tests.

Closes gh-35354
 2023-06-16 14:09:10 +02:00
Stephane Nicoll 9643dbeed2 Merge branch '3.0.x' 
Closes gh-35590
 2023-05-22 16:31:55 +02:00
Christoph Dreis b2b5728995 Remove unnecessary exclude from spring-restdocs-mockmvc 
See gh-35568
 2023-05-22 16:31:22 +02:00
Moritz Halbritter c00e6ebbdf Merge branch '3.0.x' 
Closes gh-35360
 2023-05-09 11:23:05 +02:00
Moritz Halbritter 1c87fcb806 Add property to disable DisableObservabilityContextCustomizer 
Closes gh-35009
 2023-05-09 11:21:53 +02:00
Scott Frederick a474e54cf3 Merge branch '3.0.x' 
Closes gh-35244
 2023-05-05 16:20:41 -05:00
Scott Frederick cf180fa1cc Merge branch '2.7.x' into 3.0.x 
Closes gh-35243
 2023-05-05 16:07:23 -05:00
Scott Frederick 5d91c24f63 Update Couchbase image tag used in tests 
Closes gh-35228
 2023-05-05 14:45:58 -05:00
Moritz Halbritter 735c43ce9b Merge branch '2.7.x' into 3.0.x 2023-05-02 14:38:48 +02:00
Moritz Halbritter 312f0c17ed Set initial ElasticSearch heap size in integration tests 2023-05-02 14:37:13 +02:00
Moritz Halbritter 944d77491b Set initial heap size for ElasticSearch integration tests 2023-05-02 14:25:35 +02:00
Moritz Halbritter 1ce88f25b4 Merge branch '3.0.x' 2023-05-02 14:08:37 +02:00
Moritz Halbritter 037cb8c5b0 Merge branch '2.7.x' into 3.0.x 2023-05-02 13:57:37 +02:00
Moritz Halbritter c1cef099d2 Limit maximum heap of ElasticSearch in tests 2023-05-02 13:40:59 +02:00
Moritz Halbritter d7a9f87b64 Disable Neo4j tests on aarch64 linux and mac 
See gh-35228
 2023-05-02 13:40:59 +02:00
Moritz Halbritter 9f109fe785 Disable Couchbase integration tests on aarch64 linux and mac 
See gh-35228
 2023-05-02 13:40:59 +02:00
Phillip Webb 81a972af8d Refactor testcontainers service connections 
Update restcontainers service connections support so that
technology specific `@ServiceConnector` annotations are not longer
required.

A single `@ServiceConnector` annotation can now be used to create
all `ConnectionDetail` beans.

Closes gh-35017
 2023-04-17 00:45:39 -07:00
Phillip Webb 11dac5b5b7 Create dedicated spring-boot-testcontainers module 
Create a dedicated testcontainers module containing the service
connectors code.

Closes gh-34757
 2023-04-17 00:42:31 -07:00
Phillip Webb 2951cc7594 Polish 2023-04-17 00:42:28 -07:00
Andy Wilkinson d4980ea993 Always define connection details beans 
Closes gh-34776
 2023-04-13 18:02:35 +01:00
Phillip Webb 463701db18 Merge branch '3.0.x' 2023-04-10 16:22:57 -07:00
Phillip Webb d442bfbeff Polish 2023-04-10 16:22:11 -07:00
Stephane Nicoll 2a52c47386 Merge branch '3.0.x' 
Closes gh-34870
 2023-04-05 16:58:03 +02:00
Stephane Nicoll ace8cff1b3 Merge branch '2.7.x' into 3.0.x 
Closes gh-34869
 2023-04-05 16:57:44 +02:00
Christoph Dreis 9107c5cae3 Avoid repeated class lookups in tests 
See gh-34613
 2023-04-05 16:40:21 +02:00
Andy Wilkinson d8d6cb7323 Improve diagnostics with @ServiceConnection on non-static field 
Closes gh-34795
 2023-03-28 10:44:17 +01:00
Andy Wilkinson 2267430bdb Find service connections declaring in enclosing classes 
Fixes gh-34790
 2023-03-28 10:24:11 +01:00
Andy Wilkinson cd17d92eac Merge branch '3.0.x' 
Closes gh-34782
 2023-03-27 18:05:26 +01:00
Andy Wilkinson d6dbf300ab Merge branch '2.7.x' into 3.0.x 
Closes gh-34781
 2023-03-27 18:05:03 +01:00
Andy Wilkinson 5669ea69d0 Consider properties on outer class in nested sliced tests 
Prior to this commit, properties configured using the properties
attribute of a `@…Test` sliced test annotation would not be considered
when processed a `@Nested` test class. This would lead to the nested
class not reusing its outer class's application context due to the
two having different property configuration.

Fixes gh-33317
 2023-03-27 17:58:51 +01:00
Andy Wilkinson 95f45eab1f Create service connections from Testcontainers-managed containers 
Building upon the auto-configuration support for service connections,
this commit adds support for deriving connection details from a
Testcontainers-managed container. Several service-specific
annotations have been introduced. These annotations can be used on a
container field to indicate that it is a source of the details for
a service connection.

See gh-34658

Co-Authored-By: Phillip Webb <pwebb@vmware.com>
Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
 2023-03-24 10:04:21 +00:00
Phillip Webb 0b15962aca Merge branch '2.7.x' into 3.0.x 2023-02-22 18:36:16 -08:00
Phillip Webb 58e7cae20f Merge branch '2.7.x' into 3.0.x 2023-02-22 13:36:01 -08:00
Phillip Webb 737ef61456 Enable and fix GraphQlTestIntegrationTests 2023-02-22 13:34:40 -08:00
Phillip Webb e04c09ceae Merge branch '2.7.x' into 3.0.x 2023-02-22 00:50:18 -08:00
Phillip Webb 891ce3bd1b Disable recently renamed tests 2023-02-22 00:49:23 -08:00
Phillip Webb 01e8c42c16 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:55:34 -08:00
Phillip Webb 3651ba348d Fix checkstyle test violations 2023-02-21 23:49:56 -08:00
Phillip Webb c4de86c244 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:17:57 -08:00
Phillip Webb df5898a146 Reformat code following spring-javaformat upgrade 2023-02-21 22:53:27 -08:00
Johnny Lim bc7fc90550 Replace Base64Utils with JDK's Base64 
See gh-33967
 2023-01-31 10:20:06 +01:00
Phillip Webb 71efc55bf9 Merge branch '2.7.x' 2023-01-18 16:31:53 -08:00
Phillip Webb 7c508fa324 Update copyright year of changed files 2023-01-18 15:37:58 -08:00
Moritz Halbritter 94f4a4396c Merge branch '2.7.x' 
Closes gh-33880
 2023-01-18 17:35:52 +01:00
Moritz Halbritter e8d809fe65 Replace 'via' with 'over' or 'through' in the documentation 
Closes gh-33878
 2023-01-18 16:56:42 +01:00
Phillip Webb a2ac38e203 Update copyright year of changed files 2023-01-09 15:46:07 -08:00
Krzysztof Krason cf6493f65c Simplify AssertJ assertions and also make them more readable 
See gh-33653
 2023-01-09 11:10:20 +01:00
Phillip Webb f588793445 Update copyright year of changed files 2022-12-22 01:00:42 -08:00
Phillip Webb 532fed3147 Increase couchbase connection timeout for tests 2022-12-22 00:49:04 -08:00
Moritz Halbritter 08659baeba Polish away public modifier on tests 2022-12-16 16:08:44 +01:00
Moritz Halbritter 725337f976 Make fields final 
Closes gh-33537
 2022-12-16 14:28:44 +01:00
Brian Clozel 928df41f61 Start building against Reactor 2022.0.1 SNAPSHOTs 
See gh-33475
 2022-12-07 14:45:42 +01:00
Brian Clozel ce33ec19cd Start building against Spring GraphQL 1.1.1-SNAPSHOT 
See gh-33477
 2022-12-07 14:43:04 +01:00
Moritz Halbritter fad610ef72 Add factory for NoopTracer instead of using instance supplier 
Closes gh-33298
 2022-11-22 14:02:57 +01:00
Johnny Lim 6027508cf7 Polish 
See gh-33108
 2022-11-16 10:00:36 +01:00
Andy Wilkinson d34ccb3880 Avoid duplicate test database replacement in native tests 
Closes gh-33100
 2022-11-10 19:25:36 +00:00
Andy Wilkinson fcbc7dacf1 Add reflection hints for JsonTesters 
Closes gh-32858
 2022-11-09 15:15:29 +00:00
Andy Wilkinson b357239861 Upgrade to Jakarta Activation 2.1.0 
Closes gh-33045
 2022-11-08 11:01:17 +00:00
Moritz Halbritter 85fd475821 Add noop tracer bean if tracing is disabled 
The new functionality doesn't expose any public API
and works the same as WebTestClientContextCustomizer
does.

Closes gh-32907
 2022-11-02 15:45:39 +01:00