Commit Graph

2892 Commits (1e4cc601670bb6a31af41feef8dd5a1cd058b5e8)

Author SHA1 Message Date
Andy Wilkinson 50d4eaad63 Merge branch '2.4.x' into 2.5.x
Closes gh-28439
3 years ago
Andy Wilkinson a545b6e0b4 Polish "Polish"
See gh-28367
3 years ago
Leo Li 1586232761 Polish
See gh-28367
3 years ago
Andy Wilkinson 585b8880c7 Merge branch '2.4.x' into 2.5.x
Closes gh-28424
3 years ago
Andy Wilkinson 7f976dab9e Polish "Don't use markdown syntax in javadoc or error messages"
See 2f6651c3cb.

Closes gh-28408
3 years ago
Phillip Webb daf36dff55 Merge branch '2.4.x' into 2.5.x
Closes gh-28424
3 years ago
Phillip Webb 2f6651c3cb Don't use markdown syntax in javadoc or error messages
Closes gh-28408
3 years ago
Andy Wilkinson f2ef8f9245 Start building against Spring Framework 5.3.12 snapshots
This reverts commit 196013fc39, reversing
changes made to 8b0c563832.

Closes gh-28384
See gh-28241
3 years ago
Andy Wilkinson 971bdd36fe Start building against Framework 5.3.12 snapshots
This reverts commit b32a38a814.

See gh-28223
Closes gh-28369
3 years ago
Andy Wilkinson c8e0791b50 Merge branch '2.4.x' into 2.5.x
Closes gh-28379
3 years ago
Andy Wilkinson 5fe75f3d58 Improve diagnostics when no DSLContext due to R2DBC
Fixes gh-28378
3 years ago
Andy Wilkinson 196013fc39 Merge branch '2.4.x' into 2.5.x
See gh-28241
3 years ago
Andy Wilkinson b32a38a814 Work around unwanted static resource warnings from WebFlux and MVC
See gh-28223
3 years ago
Phillip Webb 02b577390f Merge branch '2.4.x' into 2.5.x 3 years ago
Phillip Webb 0561992c2a Update copyright year of changed files 3 years ago
Phillip Webb 9abf9e6731 Modify more tests for static resource location filtering
Fix `WebFluxAutoConfigurationTests` following upstream Spring Framework
changes. Also refine `WebMvcAutoConfigurationTests` to check the locations
are set even if they are filtered.

See gh-28223
3 years ago
Scott Frederick f427ea5802 Merge branch '2.4.x' into 2.5.x
Closes gh-28304
3 years ago
Scott Frederick 3d21ac7a20 Add required id field to Spring Data Neo4j test class
Fixes gh-28303
3 years ago
Scott Frederick 3755c563df Merge branch '2.4.x' into 2.5.x 3 years ago
Scott Frederick 3c6e061917 Remove unused import
See gh-28223
3 years ago
Scott Frederick ec6bfa8062 Merge branch '2.4.x' into 2.5.x 3 years ago
Scott Frederick 207b76c39e Modify tests to expect filtering of static resource locations
Spring Framework will filter non-existent locations from any configured
static resource handlers starting with 5.3.11. Tests that verify
static resource locations should account for this change.

See gh-28223
3 years ago
Andy Wilkinson 1931104d13 Merge branch '2.4.x' into 2.5.x
Closes gh-28206
3 years ago
Andy Wilkinson 9c9fbf400e Upgrade to Spring Java Format 0.0.29
Closes gh-28205
3 years ago
Andy Wilkinson d238566920 Merge branch '2.4.x' into 2.5.x
See gh-28134
3 years ago
Andy Wilkinson a73293350a Fix parsing of portless IPv6 spring.rabbitmq.addresses
Closes gh-28133
3 years ago
Phillip Webb fcb6f557f7 Merge branch '2.4.x' into 2.5.x
Closes gh-28134
3 years ago
Phillip Webb 01a39aaf6a Support IPv6 addresses in spring.rabbitmq.addresses
Refine parsing logic in `RabbitProperties` so that IPv6 addresses can
be used.

