Commit Graph
1293 Commits
Author SHA1 Message Date
HongJongMin 88ab24ff99 Enable nullability checking of spring-boot-batch-data-mongodb's tests
Signed-off-by: HongJongMin <gwa7417@gmail.com>

See gh-51780
2026-09-16 11:14:11 +01:00
Andy Wilkinson 6fe126afed Merge branch '4.0.x' into 4.1.x 2026-09-16 09:09:12 +01:00
Andy Wilkinson d9abd902f5 Revert "Merge pull request #51549 from aashikantkumar"
This reverts commit ad8f14e785, reversing
changes made to 1d79f56ad7.

See gh-51549
2026-09-16 09:08:23 +01:00
Hyun Lee fa8ecccc37 Apply cookie handling to reactive HttpComponents connector
The spring.http.clients.cookie-handling property and
HttpClientSettings.cookieHandling() were honored by every imperative
ClientHttpRequestFactoryBuilder and by the Jetty, JDK and Reactor
ClientHttpConnectorBuilders, but HttpComponentsHttpAsyncClientBuilder
ignored the setting. As a result, a WebClient backed by Apache
HttpComponents kept storing cookies even when cookie handling was
disabled.

Map the setting to the default request config's cookie spec, as
HttpComponentsHttpClientBuilder already does, and document the property
alongside the other global HTTP client settings.

See gh-51724

Signed-off-by: Hyun Lee <dlwhdugs4147@gmail.com>
2026-09-15 13:22:25 +01:00
Andy Wilkinson 7612f4a222 Merge branch '4.0.x' into 4.1.x
Closes gh-51763
2026-09-15 13:03:03 +01:00
Hyunwoo Jung ed63da9f5d Fix duplicated tests
Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>

See gh-51722
2026-09-15 12:48:22 +01:00
Stéphane Nicoll cd6efbd910 Merge branch '4.0.x' into 4.1.x
Closes gh-51730
2026-09-14 11:42:14 +02:00
Stéphane Nicoll 5c799bc0cf Polish "Fix detection of reactive web environments in DevTools"
See gh-51708
2026-09-14 11:34:05 +02:00
ohchanKyu f5b563934a Fix detection of reactive web environments in DevTools
DevToolsPropertyDefaultsPostProcessor looked for
ConfigurableReactiveWebEnvironment
in org.springframework.boot.web.reactive.context by name, but the class
moved to org.springframework.boot.web.context.reactive in 4.0. As a
result, reactive web applications were never identified as web
applications and the hint about setting logging.level.web to DEBUG was
not logged for them.

ConfigurableReactiveWebEnvironment is part of spring-boot, so it is now
referenced directly rather than by name. The servlet environment check
is unchanged as spring-web is an optional dependency.

See gh-51708

Signed-off-by: ohchanKyu <okc0202@naver.com>
2026-09-14 11:09:40 +02:00
Stéphane Nicoll 8b6a7863a9 Merge branch '4.0.x' into 4.1.x
Closes gh-51728
2026-09-14 10:58:39 +02:00
ohchanKyu 911c4a4326 Fix documented default of spring.test.database.replace
The default of @AutoConfigureTestDatabase's replace attribute changed
from ANY to NON_TEST in 3.4 but the manually declared metadata for
spring.test.database.replace still advertised "any" as the default.

See gh-51709

Signed-off-by: ohchanKyu <okc0202@naver.com>
2026-09-14 10:57:58 +02:00
Stéphane Nicoll 5c7eea8a84 Merge branch '4.0.x' into 4.1.x
Closes gh-51720
2026-09-13 17:21:20 +02:00
Tran Ngoc Nhan 338ac4b490 Remove unnecessary backtick in author tag
See gh-51719

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2026-09-13 17:14:27 +02:00
Andy Wilkinson 885720ae66 Merge branch '4.0.x' into 4.1.x
Closes gh-51667
2026-09-11 12:55:59 +01:00
Andy Wilkinson d08d6d053a Merge pull request #51666 from ohchanKyu
Closes gh-51666

* gh-51666:
  Polish "Use TLS port for Docker Compose RabbitMQ connection when SSL is configured"
  Use TLS port for Docker Compose RabbitMQ connection when SSL is configured
