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

4412 Commits

Author SHA1 Message Date
Andy Wilkinson
5e76671859 Remove remaining code that was deprecated in 2.5 
Closes gh-30442
 2022-04-13 18:09:39 +01:00
Andy Wilkinson
d5a92ccb8b Merge branch '2.7.x' 2022-04-12 21:20:34 +01:00
Andy Wilkinson
a7a71da9ef Polish "Bring back Elasticsearch RestClient auto-configuration" 
See gh-28496
 2022-04-12 21:13:05 +01:00
Filip Hrisafov
eb3bf40bdb Bring back Elasticsearch RestClient auto-configuration 
Prior to this commit, Spring Boot would only auto-configure the
`RestHighLevelClient` and `RestClientBuilder` if the
`RestHighLevelClient` was present. This was done in 1d73d4ed.

This commit brings back the exposing of the `RestClient` bean in when
exposing the `RestHighLevelClient` or when the `RestHighLevelClient`
is not present. It allows for using the auto-configuration and its
customizers of the `RestClientBuilder` in a similar way as it is done
for the `RestTemplateBuilder` and the `WebClient.Builder`.

The presence of the `elasticsearch-rest-high-level-client` module is
now optional. This opens the door for potentially adding support for
the new Elasticsearch Java Client[1] that is based on the same
`RestClient`.

The health contributor and its configuration has also been updated to
only depend on the low-level RestClient.

See gh-28496

[1] https://github.com/elastic/elasticsearch-java
 2022-04-12 21:13:05 +01:00
rstoyanchev
b91bfc7067 Update WebMVC GraphQL autoconfig to the latest 
As a result of changes for
https://github.com/spring-projects/spring-graphql/issues/342,
GraphQlWebSocketHandler now exposes a method to create the
WebSocketHttpRequestHandler, pre-configured with a context propagating
HandshakeInterceptor. This commit updates the autoconfig to use it.

Closes gh-30641
 2022-04-12 20:17:29 +02:00
Brian Clozel
77b7f2f1ce Switch to Spring Framework SNAPSHOTs 
See gh-30624
 2022-04-12 17:02:03 +02:00
Andy Wilkinson
b871a1e457 Merge branch '2.7.x' 2022-04-12 08:51:47 +01:00
Andy Wilkinson
48f8021d88 Migrate @Local*Port annotations to spring-boot-test 
Closes gh-29589
 2022-04-12 08:48:43 +01:00
Stephane Nicoll
2ded2bf71a Adapt to latest change in Spring Framework snapshots 2022-04-09 17:10:48 +02:00
Stephane Nicoll
e735bb2fcd Start building against Spring Framework 5.3.19 snapshots 
See gh-30517
 2022-04-09 10:01:00 +02:00
Andy Wilkinson
6d865c2646 Merge branch '2.7.x' 2022-04-08 21:02:35 +01:00
Andy Wilkinson
7534e50d0b Merge branch '2.6.x' into 2.7.x 
Closes gh-30621
 2022-04-08 21:02:16 +01:00
Andy Wilkinson
7e44745816 Merge branch '2.5.x' into 2.6.x 
Closes gh-30620
 2022-04-08 21:01:48 +01:00
Andy Wilkinson
b88f062f04 Polish "Remove assumptions about ordering when comparing JSON in tests" 
See gh-30514
 2022-04-08 20:56:20 +01:00
Vivek Gupta
5b3bc1a936 Remove assumptions about ordering when comparing JSON in tests 
See gh-30514
 2022-04-08 20:55:54 +01:00
Scott Frederick
0dd9493dc1 Merge branch '2.7.x' 2022-04-07 17:12:14 -05:00
Scott Frederick
d67dcf16cd Migrate FailureAnalyzers to constructor injection 
All `FailureAnalyzer` implementations should use constructor
injection for `BeanFactory` and `Environment` instead of implementing
`BeanFactoryAware` or `EnvironmentAware` interfaces.

Fixes gh-30585
 2022-04-07 16:58:59 -05:00
Moritz Halbritter
8f275353ef Merge branch '2.7.x' 2022-04-06 08:57:15 +02:00
Moritz Halbritter
1b5927b325 Merge branch '2.6.x' into 2.7.x 
Closes gh-30552
 2022-04-06 08:56:59 +02:00
Moritz Halbritter
99a1b98e03 Merge branch '2.5.x' into 2.6.x 
Closes gh-30551
 2022-04-06 08:56:47 +02:00
Moritz Halbritter
41ab46d0c7 Fix wrong replacement hint for 'spring.data.neo4j.username' 
Closes gh-30550
 2022-04-06 08:56:23 +02:00
