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

2963 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
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
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
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
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
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
533bb24b55 Merge branch '2.4.x' into 2.5.x 
Closes gh-27525
 2021-07-29 17:42:26 +01:00
Andy Wilkinson
ad2d9c0ab1 Customize Cassandra's configuration to reduce container startup time 
Closes gh-27524
 2021-07-29 17:33:56 +01:00
Andy Wilkinson
eaca9c7a83 Merge branch '2.4.x' into 2.5.x 
Closes gh-27473
 2021-07-23 13:09:27 +01:00
Andy Wilkinson
ee07d6c3ca Increase response timeout for server-bound WebTestClients 
Closes gh-27472
 2021-07-23 13:06:25 +01:00
dreis2211
f0df9671cd Remove redundant deprecation suppressions 
See gh-27409
 2021-07-20 14:53:28 +01:00
Andy Wilkinson
1e09ef1db3 Merge branch '2.4.x' into 2.5.x 
Closes gh-27361
 2021-07-16 09:43:33 +01:00
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
 2021-07-16 09:04:46 +01:00
izeye
198e40c72e Remove Flyway references from DependsOn BFPPs for Liquibase 
See gh-27348
 2021-07-15 20:18:27 +01:00
Andy Wilkinson
9a81d2fe09 Merge branch '2.4.x' into 2.5.x 
Closes gh-27332
 2021-07-14 17:19:39 +01:00
Andy Wilkinson
c005e1de9a Rename test classes to match our naming conventions 
Closes gh-27331
 2021-07-14 17:19:11 +01:00
Andy Wilkinson
1cd3a54e88 Rework Quartz DB init dependencies to use a detector 
Closes gh-27222
 2021-07-09 15:02:15 +01:00
Andy Wilkinson
3de58c2340 Detect JdbcIndexedSessionRepository as depending on DB init 
Fixes gh-27220
 2021-07-09 14:17:23 +01:00
Andy Wilkinson
f008228f1a Polish "Detect JobRepository as depending on DB init" 
See gh-27221
 2021-07-09 12:36:30 +01:00
Henning Pöttker
cf69785393 Detect JobRepository as depending on DB init 
See gh-27221
 2021-07-09 12:36:19 +01:00
Andy Wilkinson
7b94b40a19 Ensure that Session JDBC schema is in place before DB is accessed 
Fixes gh-27208
 2021-07-09 11:12:52 +01:00
Andy Wilkinson
4b1b2d6603 Consider Flyway and Liquibase as possible Batch DB initializers 
This is a follow-on from 3fec4110 which only considered
BatchDataSourceInitializer as a possible initializer of Batch's
database schema. Flyway and Liquibase are now also considered.

Closes gh-27193
 2021-07-09 10:29:50 +01:00
Andy Wilkinson
3fec41104e Ensure that Batch schema is in place before DB is accessed 
Fixes gh-27193
 2021-07-09 09:47:48 +01:00
Stephane Nicoll
ddf76c32c6 Update copyright year of updated file 
See gh-27085
 2021-06-29 08:28:08 +02:00
dreis2211
c852961011 Avoid reflection in tests 
See gh-27085
 2021-06-29 08:25:45 +02:00
Brian Clozel
4db53601b5 Fix spring.netty.leak-detection metadata 
Fixes gh-27104
 2021-06-25 19:38:07 +02:00
Andy Wilkinson
4572ae5430 Use reflection to extract Netty's default level 
See gh-27046
 2021-06-24 11:20:56 +01:00
Phillip Webb
093e7f7e3b Merge branch '2.4.x' into 2.5.x 
Closes gh-27062
 2021-06-23 21:13:08 -07:00
Phillip Webb
1a7569056b Fix 'spring.datasource.name' property description 
Closes gh-27026
 2021-06-23 21:12:59 -07:00
Brian Clozel
bf17f50a1f Align NettyProperties with Netty's defaults 
Prior to this commit, `NettyProperties` would use `DISABLED` as the
default level for leak detection in Netty. This is not the default value
enforced by Netty, which is `SIMPLE`.

This commit changes the default configuration property value and ensures
that both stay in sync.

Fixes gh-27046
 2021-06-23 19:36:40 +02:00
dreis2211
03cd6bec6e Avoid illegal reflective access in RabbitAutoConfigurationTests 
See gh-26954
 2021-06-22 08:22:48 +02:00
Andy Wilkinson
bc7004d9c6 Fix WebSocket support with Jetty 10.0.x 
Fixes gh-26847
 2021-06-16 12:38:33 +01:00
Andy Wilkinson
2c2ab69315 Merge branch '2.4.x' into 2.5.x 
Closes gh-26917
 2021-06-15 22:20:52 +01:00
Andy Wilkinson
a1e279f736 Make Flyway and Liquibase auto-config back off without spring-jdbc 
The auto-config requires Spring JDBC for DataSource creation from
spring.flyway.url or spring.liquibase.url, checking Flyway migrations
exist, etc. Without it, the application fails to start due to missing
spring-jdbc classes.

This commit updates the auto-config so that it backs off in the
absence of spring-jdbc.

Closes gh-26849
 2021-06-15 22:00:11 +01:00
Andy Wilkinson
39aa27e13c Make DB init back off without DatabasePopulator 
Fixes gh-26850
 2021-06-10 11:27:25 +01:00
Andy Wilkinson
46d7999b1d Lower spring.sql.init.enabled's deprecation level to warning 
See gh-26682
 2021-06-09 19:11:20 +01:00
Stephane Nicoll
8590eccac4 Polish 
See gh-26682
 2021-06-09 14:47:54 +02:00
Phillip Webb
f798f26596 Merge branch '2.4.x' 2021-06-08 18:05:50 -07:00
Phillip Webb
4d62e47c5d Merge branch '2.3.x' into 2.4.x 2021-06-08 18:05:12 -07:00
Phillip Webb
9e1c78da99 Update copyright year of changed files 2021-06-08 18:03:46 -07:00
Phillip Webb
b7ac1e6cd7 Rename derivefrom to align with DataSourceBuilder 
Rename the `derivefrom` method in `ConnectionFactoryBuilder` to
`derivedFrom` to align with `DataSourceBuilder`.

Fixes gh-26810
 2021-06-08 15:44:01 -07:00
Phillip Webb
f8c3e0e5aa Respect custom username/password properties 
Fix a bug in `DataSourceInitializationConfiguration` and in
`R2dbcInitializationConfiguration` that was stopping
custom username/password properties from being applied.

Fixes gh-26676
 2021-06-08 14:58:39 -07:00