Commit Graph

535 Commits

Author SHA1 Message Date
Phillip Webb
106d30a1a6 Merge branch 'main' into 4.0.x 2025-05-20 17:21:08 -07:00
Phillip Webb
31c864b769 Merge branch '3.4.x' 2025-05-20 17:20:47 -07:00
Phillip Webb
9ae9146661 Merge branch '3.3.x' into 3.4.x 2025-05-20 17:20:34 -07:00
Phillip Webb
2b2228eba5 Update copyright year of changed files 2025-05-20 17:20:07 -07:00
Stéphane Nicoll
00e4ca2201 Merge branch 'main' into 4.0.x 2025-05-18 09:28:49 +02:00
Stéphane Nicoll
921b9fd6ac Merge branch '3.4.x'
Closes gh-45595
2025-05-18 09:28:38 +02:00
Stéphane Nicoll
fab15af876 Merge branch '3.3.x' into 3.4.x
Closes gh-45594
2025-05-18 09:26:57 +02:00
Johnny Lim
0a54804a0f Polish
See gh-45592

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-05-18 09:20:33 +02:00
Phillip Webb
7b08c07e7e Replace ClientHttpRequestFactorySettings.Redirects with HttpRedirects
Closes gh-45505
2025-05-12 21:58:00 -07:00
Stéphane Nicoll
a0944b00d0 Migrate to updated native hints API and new reachability JSON
Replace hint API calls with updated version and fix tests that
relied on previous JSON files.

See gh-45487

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2025-05-09 17:38:12 -07:00
Stéphane Nicoll
5ea0674bad Migrate to new HttpHeaders API
See gh-45487

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2025-05-09 17:38:12 -07:00
Phillip Webb
12dbe801e9 Align TestRestTemplate redirect defaults
Align redirect settings of `TestRestTemplate` with other blocking
clients and deprecate `HttpClientOption.ENABLE_REDIRECTS`. A new
`withRedirects` convenience method has also been added to quickly
allow the setting to be changed.

Closes gh-43431
2025-04-17 14:28:39 -07:00
Phillip Webb
7817797970 Drop custom CustomHttpComponentsClientHttpRequestFactory
Replace `CustomHttpComponentsClientHttpRequestFactory` with
`HttpComponentsClientHttpRequestFactoryBuilder` to reduce the amount
of duplicated logic.

Closes gh-43422
2025-04-17 14:28:39 -07:00
Phillip Webb
bc91c35644 Merge branch '3.4.x'
Closes gh-44993
2025-04-03 18:05:13 -07:00
Phillip Webb
c96835bc9d Merge branch '3.3.x' into 3.4.x
Closes gh-44992
2025-04-03 18:02:57 -07:00
Stéphane Nicoll
39bc496a8e Merge branch '3.4.x' 2025-03-04 12:21:51 +01:00
Stéphane Nicoll
d49617063a Adapt to change in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/34513

See gh-44481
2025-03-04 12:18:01 +01:00
Stéphane Nicoll
77d8b8e2b0 Merge branch '3.4.x'
Closes gh-44482
2025-02-28 11:10:39 +01:00
Stéphane Nicoll
d03847c2c7 Merge branch '3.3.x' into 3.4.x
Closes gh-44481
2025-02-28 11:10:31 +01:00
Stéphane Nicoll
e1f45c50ee Generate reflection hints for main methods
This commit makes sure to register the necessary hints to invoke the
main method of any bean available in the context. This is necessary
for tests that use the UseMainMethod feature.

This generates more hints than strictly necessary as there isn't a
way to contribute hints based on a ContextLoader, see
https://github.com/spring-projects/spring-framework/issues/34513 for
more details.

Closes gh-44461
2025-02-28 11:08:23 +01:00
Phillip Webb
3ff6e0b5a9 Merge branch '3.4.x' 2025-01-24 19:24:42 -08:00
Andy Wilkinson
1e43b0003f Merge branch '3.4.x'
Closes gh-43951
2025-01-24 08:54:50 +00:00
Andy Wilkinson
c7b54dcbb3 Merge branch '3.3.x' into 3.4.x
Closes gh-43950
2025-01-24 08:53:03 +00:00
sijun-yang
0be0bed88c Tighten rules around profile naming
Profiles are only allowed to use dashes, underscores, digits or letters.

See gh-43176
2025-01-15 09:54:47 +01: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
Phillip Webb
e72546d2a6 Add customizer variant of requestFactorySettings
Add `requestFactorySettings` that accepts a `UnaryOperator` so that
the existing `requestFactorySettings` can be customized rather than
replaced.

Closes gh-43258
2024-12-10 14:54:33 -08:00
Phillip Webb
8ca8ab14f6 Add withRequestFactorySettings method and restore previous defaults
Update `TestRestTemplate` with a `withRequestFactorySettings` method
that can be used to change defaults such as `Redirects`.

This commit also restores the previous redirect defaults for HTTP
components where redirects would only be followed when the
`HttpClientOption.ENABLE_REDIRECTS` was specified.

Closes gh-43258
2024-12-05 18:01:09 -08:00
Phillip Webb
8b83afdb68 Polish 'Add redirects(...) method to RestTemplateBuilder'
Remove deprecations and new methods in `TestRestTemplate` in favor of
passing in a configured `RestTemplateBuilder`.