Brian Clozel
1c71567c94 Support "application/graphql+json" media type in GraphQL HTTP mapping 
As seen in spring-projects/spring-graphql#108, the GraphQL HTTP spec now
requires the "application/graphql+json" media type and accepts
"application/json" for backwards compatibility.

This commit updates the `RouterFunction` definition for the GraphQL HTTP
endpoints so that both types are accepted.

Closes gh-30407
 2022-04-04 16:45:11 +02:00
Stephane Nicoll
ac93dc3252 Remove reference to spring.datasource.initialization-mode in tests 
Closes gh-30511
 2022-04-03 10:17:28 +02:00
Stephane Nicoll
535a9b7be0 Remove outdated reference to spring.datasource.initialization-mode 
Closes gh-30435
 2022-04-03 10:10:21 +02:00
Stephane Nicoll
6d7b14a5a2 Revert test assertion until we switch to framework snapshots 2022-04-01 12:14:17 +02:00
Stephane Nicoll
25d8888aff Merge branch '2.7.x' 2022-03-31 12:45:13 +02:00
Stephane Nicoll
1da5a7a600 Merge branch '2.6.x' into 2.7.x 2022-03-31 12:45:05 +02:00
Stephane Nicoll
546a7e5edb Merge branch '2.5.x' into 2.6.x 2022-03-31 12:44:52 +02:00
Stephane Nicoll
17936b855c Polish 2022-03-31 12:42:37 +02:00
Andy Wilkinson
ad95aded7e Merge branch '2.7.x' 2022-03-30 10:57:28 +01:00
Andy Wilkinson
b9029fcf9e Merge branch '2.6.x' into 2.7.x 
Closes gh-30476
 2022-03-30 10:57:10 +01:00
Andy Wilkinson
64beaba99f Merge branch '2.5.x' into 2.6.x 
Closes gh-30475
 2022-03-30 10:56:56 +01:00
Andy Wilkinson
8cb11b74cd Polish "Make MustacheViewResolver bean back off without Spring MVC" 
See gh-30456
 2022-03-30 10:33:35 +01:00
Craig Andrews
7101b5099f Make MustacheViewResolver bean back off without Spring MVC 
See gh-30456
 2022-03-30 10:31:44 +01:00
Andy Wilkinson
24e6417ddc Adapt to latest changes in Spring for GraphQL snapshots 
See gh-30463
 2022-03-29 16:50:12 +01:00
Brian Clozel
93817c708e Switch to Spring for GraphQL 1.0.0-SNAPSHOT 
See gh-30463
 2022-03-29 16:37:21 +02:00
Andy Wilkinson
eabf6cd1d8 Merge branch '2.7.x' 2022-03-25 15:15:26 +00:00
Andy Wilkinson
685d2d4391 Polish 
See gh-30152
 2022-03-25 15:15:02 +00:00
Guirong Hu
df417bf317 Simplify registration of Jackson mixin types 
See gh-30152
 2022-03-25 15:15:02 +00:00
Moritz Halbritter
e431842668 Merge branch '2.7.x' 2022-03-25 14:56:49 +01:00
Moritz Halbritter
45f393b76b Merge branch '2.6.x' into 2.7.x 
Closes gh-30437
 2022-03-25 14:56:01 +01:00
Moritz Halbritter
c003d5b533 Merge branch '2.5.x' into 2.6.x 
Closes gh-30436
 2022-03-25 14:55:31 +01:00
Moritz Halbritter
0ff8119a1b Sort entries in additional-spring-configuration metadata alphabetically 
Closes gh-30434
 2022-03-25 14:54:39 +01:00
Andy Wilkinson
5702f9ebc3 Merge branch '2.7.x' 2022-03-23 20:16:51 +00:00
Andy Wilkinson
5d55c663ba Allow spring.data.mongodb.uri to take precedence over separate props 
Closes gh-30067
 2022-03-23 20:15:04 +00:00
Andy Wilkinson
77e6279d03 Merge branch '2.7.x' 2022-03-23 12:11:24 +00:00
Andy Wilkinson
3255da23a2 Merge branch '2.6.x' into 2.7.x 
Closes gh-30388
 2022-03-23 12:11:13 +00:00
Andy Wilkinson
c739831087 Merge branch '2.5.x' into 2.6.x 
Closes gh-30387
 2022-03-23 12:11:02 +00:00
Andy Wilkinson
d8cf332c2e Document default value of spring.thymeleaf.reactive.media-types 
Closes gh-30280
 2022-03-23 12:09:48 +00:00
Andy Wilkinson
3ee44ca0b0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30386
 2022-03-23 11:47:53 +00:00