Fixes gh-28133
3 years ago
Andy Wilkinson 2ba593328f Order detector for AbstractDataSourceInitializers
Previously, the detector for AbstractDataSourceInitializers used the
default detector order. This resulted in the initializers detected
initializers running before Flyway. Constrastingly, the detector for
DataSourceScriptDatabaseInitializers uses a custom order so its
detected initializers would run after Flyway.

This commit aligns the order of the detector for
AbstractDataSourceInitializers with the order of the detector for
DataSourceScriptDatabaseInitializers. This ensures that script-based
initialization runs in the same order with respect to Flyway,
irrespective of which initializer implementation is driving it.

Fixes gh-28079
3 years ago
Stephane Nicoll 4ee249c700 Merge branch '2.4.x' into 2.5.x
Closes gh-28072
3 years ago
Stephane Nicoll 15de85d89a Polish contribution
See gh-28061
3 years ago
Leo Li 0374c3d563 Add default value for "s.d.elasticsearch.client.reactive.endpoints"
See gh-28061
3 years ago
Andy Wilkinson 8364840cd5 Merge branch '2.4.x' into 2.5.x
Closes gh-28047
3 years ago
Andy Wilkinson eacb9273e3 Polish property mapping in reactive Elastic REST client auto-config
Closes gh-28038
3 years ago
Andy Wilkinson 70b2b33f55 Merge branch '2.4.x' into 2.5.x
Closes gh-27922
3 years ago
Andy Wilkinson 206176425a Broaden testing of ReactiveElasticsearchRestClientAutoConfiguration
Closes gh-27919
3 years ago
Andy Wilkinson 128f54fbd0 Merge branch '2.4.x' into 2.5.x
Closes gh-27911
3 years ago
Andy Wilkinson 11c79ac650 Move Docker-based reactive Elasticsearch test into separate class
Closes gh-27907
3 years ago
Andy Wilkinson 7afaffb80e Merge branch '2.4.x' into 2.5.x
Closes gh-27905
3 years ago
Andy Wilkinson 1f2035ae64 Move Docker-based Elasticsearch test into separate class
Closes gh-27904
3 years ago
Andy Wilkinson 6d8ba3e8b1 Merge branch '2.4.x' into 2.5.x
Closes gh-27757
3 years ago
Andy Wilkinson ffbd28b60a Polish "Polish access modifiers for test classes"
See gh-27736
3 years ago
izeye 8a425dedfd Polish access modifiers for test classes
See gh-27736
3 years ago
Andy Wilkinson 533bb24b55 Merge branch '2.4.x' into 2.5.x
Closes gh-27525
3 years ago
Andy Wilkinson ad2d9c0ab1 Customize Cassandra's configuration to reduce container startup time
Closes gh-27524
3 years ago
Andy Wilkinson eaca9c7a83 Merge branch '2.4.x' into 2.5.x
Closes gh-27473
3 years ago
Andy Wilkinson ee07d6c3ca Increase response timeout for server-bound WebTestClients
Closes gh-27472
3 years ago
dreis2211 f0df9671cd Remove redundant deprecation suppressions
See gh-27409
3 years ago
Andy Wilkinson 1e09ef1db3 Merge branch '2.4.x' into 2.5.x
Closes gh-27361
3 years ago
Andy Wilkinson fe081b1742 Add Gson converter immediately before default Jackson converter
Previously, when the preferred json mapper was set to Gson, the Gson
HTTP message converter was added before any other converters. This
changed the form of String responses that were already valid. When
Jackson is in use, a string converter is used as it appears earlier
in the list than the Jackson converter. When the mapper is switched
to Gson, the Gson converter is added first in the list of converters
and the Strong converter is no longer used. This results in the
String, that was already valid JSON, being converted again. This
changes its form as quotes are escaped, etc.

This commit updates HttpMessageConverters so that the Gson converter
is added to the list immediately before the default Jackson
converter. This is done by considering the Gson converter to be an
equivalent of the Jackson converter.

Fixes gh-27354
3 years ago