4589 Commits

Author SHA1 Message Date
Maziz
ecda754116 Set virtual thread names for RabbitMQ and Pulsar
See gh-39958
2024-03-18 11:24:10 +01:00
Chris Bono
ac0d1e0ec6 Re-enable Spring Pulsar interceptor tests
The PulsarTemplate recently replaced its list of ProducerInterceptors
with a list of ProducerBuilderCustomizers that customize the builder by
adding each interceptor to the builder. The PulsarAutoConfigurationTests
previosuly relied on the previous field. This commit adjusts the tests
to instead use the Customizers testing utility to verify the
interceptors.

(cherry picked from commit 9c054a021fc34728a68a835a5c2e421f3e11df9f)

See gh-39946
2024-03-15 11:00:09 +01:00
Scott Frederick
460d8a070d Merge branch '3.1.x' into 3.2.x
Closes gh-39773
2024-02-27 14:13:12 -06:00
Stéphane Nicoll
f6e4bede09 Stop throwing BindingException in tests
This commit adapts the error controller tests that need the request
to fail with a bind issue, and simulate the behavior of
ModelAttributeMethodProcessor.

As of Spring Framework 6.0.x, this processor no longer throws a
BindingException, but rather a MethodArgumentNotValidException and
the handing of BindException itself is deprecated.

This makes sure that those tests can smoothly be executed against
Spring Framework 6.2.x as throwing a BindingException now results
into an unresolved exception, and an internal server error rather than
the expected bad request.

See gh-39767
2024-02-27 14:12:19 -06:00
Scott Frederick
7efef3141e Merge branch '3.1.x' into 3.2.x
Closes gh-39769
2024-02-27 13:00:50 -06:00
Stéphane Nicoll
c259a673d3 Make resolution algorithm of ConnectionDetailsFactory more explicit
This commit moves the resolution check for ConnectionDetailsFactory
to a dedicated method to make it more clear that it is meant to verify
that the implementation is resolved and can be loaded from the
classpath.

The previous algorithm relied on a behavior of ResolvableType that only
resolves the first level generics. Further improvements in Spring
Framework 6.2 make this check invalid as some implementations use a
Container that can hold a nested generic.

See gh-39737
2024-02-27 12:46:51 -06:00
Phillip Webb
12de6aa46a Merge branch '3.1.x' into 3.2.x 2024-02-21 15:27:27 -08:00
Patrick Strawderman
057432c87b Re-order route registration for GraphQL web endpoints
Re-order the route registrations for GraphQL requests so that the
most commonly matched path is evaluated first.

Closes gh-39613
2024-02-19 14:36:09 +01:00
Moritz Halbritter
bb7706fe88 Merge branch '3.1.x' into 3.2.x
Closes gh-39619
2024-02-19 11:09:36 +01:00
Stéphane Nicoll
7d73b11239 Fix json path assertion
See gh-39605
2024-02-19 11:01:12 +01:00
Moritz Halbritter
d6d70828f1 Merge branch '3.1.x' into 3.2.x
Closes gh-39598
2024-02-16 09:44:32 +01:00
junhyung
8fee77761d Change ConcurrentReferenceCachingMetadataReaderFactory to use application's resource loader
See gh-39321
2024-02-16 09:32:24 +01:00
Andy Wilkinson
256f9fe83a Only configure WebFlux blocking executor when using virtual threads
Fixes gh-39469
2024-02-14 08:19:58 +00:00
Andy Wilkinson
b6467ed826 Adapt to Spring Data Neo4j now requiring a transaction manager
See gh-39493
2024-02-13 16:53:18 +00:00
Andy Wilkinson
d597a4d56b Correct handling of disable-html-escaping
See gh-39504
2024-02-12 12:35:47 +00:00
Andy Wilkinson
5746886e64 Merge branch '3.1.x' into 3.2.x
Closes gh-39524
2024-02-12 10:22:37 +00:00
Andy Wilkinson
4319554f8a Fix mapping of boolean properties to Gson's builder
Fixes gh-39504
2024-02-12 10:13:04 +00: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
Andy Wilkinson
dada1378bd Start building against Spring GraphQL 1.2.5 snapshots
See gh-39482
2024-02-09 11:04:12 +00:00
Andy Wilkinson
af3ffb209c Start building against Spring GraphQL 1.2.5 snapshots
See gh-39462

