3229 Commits

Author SHA1 Message Date
Andy Wilkinson
1931104d13 Merge branch '2.4.x' into 2.5.x
Closes gh-28206
2021-10-06 09:57:19 +01:00
Andy Wilkinson
9c9fbf400e Upgrade to Spring Java Format 0.0.29
Closes gh-28205
2021-10-06 09:52:45 +01:00
Andy Wilkinson
bddfe9ef6e Merge branch '2.5.x'
See gh-28135
2021-10-01 11:32:59 +01:00
Andy Wilkinson
d238566920 Merge branch '2.4.x' into 2.5.x
See gh-28134
2021-10-01 11:32:22 +01:00
Andy Wilkinson
a73293350a Fix parsing of portless IPv6 spring.rabbitmq.addresses
Closes gh-28133
2021-10-01 11:30:11 +01:00
Stephane Nicoll
14fc0f78b2 Polish "Stop considering persistent when scanning for Couchbase entities"
See gh-28124
2021-10-01 08:31:14 +02:00
Dąbrowski
067b349fb1 Stop considering persistent when scanning for Couchbase entities
See gh-28124
2021-10-01 08:28:36 +02:00
Phillip Webb
ca69c8b98c Merge branch '2.5.x'
Closes gh-28135
2021-09-26 13:06:35 -07:00
Phillip Webb
fcb6f557f7 Merge branch '2.4.x' into 2.5.x
Closes gh-28134
2021-09-26 13:06:14 -07:00
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
2021-09-26 13:05:17 -07:00
Andy Wilkinson
ab95c2fa3b Polish descriptions of spring.integration.poller properties
Closes gh-28126
2021-09-24 10:09:18 +01:00
Andy Wilkinson
3274e24d55 Polish "Add Spring Integration default poller auto-config"
See gh-27992

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-09-23 16:20:13 -07:00
Artem Bilan
b2d1423e34 Add Spring Integration default poller auto-config
When polling consumers or source polling channel adapters are used in
Spring Integration applications, they require some polling policy to
be configured.

This comment auto-configures a PollerMetadata bean which customized
via newly added `spring.integration.poller.*` configuration
properties or overriden completely be user-defined bean.

See gh-27992
2021-09-23 16:20:13 -07:00
Andy Wilkinson
342c749784 Polish 2021-09-22 20:28:31 +01:00
Andy Wilkinson
4fa61cbc60 Merge branch '2.5.x' 2021-09-22 18:37:11 +01:00
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
2021-09-22 18:30:44 +01:00
Stephane Nicoll
233b63199c Polish "Clarify pooling is implicitly enabled in Sentinel mode"
See gh-27891
2021-09-22 11:52:46 +02:00
weixsun
d39b7cc46d Clarify pooling is implicitly enabled in Sentinel mode
See gh-27891
2021-09-22 11:48:36 +02:00
Phillip Webb
667e5ca30c Polish 2021-09-21 14:45:01 -07:00
Phillip Webb
55a1ec72cc Update copyright year of changed files 2021-09-21 11:25:50 -07:00
Stephane Nicoll
e0465f7357 Use RootBeanDefinition consistently
Closes gh-28077
2021-09-21 16:36:45 +02:00
Stephane Nicoll
124c3ac07c Polish "Add support for used-defined RedisStandaloneConfiguration"
See gh-28028
2021-09-21 08:34:44 +02:00
Eddú Meléndez
236c2dd0da Add support for used-defined RedisStandaloneConfiguration
See gh-28028
2021-09-21 08:22:41 +02:00
Stephane Nicoll
3e5038cddd Merge branch '2.5.x'
Closes gh-28073
2021-09-21 08:19:58 +02:00
Stephane Nicoll
4ee249c700 Merge branch '2.4.x' into 2.5.x
Closes gh-28072
2021-09-21 08:18:39 +02:00
Stephane Nicoll
15de85d89a Polish contribution
See gh-28061
2021-09-21 08:18:08 +02:00
Leo Li
0374c3d563 Add default value for "s.d.elasticsearch.client.reactive.endpoints"
See gh-28061
2021-09-21 08:12:21 +02:00
dreis2211
cf0fcafd13 Polish
See gh-27940
2021-09-21 08:08:29 +02:00
Andy Wilkinson
808aa77747 Provide a config prop for Elasticsearch client's path prefix
Closes gh-25010
2021-09-20 15:09:10 +01:00
Andy Wilkinson
e2a355f003 Consolidate Elasticsearch configuration properties
Previously, a number of Elasticsearch properties were duplicated
across the spring.elasticsearch.rest and
spring.data.elasticsearch.client.reactive prefixes for configuring
the blocking REST client provided by Elasticsearch and the reactive
client provided by Spring Data respectively. This could cause
problems when using the Elasticsearch REST client configured with
a custom spring.elasticsearch.rest.uris. If Spring WebFlux (to make
use of WebClient) and Spring Data Elasticsearch were on the classpath,
the reactive Elasticsearch Client would be autoconfigured but it
would use the default value of its analogous
spring.data.elasticsearch.client.reactive.endpoints property. It
would be unable to connect, causing a startup failure.