2026-09-11 12:47:17 +01:00
Andy Wilkinson 18295bf297 Polish "Use TLS port for Docker Compose RabbitMQ connection when SSL is configured"
See gh-51666

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-11 12:42:51 +01:00
ohchanKyu 458ed72f55 Use TLS port for Docker Compose RabbitMQ connection when SSL is configured
When a rabbitmq Docker Compose service has SSL bundle labels,
RabbitDockerComposeConnectionDetailsFactory created an SslBundle but
still resolved the address from container port 5672, the plain AMQP
listener. As the connection factory enables SSL when an SslBundle is
present, the TLS handshake was attempted against the non-TLS listener
and the connection failed.

The address is now resolved from container port 5671 when an SslBundle
is present, matching RabbitStreamDockerComposeConnectionDetailsFactory
and the Testcontainers-based RabbitContainerConnectionDetailsFactory.
The SSL integration test now opens a connection using the resolved
address and SslBundle so that it fails without this fix.

Signed-off-by: ohchanKyu <okc0202@naver.com>

See gh-51666
2026-09-11 12:35:40 +01:00
Andy Wilkinson d601081bd5 Merge branch '4.0.x' into 4.1.x
Closes gh-51645
2026-09-09 10:37:08 +01:00
Andy Wilkinson a9fbd4a24c Polish "Remove redundant whitespace"
See gh-51644

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-09 10:00:36 +01:00
Tran Ngoc Nhan fd7a52b954 Remove redundant whitespace
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>

See gh-51644
2026-09-09 10:00:23 +01:00
Andy Wilkinson e383449a5d Merge branch '4.0.x' into 4.1.x
Closes gh-51639
2026-09-09 08:21:12 +01:00
Andy Wilkinson 06c0fa8d5c Retain WebFlux's default SameSite when property not set
Fixes gh-51636
2026-09-09 08:18:47 +01:00
Stéphane Nicoll 163fac2cb1 Merge branch '4.0.x' into 4.1.x 2026-09-08 18:30:45 +02:00
Stéphane Nicoll 4fc987180d Polish "Add support for creating a container from a TestImage value"
See gh-51082
2026-09-08 18:30:35 +02:00
Andy Wilkinson 7c11fcf97f Merge branch '4.0.x' into 4.1.x
Closes gh-51632
2026-09-08 16:55:15 +01:00
ohchanKyu afc3178f33 Fix typo in deprecated Pushgateway base-url property metadata
The deprecation entry for
management.prometheus.metrics.export.pushgateway.base-url was declared
as "management.promethus", so the deprecation was never reported.

Signed-off-by: ohchanKyu <okc0202@naver.com>

See gh-51627
2026-09-08 16:54:18 +01:00
Andy Wilkinson e158494508 Merge branch '4.0.x' into 4.1.x
Closes gh-51630
2026-09-08 16:51:49 +01:00
JaeHyunAn 537c80dbb9 Honor authorities-claim-delimiter when set on its own
See gh-51619

Signed-off-by: JaeHyunAn <98042706+yyuneu@users.noreply.github.com>
2026-09-08 16:39:54 +01:00
Stéphane Nicoll 18292d400c Merge branch '4.0.x' into 4.1.x
Closes gh-51628
2026-09-08 16:57:00 +02:00
Stéphane Nicoll b1e91c942e Add support for creating a container from a TestImage value
This commit improves TestImage so that an explicit image can trigger
the creation of the container, with optional additional setup. This
removes the need of creating additional container types for images that
have multiple flavors, and to please the static method that can only
create a container based on a single match.

Closes gh-51082
2026-09-08 16:46:48 +02:00
Andy Wilkinson 60dc60c5f6 Merge branch '4.0.x' into 4.1.x
Closes gh-51616
2026-09-08 09:19:33 +01:00
Andy Wilkinson 23275d826b Polish "Preserve firewall in reactive CF security auto-configuration"
See gh-51549

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-08 09:18:26 +01:00
Andy Wilkinson c1900d0bc9 Merge branch '4.0.x' into 4.1.x
Closes gh-51614
2026-09-08 09:15:55 +01:00
aashikantkumar 4f3d0349f3 Preserve firewall in reactive CF security auto-configuration
Prior to this commit, CloudFoundryReactiveActuatorAutoConfiguration
registered a BeanPostProcessor replaced the WebFilterChainProxy bean
with one that handled CF security and delegated to the existing
chain.

Constructing a new WebFilterChainProxy resulted in the loss of any
firewall customization on the existing chain as Spring Security does
not provide an API to retreive the firewall from the existing chain
and apply it to the new chain.