Co-authored-by: Brian Clozel <brian.clozel@broadcom.com>
2024-02-08 15:19:32 +00:00
Chris Bono
41ed4d6cf4 Remove use of Pulsar ObjectMapperFactory
This commit removes the use of the Pulsar ObjectMapperFactory when
converting the authentication config props map to a JSON string. The
Pulsar factory operates on a shaded returned value of Jackson
ObjectMapper which may not exist when users are using the
non-shaded version of the Pulsar client lib.

See https://github.com/spring-projects/spring-pulsar/issues/562

See gh-39389
2024-02-06 13:12:57 +01:00
Moritz Halbritter
cee249197f Polish "Use generic wildcard for Pulsar beans"
See gh-39308
2024-01-31 09:54:18 +01:00
JonasG
c02dd14c66 Use generic wildcard for Pulsar beans
See gh-39308
2024-01-31 09:51:31 +01:00
Phillip Webb
cff8cb98c7 Merge branch '3.1.x' into 3.2.x 2024-01-22 12:20:24 -08:00
Phillip Webb
e1986ea11e Update copyright year of changed files 2024-01-22 12:20:06 -08:00
Andy Wilkinson
961da4e428 Make user details only back off without custom username or password
Closes gh-38864
2024-01-18 14:14:39 +00:00
Andy Wilkinson
fee359ff5e Downgrade to production-ready version of Oracle Database
This reverts commit d2325d111091122478200436a8b9e9dc98eeec59.

Closes gh-38943
2024-01-17 20:14:09 +00:00
Andy Wilkinson
aec4550b02 Merge branch '3.1.x' into 3.2.x
Closes gh-39167
2024-01-17 13:00:22 +00:00
Andy Wilkinson
a7d52226d5 Polish "Improve toString of SslBundle implementations"
See gh-39137
2024-01-17 11:50:34 +00:00
amparab
b49ccbb0c2 Improve toString of SslBundle implementations
See gh-39137
2024-01-17 11:37:18 +00:00
Andy Wilkinson
a5d3fb588b Merge branch '3.1.x' into 3.2.x
Closes gh-39103
2024-01-11 13:55:34 +00:00
Andy Wilkinson
31936f036b Remove FlywayMigrationScriptMissingFailureAnalyzer from spring.factories
Closes gh-39102
2024-01-11 13:55:05 +00: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
793801b9cb Merge branch '3.1.x' into 3.2.x
Closes gh-39078
2024-01-10 09:53:45 +01:00
BenchmarkingBuffalo
56f00c4c21 Move autoStartup property
Move the property 'autoStartup' from BaseContainer to AmqpContainer.

See gh-39072
2024-01-10 09:52:28 +01:00
skcskitano
dc8b55c0ef Fix connection leak in SqlDialectLookup
See gh-38924
2024-01-10 09:46:39 +01:00
Phillip Webb
7216d2b031 Merge branch '3.1.x'
Closes gh-38916
2023-12-22 10:43:46 -08:00
Phillip Webb
95a8fa561c Correctly order @AutoConfigureAfter values when sorting
Update `AutoConfigurationSorter` so that `getClassesRequestedAfter()`
results are sorted to match the earlier name/order sorting. Prior to
this commit the order of items added via `@AutoConfigureAfter` was in
an undetermined order which could cause very subtle `@ConditionalOnBean`
bugs.

Thanks very much to Alexandre Baron for their help in diagnosing and
reproducing this issue.