This commit consoliates the configuration properties where possible.
Each setting that is common across the two clients is now configured
using a single, shared spring.elasticsearch property. Each setting
that is specific to the blocked REST client or the WebClient-based
reactive client now have prefixes of spring.elasticsearch.restclient
and spring.elasticsearch.webclient respectively.

The old properties beneath spring.elasticsearch.rest and
spring.data.elasticsearch.client.reactive have been deprecated. If a
any deprecated property is set, all of the new properties are
ignored. In other words, to migrate to the new properties, each usage
of a now-deprecated property must be updated to use its new
replacement instead.

Closes gh-23106
2021-09-20 14:37:44 +01:00
Andy Wilkinson
30815cc0e0 Upgrade to Spring Data 2021.1.0-M3
Closes gh-27932
2021-09-17 15:56:57 +01:00
Andy Wilkinson
74eed94a14 Upgrade to Thymeleaf Layout Dialect 3.0.0
Closes gh-28057
2021-09-17 15:56:57 +01:00
Andy Wilkinson
7924d1fc18 Upgrade to Flyway 7.15.0
Closes gh-28049
2021-09-17 13:57:21 +01:00
Andy Wilkinson
5857bcccc6 Merge branch '2.5.x'
Closes gh-28048
2021-09-17 13:20:30 +01:00
Andy Wilkinson
8364840cd5 Merge branch '2.4.x' into 2.5.x
Closes gh-28047
2021-09-17 12:25:13 +01:00
Andy Wilkinson
eacb9273e3 Polish property mapping in reactive Elastic REST client auto-config
Closes gh-28038
2021-09-17 12:00:45 +01:00
Stephane Nicoll
599cc1f696 Start building against Spring Data 2021.1.0-M3 snapshots
See gh-27932
2021-09-11 08:59:12 +02:00
Stephane Nicoll
78d6c94a7e Polish "Auto-Configure Kafka CommonErrorHandler"
See gh-27927
2021-09-10 08:20:10 +02:00
Gary Russell
c3583a4b06 Auto-Configure Kafka CommonErrorHandler
`ErrorHandler/BatchErrorHandler` will be deprecated in a future release
in favor of `CommonErrorHandler`. Currently, the legacy handlers are
adapted to a `CommonErrorHandler` or ignored if a `CommonErrorHandler`
is configured.

See gh-27927
2021-09-10 08:16:29 +02:00
dreis2211
e1afc91ae2 Polish javadoc comments
See gh-27925
2021-09-10 07:53:49 +02:00
Andy Wilkinson
bb11abef2c Merge branch '2.5.x'
Closes gh-27923
2021-09-09 16:12:45 +01:00
Andy Wilkinson
70b2b33f55 Merge branch '2.4.x' into 2.5.x
Closes gh-27922
2021-09-09 16:12:25 +01:00
Andy Wilkinson
206176425a Broaden testing of ReactiveElasticsearchRestClientAutoConfiguration
Closes gh-27919
2021-09-09 16:12:09 +01:00
Andy Wilkinson
8ab9dbad7a Merge branch '2.5.x'
Closes gh-27913
2021-09-09 14:40:57 +01:00
Andy Wilkinson
128f54fbd0 Merge branch '2.4.x' into 2.5.x
Closes gh-27911
2021-09-09 14:40:40 +01:00
Andy Wilkinson
11c79ac650 Move Docker-based reactive Elasticsearch test into separate class
Closes gh-27907
2021-09-09 14:39:52 +01:00
Andy Wilkinson
010d201002 Merge branch '2.5.x'
Closes gh-27906
2021-09-09 13:38:38 +01:00
Andy Wilkinson
7afaffb80e Merge branch '2.4.x' into 2.5.x
Closes gh-27905
2021-09-09 13:38:09 +01:00
Andy Wilkinson
1f2035ae64 Move Docker-based Elasticsearch test into separate class
Closes gh-27904
2021-09-09 13:24:26 +01:00
Madhura Bhave
393081f2e6 Enable PathPattern based matching for MVC actuators
Closes gh-24645
2021-09-08 16:23:16 -07:00