This commit changes the approach and aligns it with its Servlet
counterpart. Instead of post-processing the filter chain proxy, a new
SecurityWebFilterChain that handles cloudfoundryapplication/**
is defined. This chain becomes part of the existing
WebFilterChainProxy, preserving any firewall customization.

Signed-off-by: aashikantkumar <aashikantkumar2@gmail.com>

See gh-51549
2026-09-08 08:56:38 +01:00
Andy Wilkinson 1d79f56ad7 Return 503 for missing application ID or cloud controller URL
Previously, the CloudFoundryAuthorizationExceptions thrown for a
missing application ID or cloud controller URL were not routed
through the error handling that turned them into a SecurityResponse
with a 503 status code. As a result, they were processed by the
general exception handling which resulted in a 500 response.

This commit updates the reactive SecurityInterceptor so that the
exceptions are processed through
SecurityInterceptor::getErrorResponse. This aligns the behavior of
the Cloud Foundry security intergration in a reactive application
more closely with that of a Servlet application.

Fixes gh-51613
2026-09-08 08:51:58 +01:00
Andy Wilkinson 50350d0c83 Merge branch '4.0.x' into 4.1.x
Closes gh-51606
2026-09-07 12:20:30 +01:00
Hyunwoo Jung 528c8bd1ea Fix typos
Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>

See gh-51590
2026-09-07 11:53:30 +01:00
Andy Wilkinson 61275b0c64 Merge branch '4.0.x' into 4.1.x
Closes gh-51601
2026-09-07 08:43:48 +01:00
Fabio Grassi b49f9e2c32 Switch to Java 17 variants of Oracle JDBC dependencies
Signed-off-by: Fabio Grassi <40345396+fabio-grassi@users.noreply.github.com>

See gh-51593
2026-09-07 08:31:23 +01:00
Andy Wilkinson ea613dc511 Merge branch '4.0.x' into 4.1.x
Closes gh-51599
2026-09-07 08:26:42 +01:00
Manu Sridharan 25a3f8feb9 Remove unnecessary NullAway suppressions
Signed-off-by: Manu Sridharan <msridhar@gmail.com>

See gh-51591
2026-09-07 08:18:11 +01:00
Andy Wilkinson 154a77cae9 Make reactive resource server back off with custom security
Previously, the auto-configuration of reactive OAuth 2 resource
server based web security did not back off when a custom
SecurityWebFilterChain was defined. This did not match the
equivalent servlet-based auto-configuration which backs off when
a custom SecurityFilterChain is defined.

This commit updates the reactive auto-configuration to behave in
the same way as the servlet auto-configuration. A new annotation,
@ConditionalOnDefaultReactiveWebSecurity, is introduced. The
existing servlet-specific annotation,
@ConditionalOnDefaultWebSecurity is deprecated and a replacement
named @ConditionalOnDefaultServletWebSecurity is introduced.

Fixes gh-50778
2026-09-04 16:08:58 +01:00
Andy Wilkinson 61a62d56d8 Merge branch '4.0.x' into 4.1.x
Closes gh-51584
2026-09-04 12:58:36 +01:00
Manu Sridharan 1c50b1cb7c Fix new warnings from NullAway 0.14.1
Signed-off-by: Manu Sridharan <msridhar@gmail.com>

See gh-51507
2026-09-04 12:56:34 +01:00
Andy Wilkinson 9380e958d3 Merge branch '4.0.x' into 4.1.x
Closes gh-51578
2026-09-04 10:14:19 +01:00
Andy Wilkinson a833fe58f9 Merge pull request #51546 from yyuneu
Closes gh-51546

* gh-51546:
  Apply RabbitMQ credential fallbacks for null values
2026-09-04 10:12:14 +01:00
Andy Wilkinson c38c15b3b7 Merge branch '4.0.x' into 4.1.x
Closes gh-51576
2026-09-04 09:53:28 +01:00
Vladimir Sitnikov ff3086700b Fix unrecognized JSpecify nullable annotations
Signed-off-by: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>

See gh-51555
2026-09-04 09:40:47 +01:00
Andy Wilkinson 4c5ed7e087 Merge branch '4.0.x' into 4.1.x
Closes gh-51574
2026-09-04 09:35:30 +01:00
kdomo 3d037f9df6 Correct Assert messages that name the wrong parameter
Three Assert messages named a parameter that does not exist on the
method. In each case the correct name is already used by neighbouring
code in the same class.

Signed-off-by: kdomo <dongho5088@naver.com>

See gh-51568
2026-09-04 09:10:05 +01:00