Fixes gh-38904
2023-12-22 08:20:25 -08:00
Phillip Webb
15dd37095f Merge branch '3.1.x'
Closes gh-38880
2023-12-19 23:45:42 -08:00
Phillip Webb
b00d5fabe8 Auto-configure Hibernate JPA before DataSource TransactionManager
Fixes gh-38861
2023-12-19 23:44:48 -08:00
Phillip Webb
5354ad15b3 Merge branch '3.1.x'
Closes gh-38877
2023-12-19 22:51:48 -08:00
Yanming Zhou
ac18e3015c Use .isEmpty() where feasible
See gh-38739
2023-12-19 22:38:05 -08:00
Phillip Webb
2158f4cc43 Polish 'Use authParamString to configure Pulsar authentication'
See gh-38839
2023-12-16 22:23:37 -08:00
Chris Bono
4c0a19e8c0 Use authParamString to configure Pulsar authentication
Update `PulsarPropertiesMapper` to use JSON encoded parameters rather
than a `Map` since the `Map` method is deprecated in Pulsar. This
commit simply takes the auth params map and converts them to the
expected encoded JSON string of auth parameters.

See gh-38839
2023-12-16 22:19:45 -08:00
Phillip Webb
26dc14031e Update LoadedPemSslStore to use lazy loading
Update `LoadedPemSslStore` so that it loads content lazily. This
restores the behavior of Spring Boot 3.1 and allows bundles to be
defined with files that don't exist as long as they are never accessed.

Fixes gh-38659
2023-12-14 22:03:07 -08:00
Phillip Webb
1d10e51755 Adapt to upstream Spring Security changes 2023-12-14 20:33:09 -08:00
Andy Wilkinson
afad358047 Align reactive web security more closely with servlet web security
There are some notable differences in the behavior of Spring
Security's reactive and servlet-based web security. Notably,
Servlet-based web security (`@EnableWebSecurity`) works without
any authentication manager, rejecting requests as not authorized.
By contrast reactive-based web security (`@EnableWebFluxSecurity`)
fails to start up when there's no authentication manager, either
provided directly as a bean or derived from a
ReactiveUserDetailsService. There are also further differences at
runtime where empty Monos from all ReactiveAuthenticationManagers
results in an internal error and a 500 response whereas a similar
situation in the servlet implementation results in a 401.

Previously, to accommodate these differences in behavior, Spring
Boot's auto-configuration would behave differently. In the Servlet
case, web security would be enabled whenever the necessary
dependencies were on the classpath. In the reactive case, web
security would back off in the absence of an authentication manager
to prevent a start up failure. While this difference is rooted in
Spring Security, it is undesirable and something that we want to
avoid Spring Boot users being exposed to where possible.
Unfortunately, the situation is more likely to occur than before
as ReactiveUserDetailsServiceAutoConfiguration now backs off more
readily (gh-35338). This makes it more likely that the context will
contain neither a reactive authetication manager not a reactive
user details service.

This commit reworks the auto-configurations related to reactive
security. ReactiveSecurityAutoConfiguration will now auto-configure
an "empty" reactive authentication manager that denies access through
Mono.error in the absence of a ReactiveAuthenticationManager,
ReactiveUserDetailsService, or SecurityWebFilterChain. The last of
these is to allow for the situation where a filter chain has been
defined with an authentication manager configured directly on it.
This configuration of an authentication manager allows
`@EnableWebFluxSecurity` to be auto-configured more readily,
removing one of the differences between reactive- and Servlet-based
security.

Corresponding updates to the auto-configurations for reactive OAuth2
support have also been made. They no longer try to auto-configure
`@EnableWebFluxSecurity`, relying instead upon
ReactiveSecurityAutoConfiguration, which they are ordered before, to
do that instead.

Closes gh-38713
2023-12-13 12:44:04 +00:00
Andy Wilkinson
964ccbb000 Revert "Do not enable WebFlux security unless other configuration is active"
This reverts commit beba1f176a93f80c179e7d0970df93ce910f8a9f.

See gh-38713
2023-12-13 11:17:08 +00:00