fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,592 Commits 22 Branches 339 Tags
Commit Graph

3155 Commits

Author SHA1 Message Date
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
Stephane Nicoll
aa24476559 Update copyright year of changed files 
See gh-27838
 2021-09-05 17:10:10 +02:00
Yanming Zhou
168688ef49 Simplify code 
See gh-27838
 2021-09-05 17:08:33 +02:00
Madhura Bhave
2d89a8253c Switch default MVC path matching strategy" 
Change the default `spring.mvc.pathmatch.matching-strategy` to
`PATH_PATTERN_PARSER`.

Closes gh-24805
 2021-09-02 11:50:35 -07:00
weixsun
149ed09230 Polish SessionAutoConfiguration#addCandidateIfAvailable 
See gh-27808
 2021-08-24 07:24:23 +02:00
Andy Wilkinson
fd2fbcb3c6 Merge branch '2.5.x' 
Closes gh-27758
 2021-08-18 18:28:34 +01:00
Andy Wilkinson
6d8ba3e8b1 Merge branch '2.4.x' into 2.5.x 
Closes gh-27757
 2021-08-18 17:56:32 +01:00
Andy Wilkinson
ffbd28b60a Polish "Polish access modifiers for test classes" 
See gh-27736
 2021-08-18 17:52:42 +01:00
izeye
8a425dedfd Polish access modifiers for test classes 
See gh-27736
 2021-08-18 17:38:40 +01:00
Andy Wilkinson
2dfdcf5e88 Merge branch '2.5.x' 
Closes gh-27754
 2021-08-18 13:52:23 +01:00
Stephane Nicoll
456d741706 Add support for configuring Jackson's ConstructorDetector 
Closes gh-27178
 2021-08-17 14:15:08 +02:00
Stephane Nicoll
68a47a7f11 Polish "Add property to customize Jackson's default leniency" 
See gh-27659
 2021-08-16 09:03:50 +02:00
Lovekesh Garg
89c532ab70 Add property to customize Jackson's default leniency 
See gh-27659
 2021-08-16 08:57:13 +02:00
Andy Wilkinson
42fb40b202 Upgrade to Flyway 7.13.0 
Closes gh-27644
 2021-08-12 17:18:29 +01:00
Andy Wilkinson
fe17be16e9 Upgrade to Commons Pool2 2.11.0 
Closes gh-27642
 2021-08-12 13:52:22 +01:00
Andy Wilkinson
7a0fe0f95f Polish "Add auto-configuration for spring-rabbit-stream" 
See gh-27480
 2021-08-11 13:19:15 +01:00
Gary Russell
9784838229 Add auto-configuration for spring-rabbit-stream 
See gh-27480
 2021-08-11 12:05:59 +01:00
Andy Wilkinson
0ed9085ba2 Polish "Apply container customizer bean to AMQP MessageListenerContainer" 
See gh-27625
 2021-08-11 11:47:03 +01:00
Gary Russell
774941e958 Apply container customizer bean to AMQP MessageListenerContainer 
See gh-27625
 2021-08-11 11:18:16 +01:00
Stephane Nicoll
a4eda34170 Start building against Spring Kafka 2.8.0-M2 snapshots 
See gh-27609
 2021-08-10 09:24:01 +02:00
Brian Clozel
a1fe82c3dd Fix formatting 2021-08-02 16:54:25 +02:00
Brian Clozel
e48cb12252 Polish "Add spring.webflux.multipart configuration properties" 
See gh-26254
 2021-08-02 15:40:42 +02:00
bono007
4c0b6304ac Add spring.webflux.multipart configuration properties 
See gh-26254
 2021-08-02 15:40:42 +02:00
Andy Wilkinson
2482607a06 Merge branch '2.5.x' 
Closes gh-27526
 2021-07-29 17:42:40 +01:00
Andy Wilkinson
533bb24b55 Merge branch '2.4.x' into 2.5.x 
Closes gh-27525
 2021-07-29 17:42:26 +01:00