See gh-43258
2024-12-04 15:12:59 -08:00
Yanming Zhou
f450b28a7c Add redirects(...) method to RestTemplateBuilder
Add `redirects(...)` method to `RestTemplateBuilder` to allow redirect
customization. This new method is required in 3.4 since the default
redirect strategy for some clients has changed and users need a way
to restore the old behavior.

See gh-43258
2024-12-04 15:09:33 -08:00
Phillip Webb
916efb632c Merge branch '3.3.x' 2024-12-04 15:04:22 -08:00
Phillip Webb
9e7972a9b4 Polish code with code cleanup rules 2024-12-04 15:03:40 -08:00
Andy Wilkinson
32433e84f3 Merge branch '3.3.x'
Closes gh-43270
2024-11-22 15:46:38 +00:00
Andy Wilkinson
bb3651b7d1 Reduce warnings reported by Eclipse
Closes gh-43269
2024-11-22 15:39:35 +00:00
Phillip Webb
26c775eff8 Register AutoConfigurations using fully qualified class name
Update `AbstractApplicationContextRunner` and `Configurations` to
allow registration of beans with a specific generated bean name. By
default, no name is generated, however, `AutoConfigurations` has been
updated to use bean names using the fully qualified class name.

The update brings `ApplicationContextRunners` closer the behavior of
a standard Spring Boot application where user `@Configuration` classes
are usually registered with a simple name and auto-configurations are
imported (via an `ImportSelector`) using a fully qualified name.

Fixes gh-17963

Co-authored-by: Stéphane Nicoll <stephane.nicoll@broadcom.com>
Co-authored-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
Co-authored-by: Dmytro Nosan <dimanosan@gmail.com>
2024-11-18 21:37:42 -08:00
Andy Wilkinson
362593019d Merge branch '3.3.x'
Closes gh-43053
2024-11-06 14:23:15 +00:00
Andy Wilkinson
4900ca1ffc Fix resetting of spied FactoryBean output
Fixes gh-31204
2024-11-06 13:27:09 +00:00
Stéphane Nicoll
606709ab8b Use Spring Framework's MockResolver implementation
Closes gh-42957
2024-11-05 11:59:01 +09:00
Phillip Webb
0305d1e9d5 Adapt to upstream Spring Framework @MockitoBean changes 2024-10-23 11:11:55 -07:00
Andy Wilkinson
25082d33e7 Provide more control over access to endpoint operations
This commit reworks the support for enabling and disabling endpoints,
replacing the on/off support that it provided with a finer-grained
access model that supports only allowing read-only access to endpoint
operations in addition to disabling an endpoint (access of none) and
fully enabling it (access of unrestricted).

The following properties are deprecated:

- management.endpoints.enabled-by-default
- management.endpoint.<id>.enabled

Their replacements are:

- management.endpoints.access.default
- management.endpoint.<id>.access

Similarly, the enableByDefault attribute on @Endpoint has been
deprecated with a new defaultAccess attribute replacing it.

Additionally, a new property has been introduced that allows an
operator to control the level of access to Actuator endpoints
that is permitted:

- management.endpoints.access.max-permitted

This property caps any access that may has been configured for
an endpoint. For example, if
management.endpoints.access.max-permitted is set to read-only and
management.endpoint.loggers.access is set to unrestricted, only
read-only access to the loggers endpoint will be allowed.

Closes gh-39046
2024-10-17 13:56:44 +01:00
Andy Wilkinson
1b6b9efcb2 Reinstate init of Mockito mocks in test execution listener
Closes gh-42708
2024-10-16 10:22:31 +01:00
Stéphane Nicoll
2728344ccb Disable test temporarily
See https://github.com/spring-projects/spring-framework/issues/33690
2024-10-14 14:38:17 +02:00
Andy Wilkinson
31fada6d3e Start building against Spring Framework 6.2.0 snapshots
See gh-42562
2024-10-09 19:13:04 +01:00
Phillip Webb
f5b6514bef Allow additional context interfaces to be defined for testing
Update `AssertableApplicationContext` and `ApplicationContextRunner`
implementations to support additional `ApplicationContext` interfaces.

Closes gh-42369
2024-09-18 23:47:13 -07:00
Moritz Halbritter
46150bae89 Merge branch '3.3.x'
Closes gh-41858
2024-08-14 17:20:59 +02:00
Moritz Halbritter
f4b4f4f0bf Make PID and application version available in the environment
Adds the following new properties:

- spring.application.pid
- spring.application.version

Refactors the ResourceBanner and the structured logging support to use
the new properties.

Closes gh-41604
2024-08-01 15:03:41 +02:00
Phillip Webb
000600c68a Merge branch '3.3.x' 2024-07-22 18:41:53 +01:00
Andy Wilkinson
cddf92e047 Polish "Deprecate @MockBean and @SpyBean"
See gh-39864
2024-07-12 13:49:11 +01:00
Jakob Wanger
24763940a0 Deprecate @MockBean and @SpyBean
- Deprecate Deprecate @MockBean and @SpyBean in favor of Spring
  Framework 6.2's @MockitoBean and @MockitoSpy
- Migrate usages of @MockBean and @SpyBean to @MockitoBean and
  @MockitoSpy

Signed-off-by: Jakob Wanger <jakobwanger@gmail.com>

See gh-39864
2024-07-12 12:18:01 +01:00
Stéphane Nicoll
156237227c Migrate MockMvc tests to MockMvcTester
See gh-41198
2024-07-03 15:09:10 +02:00
Phillip Webb
d411d4347f Merge branch '3.3.x'
Closes gh-41222
2024-06-24 12:24:40 -07:00